capistrano-magento2 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14813882851519f0585e260ccab51fc9ae4e1f40
-  data.tar.gz: 41b34bfd696df87fc7c6cea190d7ea14185d8659
+  metadata.gz: 9d5976d0843bf4508e972203a4e29e52da50bb51
+  data.tar.gz: 82ee5fdf18cdc176152dfad7134eba597f8f192d
 SHA512:
-  metadata.gz: 4d6b8420a7a06bdb2a8b6488467c58b122c77174d95cb71308662b1c57a6f97c2e0ceb71f40973f83313b6f5b5c0bb296b35fb8005e7ec59f6537764aeb326ce
-  data.tar.gz: 2317f56904fd1de989e3ab050e2848f91e21800dfdd148a78bae21a57bdb785392613b6fb622faab8cadddbfd6053d23efd48aefc1f6903d5d3609a77378ac89
+  metadata.gz: 0a7e173fb212aa6fd79cef37281fd2abeb7f83e3bfb6448a3cc009f2f937c58fe64817e94ed2a12ade528b15765be0f69173acf38e664573e9febc1d8bfb2cac
+  data.tar.gz: 8de39dba7eaea8013995e3346b065aeab1272d2a230df24381ae61cfe368b275e2e32d67eb7f1f4babc212471cae78d39408bc46ac766dd3405cd8e51d090a38

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Capistrano::Magento2 Change Log
 
+==========
+0.7.2
+
+* Added support for Magento 2.2 [static content deploy strategies](http://bit.ly/2yhMvVv) (PR #85)
+* Added support for Magento 2.2 [shared application config files](http://bit.ly/2gF8Ouu)
+
 0.7.1
 ==========
 

data/README.md

@@ -132,6 +132,7 @@ Before you can use Capistrano to deploy, you must configure the `config/deploy.r
 | `:magento_deploy_chmod_d`      | `2770` | Default permissions applied to all directories in the release path
 | `:magento_deploy_chmod_f`      | `0660` | Default permissions applied to all non-executable files in the release path
 | `:magento_deploy_chmod_x`      | `['bin/magento']` | Default list of files in release path to set executable bit on
+| `:magento_deploy_strategy`     | `nil`  | Can be `quick`, `standard` or `compact`; supported by Magento 2.2 or later
 
 #### Example Usage
 

data/lib/capistrano/magento2/defaults.rb

@@ -51,6 +51,7 @@ 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
+set :magento_deploy_strategy, fetch(:magento_deploy_strategy, nil)  # Magento 2.2 or later only: http://bit.ly/2yhMvVv
 
 # 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.7.1'
+    VERSION = '0.7.2'
   end
 end

data/lib/capistrano/tasks/deploy.rake

@@ -44,6 +44,15 @@ namespace :deploy do
 
     invoke 'magento:setup:db:schema:upgrade'
     invoke 'magento:setup:db:data:upgrade'
+    
+    # The app:config:import command was introduced in 2.2.0; check if it exists before invoking it
+    on primary fetch(:magento_deploy_setup_role) do
+      within release_path do
+        if test :magento, 'app:config:import --help >/dev/null 2>&1'
+          invoke 'magento:app:config:import'
+        end
+      end
+    end
 
     on primary fetch(:magento_deploy_setup_role) do
       within release_path do

data/lib/capistrano/tasks/magento.rake

@@ -12,6 +12,28 @@ include Capistrano::Magento2::Setup
 
 namespace :magento do
 
+  namespace :app do
+    namespace :config do
+      desc 'Create dump of application config'
+      task :dump do
+        on primary fetch(:magento_deploy_setup_role) do
+          within release_path do
+            execute :magento, 'app:config:dump'
+          end
+        end
+      end
+      
+      desc 'Import data from shared config files'
+      task :import do
+        on primary fetch(:magento_deploy_setup_role) do
+          within release_path do
+            execute :magento, 'app:config:import'
+          end
+        end
+      end
+    end
+  end
+
   namespace :cache do
     desc 'Flush Magento cache storage'
     task :flush do
@@ -311,13 +333,22 @@ namespace :magento do
             deploy_languages = [fetch(:magento_deploy_languages).join(' ')]
           end
 
+          # Magento 2.2 introduced static content compilation strategies that can be one of the following:
+          # quick (default), standard (like previous versions) or compact
+          compilation_strategy = fetch(:magento_deploy_strategy)
+          if compilation_strategy and _magento_version >= Gem::Version.new('2.2.0')
+            compilation_strategy =  "-s #{compilation_strategy} "
+          else
+            compilation_strategy = nil
+          end
+
           within release_path do
             # Magento 2.1 will fail to deploy if this file does not exist and static asset signing is enabled
             execute "touch #{release_path}/pub/static/deployed_version.txt"
 
             # This loop exists to support deploy on versions where each language must be deployed seperately
             deploy_languages.each do |lang|
-              static_content_deploy "#{deploy_jobs}#{lang}#{deploy_themes}"
+              static_content_deploy "#{compilation_strategy}#{deploy_jobs}#{lang}#{deploy_themes}"
             end
           end
 
@@ -330,7 +361,7 @@ namespace :magento do
             within release_path do with(https: 'on') {
               # This loop exists to support deploy on versions where each language must be deployed seperately
               deploy_languages.each do |lang|
-                static_content_deploy "#{deploy_jobs}#{lang}#{deploy_themes}#{deploy_flags}"
+                static_content_deploy "#{compilation_strategy}#{deploy_jobs}#{lang}#{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.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - David Alger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2017-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano