cape 1.2.0 → 1.3.0

data/History.markdown

@@ -1,6 +1,10 @@
 # Version history for the _Cape_ project
 
-## <a name="v1.2.0"></a>v1.2.0, Mon 1/30/2012
+## <a name="v1.3.0"></a>v1.3.0, Fri 2/03/2012
+
+* Don’t allow `nil` environment variables to pass through to the remote command line
+
+## <a name="v1.2.0"></a>v1.2.0, Wed 2/01/2012
 
 * Add support in the DSL for specifying remote environment variables and Capistrano recipe options
 * Add support for Rake tasks that overlap with (have the same full name as) namespaces

data/features/dsl/mirror_rake_tasks/with_defined_task_and_valid_options_arguments_and_environment_variables.feature

@@ -95,6 +95,48 @@ Feature: The #mirror_rake_tasks DSL method with arguments of a defined task and
       `with_period' is only run for servers matching {:roles=>:app}, but no servers matched
       """
 
+  Scenario: mirror Rake task 'with_period' with its implementation, ignoring nil environment variable names
+    Given a full-featured Rakefile
+    And a Capfile with:
+      """
+      set :current_path, '/path/to/current/deployed/application'
+      set :rails_env,    'production'
+
+      Cape do
+        mirror_rake_tasks :roles => :app do |env|
+          env[nil] = 'foo'
+        end
+      end
+      """
+    When I run `cap with_period`
+    Then the output should contain:
+      """
+        * executing `with_period'
+        * executing "cd /path/to/current/deployed/application && /usr/bin/env rake with_period"
+      `with_period' is only run for servers matching {:roles=>:app}, but no servers matched
+      """
+
+  Scenario: mirror Rake task 'with_period' with its implementation, ignoring nil environment variable values
+    Given a full-featured Rakefile
+    And a Capfile with:
+      """
+      set :current_path, '/path/to/current/deployed/application'
+      set :rails_env,    'production'
+
+      Cape do
+        mirror_rake_tasks :roles => :app do |env|
+          env['FOO'] = nil
+        end
+      end
+      """
+    When I run `cap with_period`
+    Then the output should contain:
+      """
+        * executing `with_period'
+        * executing "cd /path/to/current/deployed/application && /usr/bin/env rake with_period"
+      `with_period' is only run for servers matching {:roles=>:app}, but no servers matched
+      """
+
   Scenario: mirror Rake task 'with_one_arg' with its description
     Given a full-featured Rakefile
     And a Capfile with:

data/lib/cape/capistrano.rb

@@ -110,6 +110,9 @@ Set environment #{noun} #{parameters_list} if you want to pass #{noun_phrase}.
           end
           env_hash = {}
           env_block.call(env_hash) if env_block
+          env_hash.reject! do |var_name, var_value|
+            var_name.nil? || var_value.nil?
+          end
           env_strings = env_hash.collect do |var_name, var_value|
             "#{var_name}=#{var_value.inspect}"
           end

data/lib/cape/version.rb

@@ -1,6 +1,6 @@
 module Cape
 
   # The version of Cape.
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cape
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Nils Jonsson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-01 00:00:00 Z
+date: 2012-02-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: aruba