capistrano-magento2 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a81db107c4c34b425b713d6fa60472526266e14
-  data.tar.gz: 5a3bf1bb110c1f121a3063a6d67a32a3346cba96
+  metadata.gz: e6d79df3e4bedfce6d856fb16a166c15096e5031
+  data.tar.gz: eff72c1ebbc3d6e89aa416f9d6f6203e6d995578
 SHA512:
-  metadata.gz: 1f4f5c17e3e55132443b1bae1658ef3d09ac434a09b10d14709a23707200a51b1adedff986f1d5ca83f54ff86957b3c84fc12c6ba47082ef924e3b9255295e0c
-  data.tar.gz: ea57f3391c18f3ec8388fb5fe96a97c1405c26dad2b62ec87810a014c22dd053eae1c18092acad7f1d5b60db8e4a2fc4fcee40a32e6b2ffeaf4c512ee13641bd
+  metadata.gz: a00856111e7936109a2302fc25af44671041221cc0aabfeb9342217a1275154a00028c925ccfce99091133334a458bc34f5de0218b882426b3b189226ab3318c
+  data.tar.gz: c4423aac9ac9656a8f8ce7e2efeb0923f980a0d11b4fa27a4b7abf33b18040febb1415d8d539f6b0c68a7d710ee52d1afc7ed055beebb8f41a451b52499d04aa

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  2.2

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Capistrano::Magento2 Change Log
 
+0.5.4
+==========
+
+* Fixed issue causing failed releases when there are CSS compilation errors in setup:static-content:deploy task
+* Updated static content deployment to ignore `:magento_deploy_themes` when deploying 2.0 and issue a warning message.
+
 0.5.3
 ==========
 

data/Rakefile

@@ -8,3 +8,9 @@
  ##
 
 require 'bundler/gem_tasks'
+
+task default: %w[test]
+
+task :test do
+  puts "TODO: Create real integration tests!"
+end

data/capistrano-magento2.gemspec

@@ -33,6 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'terminal-notifier', '~> 1.6'
   spec.add_dependency 'capistrano-pending', '~> 0.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
 end

data/lib/capistrano/magento2.rb

@@ -7,12 +7,44 @@
  # http://davidalger.com/contact/
  ##
 
+SSHKit.config.command_map[:magento] = "/usr/bin/env php -f bin/magento --"
+
 module Capistrano
-  class Magento2
-    def self.cache_hosts
-      return fetch(:magento_deploy_cache_shared) ? (primary fetch :magento_deploy_setup_role) : (release_roles :all)
+  module Magento2
+    module Helpers
+      def magento_version
+        return (capture "/usr/bin/env php -f #{release_path}/bin/magento -- -V").split(' ').pop.to_f
+      end
+
+      def cache_hosts
+        return fetch(:magento_deploy_cache_shared) ? (primary fetch :magento_deploy_setup_role) : (release_roles :all)
+      end
+    end
+    
+    module Setup
+      def static_content_deploy params
+        output = capture :magento,
+          "setup:static-content:deploy #{params} | stdbuf -o0 tr -d .",
+          verbosity: Logger::INFO
+
+        if not output.to_s.include? 'New version of deployed files'
+          raise Exception, "\e[0;31mFailed to compile static assets\e[0m"
+        end
+
+        output.to_s.each_line { |line|
+          if line.split('errors: ', 2).pop.to_i > 0
+            raise Exception, "\e[0;31mFailed to compile static assets\e[0m"
+          end
+        }
+      end
     end
   end
 end
 
 load File.expand_path('../tasks/magento.rake', __FILE__)
+
+namespace :load do
+  task :defaults do
+    load 'capistrano/magento2/defaults.rb'
+  end
+end

data/lib/capistrano/magento2/defaults.rb

@@ -0,0 +1,50 @@
+##
+ # Copyright © 2016 by David Alger. All rights reserved
+ # 
+ # Licensed under the Open Software License 3.0 (OSL-3.0)
+ # See included LICENSE file for full text of OSL-3.0
+ # 
+ # http://davidalger.com/contact/
+ ##
+
+set :linked_files, fetch(:linked_files, []).push(
+  'app/etc/env.php',
+  'var/.setup_cronjob_status',
+  'var/.update_cronjob_status',
+  'pub/sitemap.xml'
+)
+
+set :linked_files_touch, fetch(:linked_files_touch, []).push(
+  'app/etc/env.php',
+  'var/.setup_cronjob_status',
+  'var/.update_cronjob_status',
+  'pub/sitemap.xml'
+)
+
+set :linked_dirs, fetch(:linked_dirs, []).push(
+  'pub/media', 
+  'var/backups', 
+  'var/composer_home', 
+  'var/importexport', 
+  'var/import_history', 
+  'var/log',
+  'var/session', 
+  'var/tmp'
+)
+
+# deploy permissions defaults
+set :magento_deploy_chmod_d, fetch(:magento_deploy_chmod_d, '2770')
+set :magento_deploy_chmod_f, fetch(:magento_deploy_chmod_f, '0660')
+set :magento_deploy_chmod_x, fetch(:magento_deploy_chmod_x, ['bin/magento'])
+
+# deploy configuration defaults
+set :magento_deploy_composer, fetch(:magento_deploy_composer, true)
+set :magento_deploy_confirm, fetch(:magento_deploy_confirm, [])
+set :magento_deploy_languages, fetch(:magento_deploy_languages, ['en_US'])
+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, [])
+
+# deploy targetting defaults
+set :magento_deploy_setup_role, fetch(:magento_deploy_setup_role, :all)
+set :magento_deploy_cache_shared, fetch(:magento_deploy_cache_shared, true)

data/lib/capistrano/magento2/version.rb

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

data/lib/capistrano/tasks/magento.rake

@@ -7,12 +7,15 @@
  # http://davidalger.com/contact/
  ##
 
+include Capistrano::Magento2::Helpers
+include Capistrano::Magento2::Setup
+
 namespace :magento do
   
   namespace :cache do
     desc 'Flush Magento cache storage'
     task :flush do
-      on Capistrano::Magento2.cache_hosts do
+      on cache_hosts do
         within release_path do
           execute :magento, 'cache:flush'
         end
@@ -21,7 +24,7 @@ namespace :magento do
     
     desc 'Clean Magento cache by types'
     task :clean do
-      on Capistrano::Magento2.cache_hosts do
+      on cache_hosts do
         within release_path do
           execute :magento, 'cache:clean'
         end
@@ -30,7 +33,7 @@ namespace :magento do
     
     desc 'Enable Magento cache'
     task :enable do
-      on Capistrano::Magento2.cache_hosts do
+      on cache_hosts do
         within release_path do
           execute :magento, 'cache:enable'
         end
@@ -39,7 +42,7 @@ namespace :magento do
     
     desc 'Disable Magento cache'
     task :disable do
-      on Capistrano::Magento2.cache_hosts do
+      on cache_hosts do
         within release_path do
           execute :magento, 'cache:disable'
         end
@@ -48,7 +51,7 @@ namespace :magento do
     
     desc 'Check Magento cache enabled status'
     task :status do
-      on Capistrano::Magento2.cache_hosts do
+      on cache_hosts do
         within release_path do
           execute :magento, 'cache:status'
         end
@@ -90,13 +93,9 @@ namespace :magento do
 
           execute :composer, "install #{composer_flags} 2>&1"
 
-          if fetch(:magento_deploy_production)
-            feature_version = capture :magento, "-V | cut -d' ' -f4 | cut -d. -f1-2"
-            
-            if feature_version.to_f > 2.0
-              composer_flags += ' --no-dev'
-              execute :composer, "install #{composer_flags} 2>&1" # removes require-dev components from prev command
-            end
+          if fetch(:magento_deploy_production) and magento_version > 2.0
+            composer_flags += ' --no-dev'
+            execute :composer, "install #{composer_flags} 2>&1" # removes require-dev components from prev command
           end
 
           if test "[ -d #{release_path}/update ]"   # can't count on this, but emit warning if not present
@@ -195,13 +194,18 @@ namespace :magento do
       desc 'Deploys static view files'
       task :deploy do
         on release_roles :all do
+          _magento_version = magento_version
+
           deploy_languages = fetch(:magento_deploy_languages).join(' ')
           deploy_themes = fetch(:magento_deploy_themes)
 
-          if deploy_themes.count() > 0
-            deploy_themes = ' -t ' + deploy_themes.join(' -t ')   # prepare value for cli command if theme(s) specified
+          if deploy_themes.count() > 0 and _magento_version >= 2.1
+            deploy_themes = deploy_themes.join(' -t ').prepend(' -t ')
+          elsif deploy_themes.count() > 0
+            warn "\e[0;31mWarning: Magento 2.0 does not support :magento_deploy_themes setting (ignoring value)\e[0m"
+            deploy_themes = nil
           else
-            deploy_themes = ''
+            deploy_themes = nil
           end
 
           # Output is being checked for a success message because this command may easily fail due to customizations
@@ -211,32 +215,20 @@ namespace :magento do
             # Workaround for 2.1 specific issue: https://github.com/magento/magento2/pull/6437
             execute "touch #{release_path}/pub/static/deployed_version.txt"
 
-            output = capture :magento,
-              "setup:static-content:deploy #{deploy_languages}#{deploy_themes} | stdbuf -o0 tr -d .",
-              verbosity: Logger::INFO
-
-            if not output.to_s.include? 'New version of deployed files'
-              raise Exception, 'Failed to compile static assets'
-            end
-
-            with(https: 'on') {
-              deploy_flags = ''
+            # Generates all but the secure versions of RequireJS configs
+            static_content_deploy "#{deploy_languages}#{deploy_themes}"
+          end
 
-              # Magento 2.0 does not have these flags, so only way to generate secure files is to do all of them :/
-              if test :magento, 'setup:static-content:deploy --help | grep -- --theme'
-                deploy_flags = " --no-javascript --no-css --no-less --no-images" \
-                  + " --no-fonts --no-html --no-misc --no-html-minify"
-              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-');
 
-              output = capture :magento,
-                "setup:static-content:deploy #{deploy_languages}#{deploy_themes}#{deploy_flags} | stdbuf -o0 tr -d .",
-                verbosity: Logger::INFO
+          # Magento 2.0 does not have these flags, so only way to generate secure files is to do all of them :/
+          deploy_flags = nil if _magento_version <= 2.0
 
-              if not output.to_s.include? 'New version of deployed files'
-                raise Exception, 'Failed to compile (secure) static assets'
-              end
-            }
-          end
+          within release_path do with(https: 'on') {
+            static_content_deploy "#{deploy_languages}#{deploy_themes}#{deploy_flags}"
+          } end
         end
       end
     end
@@ -327,52 +319,3 @@ namespace :magento do
     end
   end
 end
-
-namespace :load do
-  task :defaults do
-
-    SSHKit.config.command_map[:magento] = "/usr/bin/env php -f bin/magento --"
-
-    set :linked_files, fetch(:linked_files, []).push(
-      'app/etc/env.php',
-      'var/.setup_cronjob_status',
-      'var/.update_cronjob_status',
-      'pub/sitemap.xml'
-    )
-
-    set :linked_files_touch, fetch(:linked_files_touch, []).push(
-      'app/etc/env.php',
-      'var/.setup_cronjob_status',
-      'var/.update_cronjob_status',
-      'pub/sitemap.xml'
-    )
-
-    set :linked_dirs, fetch(:linked_dirs, []).push(
-      'pub/media', 
-      'var/backups', 
-      'var/composer_home', 
-      'var/importexport', 
-      'var/import_history', 
-      'var/log',
-      'var/session', 
-      'var/tmp'
-    )
-
-    # deploy permissions defaults
-    set :magento_deploy_chmod_d, fetch(:magento_deploy_chmod_d, '2770')
-    set :magento_deploy_chmod_f, fetch(:magento_deploy_chmod_f, '0660')
-    set :magento_deploy_chmod_x, fetch(:magento_deploy_chmod_x, ['bin/magento'])
-
-    # deploy configuration defaults
-    set :magento_deploy_composer, fetch(:magento_deploy_composer, true)
-    set :magento_deploy_confirm, fetch(:magento_deploy_confirm, [])
-    set :magento_deploy_languages, fetch(:magento_deploy_languages, ['en_US'])
-    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, [])
-
-    # deploy targetting defaults
-    set :magento_deploy_setup_role, fetch(:magento_deploy_setup_role, :all)
-    set :magento_deploy_cache_shared, fetch(:magento_deploy_cache_shared, true)
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-magento2
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - David Alger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +89,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.md
@@ -97,6 +98,7 @@ files:
 - capistrano-magento2.gemspec
 - lib/capistrano-magento2.rb
 - lib/capistrano/magento2.rb
+- lib/capistrano/magento2/defaults.rb
 - lib/capistrano/magento2/deploy.rb
 - lib/capistrano/magento2/notifier.rb
 - lib/capistrano/magento2/pending.rb