cape 1.6.2 → 1.7.0

data/spec/cape/dsl_spec.rb

@@ -57,13 +57,12 @@ describe Cape::DSL do
         lambda {
           do_mirror_rake_tasks task_expression, task_expression
         }.should raise_error(ArgumentError,
-                             'wrong number of arguments (2 for 0 or 1, plus ' +
-                             'an options hash)')
+                             'wrong number of arguments (2 for 1)')
       end
     end
 
-    shared_examples_for 'a successful call' do |task_expression_in_use,
-                                                options_in_use|
+    shared_examples_for "a successful call (#{Cape::DSL.name})" do |task_expression_in_use,
+                                                                    options_in_use|
       specify 'by collecting Rake#each_task' do
         mock_rake.should_receive(:each_task).with task_expression_in_use
         do_mirror_rake_tasks
@@ -113,42 +112,6 @@ describe Cape::DSL do
       end
     end
 
-    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
-
-      should_behave_like 'a successful call', 'task:expression', :bar => :baz
-    end
-
-    describe 'with one scalar argument and an options hash --' do
-      def do_mirror_rake_tasks
-        super 'task:expression', :bar => :baz
-      end
-
-      should_behave_like 'a successful call', 'task:expression', :bar => :baz
-    end
-
-    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
-
-      should_behave_like 'a successful call', nil, :bar => :baz
-    end
-
-    describe 'with an options hash --' do
-      def do_mirror_rake_tasks
-        super :bar => :baz
-      end
-
-      should_behave_like 'a successful call', nil, :bar => :baz
-    end
-
     describe 'with one scalar argument and a block --' do
       def do_mirror_rake_tasks
         super 'task:expression' do |env|
@@ -156,7 +119,9 @@ describe Cape::DSL do
         end
       end
 
-      should_behave_like('a successful call', 'task:expression', {})
+      should_behave_like("a successful call (#{Cape::DSL.name})",
+                         'task:expression',
+                         {})
     end
 
     describe 'with one scalar argument --' do
@@ -164,7 +129,9 @@ describe Cape::DSL do
         super 'task:expression'
       end
 
-      should_behave_like('a successful call', 'task:expression', {})
+      should_behave_like("a successful call (#{Cape::DSL.name})",
+                         'task:expression',
+                         {})
     end
 
     describe 'without arguments --' do
@@ -172,7 +139,7 @@ describe Cape::DSL do
         super
       end
 
-      should_behave_like('a successful call', nil, {})
+      should_behave_like("a successful call (#{Cape::DSL.name})", nil, {})
     end
   end
 

data/spec/cape/recipe_definition_spec.rb

@@ -0,0 +1,53 @@
+require 'cape/recipe_definition'
+
+describe Cape::RecipeDefinition do
+  its(:cd) { should be_nil }
+
+  it 'should have a mutable #cd' do
+    subject.cd '/foo/bar'
+    subject.cd.should == '/foo/bar'
+
+    subject.cd lambda { '/foo/bar' }
+    subject.cd.call.should == '/foo/bar'
+
+    subject.cd { '/foo/bar' }
+    subject.cd.call.should == '/foo/bar'
+  end
+
+  it 'should complain about a #cd with the wrong arity' do
+    expect {
+      subject.cd do |foo, bar|
+      end
+    }.to raise_error(ArgumentError, 'Must have 0 parameters but has 2')
+  end
+
+  its(:env) { should == {} }
+
+  it 'should have a mutable #env' do
+    subject.env['FOO'] = 'bar'
+    subject.env.should == {'FOO' => 'bar'}
+  end
+
+  its(:options) { should == {} }
+
+  it 'should have mutable #options' do
+    subject.options[:some_option] = 'foo'
+    subject.options.should == {:some_option => 'foo'}
+  end
+
+  its(:rename) { should be_nil }
+
+  it 'should have a mutable #rename' do
+    subject.rename do |task_name|
+      "#{task_name}_recipe"
+    end
+    subject.rename.call(:foo).should == 'foo_recipe'
+  end
+
+  it 'should complain about a #rename with the wrong arity' do
+    expect {
+      subject.rename do |foo, bar|
+      end
+    }.to raise_error(ArgumentError, 'Must have 1 parameter but has 2')
+  end
+end

data/spec/cape/xterm_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+require 'cape/xterm'
+
+describe Cape::XTerm do
+  describe '.format' do
+    it 'should not try to format a nil argument' do
+      described_class.format(nil).should be_nil
+    end
+
+    it 'should not try to format a nil argument with a recognized format' do
+      described_class.format(nil, :bold).should be_nil
+    end
+
+    it 'should complain about an unrecognized format' do
+      expect {
+        described_class.format nil, :this_does_not_exist
+      }.to raise_error(ArgumentError, 'Unrecognized format :this_does_not_exist')
+      expect {
+        described_class.format 'foo', :this_does_not_exist
+      }.to raise_error(ArgumentError, 'Unrecognized format :this_does_not_exist')
+    end
+
+    described_class::FORMATS.each do |format, code|
+      it "should format a String argument with the #{format.inspect} format" do
+        described_class.format('foo', format).should == "\e[#{code}mfoo\e[0m"
+      end
+    end
+
+    it "should format a String argument with the :bold and :foreground_red formats" do
+      described_class.format('foo',
+                             :bold,
+                             :foreground_red).should == "\e[1;31mfoo\e[0m"
+    end
+  end
+
+  it 'should not respond to :this_does_not_exist' do
+    described_class.should_not respond_to(:this_does_not_exist)
+  end
+
+  it '.this_does_not_exist should complain' do
+    expect {
+      described_class.this_does_not_exist
+    }.to raise_error(NoMethodError,
+                     "undefined method `this_does_not_exist' for #{described_class.name}:Module")
+  end
+
+  described_class::FORMATS.each do |format, code|
+    it "should respond to .#{format.inspect}" do
+      described_class.should respond_to(format)
+    end
+
+    describe ".#{format}" do
+      it "should format a String argument with the #{format.inspect} format" do
+        described_class.send(format,
+                             'foo').should == described_class.format('foo',
+                                                                     format)
+      end
+    end
+  end
+
+  it 'should respond to .bold_and_foreground_red' do
+    described_class.should respond_to(:bold_and_foreground_red)
+  end
+
+  describe '.bold_and_foreground_red' do
+    it "should format a String argument with the :bold and :foreground_red formats" do
+      described_class.bold_and_foreground_red('foo').should == described_class.format('foo',
+                                                                                      :bold,
+                                                                                      :foreground_red)
+    end
+  end
+end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 1
-  - 6
-  - 2
-  version: 1.6.2
+  - 7
+  - 0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Nils Jonsson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-22 00:00:00 Z
+date: 2013-03-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: aruba
@@ -99,42 +99,81 @@ files:
 - README.markdown
 - Rakefile
 - cape.gemspec
-- 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
-- features/dsl/each_rake_task/without_arguments.feature
+- features/dsl/each_rake_task/unqualified.feature
+- features/dsl/each_rake_task/with_defined_namespace.feature
+- features/dsl/each_rake_task/with_defined_task.feature
+- features/dsl/each_rake_task/with_undefined_task_or_namespace.feature
 - features/dsl/mirror_rake_tasks/inside_capistrano_namespace.feature
-- features/dsl/mirror_rake_tasks/with_defined_namespace_argument.feature
+- features/dsl/mirror_rake_tasks/unqualified.feature
+- features/dsl/mirror_rake_tasks/with_cd.feature
+- features/dsl/mirror_rake_tasks/with_cd_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_defined_namespace.feature
+- features/dsl/mirror_rake_tasks/with_defined_task.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_cd.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_cd_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_rename.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_rename_and_cd.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_rename_and_cd_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_rename_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_rename_and_valid_options.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_rename_and_valid_options_and_cd.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_rename_and_valid_options_and_cd_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_rename_and_valid_options_and_environment_variables.feature
 - features/dsl/mirror_rake_tasks/with_defined_task_and_valid_options.feature
-- features/dsl/mirror_rake_tasks/with_defined_task_and_valid_options_arguments_and_environment_variables.feature
-- features/dsl/mirror_rake_tasks/with_defined_task_argument.feature
-- features/dsl/mirror_rake_tasks/with_defined_task_argument_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_valid_options_and_cd.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_valid_options_and_cd_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_valid_options_and_environment_variables.feature
 - features/dsl/mirror_rake_tasks/with_environment_variables.feature
-- features/dsl/mirror_rake_tasks/with_undefined_argument.feature
-- features/dsl/mirror_rake_tasks/with_valid_options_argument.feature
-- features/dsl/mirror_rake_tasks/with_valid_options_arguments_and_environment_variables.feature
-- features/dsl/mirror_rake_tasks/without_arguments.feature
+- features/dsl/mirror_rake_tasks/with_rename.feature
+- features/dsl/mirror_rake_tasks/with_rename_and_cd.feature
+- features/dsl/mirror_rake_tasks/with_rename_and_cd_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_rename_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_rename_and_valid_options.feature
+- features/dsl/mirror_rake_tasks/with_rename_and_valid_options_and_cd.feature
+- features/dsl/mirror_rake_tasks/with_rename_and_valid_options_and_cd_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_rename_and_valid_options_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_undefined_task_or_namespace.feature
+- features/dsl/mirror_rake_tasks/with_valid_options.feature
+- features/dsl/mirror_rake_tasks/with_valid_options_and_cd.feature
+- features/dsl/mirror_rake_tasks/with_valid_options_and_cd_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_valid_options_and_environment_variables.feature
 - features/dsl/rake_executable.feature
 - features/step_definitions.rb
 - features/support/env.rb
 - lib/cape.rb
 - lib/cape/capistrano.rb
+- lib/cape/capistrano_deprecated.rb
 - lib/cape/core_ext.rb
 - lib/cape/core_ext/hash.rb
 - lib/cape/core_ext/symbol.rb
+- lib/cape/deprecation.rb
+- lib/cape/deprecation/base.rb
+- lib/cape/deprecation/capistrano_deprecated_define_rake_wrapper.rb
+- lib/cape/deprecation/dsl_deprecated_mirror_rake_tasks.rb
 - lib/cape/dsl.rb
+- lib/cape/dsl_deprecated.rb
 - lib/cape/hash_list.rb
 - lib/cape/rake.rb
+- lib/cape/recipe_definition.rb
+- lib/cape/recipe_definition_deprecated.rb
 - lib/cape/util.rb
 - lib/cape/version.rb
+- lib/cape/xterm.rb
 - spec/cape/capistrano_spec.rb
 - spec/cape/core_ext/hash_spec.rb
 - spec/cape/core_ext/symbol_spec.rb
+- spec/cape/deprecation/base_sharedspec.rb
+- spec/cape/deprecation/capistrano_deprecated_define_rake_wrapper_spec.rb
+- spec/cape/deprecation/dsl_deprecated_mirror_rake_tasks_spec.rb
+- spec/cape/dsl_deprecated_spec.rb
 - spec/cape/dsl_spec.rb
 - spec/cape/hash_list_spec.rb
 - spec/cape/rake_spec.rb
+- spec/cape/recipe_definition_spec.rb
 - spec/cape/util_spec.rb
 - spec/cape/version_spec.rb
+- spec/cape/xterm_spec.rb
 - spec/cape_spec.rb
 - spec/spec_helper.rb
 homepage: http://njonsson.github.com/cape
@@ -173,32 +212,62 @@ signing_key:
 specification_version: 3
 summary: Dynamically generates Capistrano recipes for Rake tasks
 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
-- features/dsl/each_rake_task/without_arguments.feature
+- features/dsl/each_rake_task/unqualified.feature
+- features/dsl/each_rake_task/with_defined_namespace.feature
+- features/dsl/each_rake_task/with_defined_task.feature
+- features/dsl/each_rake_task/with_undefined_task_or_namespace.feature
 - features/dsl/mirror_rake_tasks/inside_capistrano_namespace.feature
-- features/dsl/mirror_rake_tasks/with_defined_namespace_argument.feature
+- features/dsl/mirror_rake_tasks/unqualified.feature
+- features/dsl/mirror_rake_tasks/with_cd.feature
+- features/dsl/mirror_rake_tasks/with_cd_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_defined_namespace.feature
+- features/dsl/mirror_rake_tasks/with_defined_task.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_cd.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_cd_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_rename.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_rename_and_cd.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_rename_and_cd_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_rename_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_rename_and_valid_options.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_rename_and_valid_options_and_cd.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_rename_and_valid_options_and_cd_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_rename_and_valid_options_and_environment_variables.feature
 - features/dsl/mirror_rake_tasks/with_defined_task_and_valid_options.feature
-- features/dsl/mirror_rake_tasks/with_defined_task_and_valid_options_arguments_and_environment_variables.feature
-- features/dsl/mirror_rake_tasks/with_defined_task_argument.feature
-- features/dsl/mirror_rake_tasks/with_defined_task_argument_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_valid_options_and_cd.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_valid_options_and_cd_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_defined_task_and_valid_options_and_environment_variables.feature
 - features/dsl/mirror_rake_tasks/with_environment_variables.feature
-- features/dsl/mirror_rake_tasks/with_undefined_argument.feature
-- features/dsl/mirror_rake_tasks/with_valid_options_argument.feature
-- features/dsl/mirror_rake_tasks/with_valid_options_arguments_and_environment_variables.feature
-- features/dsl/mirror_rake_tasks/without_arguments.feature
+- features/dsl/mirror_rake_tasks/with_rename.feature
+- features/dsl/mirror_rake_tasks/with_rename_and_cd.feature
+- features/dsl/mirror_rake_tasks/with_rename_and_cd_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_rename_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_rename_and_valid_options.feature
+- features/dsl/mirror_rake_tasks/with_rename_and_valid_options_and_cd.feature
+- features/dsl/mirror_rake_tasks/with_rename_and_valid_options_and_cd_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_rename_and_valid_options_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_undefined_task_or_namespace.feature
+- features/dsl/mirror_rake_tasks/with_valid_options.feature
+- features/dsl/mirror_rake_tasks/with_valid_options_and_cd.feature
+- features/dsl/mirror_rake_tasks/with_valid_options_and_cd_and_environment_variables.feature
+- features/dsl/mirror_rake_tasks/with_valid_options_and_environment_variables.feature
 - features/dsl/rake_executable.feature
 - features/step_definitions.rb
 - features/support/env.rb
 - spec/cape/capistrano_spec.rb
 - spec/cape/core_ext/hash_spec.rb
 - spec/cape/core_ext/symbol_spec.rb
+- spec/cape/deprecation/base_sharedspec.rb
+- spec/cape/deprecation/capistrano_deprecated_define_rake_wrapper_spec.rb
+- spec/cape/deprecation/dsl_deprecated_mirror_rake_tasks_spec.rb
+- spec/cape/dsl_deprecated_spec.rb
 - spec/cape/dsl_spec.rb
 - spec/cape/hash_list_spec.rb
 - spec/cape/rake_spec.rb
+- spec/cape/recipe_definition_spec.rb
 - spec/cape/util_spec.rb
 - spec/cape/version_spec.rb
+- spec/cape/xterm_spec.rb
 - spec/cape_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true

data/features/dsl/each_rake_task/with_undefined_argument.feature

@@ -1,53 +0,0 @@
-Feature: The #each_rake_task DSL method with an undefined argument
-
-  In order to use the metadata of Rake tasks in my Capistrano recipes,
-  As a developer using Cape,
-  I want to use the Cape DSL.
-
-  Scenario: do not enumerate any Rake tasks for a completely unrecognized argument
-    Given a full-featured Rakefile
-    And a Capfile with:
-      """
-      Cape do
-        each_rake_task :this_does_not_exist do |t|
-          $stdout.puts '', "Name: #{t[:name].inspect}"
-          if t[:parameters]
-            $stdout.puts "Parameters: #{t[:parameters].inspect}"
-          end
-          if t[:description]
-            $stdout.puts "Description: #{t[:description].inspect}"
-          end
-        end
-      end
-      """
-    When I run `cap -vT`
-    Then the output should not contain:
-      """
-
-      Name: "with_period"
-      Description: "Ends with period."
-      """
-
-  Scenario: do not enumerate any Rake tasks for a partially recognized argument
-    Given a full-featured Rakefile
-    And a Capfile with:
-      """
-      Cape do
-        each_rake_task :period do |t|
-          $stdout.puts '', "Name: #{t[:name].inspect}"
-          if t[:parameters]
-            $stdout.puts "Parameters: #{t[:parameters].inspect}"
-          end
-          if t[:description]
-            $stdout.puts "Description: #{t[:description].inspect}"
-          end
-        end
-      end
-      """
-    When I run `cap -vT`
-    Then the output should not contain:
-      """
-
-      Name: "with_period"
-      Description: "Ends with period."
-      """