capistrano-magento2 0.5.6 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c6d561b4e1c051ef45a5eac22efa567f332611e
-  data.tar.gz: 7cdceb46e41430c23912d013db3cc25a91b5397c
+  metadata.gz: bd0274d749aa804a3b80628664a330835e02dba2
+  data.tar.gz: 8aba5b376eed205074d70844aff9d7076f5c6e9e
 SHA512:
-  metadata.gz: d485a334191bc07b1764effc19e4b9b5faef397c978b981adacea69ad629a408b22ce2633022b777bf7d7dcae5f1d5e39d867ad2838871852948777c509f5289
-  data.tar.gz: dfe2f1b2c179df1b3bc88b2655803ab8fd82070b6bd58e00dc5dcd4c9dcbc054e92f934f68c61fbfa1721c6ddc4dc7f6a01712f805c6bdd0b92bd97f0b739766
+  metadata.gz: 76b8f66d1db89cdeab58bc7c1cfe143abc99587a1cf3dfcbd0364aff1177babdcffaf550444758d84a382c62ee6e16ca221e4307be91b611fe76e89d20b31195
+  data.tar.gz: 8ebe366a649d741d54ff83f52f65803ce9b0bf7ad037774b47e757b965ac6ba0ad72793cb8b9eb730bfbc95cd0f820fe9ab7efc96a576ea8f6a4ac46671bbc76

data/CHANGELOG.md

@@ -1,9 +1,20 @@
 # Capistrano::Magento2 Change Log
 
+0.5.8
+==========
+
+* Fixed critical failure due to command map being broken in v0.5.7 updates
+
+0.5.7
+==========
+
+* 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)
+
 0.5.6
 ==========
 
-* Fixed issue where setup:di:compile failing to return an exit code caused DI compilation failures to be masked
+* Fixed issue where setup:di:compile failing to return an exit code caused DI compilation failures to be masked (issue #41)
 
 0.5.5
 ==========

data/README.md

@@ -114,7 +114,7 @@ Before you can use Capistrano to deploy, you must configure the `config/deploy.r
 | `:magento_deploy_setup_role`   | `:all`  | Role from which primary host is chosen to run things like setup:upgrade on
 | `:magento_deploy_cache_shared` | `true`  | If true, cache operations are restricted to the primary node in setup role
 | `:magento_deploy_languages`    | `['en_US']` | Array of languages passed to static content deploy routine
-| `:magento_deploy_themes`       | `[]`   | Array of themes passed to static content deploy routine (Magento 2.1+ only)
+| `:magento_deploy_themes`       | `[]`   | Array of themes passed to static content deploy (Magento 2.1.1 and later)
 | `:magento_deploy_composer`     | `true` | Enables composer install behaviour in the built-in deploy routine
 | `:magento_deploy_production`   | `true` | Enables production specific DI compilation and static content generation
 | `:magento_deploy_maintenance`  | `true` | Enables use of maintenance mode while magento:setup:upgrade runs

data/lib/capistrano/magento2.rb

@@ -13,7 +13,7 @@ module Capistrano
   module Magento2
     module Helpers
       def magento_version
-        return (capture "/usr/bin/env php -f #{release_path}/bin/magento -- -V").split(' ').pop.to_f
+        return Gem::Version::new((capture "/usr/bin/env php -f #{release_path}/bin/magento -- -V").split(' ').pop)
       end
 
       def disabled_modules
@@ -33,10 +33,20 @@ module Capistrano
     
     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}"
+
         output = capture :magento,
           "setup:static-content:deploy #{params} | stdbuf -o0 tr -d .",
           verbosity: Logger::INFO
 
+        # 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
         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/version.rb

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

data/lib/capistrano/tasks/magento.rake

@@ -11,7 +11,7 @@ include Capistrano::Magento2::Helpers
 include Capistrano::Magento2::Setup
 
 namespace :magento do
-  
+
   namespace :cache do
     desc 'Flush Magento cache storage'
     task :flush do
@@ -93,7 +93,7 @@ namespace :magento do
 
           execute :composer, "install #{composer_flags} 2>&1"
 
-          if fetch(:magento_deploy_production) and magento_version > 2.0
+          if fetch(:magento_deploy_production) and magento_version >= Gem::Version.new('2.1')
             composer_flags += ' --no-dev'
             execute :composer, "install #{composer_flags} 2>&1" # removes require-dev components from prev command
           end
@@ -246,10 +246,10 @@ namespace :magento do
           deploy_languages = fetch(:magento_deploy_languages).join(' ')
           deploy_themes = fetch(:magento_deploy_themes)
 
-          if deploy_themes.count() > 0 and _magento_version >= 2.1
+          if deploy_themes.count() > 0 and _magento_version >= Gem::Version.new('2.1.1')
             deploy_themes = deploy_themes.join(' -t ').prepend(' -t ')
           elsif deploy_themes.count() > 0
-            warn "\e[0;31mWarning: Magento 2.0 does not support :magento_deploy_themes setting (ignoring value)\e[0m"
+            warn "\e[0;31mWarning: the :magento_deploy_themes setting is only supported in Magento 2.1.1 and later\e[0m"
             deploy_themes = nil
           else
             deploy_themes = nil
@@ -270,8 +270,8 @@ namespace :magento do
           deploy_flags = ['javascript', 'css', 'less', 'images', 'fonts', 'html', 'misc', 'html-minify']
             .join(' --no-').prepend(' --no-');
 
-          # Magento 2.0 does not have these flags, so only way to generate secure files is to do all of them :/
-          deploy_flags = nil if _magento_version <= 2.0
+          # Magento 2.1.0 and earlier lack support for these flags, so generation of secure files requires full re-run
+          deploy_flags = nil if _magento_version <= Gem::Version.new('2.1.0')
 
           within release_path do with(https: 'on') {
             static_content_deploy "#{deploy_languages}#{deploy_themes}#{deploy_flags}"

metadata

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