capistrano 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59f8fb6442e27e32704d86292e1e22a6c67daa61
-  data.tar.gz: 7ecf7b387a1c3cbf2c0bc2685e3ec6b6a1336d9b
+  metadata.gz: 89a96214d20583f07f6f4094f94235893bec7ee1
+  data.tar.gz: 5744a684bea5aa5d11a400fb90159495e685c28f
 SHA512:
-  metadata.gz: 4a03a957b09b8b2c28f29e8f3bb81f099fdaca0f4cec6d1741591a82a24617e36416c3e8aa2ba3ff29ae6b9cb612162d8e13bb32bfb04f816fe86736aed5ca12
-  data.tar.gz: 383b341deed499908407ade22a77432bef14797a70247c5e1fc48b19103cd20e3fe4ba5b23256b5b8155ae754b4e5626cd20b2a6aa09a4bab98faffa7358872a
+  metadata.gz: e23596ce8fd844d9292f92a4fc7c6a97feceb85ecdfce82eb6462822ffe456929a693b4fdfeb2261258a7b8dffd65960c69e3688e4a433021e5db4e1062588a2
+  data.tar.gz: efc1d484e301975405fd1f7c3081ba0d2850e2dd8a64bcfbfc10b9f0b1dcbf1fea1e6e2e1cb07905327f984647c12ba798ad821198344fe9d30f8d1c291eeada

data/CHANGELOG.md

@@ -6,7 +6,21 @@ Reverse Chronological Order:
 
 https://github.com/capistrano/capistrano/compare/v3.2.0...HEAD
 
-## `3.2.0``
+## `3.2.1`
+
+* Bug Fixes:
+  * 3.2.0 introduced some behaviour to modify the way before/after hooks were called, to allow the optional
+    preservation of arguments to be passed to tasks. This release reverts that commit in order to restore
+    original functionality, and fix (fairly serious) bugs introduced by the refactoring.
+
+* Minor changes:
+  * Update dsl#local_user method and add test for it. (@bruno-)
+  * Revert short sha1 revision with git. (@blaugueux)
+  * Changed asking question to more standard format (like common unix commandline tools) (@sponomarev)
+  * Fixed typos in the README. (@sponomarev)
+  * Added `keys` method to Configuration to allow introspection of configuration options. (@juanibiapina)
+
+## `3.2.0`
 
 The changelog entries here are incomplete, because many authors choose not to
 be credited for their work, check the tag comparison link for Github.

data/README.md

@@ -17,7 +17,7 @@ Get <a href="http://codersclan.net/?repo_id=325&source=link">Capistrano support
 Add this line to your application's Gemfile:
 
 ``` ruby
-gem 'capistrano', '~> 3.1.0'
+gem 'capistrano', '~> 3.2.0'
 ```
 
 And then execute:
@@ -156,10 +156,10 @@ Perfect, who needs telephones.
 
 ## Using password authentication
 
-Password authentication can be done via `set` and `ask` in your deploy environment file (e.g.: config/environments/production.rb)
+Password authentication can be done via `set` and `ask` in your deploy environment file (e.g.: config/deploy/production.rb)
 
 ```ruby
-set :password, ask('Server password:', nil)
+set :password, ask('Server password', nil)
 server 'server.domain.com', user: 'ssh_user_name', port: 22, password: fetch(:password), roles: %w{web app db}
 ```
 

data/lib/capistrano/configuration.rb

@@ -36,6 +36,10 @@ module Capistrano
       return value
     end
 
+    def keys
+      config.keys
+    end
+
     def role(name, hosts, options={})
       if name == :all
         raise ArgumentError.new("#{name} reserved name for role. Please choose another name")

data/lib/capistrano/configuration/question.rb

@@ -15,7 +15,7 @@ module Capistrano
       attr_reader :env, :key, :default
 
       def ask_question
-        $stdout.puts question
+        $stdout.print question
       end
 
       def save_response

data/lib/capistrano/dsl.rb

@@ -1,3 +1,4 @@
+require 'etc'
 require 'capistrano/dsl/task_enhancements'
 require 'capistrano/dsl/paths'
 require 'capistrano/dsl/stages'
@@ -41,7 +42,7 @@ module Capistrano
     end
 
     def local_user
-      `whoami`
+      Etc.getlogin
     end
 
     def lock(locked_version)

data/lib/capistrano/dsl/env.rb

@@ -44,12 +44,7 @@ module Capistrano
       end
 
       def release_roles(*names)
-        options = { exclude: :no_release }
-        if names.last.is_a? Hash
-          names.last.merge(options)
-        else
-          names << options
-        end
+        names << { exclude: :no_release } unless names.last.is_a? Hash
         roles(*names)
       end
 

data/lib/capistrano/dsl/task_enhancements.rb

@@ -2,16 +2,14 @@ module Capistrano
   module TaskEnhancements
     def before(task, prerequisite, *args, &block)
       prerequisite = Rake::Task.define_task(prerequisite, *args, &block) if block_given?
-      Rake::Task[task].enhance do
-        Rake::Task[prerequisite].invoke(*args)
-      end
+      Rake::Task[task].enhance [prerequisite]
     end
 
     def after(task, post_task, *args, &block)
       Rake::Task.define_task(post_task, *args, &block) if block_given?
       post_task = Rake::Task[post_task]
       Rake::Task[task].enhance do
-        post_task.invoke(args)
+        post_task.invoke
       end
     end
 

data/lib/capistrano/git.rb

@@ -34,7 +34,7 @@ class Capistrano::Git < Capistrano::SCM
     end
 
     def fetch_revision
-      context.capture(:git, "rev-parse #{fetch(:branch)}")
+      context.capture(:git, "rev-parse --short #{fetch(:branch)}")
     end
   end
 end

data/lib/capistrano/i18n.rb

@@ -3,7 +3,6 @@ require 'i18n'
 en = {
   starting:                    'Starting',
   capified:                    'Capified',
-  starting:                    'Starting',
   start:                       'Start',
   update:                      'Update',
   finalize:                    'Finalise',
@@ -11,12 +10,12 @@ en = {
   finished:                    'Finished',
   stage_not_set:               'Stage not set, please call something such as `cap production deploy`, where production is a stage you have defined.',
   written_file:                'create %{file}',
-  question:                    'Please enter %{key}: |%{default_value}|',
+  question:                    'Please enter %{key} (%{default_value}): ',
   keeping_releases:            'Keeping %{keep_releases} of %{releases} deployed releases on %{host}',
   no_old_releases:             'No old releases (keeping newest %{keep_releases}) on %{host}',
   linked_file_does_not_exist:  'linked file %{file} does not exist on %{host}',
   cannot_rollback:             'There are no older releases to rollback to',
-  mirror_exists:               "The repository mirror is at %{at}",
+  mirror_exists:               'The repository mirror is at %{at}',
   revision_log_message:        'Branch %{branch} (at %{sha}) deployed as release %{release} by %{user}',
   rollback_log_message:        '%{user} rolled back to release %{release}',
   deploy_failed:               'The deploy has failed with an error: %{ex}',

data/lib/capistrano/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  VERSION = "3.2.0"
+  VERSION = "3.2.1"
 end

data/spec/integration/dsl_spec.rb

@@ -283,7 +283,7 @@ describe Capistrano::DSL do
   describe 'asking for a variable' do
     before do
       dsl.ask(:scm, :svn)
-      $stdout.stubs(:puts)
+      $stdout.stubs(:print)
     end
 
     context 'variable is provided' do

data/spec/lib/capistrano/configuration/question_spec.rb

@@ -23,7 +23,7 @@ module Capistrano
           let(:branch) { 'branch' }
 
           before do
-            $stdout.expects(:puts).with('Please enter branch: |default|')
+            $stdout.expects(:print).with('Please enter branch (default): ')
             $stdin.expects(:gets).returns(branch)
           end
 
@@ -37,7 +37,7 @@ module Capistrano
           let(:branch) { default }
 
           before do
-            $stdout.expects(:puts).with('Please enter branch: |default|')
+            $stdout.expects(:print).with('Please enter branch (default): ')
             $stdin.expects(:gets).returns('')
           end
 

data/spec/lib/capistrano/configuration_spec.rb

@@ -112,6 +112,19 @@ module Capistrano
       end
     end
 
+    describe 'keys' do
+      subject { config.keys }
+
+      before do
+        config.set(:key1, :value1)
+        config.set(:key2, :value2)
+      end
+
+      it 'returns all set keys' do
+        expect(subject).to match_array [:key1, :key2]
+      end
+    end
+
     describe 'deleting' do
       before do
         config.set(:key, :value)

data/spec/lib/capistrano/dsl_spec.rb

@@ -48,5 +48,16 @@ module Capistrano
         dsl.sudo(:my, :command)
       end
     end
+
+    describe '#local_user' do
+
+      before do
+        Etc.expects(:getlogin)
+      end
+
+      it 'delegates to Etc#getlogin' do
+        dsl.local_user
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Tom Clements
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit