capistrano 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dffc85194d6ad3db0812f96e216fe5d95a508e9
-  data.tar.gz: f93a202158ed81afecc72d6d19db46b9c965fdad
+  metadata.gz: 1948ef0e60f92eb2ca3eee3f5a67e96e5c0e0612
+  data.tar.gz: 8b16bda549777df3faadb59ed76cebc58dec095d
 SHA512:
-  metadata.gz: 07cb65b0395968f71258ab6e0f6886d658f5c5f6a87e1780537474855f19453c2c09e77fc7b6d7d11ce062133aca191dc1be4e19ad9f21b22c37d82a86925e55
-  data.tar.gz: 65d563a1ae4fce777c70c225f2f5d711d4c5e68493b3254215a372ba72f06fb4cf410637ab82758af6d2ac91d91ec8c11c8648da4c5a57deec7800838b30a6c4
+  metadata.gz: e2f8bdbc484772a5d54a40449dd4f2b5480fb76c906d55d57c1dbe593072487a0f717dfc00702b16aa308ada41d9df3543601179a5bc4c9cd53abe55e4de355c
+  data.tar.gz: c7312872efddec76244ee17dffa32da76108a7073c326654f207437806f86693bacac9fd0a55546e13f5004ac13046f4b26a11af3e7c17ad57ad87a8895130da

data/CHANGELOG.md

@@ -4,10 +4,20 @@ Reverse Chronological Order:
 
 ## master
 
-https://github.com/capistrano/capistrano/compare/v3.6.0...HEAD
+https://github.com/capistrano/capistrano/compare/v3.6.1...HEAD
 
 * Your contribution here!
 
+## `3.6.1` (2016-08-23)
+
+https://github.com/capistrano/capistrano/compare/v3.6.0...v3.6.1
+
+### Fixes:
+
+* Restore compatibility with older versions of Rake (< 11.0.0) (@troelskn)
+* Fix `NoMethodError: undefined method gsub` when setting `:application` to a Proc. The original fix released in 3.6.0 worked for values specified with blocks, but not for those specified with procs or lambdas (the latter syntax is much more common). [#1681](https://github.com/capistrano/capistrano/issues/1681)
+* Fix a bug where deploy would fail if `:local_user` contained a space; spaces are now replaced with dashes when computing the git-ssh suffix. (@will_in_wi)
+
 ## `3.6.0` (2016-07-26)
 
 https://github.com/capistrano/capistrano/compare/v3.5.0...v3.6.0

data/lib/capistrano/configuration/validated_variables.rb

@@ -7,9 +7,9 @@ module Capistrano
     # user-supplied validation rules. Each rule for a given key is invoked
     # immediately whenever `set` is called with a value for that key.
     #
-    # If `set` is called with a block, validation is not performed immediately.
-    # Instead, the validation rules are invoked the first time `fetch` is used
-    # to access the value.
+    # If `set` is called with a callable value or a block, validation is not
+    # performed immediately. Instead, the validation rules are invoked the first
+    # time `fetch` is used to access the value.
     #
     # A rule is simply a block that accepts two arguments: key and value. It is
     # up to the rule to raise an exception when it deems the value is invalid
@@ -31,10 +31,17 @@ module Capistrano
 
       # Decorate Variables#set to add validation behavior.
       def set(key, value=nil, &block)
-        if value.nil? && callable_without_parameters?(block)
-          super(key, nil, &assert_valid_later(key, &block))
+        assert_value_or_block_not_both(value, block)
+
+        # Skip validation behavior if no validators are registered for this key
+        return super unless validators.key?(key)
+
+        value_to_evaluate = block || value
+
+        if callable_without_parameters?(value_to_evaluate)
+          super(key, assert_valid_later(key, value_to_evaluate), &nil)
         else
-          assert_valid_now(key, block || value)
+          assert_valid_now(key, value_to_evaluate)
           super
         end
       end
@@ -50,26 +57,55 @@ module Capistrano
 
       attr_reader :validators
 
-      # Wrap a block with a proc that validates the value of the block. This
-      # allows us to defer validation until the time the value is requested.
-      def assert_valid_later(key)
-        lambda do
-          value = yield
+      # Given a callable that provides a value, wrap the callable with another
+      # object that responds to `call`. This new object will perform validation
+      # and then return the original callable's value.
+      #
+      # If the callable is a `Question`, the object returned by this method will
+      # also be a `Question` (a `ValidatedQuestion`, to be precise). This
+      # ensures that `is_a?(Question)` remains true even after the validation
+      # wrapper is applied. This is needed so that `Configuration#is_question?`
+      # works as expected.
+      #
+      def assert_valid_later(key, callable)
+        validation_callback = lambda do
+          value = callable.call
           assert_valid_now(key, value)
           value
         end
+
+        if callable.is_a?(Question)
+          ValidatedQuestion.new(validation_callback)
+        else
+          validation_callback
+        end
       end
 
       # Runs all validation rules registered for the given key against the
       # user-supplied value for that variable. If no validator raises an
       # exception, the value is assumed to be valid.
       def assert_valid_now(key, value)
-        return unless validators.key?(key)
-
         validators[key].each do |validator|
           validator.call(key, value)
         end
       end
+
+      def assert_value_or_block_not_both(value, block)
+        unless value.nil? || block.nil?
+          raise Capistrano::ValidationError,
+                "Value and block both passed to Configuration#set"
+        end
+      end
+
+      class ValidatedQuestion < Question
+        def initialize(validator)
+          @validator = validator
+        end
+
+        def call
+          @validator.call
+        end
+      end
     end
   end
 end

data/lib/capistrano/configuration/variables.rb

@@ -35,7 +35,6 @@ module Capistrano
       end
 
       def set(key, value=nil, &block)
-        assert_value_or_block_not_both(value, block)
         @trusted_keys << key if trusted?
         remember_location(key)
         values[key] = block || value
@@ -104,13 +103,6 @@ module Capistrano
         (locations[key] ||= []) << location
       end
 
-      def assert_value_or_block_not_both(value, block)
-        unless value.nil? || block.nil?
-          raise Capistrano::ValidationError,
-                "Value and block both passed to Configuration#set"
-        end
-      end
-
       def trace_set(key)
         return unless fetch(:print_config_variables, false)
         puts "Config variable set: #{key.inspect} => #{values[key].inspect}"

data/lib/capistrano/dsl.rb

@@ -13,7 +13,8 @@ module Capistrano
 
     def invoke(task_name, *args)
       task = Rake::Task[task_name]
-      if task && task.already_invoked
+      # NOTE: We access instance variable since the accessor was only added recently. Once Capistrano depends on rake 11+, we can revert the following line
+      if task && task.instance_variable_get(:@already_invoked)
         file, line, = caller.first.split(":")
         colors = SSHKit::Color.new($stderr)
         $stderr.puts colors.colorize("Skipping task `#{task_name}'.", :yellow)

data/lib/capistrano/tasks/git.rake

@@ -6,7 +6,7 @@ namespace :git do
   set :git_wrapper_path, lambda {
     # Try to avoid permissions issues when multiple users deploy the same app
     # by using different file names in the same dir for each deployer and stage.
-    suffix = [:application, :stage, :local_user].map { |key| fetch(key).to_s }.join("-")
+    suffix = [:application, :stage, :local_user].map { |key| fetch(key).to_s }.join("-").gsub(/\s+/, "-")
     "#{fetch(:tmp_dir)}/git-ssh-#{suffix}.sh"
   }
 

data/lib/capistrano/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  VERSION = "3.6.0".freeze
+  VERSION = "3.6.1".freeze
 end

data/spec/lib/capistrano/configuration_spec.rb

@@ -154,19 +154,29 @@ module Capistrano
           config.set(:key, "longer_value")
         end
 
-        it "validates proc without error" do
+        it "validates block without error" do
           config.set(:key) { "longer_value" }
           expect(config.fetch(:key)).to eq "longer_value"
         end
 
+        it "validates lambda without error" do
+          config.set :key, -> { "longer_value" }
+          expect(config.fetch(:key)).to eq "longer_value"
+        end
+
         it "raises an exception on invalid string" do
           expect { config.set(:key, "sho") }.to raise_error(Capistrano::ValidationError)
         end
 
-        it "raises an exception on invalid string provided by proc" do
+        it "raises an exception on invalid string provided by block" do
           config.set(:key) { "sho" }
           expect { config.fetch(:key) }.to raise_error(Capistrano::ValidationError)
         end
+
+        it "raises an exception on invalid string provided by lambda" do
+          config.set :key, -> { "sho" }
+          expect { config.fetch(:key) }.to raise_error(Capistrano::ValidationError)
+        end
       end
 
       context "appending" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Tom Clements
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrussh