capistrano-magento2 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65c2dad3cf15d919401c8553410a7b8cf444e9e3
-  data.tar.gz: a197832d493ef6ba2d6725b63e8f3ae2e2c7586e
+  metadata.gz: c99400c3af7e1ed48ca398c4f6c4c79fb4298f93
+  data.tar.gz: 8e735613090124de7fd60e88f0d95d17909c0258
 SHA512:
-  metadata.gz: 17d6863ccc339acc538abedfd0fc71e12a3414064f47dd09a63b028dfebffdf676b9babc60a312e18e7251c608b5fa2f40a0d6c2092a98a296ae1c3cb58b44c6
-  data.tar.gz: d9f4abb0ee29c32e9628efb2f03437e4e56b299d82e8622e86378d3e4c5ee7033a7344929f348dc2d974cad698352c376b3a866378919bae15e9a7a25aff7355
+  metadata.gz: 5ddb0e0e04bbe4e8e3d3a15931855ab3afa266267bedcc4ef02d89a71e1f0646544d4696d248cd41a3b1a900591f903d150025d745f3746c8e32188fdc087e04
+  data.tar.gz: 8382519a6b95039033d50b5af5c617ff407b84472fcaf0c25d34780b95df248b21f0c1365fcb9b3c909a13f7207fa770dc8c8bc77861f0af86f2322e2333b86d

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Capistrano::Magento2 Change Log
 
+0.6.2
+==========
+
+* Added setting `:magento_deploy_jobs` to support configuring number of parallel static content deployment tasks
+* Fixed issue where ./update dir may exist without a composer.json file, causing deployment failure
+* Updated uses of bin/magento where output is parsed to include `--no-ansi` to eliminate potential failures
+* Improved error reporting on static content deployment failure
+
 0.6.1
 ==========
 

data/README.md

@@ -120,6 +120,7 @@ Before you can use Capistrano to deploy, you must configure the `config/deploy.r
 | `: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 (Magento 2.1.1 and later)
+| `:magento_deploy_jobs`         | `4`    | Number of threads to use for 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

@@ -17,7 +17,7 @@ module Capistrano
       end
 
       def disabled_modules
-        output = capture :magento, 'module:status'
+        output = capture :magento, 'module:status --no-ansi'
         output = output.split("disabled modules:\n", 2)[1]
 
         if output == nil or output.strip == "None"
@@ -48,19 +48,19 @@ module Capistrano
       def static_content_deploy params
         Helpers.set_pipefail
         output = capture :magento,
-          "setup:static-content:deploy #{params} | stdbuf -o0 tr -d .",
+          "setup:static-content:deploy --no-ansi #{params} | stdbuf -o0 tr -d .",
           verbosity: Logger::INFO
         Helpers.unset_pipefail
 
         # 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"
+          raise Exception, "\e[0;31mFailed to compile static assets. No new version found in command output!\e[0m"
         end
 
         output.to_s.each_line { |line|
           if line.split('errors: ', 2).pop.to_i > 0
-            raise Exception, "\e[0;31mFailed to compile static assets\e[0m"
+            raise Exception, "\e[0;31mFailed to compile static assets. Errors found in command output: #{line}\e[0m"
           end
         }
       end

data/lib/capistrano/magento2/defaults.rb

@@ -48,6 +48,7 @@ set :magento_deploy_languages, fetch(:magento_deploy_languages, ['en_US'])
 set :magento_deploy_maintenance, fetch(:magento_deploy_maintenance, true)
 set :magento_deploy_production, fetch(:magento_deploy_production, true)
 set :magento_deploy_themes, fetch(:magento_deploy_themes, [])
+set :magento_deploy_jobs, fetch(:magento_deploy_jobs, nil)      # this defaults to 4 when supported by bin/magento
 
 # deploy targetting defaults
 set :magento_deploy_setup_role, fetch(:magento_deploy_setup_role, :all)

data/lib/capistrano/magento2/version.rb

@@ -9,6 +9,6 @@
 
 module Capistrano
   module Magento2
-    VERSION = '0.6.1'
+    VERSION = '0.6.2'
   end
 end

data/lib/capistrano/tasks/magento.rake

@@ -98,10 +98,10 @@ namespace :magento do
             execute :composer, "install #{composer_flags} 2>&1" # removes require-dev components from prev command
           end
 
-          if test "[ -d #{release_path}/update ]"   # can't count on this, but emit warning if not present
+          if test "[ -f #{release_path}/update/composer.json ]"   # can't count on this, but emit warning if not present
             execute :composer, "install #{composer_flags} -d ./update 2>&1"
           else
-            puts "\e[0;31m    Warning: ./update dir does not exist in repository!\n\e[0m\n"
+            puts "\e[0;31m    Warning: ./update/composer.json does not exist in repository!\n\e[0m\n"
           end
         end
       end
@@ -183,7 +183,7 @@ namespace :magento do
       task :upgrade do
         on primary fetch(:magento_deploy_setup_role) do
           within release_path do
-            db_status = capture :magento, 'setup:db:status', verbosity: Logger::INFO
+            db_status = capture :magento, 'setup:db:status --no-ansi', verbosity: Logger::INFO
             
             if not db_status.to_s.include? 'All modules are up to date'
               execute :magento, 'setup:db-schema:upgrade'
@@ -236,9 +236,9 @@ namespace :magento do
             # we have to use multi-tenant currently. However, the multi-tenant is being dropped in 2.1 and is no longer
             # present in the develop mainline, so we are testing for multi-tenant presence for long-term portability.
             if test :magento, 'setup:di:compile-multi-tenant --help >/dev/null 2>&1'
-              output = capture :magento, 'setup:di:compile-multi-tenant', verbosity: Logger::INFO
+              output = capture :magento, 'setup:di:compile-multi-tenant --no-ansi', verbosity: Logger::INFO
             else
-              output = capture :magento, 'setup:di:compile', verbosity: Logger::INFO
+              output = capture :magento, 'setup:di:compile --no-ansi', verbosity: Logger::INFO
             end
             
             # 2.0.x never returns a non-zero exit code for errors, so manually check string
@@ -259,6 +259,7 @@ namespace :magento do
 
           deploy_languages = fetch(:magento_deploy_languages).join(' ')
           deploy_themes = fetch(:magento_deploy_themes)
+          deploy_jobs = fetch(:magento_deploy_jobs)
 
           if deploy_themes.count() > 0 and _magento_version >= Gem::Version.new('2.1.1')
             deploy_themes = deploy_themes.join(' -t ').prepend(' -t ')
@@ -269,6 +270,15 @@ namespace :magento do
             deploy_themes = nil
           end
 
+          if deploy_jobs and _magento_version >= Gem::Version.new('2.1.1')
+            deploy_jobs = "--jobs #{deploy_jobs} "
+          elsif deploy_jobs
+            warn "\e[0;31mWarning: the :magento_deploy_jobs setting is only supported in Magento 2.1.1 and later\e[0m"
+            deploy_jobs = nil
+          else
+            deploy_jobs = nil
+          end
+
           # Output is being checked for a success message because this command may easily fail due to customizations
           # and 2.0.x CLI commands do not return error exit codes on failure. See magento/magento2#3060 for details.
           within release_path do
@@ -277,7 +287,7 @@ namespace :magento do
             execute "touch #{release_path}/pub/static/deployed_version.txt"
 
             # Generates all but the secure versions of RequireJS configs
-            static_content_deploy "#{deploy_languages}#{deploy_themes}"
+            static_content_deploy "#{deploy_jobs}#{deploy_languages}#{deploy_themes}"
           end
 
           # Run again with HTTPS env var set to 'on' to pre-generate secure versions of RequireJS configs
@@ -288,7 +298,7 @@ namespace :magento do
           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}"
+            static_content_deploy "#{deploy_jobs}#{deploy_languages}#{deploy_themes}#{deploy_flags}"
           } end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-magento2
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - David Alger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano