capistrano-magento2 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6d79df3e4bedfce6d856fb16a166c15096e5031
-  data.tar.gz: eff72c1ebbc3d6e89aa416f9d6f6203e6d995578
+  metadata.gz: ab43aa471d09b1d480dcc26eecc39e9155887fe7
+  data.tar.gz: 3becffe86075bae268551e1f441bd93a1fef7246
 SHA512:
-  metadata.gz: a00856111e7936109a2302fc25af44671041221cc0aabfeb9342217a1275154a00028c925ccfce99091133334a458bc34f5de0218b882426b3b189226ab3318c
-  data.tar.gz: c4423aac9ac9656a8f8ce7e2efeb0923f980a0d11b4fa27a4b7abf33b18040febb1415d8d539f6b0c68a7d710ee52d1afc7ed055beebb8f41a451b52499d04aa
+  metadata.gz: ae3e8515b724bb656e48b836076ef393bb90416dee9542f9b9f30339f1231c7b4e84fa79be6cc7ce337aa1931606169981b1348ca6f29c5aff911a2839ce7817
+  data.tar.gz: cf875fc79fabb210c25886b500610ca9ded11c0dbe03a637f70061745f5033358bff87ca2c64b5ccd080504c46083c9866bb547cc66474a6d9389fa1a64df6ae

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Capistrano::Magento2 Change Log
 
+0.5.5
+==========
+
+* Fixed DI artifact mismatch caused by setup:ugprade overwriting frozen config.php post compilation
+* Removed redundant (and non-functional) commands from deploy:reverted task
+* Added informational output which lists the installed modules which are disabled per `app/etc/config.php`
+
 0.5.4
 ==========
 

data/lib/capistrano/magento2.rb

@@ -16,6 +16,16 @@ module Capistrano
         return (capture "/usr/bin/env php -f #{release_path}/bin/magento -- -V").split(' ').pop.to_f
       end
 
+      def disabled_modules
+        output = capture :magento, 'module:status'
+        output = output.split("disabled modules:\n", 2)[1]
+
+        if output == nil or output.strip == "None"
+          return []
+        end
+        return output.split("\n")
+      end
+
       def cache_hosts
         return fetch(:magento_deploy_cache_shared) ? (primary fetch :magento_deploy_setup_role) : (release_roles :all)
       end

data/lib/capistrano/magento2/version.rb

@@ -9,6 +9,6 @@
 
 module Capistrano
   module Magento2
-    VERSION = '0.5.4'
+    VERSION = '0.5.5'
   end
 end

data/lib/capistrano/tasks/deploy.rake

@@ -7,6 +7,8 @@
  # http://davidalger.com/contact/
  ##
 
+include Capistrano::Magento2::Helpers
+
 namespace :deploy do
   before 'deploy:check:linked_files', 'magento:deploy:check'
 
@@ -37,7 +39,20 @@ namespace :deploy do
       end
     end
 
-    invoke 'magento:setup:upgrade'
+    invoke 'magento:setup:db:schema:upgrade'
+    invoke 'magento:setup:db:data:upgrade'
+
+    on primary fetch(:magento_deploy_setup_role) do
+      within release_path do
+        _disabled_modules = disabled_modules
+        if _disabled_modules.count > 0
+          info "\nThe following modules are disabled per app/etc/config.php:\n"
+          _disabled_modules.each do |module_name|
+            info '- ' + module_name
+          end
+        end
+      end
+    end
   end
 
   task :published do
@@ -45,10 +60,4 @@ namespace :deploy do
     invoke 'magento:cache:varnish:ban'
     invoke 'magento:maintenance:disable' if fetch(:magento_deploy_maintenance)
   end
-
-  task :reverted do
-    invoke 'magento:maintenance:disable' if fetch(:magento_deploy_maintenance)
-    invoke 'magento:cache:flush'
-    invoke 'magento:cache:varnish:ban'
-  end
 end

data/lib/capistrano/tasks/magento.rake

@@ -144,15 +144,60 @@ namespace :magento do
   end
 
   namespace :setup do
-    desc 'Run the Magento upgrade process'
+    desc 'Updates the module load sequence and upgrades database schemas and data fixtures'
     task :upgrade do
       on primary fetch(:magento_deploy_setup_role) do
         within release_path do
+          warn "\e[0;31mWarning: Use of magento:setup:upgrade on production systems is discouraged." +
+               " See https://github.com/davidalger/capistrano-magento2/issues/34 for details.\e[0m\n"
+
           execute :magento, 'setup:upgrade --keep-generated'
         end
       end
     end
     
+    namespace :db do
+      desc 'Checks if database schema and/or data require upgrading'
+      task :status do
+        on primary fetch(:magento_deploy_setup_role) do
+          within release_path do
+            execute :magento, 'setup:db:status'
+          end
+        end
+      end
+      
+      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
+            
+            if not db_status.to_s.include? 'All modules are up to date'
+              execute :magento, 'setup:db-schema:upgrade'
+              execute :magento, 'setup:db-data:upgrade'
+            end
+          end
+        end
+      end
+      
+      desc 'Upgrades data fixtures'
+      task 'schema:upgrade' do
+        on primary fetch(:magento_deploy_setup_role) do
+          within release_path do
+            execute :magento, 'setup:db-schema:upgrade'
+          end
+        end
+      end
+      
+      desc 'Upgrades database schema'
+      task 'data:upgrade' do
+        on primary fetch(:magento_deploy_setup_role) do
+          within release_path do
+            execute :magento, 'setup:db-data:upgrade'
+          end
+        end
+      end
+    end
+    
     desc 'Sets proper permissions on application'
     task :permissions do
       on release_roles :all do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-magento2
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - David Alger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano