cape 1.0.3 → 1.1.0

data/History.markdown

@@ -1,6 +1,10 @@
 # Version history for the _Cape_ project
 
-## <a name="v1.0.3"></a>v1.0.3, Tue 11/29/2011
+## <a name="v1.1.0"></a>v1.1.0, Thu 12/29/2011
+
+* Allow environment variables for Rake task arguments to be optional
+
+## <a name="v1.0.3"></a>v1.0.3, Thu 12/29/2011
 
 * Run Cucumber features from `gem test cape`
 

data/README.markdown

@@ -124,7 +124,7 @@ Let’s use Capistrano to view the unabbreviated description of a Rake task reci
     ------------------------------------------------------------
     Bags the leaves.
 
-    You must set environment variable PAPER_OR_PLASTIC.
+    Set environment variable PAPER_OR_PLASTIC to pass a Rake task argument.
 
 Here’s how to invoke a task/recipe with arguments. On the local computer, via Rake:
 

data/features/dsl/mirror_rake_tasks/inside_capistrano_namespace/without_arguments.feature

@@ -150,7 +150,7 @@ Feature: The #mirror_rake_tasks DSL method, inside a Capistrano namespace, witho
       ------------------------------------------------------------
       My task with one argument.
 
-      You must set environment variable THE_ARG.
+      Set environment variable THE_ARG to pass a Rake task argument.
 
 
       """
@@ -215,7 +215,7 @@ Feature: The #mirror_rake_tasks DSL method, inside a Capistrano namespace, witho
       ------------------------------------------------------------
       My task with two arguments.
 
-      You must set environment variables MY_ARG1 and MY_ARG2.
+      Set environment variables MY_ARG1 and MY_ARG2 to pass Rake task arguments.
 
 
       """
@@ -238,7 +238,8 @@ Feature: The #mirror_rake_tasks DSL method, inside a Capistrano namespace, witho
       ------------------------------------------------------------
       My task with three arguments.
 
-      You must set environment variables AN_ARG1, AN_ARG2, and AN_ARG3.
+      Set environment variables AN_ARG1, AN_ARG2, and AN_ARG3 to pass Rake task
+      arguments.
 
 
       """

data/features/dsl/mirror_rake_tasks/without_arguments.feature

@@ -138,7 +138,7 @@ Feature: The #mirror_rake_tasks DSL method without arguments
       ------------------------------------------------------------
       My task with one argument.
 
-      You must set environment variable THE_ARG.
+      Set environment variable THE_ARG to pass a Rake task argument.
 
 
       """
@@ -213,7 +213,7 @@ Feature: The #mirror_rake_tasks DSL method without arguments
       ------------------------------------------------------------
       My task with two arguments.
 
-      You must set environment variables MY_ARG1 and MY_ARG2.
+      Set environment variables MY_ARG1 and MY_ARG2 to pass Rake task arguments.
 
 
       """
@@ -234,24 +234,31 @@ Feature: The #mirror_rake_tasks DSL method without arguments
       ------------------------------------------------------------
       My task with three arguments.
 
-      You must set environment variables AN_ARG1, AN_ARG2, and AN_ARG3.
+      Set environment variables AN_ARG1, AN_ARG2, and AN_ARG3 to pass Rake task
+      arguments.
 
 
       """
 
-  Scenario: mirror Rake task 'with_three_args' with its implementation enforcing arguments
+  Scenario: mirror Rake task 'with_three_args' with its implementation
     Given a full-featured Rakefile
     And a Capfile with:
       """
       set :current_path, '/path/to/current/deployed/application'
+
       Cape do
         mirror_rake_tasks
       end
       """
-    When I run `cap with_three_args AN_ARG1="a value for an_arg1"`
-    Then the output should contain "Environment variable AN_ARG2 must be set (RuntimeError)"
+    When I run `cap with_three_args AN_ARG1="a value for an_arg1" AN_ARG2="a value for an_arg2" AN_ARG3="a value for an_arg3"`
+    Then the output should contain:
+      """
+        * executing `with_three_args'
+        * executing "cd /path/to/current/deployed/application && /usr/bin/env rake with_three_args[\"a value for an_arg1\",\"a value for an_arg2\",\"a value for an_arg3\"]"
+
+      """
 
-  Scenario: mirror Rake task 'with_three_args' with its implementation
+  Scenario: mirror Rake task 'with_three_args' with its implementation not enforcing arguments
     Given a full-featured Rakefile
     And a Capfile with:
       """
@@ -261,11 +268,11 @@ Feature: The #mirror_rake_tasks DSL method without arguments
         mirror_rake_tasks
       end
       """
-      When I run `cap with_three_args AN_ARG1="a value for an_arg1" AN_ARG2="a value for an_arg2" AN_ARG3="a value for an_arg3"`
+    When I run `cap with_three_args AN_ARG2="a value for an_arg2"`
     Then the output should contain:
       """
         * executing `with_three_args'
-        * executing "cd /path/to/current/deployed/application && /usr/bin/env rake with_three_args[\"a value for an_arg1\",\"a value for an_arg2\",\"a value for an_arg3\"]"
+        * executing "cd /path/to/current/deployed/application && /usr/bin/env rake with_three_args[,\"a value for an_arg2\",]"
 
       """
 

data/lib/cape/capistrano.rb

@@ -58,10 +58,14 @@ module Cape
       unless (parameters = Array(task[:parameters])).empty?
         noun            = Util.pluralize('variable', parameters.length)
         parameters_list = Util.to_list_phrase(parameters.collect(&:upcase))
+        singular        = 'Rake task argument'
+        noun_phrase     = (parameters.length == 1) ?
+                          "a #{singular}"          :
+                          Util.pluralize(singular)
         description << <<-end_description
 
 
-You must set environment #{noun} #{parameters_list}.
+Set environment #{noun} #{parameters_list} to pass #{noun_phrase}.
         end_description
       end
       description.join
@@ -73,10 +77,10 @@ You must set environment #{noun} #{parameters_list}.
       block = lambda { |context|
         context.task name.last, :roles => roles do
           arguments = Array(task[:parameters]).collect do |a|
-            unless (value = ENV[a.upcase])
-              fail "Environment variable #{a.upcase} must be set"
+            if (value = ENV[a.upcase])
+              value = value.inspect
             end
-            value.inspect
+            value
           end
           if arguments.empty?
             arguments = nil

data/lib/cape/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cape
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 3
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors: 
 - Nils Jonsson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-29 00:00:00 Z
+date: 2011-12-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: aruba