capistrano-magento2 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9734beaa70a60e3ec804e38312cc950321eae102
-  data.tar.gz: c5c9f8a4e5493a2b17c4c663ea284152079d249f
+  metadata.gz: 4fbd7419a47dfb734ba5b5a550bb519e10d1ba6b
+  data.tar.gz: abcaa12f7685033761b17240015801db9c0a2f4f
 SHA512:
-  metadata.gz: 16a5cde46f8e77743092a0050676a75f341bfe9d7369319f69c6cbc337902bf53b6ba54ebe492267d05bbebda27eb583be00e66b5bd49f2e13dfb1b23b458425
-  data.tar.gz: 89d915f6205b22bfb8f5ef7be0607f59120d9fc6bf8a0b74a6776eca15d55d04374b8f3d0af9bc0dc5361da74ed0515c8dbbf9e2b841ad83805e73462e21ac8d
+  metadata.gz: b0bf37f855fa2afa6d96c7f75f107b9a000d9b719ee52819dbb3db458bb6cab17c13236472c05afa5d033d8a183d777f966431abc24d2c361afa778b5884bc88
+  data.tar.gz: 054f63601690bc9301fdbf9d5f6d247b0bfd738f39228f1018e98be55af1cddb6f6972746092156f2c9dd7851997c5f5b0845dc19d9c8f51a852cb75a8aa85f3

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Capistrano::Magento2 Change Log
 
+0.6.6
+==========
+
+* Updated date formatting of pending change log output for enhanced readability (PR #73)
+* Fixed bug in static content deploy resulting from a change in behaviour in Magento 2.1.3 and later (PR #74)
+
 0.6.5
 ==========
 

data/lib/capistrano/magento2/defaults.rb

@@ -61,5 +61,5 @@ set :magento_deploy_pending_role, fetch(:magento_deploy_pending_role, :all)
 set :magento_deploy_pending_warn, fetch(:magento_deploy_pending_warn, true)
 set :magento_deploy_pending_format, fetch(
   :magento_deploy_pending_format,
-  '--pretty="format:%C(yellow)%h %Cblue%>(12)%ad %Cgreen%<(7)%aN%Cred%d %Creset%s"'
+  '--pretty="format:%C(yellow)%h %Cblue%>(12)%ai %Cgreen%<(7)%aN%Cred%d %Creset%s"'
 )

data/lib/capistrano/magento2/version.rb

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

data/lib/capistrano/tasks/magento.rake

@@ -309,8 +309,15 @@ namespace :magento do
           end
 
           # Run again with HTTPS env var set to 'on' to pre-generate secure versions of RequireJS configs
-          deploy_flags = ['javascript', 'css', 'less', 'images', 'fonts', 'html', 'misc', 'html-minify']
-            .join(' --no-').prepend(' --no-');
+          deploy_flags = ['css', 'less', 'images', 'fonts', 'html', 'misc', 'html-minify']
+          
+          # As of Magento 2.1.3, it became necessary to exclude "--no-javacript" in order for secure versions of 
+          # RequireJs configs to be generated
+          if _magento_version < Gem::Version.new('2.1.3')
+            deploy_flags.push('javascript')
+          end
+          
+          deploy_flags = deploy_flags.join(' --no-').prepend(' --no-');
 
           # 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')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-magento2
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - David Alger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano