cape 1.4.0 → 1.5.0

data/.yardopts

@@ -1 +1 @@
---file MIT-LICENSE.markdown --file History.markdown --no-private --protected --title "Cape"
+--file History.markdown --file License.markdown --no-private --protected --title "Cape"

data/Gemfile

@@ -13,7 +13,7 @@ group :doc do
 end
 
 group :tooling do
-  gem   'guard-rspec',  '~> 0'
+  gem   'guard-rspec',  '~> 2'
   if RUBY_PLATFORM =~ /darwin/i
     gem 'rb-fsevent',   '~> 0',                        :require => false
   end

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', :cli => '--color', :version => 2 do
+guard :rspec, :cli => '--color --debugger' do
   # Run the corresponding spec (or all specs) when code changes.
   watch( %r{^lib/(.+)\.rb$} ) do |match|
     corresponding_spec = "spec/#{match[1]}_spec.rb"

data/History.markdown

@@ -1,5 +1,9 @@
 # Version history for the _Cape_ project
 
+## <a name="v1.5.0"></a>v1.5.0, Tue 10/09/2012
+
+* Automatically detect and use Bundler when running Rake
+
 ## <a name="v1.4.0"></a>v1.4.0, Mon 2/06/2012
 
 * Cache the Rake task list to improve Capistrano responsiveness

data/README.markdown

@@ -29,26 +29,28 @@
             <hNNBNBh=(.                                /   \   `
                ..
 
-# [<img align="right" src="https://gemnasium.com/njonsson/cape.png" title="Gemnasium build status" />](http://gemnasium.com/njonsson/cape) [<img align="right" src="https://secure.travis-ci.org/njonsson/cape.png?branch=master" title="Travis CI build status" />](http://travis-ci.org/njonsson/cape) Cape
+# [<img align="right" src="https://codeclimate.com/badge.png" title="Code Climate" />](http://codeclimate.com/github/njonsson/cape) [<img align="right" src="https://gemnasium.com/njonsson/cape.png" title="Gemnasium build status" />](http://gemnasium.com/njonsson/cape) [<img align="right" src="https://secure.travis-ci.org/njonsson/cape.png?branch=master" title="Travis CI build status" />](http://travis-ci.org/njonsson/cape) Cape
 
 If
 
 * **You use [Capistrano](http://capify.org)** to deploy your application, and
-* **You have [Rake](http://rake.rubyforge.org) tasks you want to run remotely** — but you don’t want to hand-code Capistrano recipes for each Rake task —
+* **You have [Rake](http://rake.rubyforge.org) tasks that you want to execute remotely** — but you don’t want to hand-code Capistrano recipes for each Rake task —
 
 Then
 
-* **You can use the [Cape](http://github.com/njonsson/cape) DSL** within Capistrano recipes to dynamically add recipes for your application’s Rake tasks, and
-* **You can run your Rake tasks on your deployed servers,** friction-free, and look like a superhero. _[cue fanfare]_
+* **You can use the [Cape](http://njonsson.github.com/cape) DSL** within Capistrano recipes to dynamically add recipes for your application’s Rake tasks, and
+* **You can execute your Rake tasks on your deployed servers,** friction-free, and look like a superhero. _[cue fanfare]_
 
 ## Features
 
 * **Mirror Rake tasks** as Capistrano recipes, optionally filtered by namespace or name
 * **Embed Rake tasks** in Capistrano namespaces
 * **Pass arguments** to Rake tasks by setting environment variables with the same names
-* **Override the default executables** for local and remote Rake installations (`/usr/bin/env rake` is the default)
+* **Specify the Rake executable** for local and remote Rake installations
 * **Enumerate Rake tasks** for your own purposes
 
+See what’s changed lately by reading the [project history](http://github.com/njonsson/cape/blob/master/History.markdown).
+
 ## Installation — get your Cape on
 
 Install [the RubyGem](http://rubygems.org/gems/cape "Cape at RubyGems.org").
@@ -61,7 +63,7 @@ Or you may want to make Cape a dependency of your project by using [Bundler](htt
 
     source 'http://rubygems.org'
 
-    gem 'cape'
+    gem 'cape', '~> 1'
 
 ## Examples
 
@@ -89,7 +91,7 @@ Rake lists these tasks in the expected fashion.
 
 ### Simply mirror all Rake tasks as Capistrano recipes
 
-Add the following to your Capistrano recipes. Note that Cape statements must be executed within a `Cape` block.
+Add the following to your Capistrano recipes. Note that Cape statements must be contained in a `Cape` block.
 
     # config/deploy.rb
 
@@ -137,7 +139,7 @@ On remote computers, via Capistrano:
 
     $ cap bag_leaves PAPER_OR_PLASTIC=plastic
       * executing `bag_leaves'
-      * executing "cd /path/to/currently/deployed/version/of/your/app && /usr/bin/env rake bag_leaves[plastic]"
+      * executing "cd /path/to/currently/deployed/version/of/your/app && /usr/bin/env `/usr/bin/env bundle check >/dev/null 2>&1; case $? in 0|1 ) echo bundle exec ;; esac` rake bag_leaves[plastic]"
         servers: ["your.server.name"]
         [your.server.name] executing command
      ** [out :: your.server.name] (in /path/to/currently/deployed/version/of/your/app)
@@ -147,7 +149,7 @@ On remote computers, via Capistrano:
 
 ### Mirror some Rake tasks, but not others
 
-Cape lets you filter the Rake tasks to be mirrored. Note that Cape statements must be executed within a `Cape` block.
+Cape lets you filter the Rake tasks to be mirrored. Note that Cape statements must be contained in a `Cape` block.
 
     # config/deploy.rb
 
@@ -161,7 +163,7 @@ Cape lets you filter the Rake tasks to be mirrored. Note that Cape statements mu
 
 ### Mirror Rake tasks that require Capistrano recipe options and/or environment variables
 
-Cape lets you specify options used for defining Capistrano recipes. You can also specify remote environment variables to be set when running Rake tasks. Note that Cape statements must be executed within a `Cape` block.
+Cape lets you specify options used for defining Capistrano recipes. You can also specify remote environment variables to be set when executing Rake tasks. Note that Cape statements must be contained in a `Cape` block.
 
     # config/deploy.rb
 
@@ -185,19 +187,32 @@ The above is equivalent to the following manually-defined Capistrano recipes.
 
     # These translations to Capistrano are just for illustration.
 
+    RAKE = '/usr/bin/env '                                +
+           '`'                                            +
+            '/usr/bin/env bundle check >/dev/null 2>&1; ' +
+            'case $? in '                                 +
+               # Exit code 0: bundle is defined and installed
+               # Exit code 1: bundle is defined but not installed
+              '0|1 ) '                                    +
+                'echo bundle exec '                       +
+                ';; '                                     +
+            'esac'                                        +
+           '` '                                           +
+           'rake'
+
     task :routes, :roles => :app do
-      run "cd #{current_path} && /usr/bin/env rake routes"
+      run "cd #{current_path} && #{RAKE} routes"
     end
 
     namespace :db do
       task :migrate, :roles => :app do
-        run "cd #{current_path} && /usr/bin/env rake db:migrate RAILS_ENV=#{rails_env}"
+        run "cd #{current_path} && #{RAKE} db:migrate RAILS_ENV=#{rails_env}"
       end
     end
 
 ### Mirror Rake tasks into a Capistrano namespace
 
-Cape plays friendly with the Capistrano DSL for organizing Rake tasks in Capistrano namespaces. Note that Cape statements must be executed within a `Cape` block.
+Cape plays friendly with the Capistrano DSL for organizing Rake tasks in Capistrano namespaces. Note that Cape statements must be contained in a `Cape` block.
 
     # config/deploy.rb
 
@@ -212,7 +227,7 @@ Cape plays friendly with the Capistrano DSL for organizing Rake tasks in Capistr
 
 ### Iterate over available Rake tasks
 
-Cape lets you enumerate Rake tasks, optionally filtering them by task name or namespace. Note that Cape statements must be executed within a `Cape` block.
+Cape lets you enumerate Rake tasks, optionally filtering them by task name or namespace. Note that Cape statements must be contained in a `Cape` block.
 
     # config/deploy.rb
 
@@ -235,15 +250,21 @@ Cape lets you enumerate Rake tasks, optionally filtering them by task name or na
 
 ### Configure Rake execution
 
-Cape lets you specify how Rake should be executed on the local computer and on remote computers. Note that Cape statements must be executed within a `Cape` block.
+Cape lets you specify how Rake should be run on the local computer and on remote computers. But the default behavior is most likely just right for your needs:
+
+* It detects whether Bundler is installed on the computer
+* It detects whether the project uses Bundler to manage its dependencies
+* It runs Rake via Bundler if the above conditions are true; otherwise, it runs Rake directly
+
+Note that Cape statements must be contained in a `Cape` block.
 
     # config/deploy.rb
 
     require 'cape'
 
-    # Configure Cape to execute Rake via Bundler, both locally and remotely.
-    Cape.local_rake_executable  = '/usr/bin/env bundle exec rake'
-    Cape.remote_rake_executable = '/usr/bin/env bundle exec rake'
+    # Configure Cape never to run Rake via Bundler, neither locally nor remotely.
+    Cape.local_rake_executable  = '/usr/bin/env rake'
+    Cape.remote_rake_executable = '/usr/bin/env rake'
 
     Cape do
       # Create Capistrano recipes for all Rake tasks.
@@ -252,7 +273,11 @@ Cape lets you specify how Rake should be executed on the local computer and on r
 
 ## Known issues
 
-For now, only Rake tasks that have descriptions can be mirrored or enumerated.
+**A Rake task that lacks a description cannot be mirrored or enumerated.** This is pending [an enhancement to Rake](http://github.com/jimweirich/rake/pull/99 "Rake pull request #99 (“Add ‘--include-hidden-tasks’ option to enhance ‘-T’ and ‘-D’ ”)").
+
+**A Rake task whose name collides with a Ruby method cannot be mirrored.** For example, the name of [Rails](http://rubyonrails.org)’s _db:fixtures:load_ task collides with the Ruby Core Library’s [_Kernel::load_ method](http://ruby-doc.org/core/Kernel.html#method-i-load) because that method is mixed into all objects. If you try to mirror _db:fixtures:load_, Capistrano will raise an exception. There is [a questionable workaround](http://github.com/njonsson/cape/issues/7#issuecomment-5632718 "Comment on Cape issue #7 (“defining a task named ‘load’ would shadow an existing method with that name (ArgumentError)”)") for this.
+
+**A Rake task is always executed in the Capistrano deployment’s _current_path_.** You may need to execute a task under _release_path_ or another remote filesystem location, but this is not possible at present. [Discuss](http://github.com/njonsson/cape/issues/9 "Cape issue #9 (“Cape Always Runs the Mirrorred Rake Tasks Under $current_path”)") this.
 
 ## Contributing
 
@@ -262,4 +287,4 @@ Your patches are welcome, and you will receive attribution here for good stuff.
 
 ## License
 
-Released under the [MIT License](http://github.com/njonsson/cape/blob/master/MIT-LICENSE.markdown).
+Released under the [MIT License](http://github.com/njonsson/cape/blob/master/License.markdown).

data/cape.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Nils Jonsson']
   s.email       = %w(cape@nilsjonsson.com)
-  s.homepage    = 'http://github.com/njonsson/cape'
+  s.homepage    = 'http://njonsson.github.com/cape'
   s.license     = 'MIT'
 
   s.rubyforge_project = 'cape'

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

@@ -90,7 +90,7 @@ Feature: The #mirror_rake_tasks DSL method, inside a Capistrano namespace, witho
     Then the output should contain:
       """
         * executing `ns:with_period'
-        * executing "cd /path/to/current/deployed/application && /usr/bin/env rake with_period"
+        * executing "cd /path/to/current/deployed/application && /usr/bin/env `/usr/bin/env bundle check >/dev/null 2>&1; case $? in 0|1 ) echo bundle exec ;; esac` rake with_period"
       """
 
   Scenario: mirror Rake task 'without_period' with its description
@@ -197,7 +197,7 @@ Feature: The #mirror_rake_tasks DSL method, inside a Capistrano namespace, witho
     Then the output should contain:
       """
         * executing `ns:my_namespace'
-        * executing "cd /path/to/current/deployed/application && /usr/bin/env rake my_namespace"
+        * executing "cd /path/to/current/deployed/application && /usr/bin/env `/usr/bin/env bundle check >/dev/null 2>&1; case $? in 0|1 ) echo bundle exec ;; esac` rake my_namespace"
       """
 
   Scenario: mirror Rake task 'my_namespace:in_a_namespace' with its description

data/features/dsl/mirror_rake_tasks/with_defined_task_and_valid_options_arguments_and_environment_variables.feature

@@ -91,7 +91,7 @@ Feature: The #mirror_rake_tasks DSL method with arguments of a defined task and
     Then the output should contain:
       """
         * executing `with_period'
-        * executing "cd /path/to/current/deployed/application && /usr/bin/env rake with_period RAILS_ENV=\"production\""
+        * executing "cd /path/to/current/deployed/application && /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=\"production\""
       `with_period' is only run for servers matching {:roles=>:app}, but no servers matched
       """
 
@@ -112,7 +112,7 @@ Feature: The #mirror_rake_tasks DSL method with arguments of a defined task and
     Then the output should contain:
       """
         * executing `with_period'
-        * executing "cd /path/to/current/deployed/application && /usr/bin/env rake with_period"
+        * executing "cd /path/to/current/deployed/application && /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
       """
 
@@ -133,7 +133,7 @@ Feature: The #mirror_rake_tasks DSL method with arguments of a defined task and
     Then the output should contain:
       """
         * executing `with_period'
-        * executing "cd /path/to/current/deployed/application && /usr/bin/env rake with_period"
+        * executing "cd /path/to/current/deployed/application && /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
       """
 
@@ -198,7 +198,7 @@ Feature: The #mirror_rake_tasks DSL method with arguments of a defined task and
     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\"] RAILS_ENV=\"production\""
+        * executing "cd /path/to/current/deployed/application && /usr/bin/env `/usr/bin/env bundle check >/dev/null 2>&1; case $? in 0|1 ) echo bundle exec ;; esac` rake with_three_args[\"a value for an_arg1\",\"a value for an_arg2\",\"a value for an_arg3\"] RAILS_ENV=\"production\""
       `with_three_args' is only run for servers matching {:roles=>:app}, but no servers matched
       """
 
@@ -219,7 +219,7 @@ Feature: The #mirror_rake_tasks DSL method with arguments of a defined task and
     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_arg2\",] RAILS_ENV=\"production\""
+        * executing "cd /path/to/current/deployed/application && /usr/bin/env `/usr/bin/env bundle check >/dev/null 2>&1; case $? in 0|1 ) echo bundle exec ;; esac` rake with_three_args[,\"a value for an_arg2\",] RAILS_ENV=\"production\""
       `with_three_args' is only run for servers matching {:roles=>:app}, but no servers matched
       """
 

data/features/dsl/mirror_rake_tasks/with_valid_options_argument.feature

@@ -85,6 +85,6 @@ Feature: The #mirror_rake_tasks DSL method with arguments of a defined task and
     Then the output should contain:
       """
         * executing `with_period'
-        * executing "cd /path/to/current/deployed/application && /usr/bin/env rake with_period"
+        * executing "cd /path/to/current/deployed/application && /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
       """

data/features/dsl/mirror_rake_tasks/without_arguments.feature

@@ -84,7 +84,7 @@ Feature: The #mirror_rake_tasks DSL method without arguments
     Then the output should contain:
       """
         * executing `with_period'
-        * executing "cd /path/to/current/deployed/application && /usr/bin/env rake with_period"
+        * executing "cd /path/to/current/deployed/application && /usr/bin/env `/usr/bin/env bundle check >/dev/null 2>&1; case $? in 0|1 ) echo bundle exec ;; esac` rake with_period"
       """
 
   Scenario: mirror Rake task 'without_period' with its description
@@ -181,7 +181,7 @@ Feature: The #mirror_rake_tasks DSL method without arguments
     Then the output should contain:
       """
         * executing `my_namespace'
-        * executing "cd /path/to/current/deployed/application && /usr/bin/env rake my_namespace"
+        * executing "cd /path/to/current/deployed/application && /usr/bin/env `/usr/bin/env bundle check >/dev/null 2>&1; case $? in 0|1 ) echo bundle exec ;; esac` rake my_namespace"
       """
 
   Scenario: mirror Rake task 'my_namespace:in_a_namespace' with its description
@@ -236,7 +236,7 @@ Feature: The #mirror_rake_tasks DSL method without arguments
     Then the output should contain:
       """
         * executing `my_namespace:my_nested_namespace:in_a_nested_namespace'
-        * executing "cd /path/to/current/deployed/application && /usr/bin/env rake my_namespace:my_nested_namespace:in_a_nested_namespace"
+        * executing "cd /path/to/current/deployed/application && /usr/bin/env `/usr/bin/env bundle check >/dev/null 2>&1; case $? in 0|1 ) echo bundle exec ;; esac` rake my_namespace:my_nested_namespace:in_a_nested_namespace"
       """
 
   Scenario: mirror Rake task 'with_two_args' with its description
@@ -297,7 +297,7 @@ Feature: The #mirror_rake_tasks DSL method without arguments
     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 `/usr/bin/env bundle check >/dev/null 2>&1; case $? in 0|1 ) echo bundle exec ;; esac` rake with_three_args[\"a value for an_arg1\",\"a value for an_arg2\",\"a value for an_arg3\"]"
 
       """
 
@@ -315,7 +315,7 @@ Feature: The #mirror_rake_tasks DSL method without arguments
     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_arg2\",]"
+        * executing "cd /path/to/current/deployed/application && /usr/bin/env `/usr/bin/env bundle check >/dev/null 2>&1; case $? in 0|1 ) echo bundle exec ;; esac` rake with_three_args[,\"a value for an_arg2\",]"
 
       """
 

data/features/dsl/rake_executable.feature

@@ -31,7 +31,7 @@ Feature: The #local_rake_executable and #remote_rake_executable DSL attributes
       """
     And the output should contain:
       """
-      We left the remote Rake executable as "/usr/bin/env rake"
+      We left the remote 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:
       """
@@ -61,7 +61,7 @@ Feature: The #local_rake_executable and #remote_rake_executable DSL attributes
       """
     And the output should contain:
       """
-      We left the local Rake executable as "/usr/bin/env rake"
+      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:
       """

data/lib/cape/dsl.rb

@@ -217,6 +217,7 @@ module Cape
 
   protected
 
+    # Returns an abstraction of the Rake installation and available tasks.
     def rake
       @rake ||= Rake.new
     end

data/lib/cape/rake.rb

@@ -3,8 +3,23 @@ module Cape
   # An abstraction of the Rake installation and available tasks.
   class Rake
 
-    # The default command used to run Rake.
-    DEFAULT_EXECUTABLE = '/usr/bin/env rake'.freeze
+    # The default command used to run Rake. We use `bundle check` to detect the
+    # presence of Bundler and a Bundler configuration. If Bundler is installed
+    # on the computer and configured, we prepend `rake` with `bundle exec`.
+    DEFAULT_EXECUTABLE = (
+                          '/usr/bin/env '                                +
+                          '`'                                            +
+                           '/usr/bin/env bundle check >/dev/null 2>&1; ' +
+                           'case $? in '                                 +
+                              # Exit code 0: bundle is defined and installed
+                              # Exit code 1: bundle is defined but not installed
+                             '0|1 ) '                                    +
+                               'echo bundle exec '                       +
+                               ';; '                                     +
+                           'esac'                                        +
+                          '` '                                           +
+                          'rake'
+                         ).freeze
 
     # Sets the command used to run Rake on remote computers.
     #
@@ -34,7 +49,6 @@ module Cape
     #
     # @param [String, Symbol] task_expression the full name of a task or
     #                                         namespace to filter; optional
-    # @param [Proc]           block           a block that processes tasks
     #
     # @yield [task] a block that processes tasks
     # @yieldparam [Hash] task metadata on a task
@@ -129,7 +143,7 @@ module Cape
     end
 
     def fetch_output
-      `#{local_executable} --tasks 2> /dev/null`
+      `#{local_executable} --tasks 2>/dev/null`
     end
   end
 

data/lib/cape/util.rb

@@ -5,9 +5,9 @@ module Cape
 
     # Conditionally transforms the specified _noun_ into its plural form.
     #
-    # @param [String] noun  a singular noun
-    # @param [Fixnum] count the quantity of _noun_; optional
-    # @return [String] the plural of _noun_, unless _count_ is +1+
+    # @param [String] singular_noun  a singular noun
+    # @param [Fixnum] count the quantity of _singular_noun_; optional
+    # @return [String] the plural of _singular_noun_, unless _count_ is +1+
     def self.pluralize(singular_noun, count=2)
       return singular_noun if count == 1
 

data/lib/cape/version.rb

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

data/spec/cape/capistrano_spec.rb

@@ -7,10 +7,8 @@ describe Cape::Capistrano do
   end
 
   describe 'with specified attributes' do
-    subject {
-      described_class.new :rake => 'I see you have the machine that goes "Bing!"'
-    }
+    subject { described_class.new :rake => 'the specified value of #rake' }
 
-    its(:rake) { should == 'I see you have the machine that goes "Bing!"' }
+    its(:rake) { should == 'the specified value of #rake' }
   end
 end

data/spec/cape/core_ext/hash_spec.rb

@@ -1,12 +1,12 @@
 require 'cape/core_ext/hash'
 
 describe Hash do
-  describe '#slice' do
-    it 'should return the expected Hash' do
-      hash = {:foo => 'bar', :baz => 'qux', :quux => 'corge'}
-      hash.slice(:baz, :quux).should == {:baz => 'qux', :quux => 'corge'}
+  subject { {:foo => 'bar', :baz => 'qux', :quux => 'corge'} }
 
-      {}.slice(:foo).should == {}
+  describe '-- when sent #slice with keys that are present and those that are not --' do
+    it 'should return the expected subset hash' do
+      subject.slice(:baz, :fizzle, :quux).should == {:baz => 'qux',
+                                                     :quux => 'corge'}
     end
   end
 end

data/spec/cape/core_ext/symbol_spec.rb

@@ -1,7 +1,15 @@
 require 'cape/core_ext/symbol'
 
 describe Symbol do
-  it 'should compare as expected to another Symbol' do
+  it '-- when sent #<=> with a lower symbol -- should return 1' do
     (:foo <=> :bar).should == 1
   end
+
+  it '-- when sent #<=> with a higher symbol -- should return -1' do
+    (:baz <=> :qux).should == -1
+  end
+
+  it '-- when sent #<=> with itself -- should return 0' do
+    (:quux <=> :quux).should == 0
+  end
 end

data/spec/cape/dsl_spec.rb

@@ -3,6 +3,7 @@ require 'cape/capistrano'
 require 'cape/core_ext/hash'
 require 'cape/core_ext/symbol'
 require 'cape/rake'
+require ::File.expand_path('../../spec_helper', __FILE__)
 
 describe Cape::DSL do
   subject do
@@ -22,7 +23,7 @@ describe Cape::DSL do
     Cape::Rake.      stub!(:new).and_return mock_rake
   end
 
-  describe 'when sent #each_rake_task' do
+  describe '-- when sent #each_rake_task --' do
     def do_each_rake_task(&block)
       subject.each_rake_task(task_expression, &block)
     end
@@ -41,7 +42,7 @@ describe Cape::DSL do
     end
   end
 
-  describe 'when sent #mirror_rake_tasks' do
+  describe '-- when sent #mirror_rake_tasks' do
     before :each do
       mock_rake.stub!(:each_task).and_yield({:name => task_expression})
       subject.stub! :raise_unless_capistrano
@@ -51,7 +52,7 @@ describe Cape::DSL do
       subject.mirror_rake_tasks(*arguments, &block)
     end
 
-    describe 'with two scalar arguments' do
+    describe 'with two scalar arguments --' do
       specify do
         lambda {
           do_mirror_rake_tasks task_expression, task_expression
@@ -63,17 +64,17 @@ describe Cape::DSL do
 
     shared_examples_for 'a successful call' do |task_expression_in_use,
                                                 options_in_use|
-      it 'should collect Rake#each_task' do
+      specify 'by collecting Rake#each_task' do
         mock_rake.should_receive(:each_task).with task_expression_in_use
         do_mirror_rake_tasks
       end
 
-      it 'should verify that Capistrano is in use' do
+      specify 'by verifying that Capistrano is in use' do
         subject.should_receive :raise_unless_capistrano
         do_mirror_rake_tasks
       end
 
-      describe 'should Capistrano#define_rake_wrapper for Rake#each_task' do
+      describe 'by sending Capistrano#define_rake_wrapper for Rake#each_task' do
         specify 'with the expected task' do
           mock_capistrano.should_receive(:define_rake_wrapper).with do |task,
                                                                         named_arguments|
@@ -107,75 +108,75 @@ describe Cape::DSL do
         end
       end
 
-      it 'should return itself' do
+      specify 'by returning itself' do
         do_mirror_rake_tasks.should == subject
       end
     end
 
-    describe 'with one scalar argument, an options hash, and a block' do
+    describe 'with one scalar argument, an options hash, and a block --' do
       def do_mirror_rake_tasks
         super 'task:expression', :bar => :baz do |env|
           env['AN_ENV_VAR'] = 'an environment variable'
         end
       end
 
-      it_should_behave_like 'a successful call', 'task:expression', :bar => :baz
+      should_behave_like 'a successful call', 'task:expression', :bar => :baz
     end
 
-    describe 'with one scalar argument and an options hash' do
+    describe 'with one scalar argument and an options hash --' do
       def do_mirror_rake_tasks
         super 'task:expression', :bar => :baz
       end
 
-      it_should_behave_like 'a successful call', 'task:expression', :bar => :baz
+      should_behave_like 'a successful call', 'task:expression', :bar => :baz
     end
 
-    describe 'with an options hash and a block' do
+    describe 'with an options hash and a block --' do
       def do_mirror_rake_tasks
         super :bar => :baz do |env|
           env['AN_ENV_VAR'] = 'an environment variable'
         end
       end
 
-      it_should_behave_like 'a successful call', nil, :bar => :baz
+      should_behave_like 'a successful call', nil, :bar => :baz
     end
 
-    describe 'with an options hash' do
+    describe 'with an options hash --' do
       def do_mirror_rake_tasks
         super :bar => :baz
       end
 
-      it_should_behave_like 'a successful call', nil, :bar => :baz
+      should_behave_like 'a successful call', nil, :bar => :baz
     end
 
-    describe 'with one scalar argument and a block' do
+    describe 'with one scalar argument and a block --' do
       def do_mirror_rake_tasks
         super 'task:expression' do |env|
           env['AN_ENV_VAR'] = 'an environment variable'
         end
       end
 
-      it_should_behave_like('a successful call', 'task:expression', {})
+      should_behave_like('a successful call', 'task:expression', {})
     end
 
-    describe 'with one scalar argument' do
+    describe 'with one scalar argument --' do
       def do_mirror_rake_tasks
         super 'task:expression'
       end
 
-      it_should_behave_like('a successful call', 'task:expression', {})
+      should_behave_like('a successful call', 'task:expression', {})
     end
 
-    describe 'without arguments' do
+    describe 'without arguments --' do
       def do_mirror_rake_tasks
         super
       end
 
-      it_should_behave_like('a successful call', nil, {})
+      should_behave_like('a successful call', nil, {})
     end
   end
 
-  describe 'when sent #local_rake_executable' do
+  describe '-- when sent #local_rake_executable --' do
     before :each do
       mock_rake.stub!(:local_executable).and_return 'foo'
     end
@@ -190,7 +191,7 @@ describe Cape::DSL do
     end
   end
 
-  describe 'when sent #remote_rake_executable' do
+  describe '-- when sent #remote_rake_executable --' do
     before :each do
       mock_rake.stub!(:remote_executable).and_return 'foo'
     end

data/spec/cape/rake_spec.rb

@@ -2,14 +2,12 @@ require 'cape/rake'
 
 describe Cape::Rake do
   describe '::DEFAULT_EXECUTABLE' do
-    subject { Cape::Rake::DEFAULT_EXECUTABLE }
-
-    it { should == '/usr/bin/env rake' }
+    subject { described_class::DEFAULT_EXECUTABLE }
 
     it { should be_frozen }
   end
 
-  describe '#==' do
+  describe '-- when sent #== --' do
     it('should recognize equivalent instances to be equal') {
       described_class.new.should == described_class.new
     }
@@ -23,22 +21,28 @@ describe Cape::Rake do
     }
   end
 
-  describe 'without specified attributes' do
-    its(:local_executable)  { should == '/usr/bin/env rake' }
+  describe '-- without specified attributes --' do
+    its(:local_executable) { should == described_class::DEFAULT_EXECUTABLE }
 
-    its(:remote_executable) { should == '/usr/bin/env rake' }
+    its(:remote_executable) { should == described_class::DEFAULT_EXECUTABLE }
   end
 
-  describe 'with specified attributes' do
-    subject { described_class.new :local_executable => 'And now for something',
-                                  :remote_executable => 'completely different' }
+  describe '-- with specified attributes --' do
+    subject {
+      described_class.new :local_executable => 'the specified value of #local_executable',
+                          :remote_executable => 'the specified value of #remote_executable'
+    }
 
-    its(:local_executable)  { should == 'And now for something' }
+    its(:local_executable) {
+      should == 'the specified value of #local_executable'
+    }
 
-    its(:remote_executable) { should == 'completely different' }
+    its(:remote_executable) {
+      should == 'the specified value of #remote_executable'
+    }
   end
 
-  describe 'caching: ' do
+  describe '-- with respect to caching --' do
     before :each do
       subject.stub!(:fetch_output).and_return output
     end
@@ -51,7 +55,7 @@ rake baz # baz
       end_output
     }
 
-    describe '#each_task' do
+    describe 'when sent #each_task,' do
       it 'should build and use a cache' do
         subject.should_receive(:fetch_output).once.and_return output
         subject.each_task do |t|
@@ -85,7 +89,7 @@ rake baz # baz
       end
     end
 
-    describe '#expire_cache!' do
+    describe 'when sent #expire_cache!,' do
       it 'should expire the cache' do
         subject.should_receive(:fetch_output).twice.and_return output
         subject.each_task do |t|
@@ -96,15 +100,15 @@ rake baz # baz
       end
     end
 
-    describe '#local_executable=' do
-      describe 'with the same value' do
+    describe 'when sent #local_executable=' do
+      describe 'with the same value,' do
         it 'should not expire the cache' do
           subject.should_not_receive :expire_cache!
           subject.local_executable = subject.local_executable
         end
       end
 
-      describe 'with a different value' do
+      describe 'with a different value,' do
         it 'should expire the cache' do
           subject.should_receive(:expire_cache!).once
           subject.local_executable = subject.local_executable + ' foo'

data/spec/cape/util_spec.rb

@@ -10,7 +10,7 @@ describe Cape::Util do
       Cape::Util.pluralize('foo', 2).should == 'foos'
     end
 
-    it "should not pluralize for a count of 1" do
+    it "should not pluralize 'foo' for a count of 1" do
       Cape::Util.pluralize('foo', 1).should == 'foo'
     end
 

data/spec/cape/version_spec.rb

@@ -1,5 +1,5 @@
 require 'cape/version'
 
-describe Cape::VERSION do
-  it { should =~ /^\d+\.\d+\.\d+/ }
+describe 'Cape::VERSION' do
+  specify { Cape::VERSION.should =~ /^\d+\.\d+\.\d+/ }
 end

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+RSpec.configure do |c|
+  c.alias_it_should_behave_like_to :should_behave_like,
+                                   'should behave like'
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cape
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 1
-  - 4
+  - 5
   - 0
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Nils Jonsson
@@ -15,12 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-06 00:00:00 Z
+date: 2012-10-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: aruba
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,11 +29,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id001
+  requirement: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: capistrano
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -44,11 +43,11 @@ dependencies:
         - 2
         version: "2"
   type: :development
-  version_requirements: *id002
+  requirement: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: rake
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -58,11 +57,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  requirement: *id003
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -72,7 +71,8 @@ dependencies:
         - 2
         version: "2"
   type: :development
-  version_requirements: *id004
+  requirement: *id004
+  prerelease: false
 description: |-
   Cape dynamically generates Capistrano recipes for Rake tasks.
   It provides a DSL for reflecting on Rake tasks and mirroring
@@ -94,7 +94,7 @@ files:
 - Gemfile
 - Guardfile
 - History.markdown
-- MIT-LICENSE.markdown
+- License.markdown
 - README.markdown
 - Rakefile
 - cape.gemspec
@@ -132,7 +132,8 @@ files:
 - spec/cape/util_spec.rb
 - spec/cape/version_spec.rb
 - spec/cape_spec.rb
-homepage: http://github.com/njonsson/cape
+- spec/spec_helper.rb
+homepage: http://njonsson.github.com/cape
 licenses: 
 - MIT
 post_install_message: 
@@ -163,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cape
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Dynamically generates Capistrano recipes for Rake tasks
@@ -193,4 +194,5 @@ test_files:
 - spec/cape/util_spec.rb
 - spec/cape/version_spec.rb
 - spec/cape_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true