capistrano-magento2 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd0274d749aa804a3b80628664a330835e02dba2
-  data.tar.gz: 8aba5b376eed205074d70844aff9d7076f5c6e9e
+  metadata.gz: 8898c62e930f71d3b30804d3c0d3834bb75f22c0
+  data.tar.gz: 71af2dbbe39540c476c38ba6bdb47d8d95ea1666
 SHA512:
-  metadata.gz: 76b8f66d1db89cdeab58bc7c1cfe143abc99587a1cf3dfcbd0364aff1177babdcffaf550444758d84a382c62ee6e16ca221e4307be91b611fe76e89d20b31195
-  data.tar.gz: 8ebe366a649d741d54ff83f52f65803ce9b0bf7ad037774b47e757b965ac6ba0ad72793cb8b9eb730bfbc95cd0f820fe9ab7efc96a576ea8f6a4ac46671bbc76
+  metadata.gz: 7c8f3cdc2b99db147d0f0da84f886c65d91ef38c82e26aeb8e47d12366dd3d8efe86e8a8b366ca90257e7b5d45e549e75d0253ab40f48fc1ecd0e41f6385347b
+  data.tar.gz: 209ce16d410078b31ddcc68bee40529792654fd77e029f8ace6e982286a79a1cd21736eaa197cdf94aa5d02d215f339e850940700f9906644b4ca316894188c2

data/CHANGELOG.md

@@ -1,12 +1,21 @@
 # Capistrano::Magento2 Change Log
 
+0.5.9
+==========
+
+* Updated README with Capistrano 3.7 setup information
+* Updated `linked_dirs` to link `pub/sitemaps` by default in similar fashion to the Magento1 deployment gem
+* Updated README with guidance on adding a path to the list of `linked_dirs` without copying the entire configuration forward
+* Fixed bug causing pipefail option to persist after `Capistrano::Magento2::Setup.static_content_deploy` is called
+ 
 0.5.8
 ==========
 
-* Fixed critical failure due to command map being broken in v0.5.7 updates
+* Fixed critical failure due to command map being broken in v0.5.7 updates (issue #50, issue #51)
 
 0.5.7
 ==========
+_Note: This release was yanked from RubyGems due to a critical failure in the deploy routine._
 
 * Fixed failing deploys for Magento 2.1.0 caused by improper version checks on flags added in version 2.1.1 (issue #45)
 * Fixed failure to detect error codes Magento 2.1.1 returns on a failed static-content deploy job (issue #44)

data/README.md

@@ -44,6 +44,10 @@ _Note: By default, Capistrano creates "staging" and "production" stages. If you
     # Load Magento deployment tasks
     require 'capistrano/magento2/deploy'
     
+    # Load Git plugin
+    require "capistrano/scm/git"
+    install_plugin Capistrano::SCM::Git
+    
     # Load custom tasks from `lib/capistrano/tasks` if you have any defined
     Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
     ```
@@ -143,12 +147,12 @@ For the sake of simplicity in new project setups `:linked_dirs` and `:linked_fil
 set :linked_files, [
   'app/etc/env.php',
   'var/.setup_cronjob_status',
-  'var/.update_cronjob_status',
-  'pub/sitemap.xml'
+  'var/.update_cronjob_status'
 ]
 
 set :linked_dirs, [
-  'pub/media', 
+  'pub/media',
+  'pub/sitemaps',
   'var/backups', 
   'var/composer_home', 
   'var/importexport', 
@@ -159,7 +163,11 @@ set :linked_dirs, [
 ]
 ```
 
-If you would like to customize the linked files or directories for your project, you can copy either one or both of the above arrays into the `config/deploy.rb` or `config/deploy/*.rb` files and tweak them to fit your project's needs.
+If you would like to customize the linked files or directories for your project, you can copy either one or both of the above arrays into the `config/deploy.rb` or `config/deploy/*.rb` files and tweak them to fit your project's needs. Alternatively, you can add a single linked dir (or file) using `append` like this:
+
+```ruby
+append :linked_dirs, 'path/to/link'
+```
 
 ### Magento 2 Deploy Routine
 

data/lib/capistrano/magento2.rb

@@ -29,24 +29,31 @@ module Capistrano
       def cache_hosts
         return fetch(:magento_deploy_cache_shared) ? (primary fetch :magento_deploy_setup_role) : (release_roles :all)
       end
+
+      # Set pipefail allowing console exit codes in Magento 2.1.1 and later to halt execution when using pipes
+      def Helpers.set_pipefail
+        if not SSHKit.config.command_map[:magento].include? 'set -o pipefail' # avoids trouble on multi-host deploys
+          @@pipefail_less = SSHKit.config.command_map[:magento].dup
+          SSHKit.config.command_map[:magento] = "set -o pipefail; #{@@pipefail_less}"
+        end
+      end
+
+      # Reset the command map without prefix, removing pipefail option so it won't affect other commands
+      def Helpers.unset_pipefail
+        SSHKit.config.command_map[:magento] = @@pipefail_less
+      end
     end
-    
+
     module Setup
       def static_content_deploy params
-        # Setting pipefail causes the console exit codes introduced in Magento 2.1.1 to bubble up and halt execution
-        # as is normally expected. Versions which do not return exit codes will fall back on the far less reliable
-        # error checks we're doing on the command output
-        magento_command = SSHKit.config.command_map[:magento]
-        SSHKit.config.command_map[:magento] = "set -o pipefail; #{magento_command}"
-
+        Helpers.set_pipefail
         output = capture :magento,
           "setup:static-content:deploy #{params} | stdbuf -o0 tr -d .",
           verbosity: Logger::INFO
+        Helpers.unset_pipefail
 
-        # Reset the command map without our prefix, removing pipefail option so it won't affect other commands
-        SSHKit.config.command_map[:magento] = magento_command
-
-        # String based error checking is here to catch errors in Magento 2.1.0 and earlier
+        # String based error checking is here to catch errors in Magento 2.1.0 and earlier; later versions will exit
+        # immediately when a console exit code is retruned, never evaluating this code.
         if not output.to_s.include? 'New version of deployed files'
           raise Exception, "\e[0;31mFailed to compile static assets\e[0m"
         end

data/lib/capistrano/magento2/defaults.rb

@@ -10,19 +10,18 @@
 set :linked_files, fetch(:linked_files, []).push(
   'app/etc/env.php',
   'var/.setup_cronjob_status',
-  'var/.update_cronjob_status',
-  'pub/sitemap.xml'
+  'var/.update_cronjob_status'
 )
 
 set :linked_files_touch, fetch(:linked_files_touch, []).push(
   'app/etc/env.php',
   'var/.setup_cronjob_status',
-  'var/.update_cronjob_status',
-  'pub/sitemap.xml'
+  'var/.update_cronjob_status'
 )
 
 set :linked_dirs, fetch(:linked_dirs, []).push(
-  'pub/media', 
+  'pub/media',
+  'pub/sitemaps',
   'var/backups', 
   'var/composer_home', 
   'var/importexport', 

data/lib/capistrano/magento2/version.rb

@@ -9,6 +9,6 @@
 
 module Capistrano
   module Magento2
-    VERSION = '0.5.8'
+    VERSION = '0.5.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-magento2
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - David Alger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano