Merge remote-tracking branch 'origin/2.0' into Cli-Ux-Improvements

# Conflicts:
#	CHANGELOG.md
#	m-switch-to-ce
#	m-switch-to-ee
#	scripts/host/relink_sample_data.sh

Author: Alex Paliarush

CHANGELOG.md

@@ -12,10 +12,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
-- Improved CLI scripts output formatting
+ - After EE is linked, EE versions of composer.lock and composer.json are replaced back with CE versions (thus are not marked by git as modified)
+ - Improved CLI scripts output formatting
 
 ### Fixed
 
+ - Fixed issue with some files marked as unversioned in git after EE linking
  - It is now possible to use spaces in path to vagrant project on Windows. On OSX and Linux hosts it works in non-NFS mode, in NFS mode it does not work because of [bug in vagrant](mitchellh/vagrant#7540)
  - Fixed issue with MySQL being down after VM power off
 

etc/config.yaml.dist

@@ -1,5 +1,5 @@
 repository_url:
-  # [To apply changes: init-project -fc]
+  # [To apply changes: init_project.sh -fc]
   # git@github.com:magento/magento2ce.git OR custom one
   ce: "git@github.com:magento/magento2.git"
   # git@github.com:magento/magento2ee.git OR custom one
@@ -9,7 +9,7 @@ repository_url:
   # git@github.com:magento/magento2-sample-data-ee.git OR custom one
   ee_sample_data: ""
 guest:
-  # [To apply changes: init-project -f]
+  # [To apply changes: init_project.sh -f]
   # NFS will be used for folder synchronization on *nix and OSX hosts by default.
   use_nfs: 1
   # Default is 2Gb, around 3Gb is necessary to run functional tests.
@@ -30,7 +30,7 @@ environment:
 magento:
   # [To apply changes: m-switch-to-ce -f OR m-switch-to-ee -f]
   install_sample_data: 0
-  # [To apply changes: init-project -f]
+  # [To apply changes: init_project.sh -f]
   host_name: "magento2.vagrant2"
   # [To apply changes: m-reinstall]
   admin_frontname: "admin"

init_project.sh

@@ -148,4 +148,4 @@ if [[ ${host_os} == "Windows" ]] || [[ ${use_nfs} == 0 ]]; then
     If not using PhpStorm, you can set up synchronization using rsync"
 fi
 
-info "See detailed log in '${vagrant_dir}/log/debug.log'"
+info "See detailed log in '${vagrant_dir}/log/debug.log'. For even more details you can set debug:vagrant_project to 1 in config.yaml"

m-bin-magento

@@ -18,4 +18,4 @@ vagrant ssh -c "\$MAGENTO_ROOT/bin/magento $arguments" 2> >(logError)
 # To debug, comment out line above and uncomment line below
 # vagrant ssh -c "php -d xdebug.remote_autostart=1 \$MAGENTO_ROOT/bin/magento $arguments" 2> >(logError)
 
-info "See detailed log in '${vagrant_dir}/log/debug.log'"
+info "See detailed log in '${vagrant_dir}/log/debug.log'. For even more details you can set 'debug:vagrant_project' to 1 in etc/config.yaml"

m-clear-cache

@@ -14,4 +14,4 @@ fi
 
 bash "${vagrant_dir}/scripts/host/m_clear_cache.sh" "$@" 2> >(logError)
 
-info "See detailed log in '${vagrant_dir}/log/debug.log'"
+info "See detailed log in '${vagrant_dir}/log/debug.log'. For even more details you can set 'debug:vagrant_project' to 1 in etc/config.yaml"

m-composer

@@ -14,4 +14,4 @@ fi
 
 bash "${vagrant_dir}/scripts/host/m_composer.sh" "$@" 2> >(logError)
 
-info "See detailed log in '${vagrant_dir}/log/debug.log'"
+info "See detailed log in '${vagrant_dir}/log/debug.log'. For even more details you can set 'debug:vagrant_project' to 1 in etc/config.yaml"

m-reinstall

@@ -14,4 +14,4 @@ fi
 
 bash "${vagrant_dir}/scripts/host/m_reinstall.sh" "$@" 2> >(logError)
 
-info "See detailed log in '${vagrant_dir}/log/debug.log'"
+info "See detailed log in '${vagrant_dir}/log/debug.log'. For even more details you can set 'debug:vagrant_project' to 1 in etc/config.yaml"

m-search-engine

@@ -15,4 +15,4 @@ fi
 cd "${vagrant_dir}"
 vagrant ssh -c "bash /vagrant/scripts/guest/m-search-engine ${@}" 2> >(logError)
 
-info "See detailed log in '${vagrant_dir}/log/debug.log'"
+info "See detailed log in '${vagrant_dir}/log/debug.log'. For even more details you can set 'debug:vagrant_project' to 1 in etc/config.yaml"

m-switch-to-ce

@@ -14,4 +14,4 @@ fi
 
 bash "${vagrant_dir}/scripts/host/m_switch_to_ce.sh" "$@" 2> >(logError)
 
-info "See detailed log in '${vagrant_dir}/log/debug.log'"
+info "See detailed log in '${vagrant_dir}/log/debug.log'. For even more details you can set 'debug:vagrant_project' to 1 in etc/config.yaml"

m-switch-to-ee

@@ -14,4 +14,4 @@ fi
 
 bash "${vagrant_dir}/scripts/host/m_switch_to_ee.sh" "$@" 2> >(logError)
 
-info "See detailed log in '${vagrant_dir}/log/debug.log'"
+info "See detailed log in '${vagrant_dir}/log/debug.log'. For even more details you can set 'debug:vagrant_project' to 1 in etc/config.yaml"

m-varnish

@@ -15,4 +15,4 @@ fi
 cd "${vagrant_dir}"
 vagrant ssh -c "bash /vagrant/scripts/guest/m-varnish ${@}" 2> >(logError)
 
-info "See detailed log in '${vagrant_dir}/log/debug.log'"
+info "See detailed log in '${vagrant_dir}/log/debug.log'. For even more details you can set 'debug:vagrant_project' to 1 in etc/config.yaml"

scripts/host/m_switch_to_ce.sh

@@ -36,8 +36,9 @@ else
     fi
 
     status "Unlinking EE repository"
-    ${php_executable} -f ${magento_ee_dir}/dev/tools/build-ee.php -- --command=unlink --ee-source="${magento_ee_dir}" --ce-source="${magento_ce_dir}" 2> >(logError) > >(log)
+    ${php_executable} -f ${magento_ee_dir}/dev/tools/build-ee.php -- --command=unlink --ee-source="${magento_ee_dir}" --ce-source="${magento_ce_dir}" --exclude=true 2> >(logError) > >(log)
 
+   # TODO: Remove after some time. For now this is left for backward compatibility
     cd ${magento_ce_dir}
     git checkout composer.json
     git checkout composer.lock

scripts/host/m_switch_to_ee.sh

@@ -32,9 +32,8 @@ else
     fi
 
     status "Linking EE repository"
-    ${php_executable} -f ${magento_ee_dir}/dev/tools/build-ee.php -- --command=link --ee-source="${magento_ee_dir}" --ce-source="${magento_ce_dir}" 2> >(logError) > >(log)
+    ${php_executable} -f ${magento_ee_dir}/dev/tools/build-ee.php -- --command=link --ee-source="${magento_ee_dir}" --ce-source="${magento_ce_dir}" --exclude=true 2> >(logError) > >(log)
 
-    cp ${magento_ee_dir}/composer.json ${magento_ce_dir}/composer.json
     cp ${magento_ee_dir}/composer.lock ${magento_ce_dir}/composer.lock
 
     if [[ ${host_os} == "Windows" ]] || [[ $(bash "${vagrant_dir}/scripts/get_config_value.sh" "guest_use_nfs") == 0 ]]; then
@@ -56,6 +55,8 @@ bash "${vagrant_dir}/scripts/host/relink_sample_data.sh" 2> >(logError)
 bash "${vagrant_dir}/scripts/host/m_clear_cache.sh" 2> >(logError)
 bash "${vagrant_dir}/scripts/host/m_composer.sh" install 2> >(logError)
 
+cd ${magento_ce_dir} && git checkout composer.lock 2> >(logError) > >(log)
+
 if [[ ${host_os} == "Windows" ]] || [[ $(bash "${vagrant_dir}/scripts/get_config_value.sh" "guest_use_nfs") == 0 ]]; then
     read -p "$(warning "[Action Required] Wait while Magento2 code is uploaded in PhpStorm and press any key to continue...")" -n1 -s
 fi

scripts/host/relink_sample_data.sh

@@ -22,17 +22,17 @@ fi
 # As a precondition, disable CE sample data
 if [[ -f "${magento_ce_sample_data_dir}/dev/tools/build-sample-data.php" ]]; then
     status "Unlinking CE sample data"
-    ${php_executable} -f "${magento_ce_sample_data_dir}/dev/tools/build-sample-data.php" -- --command=unlink --ce-source="${magento_ce_dir}" --sample-data-source="${magento_ce_sample_data_dir}" 2> >(logError) > >(log)
+    ${php_executable} -f "${magento_ce_sample_data_dir}/dev/tools/build-sample-data.php" -- --command=unlink --ce-source="${magento_ce_dir}" --sample-data-source="${magento_ce_sample_data_dir}" --exclude=true 2> >(logError) > >(log)
 fi
 # As a precondition, disable EE sample data
 if [[ -f "${magento_ee_sample_data_dir}/dev/tools/build-sample-data.php" ]]; then
-    "${php_executable}" -f "${magento_ee_sample_data_dir}/dev/tools/build-sample-data.php" -- --command=unlink --ce-source="${magento_ce_dir}" --sample-data-source="${magento_ee_sample_data_dir}" 2> >(logError) > >(log)
+    "${php_executable}" -f "${magento_ee_sample_data_dir}/dev/tools/build-sample-data.php" -- --command=unlink --ce-source="${magento_ce_dir}" --sample-data-source="${magento_ee_sample_data_dir}" --exclude=true 2> >(logError) > >(log)
     status "Unlinking EE sample data"
 fi
 
 if [[ ${install_ee} -eq 1 ]]; then
     status "Linking EE to CE"
-    "${php_executable}" -f "${magento_ee_dir}/dev/tools/build-ee.php" -- --command=link --ee-source="${magento_ee_dir}" --ce-source="${magento_ce_dir}" 2> >(logError) > >(log)
+    "${php_executable}" -f "${magento_ee_dir}/dev/tools/build-ee.php" -- --command=link --ee-source="${magento_ee_dir}" --ce-source="${magento_ce_dir}" --exclude=true 2> >(logError) > >(log)
 fi
 
 if [[ ${install_sample_data} -eq 1 ]]; then
@@ -46,7 +46,7 @@ if [[ ${install_sample_data} -eq 1 ]]; then
         # Sample data available and should be enabled
         success "CE Sample data enabled"
         cd ${magento_ce_sample_data_dir} && git fetch && git pull 2> >(logError) > >(log)
-        "${php_executable}" -f "${magento_ce_sample_data_dir}/dev/tools/build-sample-data.php" -- --command=link --ce-source="${magento_ce_dir}" --sample-data-source="${magento_ce_sample_data_dir}" 2> >(logError) > >(log)
+        "${php_executable}" -f "${magento_ce_sample_data_dir}/dev/tools/build-sample-data.php" -- --command=link --ce-source="${magento_ce_dir}" --sample-data-source="${magento_ce_sample_data_dir}" --exclude=true 2> >(logError) > >(log)
     fi
 
     if [[ ${install_ee} -eq 1 ]]; then
@@ -60,7 +60,7 @@ if [[ ${install_sample_data} -eq 1 ]]; then
             # Sample data available and should be enabled
             success "EE Sample data enabled"
             cd ${magento_ee_sample_data_dir} && git fetch && git pull 2> >(logError) > >(log)
-            "${php_executable}" -f "${magento_ee_sample_data_dir}/dev/tools/build-sample-data.php" -- --command=link --ce-source="${magento_ce_dir}" --sample-data-source="${magento_ee_sample_data_dir}" 2> >(logError) > >(log)
+            "${php_executable}" -f "${magento_ee_sample_data_dir}/dev/tools/build-sample-data.php" -- --command=link --ce-source="${magento_ce_dir}" --sample-data-source="${magento_ee_sample_data_dir}" --exclude=true 2> >(logError) > >(log)
         fi
     fi
 fi