capistrano-magento2 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8469b82d98864aafd3331f72e0b5082243f835c8
-  data.tar.gz: 8eeb51698b72e2a102ef151bfd2d14546c916232
+  metadata.gz: 65c2dad3cf15d919401c8553410a7b8cf444e9e3
+  data.tar.gz: a197832d493ef6ba2d6725b63e8f3ae2e2c7586e
 SHA512:
-  metadata.gz: 3afa6eb01bbb5425ba083bc58c0f7efaead6307183847eebc01fb4b89ed3a5501b117e7d71679bcfb016fae5ec60a9b252dd04a1f60bfd87c984e28b10a2663c
-  data.tar.gz: ce1bb3f5b21ce33a6d1fcdeb3b5733481109d415bf83afffb2f9ab2bd72ce5c8ffef675c1c8a53527f84aa875cf7df31c18772f184e23e730b1d18a93a675dbd
+  metadata.gz: 17d6863ccc339acc538abedfd0fc71e12a3414064f47dd09a63b028dfebffdf676b9babc60a312e18e7251c608b5fa2f40a0d6c2092a98a296ae1c3cb58b44c6
+  data.tar.gz: d9f4abb0ee29c32e9628efb2f03437e4e56b299d82e8622e86378d3e4c5ee7033a7344929f348dc2d974cad698352c376b3a866378919bae15e9a7a25aff7355

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Capistrano::Magento2 Change Log
 
+0.6.1
+==========
+
+* Fixed Magento version check failing on some servers due to ansi output in non-interactive shells (issue #64)
+* Added ability to configure Magento's composer authentication keys. See README for details (PR #56)
+* Changed pending change log to hook into before `deploy:check` (previously hooked before `deploy`)
+
 0.6.0
 ==========
 

data/README.md

@@ -170,6 +170,19 @@ If you would like to customize the linked files or directories for your project,
 append :linked_dirs, 'path/to/link'
 ```
 
+### Composer Auth Credentials
+
+Magento 2's composer repository requires auth credentials to install. These can be set on target servers in a global composer `auth.json` file, the project's `composer.json` or by setting them in your deployment configuration using the following two settings:
+
+```ruby
+set :magento_auth_public_key, '<your_public_key_here>'
+set :magento_auth_private_key, '<your_prviate_key_here>'
+```
+
+To obtain these credentials, reference the official documentation on DevDocs: [Get your authentication keys](http://devdocs.magento.com/guides/v2.0/install-gde/prereq/connect-auth.html)
+
+**Caution:** When using these settings, the values will be logged to the `log/capistrano.log` file by SSHKit. They will not, however, be included in the general command output by default.
+
 ### Magento 2 Deploy Routine
 
 A pre-built deploy routine is available out-of-the-box. This can be overriden on a per-project basis by including only the Magento 2 specific tasks and defining your own `deploy.rake` file under `lib/capistrano/tasks` in your projects Capistrano install location.
@@ -233,7 +246,7 @@ No changes to deploy on web2 (from and to are the same: 2.1 -> 2.1)
 Are you sure you want to continue? [y/n]
 ```
 
-This conformational warning can be disabled by including the following in your project's configuration:
+This confirmational warning can be disabled by including the following in your project's configuration:
 
 ```ruby
 set :magento_deploy_pending_warn, false
@@ -243,9 +256,9 @@ set :magento_deploy_pending_warn, false
 
 | setting                          | what it does
 | -------------------------------- | ------- | ---
-| `:magento_deploy_pending_role`   | Roles to check for pending changes on. This defaults to `:all`
-| `:magento_deploy_pending_warn`   | Set this to `false` to disable the conformational warning on zero-change deployment
-| `:magento_deploy_pending_format` | Can be used to set a custom change log format. See `defaults.rb` for example.
+| `:magento_deploy_pending_role`   | Role to check for pending changes on; defaults to `:all`
+| `:magento_deploy_pending_warn`   | Set this to `false` to disable confirmational warning on zero-change deployments
+| `:magento_deploy_pending_format` | Can be used to set a custom change log format; refer to `defaults.rb` for example
 
 ### Pending Changes Tasks
 

data/lib/capistrano/magento2.rb

@@ -13,7 +13,7 @@ module Capistrano
   module Magento2
     module Helpers
       def magento_version
-        return Gem::Version::new((capture :php, "-f #{release_path}/bin/magento -- -V").split(' ').pop)
+        return Gem::Version::new((capture :php, "-f #{release_path}/bin/magento -- -V --no-ansi").split(' ').pop)
       end
 
       def disabled_modules

data/lib/capistrano/magento2/defaults.rb

@@ -31,6 +31,11 @@ set :linked_dirs, fetch(:linked_dirs, []).push(
   'var/tmp'
 )
 
+# magento composer repository auth credentials
+set :magento_auth_repo_name, fetch(:magento_auth_repo_name, 'http-basic.repo.magento.com')
+set :magento_auth_public_key, fetch(:magento_auth_public_key, false)
+set :magento_auth_private_key, fetch(:magento_auth_private_key, false)
+
 # 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')

data/lib/capistrano/magento2/version.rb

@@ -9,6 +9,6 @@
 
 module Capistrano
   module Magento2
-    VERSION = '0.6.0'
+    VERSION = '0.6.1'
   end
 end

data/lib/capistrano/tasks/magento.rake

@@ -81,7 +81,7 @@ namespace :magento do
   
   namespace :composer do
     desc 'Run composer install'
-    task :install do
+    task :install => :auth_config do
 
       on release_roles :all do
         within release_path do
@@ -106,6 +106,20 @@ namespace :magento do
         end
       end
     end
+
+    task :auth_config do
+      on release_roles :all do
+        within release_path do
+          if fetch(:magento_auth_public_key) and fetch(:magento_auth_private_key)
+            execute :composer, :config, '-q',
+              fetch(:magento_auth_repo_name),
+              fetch(:magento_auth_public_key),
+              fetch(:magento_auth_private_key),
+              verbosity: Logger::DEBUG
+          end
+        end
+      end
+    end
   end
 
   namespace :deploy do

data/lib/capistrano/tasks/pending.rake

@@ -9,7 +9,7 @@
 
 include Capistrano::Magento2::Pending
 
-before :deploy, 'deploy:pending:warn'
+before 'deploy:check', 'deploy:pending:warn'
 
 namespace :deploy do
   desc "Displays a summary of commits pending deployment"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-magento2
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - David Alger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano