cape 1.5.0 → 1.6.0

data/.travis.yml

@@ -1,6 +1,25 @@
+language: ruby
 bundler_args: --without debug doc tooling
 rvm:
   - 1.8.7
+  - 1.9.2
   - 1.9.3
+  - ruby-head
   - ree
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
+  - rbx-18mode
+  - rbx-19mode
+  - rbx-head
 script: "bundle exec rake"
+matrix:
+  allow_failures:
+    - rvm: 1.9.2
+    - rvm: ruby-head
+    - rvm: jruby-18mode
+    - rvm: jruby-19mode
+    - rvm: jruby-head
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode
+    - rvm: rbx-head

data/History.markdown

@@ -1,5 +1,9 @@
 # Version history for the _Cape_ project
 
+## <a name="v1.6.0"></a>v1.6.0, Wed 11/14/2012
+
+* Enable mirroring and enumeration of hidden Rake tasks for versions of Rake that make it possible
+
 ## <a name="v1.5.0"></a>v1.5.0, Tue 10/09/2012
 
 * Automatically detect and use Bundler when running Rake

data/README.markdown

@@ -273,7 +273,13 @@ Note that Cape statements must be contained in a `Cape` block.
 
 ## Known issues
 
-**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 that lacks a description can be mirrored or enumerated only if Rake v0.9.3 or newer is installed.** Older versions of Rake did not support enumerating such tasks. You may want to make Rake v0.9.3 a dependency of your project:
+
+    # Gemfile
+
+    source 'http://rubygems.org'
+
+    gem 'rake', '>= 0.9.3'
 
 **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.
 

data/cape.gemspec

@@ -32,6 +32,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'aruba',      '~> 0'
   s.add_development_dependency 'capistrano', '~> 2'
-  s.add_development_dependency 'rake',       '~> 0'
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec',      '~> 2'
 end

data/features/dsl/each_rake_task/with_defined_namespace_argument.feature

@@ -21,7 +21,7 @@ Feature: The #each_rake_task DSL method with an argument of a defined namespace
         end
       end
       """
-    When I run `cap -T`
+    When I run `cap -vT`
     Then the output should not contain:
       """
 

data/features/dsl/each_rake_task/with_defined_task_argument.feature

@@ -20,7 +20,7 @@ Feature: The #each_rake_task DSL method with an argument of a defined task
         end
       end
       """
-    When I run `cap -T`
+    When I run `cap -vT`
     Then the output should contain:
       """
 

data/features/dsl/each_rake_task/with_undefined_argument.feature

@@ -20,7 +20,7 @@ Feature: The #each_rake_task DSL method with an undefined argument
         end
       end
       """
-    When I run `cap -T`
+    When I run `cap -vT`
     Then the output should not contain:
       """
 
@@ -44,7 +44,7 @@ Feature: The #each_rake_task DSL method with an undefined argument
         end
       end
       """
-    When I run `cap -T`
+    When I run `cap -vT`
     Then the output should not contain:
       """
 

data/features/dsl/each_rake_task/without_arguments.feature

@@ -4,7 +4,7 @@ Feature: The #each_rake_task DSL method without arguments
   As a developer using Cape,
   I want to use the Cape DSL.
 
-  Scenario: enumerate all non-hidden Rake tasks
+  Scenario: enumerate all Rake tasks
     Given a full-featured Rakefile
     And a Capfile with:
       """
@@ -21,7 +21,7 @@ Feature: The #each_rake_task DSL method without arguments
         end
       end
       """
-    When I run `cap -T`
+    When I run `cap -vT`
     Then the output should contain:
       """
 
@@ -80,8 +80,3 @@ Feature: The #each_rake_task DSL method without arguments
       Parameters: ["an_arg1", "an_arg2", "an_arg3"]
       Description: "My task with three arguments"
       """
-    And the output should not contain:
-      """
-
-      Name: "hidden_task"
-      """

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

@@ -14,7 +14,7 @@ Feature: The #mirror_rake_tasks DSL method, inside a Capistrano namespace, with
         end
       end
       """
-    When I run `cap -T`
+    When I run `cap -vT`
     Then the output should not contain "cap ns:with_period"
     And the output should contain:
       """

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

@@ -14,7 +14,7 @@ Feature: The #mirror_rake_tasks DSL method, inside a Capistrano namespace, with
         end
       end
       """
-    When I run `cap -T`
+    When I run `cap -vT`
     Then the output should contain:
       """
       cap ns:with_period # Ends with period.

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

@@ -14,7 +14,7 @@ Feature: The #mirror_rake_tasks DSL method, inside a Capistrano namespace, with
         end
       end
       """
-    When I run `cap -T`
+    When I run `cap -vT`
     Then the output should not contain "cap ns:with_period"
 
   Scenario: do not mirror Rake task 'with_period'

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

@@ -4,7 +4,7 @@ Feature: The #mirror_rake_tasks DSL method, inside a Capistrano namespace, witho
   As a developer using Cape,
   I want to use the Cape DSL.
 
-  Scenario: mirror all non-hidden Rake tasks
+  Scenario: mirror all Rake tasks
     Given a full-featured Rakefile
     And a Capfile with:
       """
@@ -14,7 +14,7 @@ Feature: The #mirror_rake_tasks DSL method, inside a Capistrano namespace, witho
         end
       end
       """
-    When I run `cap -T`
+    When I run `cap -vT`
     Then the output should contain:
       """
       cap ns:with_period                                            # Ends with period.
@@ -51,7 +51,6 @@ Feature: The #mirror_rake_tasks DSL method, inside a Capistrano namespace, witho
       """
       cap ns:with_three_args                                        # My task with three arguments.
       """
-    And the output should not contain "cap hidden_task"
 
   Scenario: mirror Rake task 'with_period' with its description
     Given a full-featured Rakefile
@@ -288,21 +287,4 @@ Feature: The #mirror_rake_tasks DSL method, inside a Capistrano namespace, witho
       task arguments.
 
 
-      """
-
-  Scenario: do not mirror Rake task 'hidden_task'
-    Given a full-featured Rakefile
-    And a Capfile with:
-      """
-      namespace :ns do
-        Cape do |cape|
-          cape.mirror_rake_tasks
-        end
-      end
-      """
-    When I run `cap -e ns:hidden_task`
-    Then the output should contain exactly:
-      """
-      The task `ns:hidden_task' does not exist.
-
       """

data/features/dsl/mirror_rake_tasks/with_defined_namespace_argument.feature

@@ -12,7 +12,7 @@ Feature: The #mirror_rake_tasks DSL method with an argument of a defined namespa
         mirror_rake_tasks 'my_namespace'
       end
       """
-    When I run `cap -T`
+    When I run `cap -vT`
     Then the output should not contain "cap with_period"
     And the output should contain:
       """

data/features/dsl/mirror_rake_tasks/with_defined_task_and_valid_options_arguments_and_environment_variables.feature

@@ -4,7 +4,7 @@ Feature: The #mirror_rake_tasks DSL method with arguments of a defined task and
   As a developer using Cape,
   I want to use the Cape DSL.
 
-  Scenario: mirror all non-hidden Rake tasks with the specified options
+  Scenario: mirror all Rake tasks with the specified options
     Given a full-featured Rakefile
     And a Capfile with:
       """
@@ -14,7 +14,7 @@ Feature: The #mirror_rake_tasks DSL method with arguments of a defined task and
         end
       end
       """
-    When I run `cap -T`
+    When I run `cap -vT`
     Then the output should contain:
       """
       cap with_period                                            # Ends with period.
@@ -51,7 +51,6 @@ Feature: The #mirror_rake_tasks DSL method with arguments of a defined task and
       """
       cap with_three_args                                        # My task with three arguments.
       """
-    And the output should not contain "cap hidden_task"
 
   Scenario: mirror Rake task 'with_period' with its description
     Given a full-featured Rakefile
@@ -222,20 +221,3 @@ Feature: The #mirror_rake_tasks DSL method with arguments of a defined task and
         * 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
       """
-
-  Scenario: do not mirror Rake task 'hidden_task'
-    Given a full-featured Rakefile
-    And a Capfile with:
-      """
-      Cape do
-        mirror_rake_tasks :roles => :app do |env|
-          env['RAILS_ENV'] = rails_env
-        end
-      end
-      """
-    When I run `cap -e hidden_task`
-    Then the output should contain exactly:
-      """
-      The task `hidden_task' does not exist.
-
-      """

data/features/dsl/mirror_rake_tasks/with_defined_task_argument.feature

@@ -12,7 +12,7 @@ Feature: The #mirror_rake_tasks DSL method with an argument of a defined task
         mirror_rake_tasks 'with_period'
       end
       """
-    When I run `cap -T`
+    When I run `cap -vT`
     Then the output should contain:
       """
       cap with_period # Ends with period.

data/features/dsl/mirror_rake_tasks/with_undefined_argument.feature

@@ -12,7 +12,7 @@ Feature: The #mirror_rake_tasks DSL method with an undefined argument
         mirror_rake_tasks 'this_does_not_exist'
       end
       """
-    When I run `cap -T`
+    When I run `cap -vT`
     Then the output should not contain "cap with_period"
 
   Scenario: do not mirror Rake task 'with_period'

data/features/dsl/mirror_rake_tasks/with_valid_options_argument.feature

@@ -4,7 +4,7 @@ Feature: The #mirror_rake_tasks DSL method with arguments of a defined task and
   As a developer using Cape,
   I want to use the Cape DSL.
 
-  Scenario: mirror all non-hidden Rake tasks with the specified options
+  Scenario: mirror all Rake tasks with the specified options
     Given a full-featured Rakefile
     And a Capfile with:
       """
@@ -12,7 +12,7 @@ Feature: The #mirror_rake_tasks DSL method with arguments of a defined task and
         mirror_rake_tasks :roles => :app
       end
       """
-    When I run `cap -T`
+    When I run `cap -vT`
     Then the output should contain:
       """
       cap with_period                                            # Ends with period.
@@ -49,7 +49,6 @@ Feature: The #mirror_rake_tasks DSL method with arguments of a defined task and
       """
       cap with_three_args                                        # My task with three arguments.
       """
-    And the output should not contain "cap hidden_task"
 
   Scenario: mirror Rake task 'with_period' with its description
     Given a full-featured Rakefile

data/features/dsl/mirror_rake_tasks/without_arguments.feature

@@ -4,7 +4,7 @@ Feature: The #mirror_rake_tasks DSL method without arguments
   As a developer using Cape,
   I want to use the Cape DSL.
 
-  Scenario: mirror all non-hidden Rake tasks
+  Scenario: mirror all Rake tasks
     Given a full-featured Rakefile
     And a Capfile with:
       """
@@ -12,7 +12,7 @@ Feature: The #mirror_rake_tasks DSL method without arguments
         mirror_rake_tasks
       end
       """
-    When I run `cap -T`
+    When I run `cap -vT`
     Then the output should contain:
       """
       cap with_period                                            # Ends with period.
@@ -49,7 +49,6 @@ Feature: The #mirror_rake_tasks DSL method without arguments
       """
       cap with_three_args                                        # My task with three arguments.
       """
-    And the output should not contain "cap hidden_task"
 
   Scenario: mirror Rake task 'with_period' with its description
     Given a full-featured Rakefile
@@ -318,18 +317,3 @@ Feature: The #mirror_rake_tasks DSL method without arguments
         * 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\",]"
 
       """
-
-  Scenario: do not mirror Rake task 'hidden_task'
-    Given a full-featured Rakefile
-    And a Capfile with:
-      """
-      Cape do
-        mirror_rake_tasks
-      end
-      """
-    When I run `cap -e hidden_task`
-    Then the output should contain exactly:
-      """
-      The task `hidden_task' does not exist.
-
-      """

data/features/dsl/rake_executable.feature

@@ -24,7 +24,7 @@ Feature: The #local_rake_executable and #remote_rake_executable DSL attributes
         end
       end
       """
-    When I run `cap -T`
+    When I run `cap -vT`
     Then the output should contain:
       """
       We changed the local Rake executable to "echo \"rake this-comes-from-overridden-rake  # This comes from overridden Rake\" #"

data/lib/cape/capistrano.rb

@@ -64,7 +64,9 @@ module Cape
       return nil unless task[:description]
 
       description = [task[:description]]
-      description << '.' unless task[:description].end_with?('.')
+      unless task[:description].empty? || task[:description].end_with?('.')
+        description << '.'
+      end
 
       unless (parameters = Array(task[:parameters])).empty?
         noun            = Util.pluralize('variable', parameters.length)

data/lib/cape/rake.rb

@@ -59,7 +59,7 @@ module Cape
       task_expression = task_expression                       ?
                         ::Regexp.escape(task_expression.to_s) :
                         '.+?'
-      regexp = /^rake (#{task_expression}(?::.+?)?)(?:\[(.+?)\])?\s+# (.+)/
+      regexp = /^rake (#{task_expression}(?::.+?)?)(?:\[(.+?)\])?\s+#\s*(.*)/
       each_output_line do |l|
         unless (matches = l.chomp.match(regexp))
           next
@@ -143,7 +143,7 @@ module Cape
     end
 
     def fetch_output
-      `#{local_executable} --tasks 2>/dev/null`
+      `#{local_executable} --all --tasks 2>/dev/null || #{local_executable} --tasks 2>/dev/null`
     end
   end
 

data/lib/cape/version.rb

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

metadata

@@ -1,92 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cape
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 1.6.0
   prerelease: 
-  segments: 
-  - 1
-  - 5
-  - 0
-  version: 1.5.0
 platform: ruby
-authors: 
+authors:
 - Nils Jonsson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: aruba
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id001
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: capistrano
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  requirement: *id002
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  name: rake
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id003
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  requirement: *id004
   prerelease: false
-description: |-
-  Cape dynamically generates Capistrano recipes for Rake tasks.
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
+description: ! 'Cape dynamically generates Capistrano recipes for Rake tasks.
+
   It provides a DSL for reflecting on Rake tasks and mirroring
+
   them as documented Capistrano recipes. You can pass Rake task
-  arguments via environment variables.
-email: 
+
+  arguments via environment variables.'
+email:
 - cape@nilsjonsson.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gemtest
 - .gitignore
 - .travis.yml
@@ -134,41 +135,34 @@ files:
 - spec/cape_spec.rb
 - spec/spec_helper.rb
 homepage: http://njonsson.github.com/cape
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -2402539198101569570
 requirements: []
-
 rubyforge_project: cape
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Dynamically generates Capistrano recipes for Rake tasks
-test_files: 
+test_files:
 - features/dsl/each_rake_task/with_defined_namespace_argument.feature
 - features/dsl/each_rake_task/with_defined_task_argument.feature
 - features/dsl/each_rake_task/with_undefined_argument.feature