Merge pull request #53 from paliarush/Improvements

Improvements

Author: paliarush

CHANGELOG.md

@@ -14,6 +14,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
  - Removed requirement for public github token due to Composer limitations (issue is fixed on Composer side)
  - Changed requirement for minimum box version from 1.0 to 1.1
  - Upgraded PHP 5.5.9 to PHP 5.6
+ - When [init_project.sh](init_project.sh) is executed, EE will be installed by default, if EE repository is specified in [etc/config.yaml.dist](etc/config.yaml.dist)
 
 ### Fixed
 
@@ -29,6 +30,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
  - Added ability to modify guest config files (PHP, Apache etc) directly from host IDE
  - Added ability to choose if PhpStorm configs should be removed during project reinitialization
  - Added ability to switch PHP version without destroying the project ("vagrant reload" is required)
+ - Added ability to do force switch to CE or EE (even if already switched to target edition)
  - Added ability to use Varnish full page caching automatically. (Using "vagrant reload" or m-varnish script)
 
 ## [v2.0.0] - 2016-02-05

README.md

@@ -134,6 +134,7 @@ Note, that semantic versioning is only used for `x.0` branches (not for `develop
  1. ![](docs/images/linux-icon.png)![](docs/images/osx-icon.png) On OSX and \*nix hosts NFS will be used by default to sync your project files with guest. On some hosts Vagrant cannot configure NFS properly, in this case it is possible to deploy project without NFS by setting `use_nfs` option in [config.yaml](etc/config.yaml.dist) to `0` <br />
  1. ![](docs/images/windows-icon.png) On Windows hosts you might face `Composer Install Error: ZipArchive::extractTo(): Full extraction path exceed MAXPATHLEN (260)` exception during `composer install`. This can be fixed in 2 ways: decrease path length to the project directory or set `composer_prefer_source` option in [config.yaml](etc/config.yaml.dist) to `1`
  1. Make sure that you used `vagrant-magento` directory as project root in PHP Storm (not `vagrant-magento/magento2ce`)
+ 1. If project opened in PhpStorm looks broken, close PhpStorm  and remove `vagrant-magento/.idea`. After opening project in PhpStorm again everything should look good
  1. If code is not synchronized properly on Windows hosts (or when NFS mode is disabled in [config.yaml](etc/config.yaml.dist) explicitly), make sure that PhpStorm is running before making any changes in the code. This is important because otherwise PhpStorm will not be able to detect changes and upload them to the guest machine
  1. Please make sure that currently installed software, specified in [requirements section](#requirements), meets minimum version requirement
  1. If MySQL fails to start and Magento reinstallation fails with `ERROR 2002 (HY000): Can't connect to local MySQL server through socket '/var/run/mysqld/mysqld.sock' (13)`, try to run login to virtual machine using `vagrant ssh` and then run `sudo dpkg-reconfigure mysql-server-5.6`, then `sudo service mysql restart.`
@@ -169,6 +170,9 @@ bash m-switch-to-ce
 OR
 bash m-switch-to-ee
 ```
+
+Force switch can be done using `-f` flag even if already switched to the target edition. May be helpful to relink EE modules after switching between branches.
+
 :information_source: On Windows hosts (or when NFS mode is disabled in [config.yaml](etc/config.yaml.dist) explicitly) you will be asked to wait until code is uploaded to guest machine by PhpStorm (PhpStorm must be lunched). To continue the process press any key.
 
 ### Update Composer dependencies

Vagrantfile

@@ -101,8 +101,6 @@ Vagrant.configure(VAGRANT_API_VERSION) do |config|
         config.vm.provision "guest_remove_compressed_code", type: "shell", inline: "rm -f /vagrant/scripts/host/magento2ce.tar"
     end
 
-    config.vm.provision "install_magento", type: "shell", inline: "m-reinstall"
-
     # Host manager plugin configuration
     config.hostmanager.enabled = true
     config.hostmanager.manage_host = true

init_project.sh

@@ -83,6 +83,12 @@ bash "${vagrant_dir}/scripts/host/composer.sh" install
 cd "${vagrant_dir}"
 vagrant up
 
+if [[ -n "${repository_url_ee}" ]]; then
+    bash "${vagrant_dir}/m-switch-to-ee" -f
+else
+    bash "${vagrant_dir}/m-switch-to-ce" -f
+fi
+
 set +x
 echo "Configuring PhpStorm..."
 if [[ ${force_project_cleaning} -eq 1 ]] && [[ ${force_phpstorm_config_cleaning} -eq 1 ]]; then

m-switch-to-ce

@@ -10,12 +10,22 @@ php_executable=$(bash "${vagrant_dir}/scripts/host/get_path_to_php.sh")
 set -ex
 
 if [[ ! -f ${magento_ee_dir}/app/etc/aliases_to_classes_map.json ]]; then
+    set +x
     echo "EE codebase is not available"
     exit 0
 fi
 
-if [[ ! -f ${magento_ce_dir}/app/etc/aliases_to_classes_map.json ]]; then
-    echo "Already switched to CE"
+force_switch=0
+while getopts 'f' flag; do
+  case "${flag}" in
+    f) force_switch=1 ;;
+    *) error "Unexpected option ${flag}" ;;
+  esac
+done
+
+if [[ ! -f ${magento_ce_dir}/app/etc/aliases_to_classes_map.json ]] && [[ ${force_switch} -eq 0 ]]; then
+    set +x
+    echo "Already switched to CE. Use 'm-switch-to-ce -f' to switch anyway."
     exit 0
 fi
 

m-switch-to-ee

@@ -10,12 +10,22 @@ php_executable=$(bash "${vagrant_dir}/scripts/host/get_path_to_php.sh")
 set -ex
 
 if [[ ! -f ${magento_ee_dir}/app/etc/aliases_to_classes_map.json ]]; then
+    set +x
     echo "EE codebase is not available"
     exit 0
 fi
 
-if [[ -f ${magento_ce_dir}/app/etc/aliases_to_classes_map.json ]]; then
-    echo "Already switched to EE"
+force_switch=0
+while getopts 'f' flag; do
+  case "${flag}" in
+    f) force_switch=1 ;;
+    *) error "Unexpected option ${flag}" ;;
+  esac
+done
+
+if [[ -f ${magento_ce_dir}/app/etc/aliases_to_classes_map.json ]] && [[ ${force_switch} -eq 0 ]]; then
+    set +x
+    echo "Already switched to EE. Use 'm-switch-to-ce -f' to switch anyway."
     exit 0
 fi
 

scripts/guest/m-reinstall

@@ -63,7 +63,7 @@ install_cmd="./bin/magento setup:install \
     --use-rewrites=1"
 
 # Configure Rabbit MQ
-if [[ -f "${MAGENTO_ROOT}/app/etc/enterprise/di.xml" ]] && [[ -d "${MAGENTO_ROOT}/app/code/Magento/Amqp" ]]; then
+if [[ -f "${MAGENTO_ROOT}/app/etc/enterprise/di.xml" ]]; then
     install_cmd="${install_cmd} \
     --amqp-host=${setupOptions[amqp_host]} \
     --amqp-port=${setupOptions[amqp_port]} \