capistrano-magento2 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c28c8853fc1ad5cbd6f71307babf6f930264f717
-  data.tar.gz: a7aa576949fe6e30d15e32cd9ac720d38fc515cb
+  metadata.gz: 9734beaa70a60e3ec804e38312cc950321eae102
+  data.tar.gz: c5c9f8a4e5493a2b17c4c663ea284152079d249f
 SHA512:
-  metadata.gz: 2ff54488c83b5d3704b552ac492d8098ad8c14a4d9f11ff1c36eabe419c23037c8671fecdece7b4a68b7da6a7490d32772431d2071539ba63a24990b9f3b4e58
-  data.tar.gz: 8dcf73fe054d0b677430072b587c74603ca1cccbd375cdaf65f8f975328e081ced3beb53b0ce6ccf5ff92ec39ea767dac8f7091b7e87ae2e7c5059968bdbd447
+  metadata.gz: 16a5cde46f8e77743092a0050676a75f341bfe9d7369319f69c6cbc337902bf53b6ba54ebe492267d05bbebda27eb583be00e66b5bd49f2e13dfb1b23b458425
+  data.tar.gz: 89d915f6205b22bfb8f5ef7be0607f59120d9fc6bf8a0b74a6776eca15d55d04374b8f3d0af9bc0dc5361da74ed0515c8dbbf9e2b841ad83805e73462e21ac8d

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Capistrano::Magento2 Change Log
 
+0.6.5
+==========
+
+* Added workaround for Magento 2.1.3 bug causing multi-lingual static-content deployment failure (issue #72)
+
 0.6.4
 ==========
 

data/lib/capistrano/magento2/version.rb

@@ -9,6 +9,6 @@
 
 module Capistrano
   module Magento2
-    VERSION = '0.6.4'
+    VERSION = '0.6.5'
   end
 end

data/lib/capistrano/tasks/magento.rake

@@ -268,7 +268,6 @@ namespace :magento do
         on release_roles :all do
           _magento_version = magento_version
 
-          deploy_languages = fetch(:magento_deploy_languages).join(' ')
           deploy_themes = fetch(:magento_deploy_themes)
           deploy_jobs = fetch(:magento_deploy_jobs)
 
@@ -290,6 +289,14 @@ namespace :magento do
             deploy_jobs = nil
           end
 
+          # Workaround core-bug with multi-lingual deployments on Magento 2.1.3 and newer. In 2.1.3 and later each
+          # languages must be iterated individuall. See issue #72 for details
+          if _magento_version >= Gem::Version.new('2.1.3')
+            deploy_languages = fetch(:magento_deploy_languages)
+          else
+            deploy_languages = [fetch(:magento_deploy_languages).join(' ')]
+          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
@@ -298,7 +305,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_jobs}#{deploy_languages}#{deploy_themes}"
+            deploy_languages.each {|lang| static_content_deploy "#{deploy_jobs}#{lang}#{deploy_themes}"}
           end
 
           # Run again with HTTPS env var set to 'on' to pre-generate secure versions of RequireJS configs
@@ -309,7 +316,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_jobs}#{deploy_languages}#{deploy_themes}#{deploy_flags}"
+            deploy_languages.each {|lang| static_content_deploy "#{deploy_jobs}#{lang}#{deploy_themes}#{deploy_flags}"}
           } end
 
           # Set the deployed_version of static content to ensure it matches across all hosts
@@ -318,7 +325,7 @@ namespace :magento do
       end
     end
   end
-  
+
   namespace :maintenance do
     desc 'Enable maintenance mode'
     task :enable do

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-magento2
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - David Alger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 description: A Capistrano extension for Magento 2 deployments. Takes care of specific
@@ -60,8 +60,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.md
@@ -89,17 +89,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: A Capistrano extension for Magento 2 deployments.