capistrano-spec 0.5.0 → 0.5.1

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "capistrano-spec"
-    gem.version = '0.5.0'
+    gem.version = '0.5.1'
 
     gem.summary = %Q{Test your capistrano recipes}
     gem.description = %Q{Helpers and matchers for testing capistrano}

data/capistrano-spec.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{capistrano-spec}
-  s.version = "0.5.0"
+  s.name = "capistrano-spec"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Nichols", "Karl Matthias", "Peter M Souter", "Jan Graichen"]
-  s.date = %q{2013-06-21}
-  s.description = %q{Helpers and matchers for testing capistrano}
-  s.email = %q{josh@technicalpickles.com}
+  s.date = "2013-06-30"
+  s.description = "Helpers and matchers for testing capistrano"
+  s.email = "josh@technicalpickles.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -32,12 +32,13 @@ Gem::Specification.new do |s|
     "spec/spec.opts",
     "spec/spec_helper.rb",
     "spec/stub_commands_spec.rb",
+    "spec/support/shared/callback_examples.rb",
     "spec/uploaded_spec.rb"
   ]
-  s.homepage = %q{http://github.com/technicalpickles/capistrano-spec}
+  s.homepage = "http://github.com/technicalpickles/capistrano-spec"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Test your capistrano recipes}
+  s.rubygems_version = "1.8.23"
+  s.summary = "Test your capistrano recipes"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/capistrano/spec.rb

@@ -57,6 +57,18 @@ module Capistrano
         end
       end
 
+      def task_callable?(configuration, callbacks, task_name)
+        task = find_task(configuration, task_name) || stub_task(task_name)
+        callbacks.any? { |callback| callback.applies_to?(task) }
+      end
+
+      def find_task(configuration, task_name)
+        configuration.find_task(task_name)
+      end
+
+      def stub_task(task_name)
+        Struct.new(:fully_qualified_name).new(task_name)
+      end
     end
 
     module Matchers
@@ -66,16 +78,14 @@ module Capistrano
         extend Helpers
 
         match do |configuration|
-          @task = configuration.find_task(task_name)
-          callbacks = find_callback(configuration, @on, @task)
+          task = configuration.find_task(task_name)
+          callbacks = find_callback(configuration, @on, task)
 
           if callbacks
             if @after_task_name
-              @after_task = configuration.find_task(@after_task_name)
-              callbacks.any? { |callback| callback.applies_to?(@after_task) }
+              task_callable?(configuration, callbacks, @after_task_name)
             elsif @before_task_name
-              @before_task = configuration.find_task(@before_task_name)
-              callbacks.any? { |callback| callback.applies_to?(@before_task) }
+              task_callable?(configuration, callbacks, @before_task_name)
             else
               ! @callback.nil?
             end
@@ -111,6 +121,16 @@ module Capistrano
           end
         end
 
+        failure_message_for_should_not do |actual|
+          if @after_task_name
+            "expected configuration to not callback #{task_name.inspect} #{@on} #{@after_task_name.inspect}, but did"
+          elsif @before_task_name
+            "expected configuration to not callback #{task_name.inspect} #{@on} #{@before_task_name.inspect}, but did"
+          else
+            "expected configuration to not callback #{task_name.inspect} on #{@on}, but did"
+          end
+        end
+
       end
 
       define :have_gotten do |path|

data/spec/capistrano-spec_spec.rb

@@ -53,16 +53,47 @@ describe Capistrano::Spec do
   end
 
   describe 'callback' do
+    context 'before callbacks' do
+      it_should_behave_like 'correct before callback' do
+        let(:task_name) { 'fake:before_this_execute_thing' }
+      end
+
+      it_should_behave_like 'correct before callback' do
+        let(:task_name) { 'fake:before_this_also_execute_thing' }
+      end
+
+      it_should_behave_like 'correct before callback' do
+        let(:task_name) { 'outside:undefined_task' }
+      end
+
+      it_should_behave_like 'incorrect before callback' do
+        let(:task_name) { 'undefined_task' }
+      end
 
-    ['fake:before_this_execute_thing', "fake:before_this_also_execute_thing"].each do |task|
-      it "will not raise error when `before` callback has occured for #{task}" do
-        fake_recipe.should callback('fake:thing').before(task)
+      it_should_behave_like 'incorrect before callback' do
+        let(:task_name) { 'fake:before_this_dont_execute_thing' }
       end
     end
 
-    ['fake:after_this_execute_thing', "fake:after_this_also_execute_thing"].each do |task|
-      it "will not raise error when `after` callback has occured for #{task}" do
-        fake_recipe.should callback('fake:thing').after(task)
+    context 'after callbacks' do
+      it_should_behave_like 'correct after callback' do
+        let(:task_name) { 'fake:after_this_execute_thing' }
+      end
+
+      it_should_behave_like 'correct after callback' do
+        let(:task_name) { 'fake:after_this_also_execute_thing' }
+      end
+
+      it_should_behave_like 'correct after callback' do
+        let(:task_name) { 'outside:undefined_task' }
+      end
+
+      it_should_behave_like 'incorrect after callback' do
+        let(:task_name) { 'undefined_task' }
+      end
+
+      it_should_behave_like 'incorrect after callback' do
+        let(:task_name) { 'fake:after_this_dont_execute_thing' }
       end
     end
   end
@@ -73,14 +104,20 @@ describe Capistrano::Spec do
         fake_recipe.find_and_execute_task('fake:thing')
         expect do
           should have_put('fake content').to('/tmp/put')
-        end.to_not raise_error(RSpec::Expectations::ExpectationNotMetError, /expected configuration to put .*\s* to .*\s*, but did not/)
+        end.to_not raise_error(
+          RSpec::Expectations::ExpectationNotMetError,
+          /expected configuration to put .*\s* to .*\s*, but did not/
+        )
       end
 
       it "will raise error when put is not in recipe" do
         fake_recipe.find_and_execute_task('fake:thing')
         expect do
           should have_put('real content').to('/tmp/wherever')
-        end.to raise_error(RSpec::Expectations::ExpectationNotMetError, /expected configuration to put .*\s* to .*\s*, but did not/)
+        end.to raise_error(
+          RSpec::Expectations::ExpectationNotMetError,
+          /expected configuration to put .*\s* to .*\s*, but did not/
+        )
       end
     end
 
@@ -89,14 +126,20 @@ describe Capistrano::Spec do
         fake_recipe.find_and_execute_task('fake:thing')
         expect do
           should have_put('fake content')
-        end.to_not raise_error(RSpec::Expectations::ExpectationNotMetError, /expected configuration to put .*\s*, but did not/)
+        end.to_not raise_error(
+          RSpec::Expectations::ExpectationNotMetError,
+          /expected configuration to put .*\s*, but did not/
+        )
       end
 
       it "will raise error when put is not in recipe" do
         fake_recipe.find_and_execute_task('fake:thing')
         expect do
           should have_put('real content')
-        end.to raise_error(RSpec::Expectations::ExpectationNotMetError, /expected configuration to put .*\s*, but did not/)
+        end.to raise_error(
+          RSpec::Expectations::ExpectationNotMetError,
+          /expected configuration to put .*\s*, but did not/
+        )
       end
     end
   end

data/spec/recipe/fakerecipe.rb

@@ -5,8 +5,12 @@ require 'capistrano'
         configuration.load do
           before "fake:before_this_execute_thing", "fake:thing"
           before "fake:before_this_also_execute_thing", "fake:thing"
+          before "outside:undefined_task", "fake:thing"
+
           after "fake:after_this_execute_thing", "fake:thing"
           after "fake:after_this_also_execute_thing", "fake:thing"
+          after "outside:undefined_task", "fake:thing"
+
           namespace :fake do
             desc "thing and run fake manifests"
             task :thing do
@@ -24,12 +28,18 @@ require 'capistrano'
             task :before_this_also_execute_thing do
               #
             end
+            task :before_this_dont_execute_thing do
+              #
+            end
             task :after_this_execute_thing do
               #
             end
             task :after_this_also_execute_thing do
               #
             end
+            task :after_this_dont_execute_thing do
+              #
+            end
           end
         end
       end

data/spec/spec_helper.rb

@@ -5,7 +5,9 @@ require 'capistrano-spec'
 require 'rspec'
 require 'rspec/autorun'
 
+Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
+
 RSpec.configure do |config|
-	config.include Capistrano::Spec::Matchers
-	config.include Capistrano::Spec::Helpers
+  config.include Capistrano::Spec::Matchers
+  config.include Capistrano::Spec::Helpers
 end

data/spec/support/shared/callback_examples.rb

@@ -0,0 +1,43 @@
+shared_examples 'correct before callback' do
+  it "won't raise error when `before` callback has occured for the given task" do
+    expect do
+      should callback('fake:thing').before(task_name)
+    end.to_not raise_error(
+      RSpec::Expectations::ExpectationNotMetError,
+      /expected configuration to callback .*\s* before .*\s*, but did not/
+    )
+  end
+end
+
+shared_examples 'incorrect before callback' do
+  it "will raise error when `before` callback hasn't occured for the given task" do
+    expect do
+      should_not callback('fake:thing').before(task_name)
+    end.to_not raise_error(
+      RSpec::Expectations::ExpectationNotMetError,
+      /expected configuration to not callback .*\s* before .*\s*, but did/
+    )
+  end
+end
+
+shared_examples 'correct after callback' do
+  it "won't raise error when `after` callback has occured for the given task" do
+    expect do
+      should callback('fake:thing').after(task_name)
+    end.to_not raise_error(
+      RSpec::Expectations::ExpectationNotMetError,
+      /expected configuration to callback .*\s* after .*\s*, but did not/
+    )
+  end
+end
+
+shared_examples 'incorrect after callback' do
+  it "will raise error when `after` callback hasn't occured for the given task" do
+    expect do
+      should_not callback('fake:thing').after(task_name)
+    end.to_not raise_error(
+      RSpec::Expectations::ExpectationNotMetError,
+      /expected configuration to not callback .*\s* after .*\s*, but did/
+    )
+  end
+end

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: capistrano-spec
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.5.1
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Joshua Nichols
 - Karl Matthias
 - Peter M Souter
@@ -17,36 +12,32 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-06-21 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-06-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  name: rspec
-  version_requirements: *id001
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: Helpers and matchers for testing capistrano
 email: josh@technicalpickles.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
 - .travis.yml
 - Gemfile
@@ -62,40 +53,33 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/stub_commands_spec.rb
+- spec/support/shared/callback_examples.rb
 - spec/uploaded_spec.rb
-has_rdoc: true
 homepage: http://github.com/technicalpickles/capistrano-spec
 licenses: []
-
 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: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2637377504704629804
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Test your capistrano recipes
 test_files: []
-