capistrano-spec 0.3.3 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTkzNTBlOGEzZjQyNzRlNDFmNTE4ODdmZjczZTA2MDAwY2E2N2EzYw==
+    NDU4NmVlNjQyZWFhYTZkMWIwYjMwMmQxMGI4ZGYzMGVkOWI1Y2U1Ng==
   data.tar.gz: !binary |-
-    YzRkMzU0NjFiZjlhNzRiYTJjNGNjZjJiMjZhODhkMzU3OGIyZTQzZA==
+    ZTM0Y2VhYTdkMWVlZTZkYTgxZDE3YWM3MzIxNWNmMjUyZmRkNWFjZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTE1ODc4YWM4NmIzM2E3ZTllZjUwZDQ0YWM3OTgxMmM1MjkxY2JiNWEyMjkw
-    YjVkZDQ5NDQ3OTI4MWY5MGVhOTU0YjcwNDBhN2YzN2I3Y2M3Y2JkMWE0Y2Nl
-    ZGMyOTQ5Y2Y2OTI4YjdkNzkxODE4ODg5NDVhNDZlNzlhNjZiZjY=
+    OGZlNjE2YzJhODU0NmZiZDFlMjg3MmMxNjdhYWZkZjM2MzMxODBlMzlhMmYz
+    MDRjMjE3NzlhOTIyZjVkYmM3NWY4NTIwZWYxMDU3OWJiMTk3NzVkNThlNjA5
+    ZDNmN2M5ZmVkZmU2ODdlNGNiNWY0OTVjNDU0ODQ1ZTU0ZjQ5ZDQ=
   data.tar.gz: !binary |-
-    YTEzY2MwYjcwOTYwMTBlZTM5MWI1ZWYzYjJkNjhhZTliOGVmYjQzMGJhODMw
-    NmRiYmMwOTFiOGQ3MDA3OGI4OGQ1ZGZiMmNiOWQ4YzA3N2E4NzFhOGJjNmFj
-    YzFmNDAxM2JjNDJjNjhkYzEzNDIyNzZkYzYwOWY4MmNkOWFhMjg=
+    NzQzMDVhNjhiNDUyOTQ3YzM0YjM5NDdiY2E4ZDY2MWZhM2ZjMDA5NWRkMzU0
+    NmIzZmM0YThiNTI1NDgyNzE1MWQ2YTMyYzhjY2ExZGNiMDlhOGFiMmNlM2Fj
+    MDg1ZGY0MzUyY2IxMjFjMTEyMDkyNzk5NGExMzVhYmE4YWExYzk=

data/Rakefile

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

data/capistrano-spec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "capistrano-spec"
-  s.version = "0.3.3"
+  s.version = "0.4.0"
 
   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 = "2013-04-22"
+  s.date = "2013-05-16"
   s.description = "Helpers and matchers for testing capistrano"
   s.email = "josh@technicalpickles.com"
   s.extra_rdoc_files = [

data/lib/capistrano/spec.rb

@@ -70,14 +70,12 @@ module Capistrano
           callbacks = find_callback(configuration, @on, @task)
 
           if callbacks
-            @callback = callbacks.first
-
-            if @callback && @after_task_name
+            if @after_task_name
               @after_task = configuration.find_task(@after_task_name)
-              @callback.applies_to?(@after_task)
-            elsif @callback && @before_task_name
+              callbacks.any? { |callback| callback.applies_to?(@after_task) }
+            elsif @before_task_name
               @before_task = configuration.find_task(@before_task_name)
-              @callback.applies_to?(@before_task)
+              callbacks.any? { |callback| callback.applies_to?(@before_task) }
             else
               ! @callback.nil?
             end

data/spec/capistrano-spec_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 require 'capistrano'
-
 require File.expand_path('../recipe/fakerecipe', __FILE__)
 
 describe Capistrano::Spec do
@@ -55,12 +54,16 @@ describe Capistrano::Spec do
 
   describe 'callback' do
 
-    it "will not raise error when `before` callback has occured" do
-      expect{ should callback('fake:thing').before('fake:stuff_and_things')}.to_not raise_error(RSpec::Expectations::ExpectationNotMetError, /expected configuration to callback .*\s* before .*\s*, but did not/)
+    ['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)
+      end
     end
 
-    it "will not raise error when `after` callback has occured" do
-      expect{ should callback('fake:other_thing').after('fake:thing')}.to_not raise_error(RSpec::Expectations::ExpectationNotMetError, /expected configuration to callback .*\s* after .*\s*, but did not/)
+    ['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)
+      end
     end
   end
 

data/spec/recipe/fakerecipe.rb

@@ -3,8 +3,10 @@ require 'capistrano'
     module Fakerecipe
       def self.load_into(configuration)
         configuration.load do
-          before "fake:stuff_and_things", "fake:thing"
-          after "fake:thing", "fake:other_thing"
+          before "fake:before_this_execute_thing", "fake:thing"
+          before "fake:before_this_also_execute_thing", "fake:thing"
+          after "fake:after_this_execute_thing", "fake:thing"
+          after "fake:after_this_also_execute_thing", "fake:thing"
           namespace :fake do
             desc "thing and run fake manifests"
             task :thing do
@@ -14,11 +16,17 @@ require 'capistrano'
               get('/tmp/baz', 'baz')
             end
             desc "More fake tasks!"
-            task :other_thing do
+            task :before_this_execute_thing do
               #
             end
             desc "You get the picture..."
-            task :stuff_and_things do
+            task :before_this_also_execute_thing do
+              #
+            end
+            task :after_this_execute_thing do
+              #
+            end
+            task :after_this_also_execute_thing do
               #
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-spec
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Joshua Nichols
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec