capistrano-magento2 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab43aa471d09b1d480dcc26eecc39e9155887fe7
-  data.tar.gz: 3becffe86075bae268551e1f441bd93a1fef7246
+  metadata.gz: 1c6d561b4e1c051ef45a5eac22efa567f332611e
+  data.tar.gz: 7cdceb46e41430c23912d013db3cc25a91b5397c
 SHA512:
-  metadata.gz: ae3e8515b724bb656e48b836076ef393bb90416dee9542f9b9f30339f1231c7b4e84fa79be6cc7ce337aa1931606169981b1348ca6f29c5aff911a2839ce7817
-  data.tar.gz: cf875fc79fabb210c25886b500610ca9ded11c0dbe03a637f70061745f5033358bff87ca2c64b5ccd080504c46083c9866bb547cc66474a6d9389fa1a64df6ae
+  metadata.gz: d485a334191bc07b1764effc19e4b9b5faef397c978b981adacea69ad629a408b22ce2633022b777bf7d7dcae5f1d5e39d867ad2838871852948777c509f5289
+  data.tar.gz: dfe2f1b2c179df1b3bc88b2655803ab8fd82070b6bd58e00dc5dcd4c9dcbc054e92f934f68c61fbfa1721c6ddc4dc7f6a01712f805c6bdd0b92bd97f0b739766

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Capistrano::Magento2 Change Log
 
+0.5.6
+==========
+
+* Fixed issue where setup:di:compile failing to return an exit code caused DI compilation failures to be masked
+
 0.5.5
 ==========
 

data/lib/capistrano/magento2/version.rb

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

data/lib/capistrano/tasks/magento.rake

@@ -223,12 +223,14 @@ namespace :magento do
             # 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
-              
-              if output.to_s.include? 'Errors during compilation'
-                raise Exception, 'setup:di:compile-multi-tenant command execution failed'
-              end
             else
-              execute :magento, 'setup:di:compile'
+              output = capture :magento, 'setup:di:compile', verbosity: Logger::INFO
+            end
+            
+            # 2.0.x never returns a non-zero exit code for errors, so manually check string
+            # 2.1.x doesn't return a non-zero exit code for certain errors (see davidalger/capistrano-magento2#41)
+            if output.to_s.include? 'Errors during compilation'
+              raise Exception, 'DI compilation command execution failed'
             end
           end
         end

metadata

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