cape 1.7.0 → 1.8.0

data/features/dsl/mirror_rake_tasks/with_valid_options.feature

@@ -15,13 +15,15 @@ Feature: The #mirror_rake_tasks DSL method with valid options
         mirror_rake_tasks :roles => :app
       end
       """
-    When I run `cap with_period`
+    When I run `cap long`
     Then the output should contain:
       """
       *** DEPRECATED: `mirror_rake_tasks :roles => :app`. Use this instead: `mirror_rake_tasks { |recipes| recipes.options[:roles] = :app }`
-        * executing `with_period'
-        * executing "cd /current/path && /usr/bin/env `/usr/bin/env bundle check >/dev/null 2>&1; case $? in 0|1 ) echo bundle exec ;; esac` rake with_period"
-      `with_period' is only run for servers matching {:roles=>:app}, but no servers matched
+        * executing `long'
+      """
+    And the output should contain:
+      """
+      `long' is only run for servers matching {:roles=>:app}, but no servers matched
       """
 
   Scenario: mirror a Rake task with its implementation
@@ -36,11 +38,13 @@ Feature: The #mirror_rake_tasks DSL method with valid options
         end
       end
       """
-    When I run `cap with_period`
+    When I run `cap long`
     Then the output should contain:
       """
-        * executing `with_period'
-        * executing "cd /current/path && /usr/bin/env `/usr/bin/env bundle check >/dev/null 2>&1; case $? in 0|1 ) echo bundle exec ;; esac` rake with_period"
-      `with_period' is only run for servers matching {:roles=>:app}, but no servers matched
+        * executing `long'
+      """
+    And the output should contain:
+      """
+      `long' is only run for servers matching {:roles=>:app}, but no servers matched
       """
     And the output should not contain "DEPRECATED"

data/features/dsl/mirror_rake_tasks/with_valid_options_and_cd.feature

@@ -17,10 +17,12 @@ Feature: The #mirror_rake_tasks DSL method with valid options and a different di
         end
       end
       """
-    When I run `cap with_period`
+    When I run `cap long`
     Then the output should contain:
       """
-        * executing `with_period'
-        * executing "cd /release/path && /usr/bin/env `/usr/bin/env bundle check >/dev/null 2>&1; case $? in 0|1 ) echo bundle exec ;; esac` rake with_period"
-      `with_period' is only run for servers matching {:roles=>:app}, but no servers matched
+        * executing `long'
+      """
+    And the output should contain:
+      """
+      `long' is only run for servers matching {:roles=>:app}, but no servers matched
       """

data/features/dsl/mirror_rake_tasks/with_valid_options_and_cd_and_environment_variables.feature

@@ -19,10 +19,12 @@ Feature: The #mirror_rake_tasks DSL method with valid options, a different direc
         end
       end
       """
-    When I run `cap with_period`
+    When I run `cap long`
     Then the output should contain:
       """
-        * executing `with_period'
-        * executing "cd /release/path && /usr/bin/env `/usr/bin/env bundle check >/dev/null 2>&1; case $? in 0|1 ) echo bundle exec ;; esac` rake with_period RAILS_ENV=\"rails-env\""
-      `with_period' is only run for servers matching {:roles=>:app}, but no servers matched
+        * executing `long'
+      """
+    And the output should contain:
+      """
+      `long' is only run for servers matching {:roles=>:app}, but no servers matched
       """

data/features/dsl/mirror_rake_tasks/with_valid_options_and_environment_variables.feature

@@ -5,7 +5,7 @@ Feature: The #mirror_rake_tasks DSL method with valid options and environment va
   I want to use the Cape DSL.
 
   @deprecated
-  Scenario: mirror the matching Rake task with its implementation (deprecated)
+  Scenario: mirror a Rake task with its implementation (deprecated)
     Given a full-featured Rakefile
     And a Capfile with:
       """
@@ -18,16 +18,18 @@ Feature: The #mirror_rake_tasks DSL method with valid options and environment va
         end
       end
       """
-    When I run `cap with_period`
+    When I run `cap long`
     Then the output should contain:
       """
       *** DEPRECATED: `mirror_rake_tasks(:roles => :app) { |env| env["RAILS_ENV"] = "rails-env" }`. Use this instead: `mirror_rake_tasks { |recipes| recipes.options[:roles] = :app; recipes.env["RAILS_ENV"] = "rails-env" }`
-        * executing `with_period'
-        * executing "cd /current/path && /usr/bin/env `/usr/bin/env bundle check >/dev/null 2>&1; case $? in 0|1 ) echo bundle exec ;; esac` rake with_period RAILS_ENV=\"rails-env\""
-      `with_period' is only run for servers matching {:roles=>:app}, but no servers matched
+        * executing `long'
+      """
+    And the output should contain:
+      """
+      `long' is only run for servers matching {:roles=>:app}, but no servers matched
       """
 
-  Scenario: mirror the matching Rake task with its implementation
+  Scenario: mirror a Rake task with its implementation
     Given a full-featured Rakefile
     And a Capfile with:
       """
@@ -41,11 +43,13 @@ Feature: The #mirror_rake_tasks DSL method with valid options and environment va
         end
       end
       """
-    When I run `cap with_period`
+    When I run `cap long`
     Then the output should contain:
       """
-        * executing `with_period'
-        * executing "cd /current/path && /usr/bin/env `/usr/bin/env bundle check >/dev/null 2>&1; case $? in 0|1 ) echo bundle exec ;; esac` rake with_period RAILS_ENV=\"rails-env\""
-      `with_period' is only run for servers matching {:roles=>:app}, but no servers matched
+        * executing `long'
+      """
+    And the output should contain:
+      """
+      `long' is only run for servers matching {:roles=>:app}, but no servers matched
       """
     And the output should not contain "DEPRECATED"

data/features/dsl/rake_executable.feature

@@ -54,7 +54,7 @@ Feature: The #local_rake_executable and #remote_rake_executable DSL attributes
         mirror_rake_tasks
       end
       """
-    When I run `cap with_period`
+    When I run `cap long`
     Then the output should contain:
       """
       We changed the remote Rake executable to "echo \"This comes from overridden Rake\" #"
@@ -63,8 +63,3 @@ Feature: The #local_rake_executable and #remote_rake_executable DSL attributes
       """
       We left the local Rake executable as "/usr/bin/env `/usr/bin/env bundle check >/dev/null 2>&1; case $? in 0|1 ) echo bundle exec ;; esac` rake"
       """
-    And the output should contain:
-      """
-        * executing `with_period'
-        * executing "cd /current/path && echo \"This comes from overridden Rake\" # with_period"
-      """

data/features/step_definitions.rb

@@ -9,12 +9,6 @@ end
 
 Given 'a full-featured Rakefile' do
   step 'a file named "Rakefile" with:', <<-end_step
-    desc 'Ends with period.'
-    task :with_period
-
-    desc 'Ends without period'
-    task :without_period
-
     desc 'My long task -- it has a very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very long description'
     task :long
 
@@ -49,12 +43,6 @@ Given 'a full-featured Rakefile defining a Ruby-method-shadowing task' do
     desc 'A task that shadows a Ruby method'
     task :load
 
-    desc 'Ends with period.'
-    task :with_period
-
-    desc 'Ends without period'
-    task :without_period
-
     desc 'My long task -- it has a very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very, very long description'
     task :long
 

data/gemfiles/capistrano_v2.x.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "capistrano", "~> 2"
+
+gemspec :path=>"../"

data/gemfiles/capistrano_v2.x.gemfile.lock

@@ -0,0 +1,66 @@
+PATH
+  remote: /Users/nils/Sources/personal/cape
+  specs:
+    cape (1.7.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    appraisal (0.5.2)
+      bundler
+      rake
+    aruba (0.5.3)
+      childprocess (>= 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    builder (3.2.2)
+    capistrano (2.15.5)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.1.0)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    cucumber (1.3.10)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.0.2)
+    diff-lcs (1.2.5)
+    ffi (1.9.3)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    highline (1.6.20)
+    json_pure (1.8.1)
+    multi_json (1.8.2)
+    multi_test (0.0.2)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.7.0)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    rake (10.1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0)
+  aruba (~> 0)
+  cape!
+  capistrano (~> 2)
+  json_pure
+  rake (>= 0.9.3)
+  rspec (~> 2)

data/gemfiles/rake_v0.9.3.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rake", "0.9.3"
+
+gemspec :path=>"../"

data/gemfiles/rake_v0.9.3.gemfile.lock

@@ -0,0 +1,66 @@
+PATH
+  remote: /Users/nils/Sources/personal/cape
+  specs:
+    cape (1.7.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    appraisal (0.5.2)
+      bundler
+      rake
+    aruba (0.5.3)
+      childprocess (>= 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    builder (3.2.2)
+    capistrano (2.15.5)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.1.0)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    cucumber (1.3.10)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.0.2)
+    diff-lcs (1.2.5)
+    ffi (1.9.3)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    highline (1.6.20)
+    json_pure (1.8.1)
+    multi_json (1.8.2)
+    multi_test (0.0.2)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.7.0)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    rake (0.9.3)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0)
+  aruba (~> 0)
+  cape!
+  capistrano (~> 2)
+  json_pure
+  rake (= 0.9.3)
+  rspec (~> 2)

data/gemfiles/rake_v10.x.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rake", "~> 10"
+
+gemspec :path=>"../"

data/gemfiles/rake_v10.x.gemfile.lock

@@ -0,0 +1,66 @@
+PATH
+  remote: /Users/nils/Sources/personal/cape
+  specs:
+    cape (1.7.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    appraisal (0.5.2)
+      bundler
+      rake
+    aruba (0.5.3)
+      childprocess (>= 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    builder (3.2.2)
+    capistrano (2.15.5)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.1.0)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    cucumber (1.3.10)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.0.2)
+    diff-lcs (1.2.5)
+    ffi (1.9.3)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    highline (1.6.20)
+    json_pure (1.8.1)
+    multi_json (1.8.2)
+    multi_test (0.0.2)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.7.0)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    rake (10.1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0)
+  aruba (~> 0)
+  cape!
+  capistrano (~> 2)
+  json_pure
+  rake (~> 10)
+  rspec (~> 2)

data/lib/cape/capistrano.rb

@@ -1,6 +1,7 @@
 require 'cape/rake'
 require 'cape/recipe_definition'
 require 'cape/util'
+require 'cape/xterm'
 
 module Cape
 
@@ -105,40 +106,49 @@ Set environment #{noun} #{parameters_list} if you want to pass #{noun_phrase}.
         if recipe_definition.rename
           recipe_name = recipe_definition.rename.call(name_tokens.last)
         end
-        context.task recipe_name, recipe_definition.options do
-          arguments = Array(task[:parameters]).collect do |a|
-            if (value = ENV[a.upcase])
-              value = value.inspect
+        begin
+          context.task recipe_name, recipe_definition.options do
+            arguments = Array(task[:parameters]).collect do |a|
+              if (value = ENV[a.upcase])
+                value = value.inspect
+              end
+              value
+            end
+            if arguments.empty?
+              arguments = nil
+            else
+              arguments = "[#{arguments.join ','}]"
             end
-            value
-          end
-          if arguments.empty?
-            arguments = nil
-          else
-            arguments = "[#{arguments.join ','}]"
-          end
 
-          unless env
-            env_strings = recipe_definition.env.collect do |var_name, var_value|
-              if var_name.nil? || var_value.nil?
-                nil
-              else
-                if var_value.is_a?(Proc)
-                  var_value = context.instance_eval do
-                    var_value.call
+            unless env
+              env_strings = recipe_definition.env.collect do |var_name, var_value|
+                if var_name.nil? || var_value.nil?
+                  nil
+                else
+                  if var_value.is_a?(Proc)
+                    var_value = context.instance_eval do
+                      var_value.call
+                    end
                   end
+                  "#{var_name}=#{var_value.inspect}"
                 end
-                "#{var_name}=#{var_value.inspect}"
-              end
-            end.compact
-            env = env_strings.empty? ? nil : (' ' + env_strings.join(' '))
-          end
+              end.compact
+              env = env_strings.empty? ? nil : (' ' + env_strings.join(' '))
+            end
 
-          path = recipe_definition.cd || context.current_path
-          path = path.call if path.respond_to?(:call)
-          command = "cd #{path} && #{rake.remote_executable} " +
-                    "#{task[:name]}#{arguments}#{env}"
-          context.run command
+            path = recipe_definition.cd || context.current_path
+            path = path.call if path.respond_to?(:call)
+            command = "cd #{path} && #{rake.remote_executable} " +
+                      "#{task[:name]}#{arguments}#{env}"
+            context.run command
+          end
+        rescue => e
+          $stderr.puts XTerm.bold_and_foreground_red('*** WARNING:')           +
+                       ' '                                                     +
+                       XTerm.bold("You must use Cape's renaming API in order " +
+                                  'to mirror Rake task ')                      +
+                       XTerm.bold_and_underlined(task[:name])                  +
+                       XTerm.bold(" (#{e.message})")
         end
       }
       # Nest the recipe inside its containing namespaces.