minitest-capistrano 0.0.3 → 0.0.4

data/lib/minitest/capistrano/version.rb

@@ -1,5 +1,5 @@
 module MiniTest
   module Capistrano
-    VERSION = "0.0.3" # :nodoc:
+    VERSION = "0.0.4" # :nodoc:
   end
 end

data/lib/minitest/capistrano.rb

@@ -12,7 +12,7 @@ module MiniTest
     #   assert_have_run "echo hi", configuration
 
     def assert_have_run(cmd, configuration, msg = nil)
-      msg = message(msg) { "Expected configuration to run #{cmd}, but did not" }
+      msg ||= "Expected configuration to run #{cmd}, but did not"
       refute_nil configuration.runs[cmd], msg
     end
 
@@ -20,7 +20,7 @@ module MiniTest
     # Fails if +configuration+ has run +cmd+.
 
     def refute_have_run(cmd, configuration, msg = nil)
-      msg = message(msg) { "Expected configuration to not run #{cmd}, but did" }
+      msg ||= "Expected configuration to not run #{cmd}, but did"
       assert_nil configuration.runs[cmd], msg
     end
 
@@ -30,7 +30,7 @@ module MiniTest
     #   assert_have_run_something configuration
 
     def assert_have_run_something(configuration, msg = nil)
-      msg = message(msg) { "Expected configuration to have run something, but did not" }
+      msg ||= "Expected configuration to have run something, but did not"
       refute_empty configuration.runs, msg
     end
 
@@ -40,7 +40,7 @@ module MiniTest
     #   refute_have_run_something configuration
 
     def refute_have_run_something(configuration, msg = nil)
-      msg = message(msg) { "Expected configuration to have run nothing, but did" }
+      msg ||= "Expected configuration to have run nothing, but did"
       assert_empty configuration.runs, msg
     end
 
@@ -51,7 +51,7 @@ module MiniTest
     #   assert_callback_before configuration, :stop, :finalize
 
     def assert_callback_before(configuration, task_name, before_task_name, msg = nil)
-      msg = message(msg) { "Expected configuration to callback #{task_name.inspect} before #{before_task_name.inspect} but did not" }
+      msg ||= "Expected configuration to callback #{task_name.inspect} before #{before_task_name.inspect} but did not"
       test_callback_on(true, configuration, task_name, :before, before_task_name, msg)
     end
 
@@ -62,7 +62,7 @@ module MiniTest
     #   refute_callback_before configuration, :stop, :start
 
     def refute_callback_before(configuration, task_name, before_task_name, msg = nil)
-      msg = message(msg) { "Expected configuration to not have a callback #{task_name.inspect} before #{before_task_name.inspect} but did" }
+      msg ||= "Expected configuration to not have a callback #{task_name.inspect} before #{before_task_name.inspect} but did"
       test_callback_on(false, configuration, task_name, :before, before_task_name, msg)
     end
 
@@ -73,7 +73,7 @@ module MiniTest
     #   assert_callback_after configuration, :reload, :log_event
 
     def assert_callback_after(configuration, task_name, after_task_name, msg = nil)
-      msg = message(msg) { "Expected configuration to callback #{task_name.inspect} after #{after_task_name.inspect} but did not" }
+      msg ||= "Expected configuration to callback #{task_name.inspect} after #{after_task_name.inspect} but did not"
       test_callback_on(true, configuration, task_name, :after, after_task_name, msg)
     end
 
@@ -84,10 +84,30 @@ module MiniTest
     #   refute_callback_after configuration, :start, :stop
 
     def refute_callback_after(configuration, task_name, after_task_name, msg = nil)
-      msg = message(msg) { "Expected configuration to not have a callback #{task_name.inspect} after #{after_task_name.inspect} but did" }
+      msg ||= "Expected configuration to not have a callback #{task_name.inspect} after #{after_task_name.inspect} but did"
       test_callback_on(false, configuration, task_name, :after, after_task_name, msg)
     end
 
+    ##
+    # Fails unless +configuration+ has a task called +task_name+.
+    #
+    #   assert_have_task "deploy:restart", configuration
+
+    def assert_have_task(task_name, configuration, msg = nil)
+      msg ||= "Expected configuration to have task #{task_name} but did not"
+      refute_nil configuration.find_task(task_name), msg
+    end
+
+    ##
+    # Fails if +configuration+ has a task called +task_name+.
+    #
+    #   refute_have_task "deploy:nothing", configuration
+
+    def refute_have_task(task_name, configuration, msg = nil)
+      msg ||= "Expected configuration to not have task #{task_name} but did"
+      assert_nil configuration.find_task(task_name), msg
+    end
+
     private
 
     def test_callback_on(positive, configuration, task_name, on, other_task_name, msg)
@@ -178,6 +198,24 @@ module MiniTest
     # :method: wont_have_callback_after
 
     infect_an_assertion :refute_callback_after, :wont_have_callback_after, true
+
+    ##
+    # See MiniTest::Assertions#assert_have_task
+    #
+    #   config.must_have_task "deploy:restart"
+    #
+    # :method: must_have_task
+
+    infect_an_assertion :assert_have_task, :must_have_task
+
+    ##
+    # See MiniTest::Assertions#refute_have_task
+    #
+    #   config.wont_have_task "nothing:here"
+    #
+    # :method: wont_have_task
+
+    infect_an_assertion :refute_have_task, :wont_have_task
   end
 
   module Capistrano

data/spec/minitest_capistrano_spec.rb

@@ -5,8 +5,10 @@ require 'capistrano'
 
 describe MiniTest::Capistrano::ConfigurationExtension do
   before do
-    @config = Object.new
+    @config = Capistrano::Configuration.new
     @config.extend(MiniTest::Capistrano::ConfigurationExtension)
+    @config.task(:startup)          { run "rails server" }
+    @config.task(:announce_startup) { run "echo starting up"}
   end
 
   describe "#get" do
@@ -72,13 +74,6 @@ describe MiniTest::Capistrano::ConfigurationExtension do
   end
 
   describe "#find_callback" do
-    before do
-      @config = Capistrano::Configuration.new
-      @config.extend(MiniTest::Capistrano::ConfigurationExtension)
-      @config.task(:startup)          { run "rails server" }
-      @config.task(:announce_startup) { run "echo starting up"}
-    end
-
     it "returns an empty array when no callbacks are found" do
       @config.find_callback(:before, @config.find_task("startup")).must_equal []
     end
@@ -94,8 +89,10 @@ end
 
 describe MiniTest::Assertions do
   before do
-    @config = Object.new
+    @config = Capistrano::Configuration.new
     @config.extend(MiniTest::Capistrano::ConfigurationExtension)
+    @config.task(:startup)          { run "rails server" }
+    @config.task(:announce_startup) { run "echo starting up"}
   end
 
   subject { MiniTest::Unit::TestCase.new 'fake tc' }
@@ -119,40 +116,43 @@ describe MiniTest::Assertions do
     subject.refute_have_run_something @config
   end
 
-  describe "callbacks" do
-    before do
-      @config = Capistrano::Configuration.new
-      @config.extend(MiniTest::Capistrano::ConfigurationExtension)
-      @config.task(:startup)          { run "rails server" }
-      @config.task(:announce_startup) { run "echo starting up"}
-    end
+  it "asserts a callback exists for one task before another" do
+    @config.before :startup, :announce_startup
 
-    it "asserts a callback exists for one task before another" do
-      @config.before :startup, :announce_startup
+    subject.assert_callback_before @config, :startup, :announce_startup
+  end
 
-      subject.assert_callback_before @config, :startup, :announce_startup
-    end
+  it "refutes a callback exists for one task before another" do
+    subject.refute_callback_before @config, :startup, :nadda
+  end
 
-    it "refutes a callback exists for one task before another" do
-      subject.refute_callback_before @config, :startup, :nadda
-    end
+  it "asserts a callback exists for one task after another" do
+    @config.after :start, :intialize
 
-    it "asserts a callback exists for one task after another" do
-      @config.after :start, :intialize
+    subject.assert_callback_after @config, :start, :intialize
+  end
 
-      subject.assert_callback_after @config, :start, :intialize
-    end
+  it "refutes a callback exists for one task after another" do
+    subject.refute_callback_after @config, :clone, :nadda
+  end
 
-    it "refutes a callback exists for one task after another" do
-      subject.refute_callback_after @config, :clone, :nadda
-    end
+  it "asserts a task exists" do
+    @config.namespace(:one) { task(:two) {} }
+
+    subject.assert_have_task "one:two", @config
+  end
+
+  it "refute a task exists" do
+    subject.refute_have_task "three:four", @config
   end
 end
 
 describe MiniTest::Expectations do
   before do
-    @config = Object.new
+    @config = Capistrano::Configuration.new
     @config.extend(MiniTest::Capistrano::ConfigurationExtension)
+    @config.task(:startup)          { run "rails server" }
+    @config.task(:announce_startup) { run "echo starting up"}
   end
 
   it "needs to verify a command has run" do
@@ -174,32 +174,31 @@ describe MiniTest::Expectations do
     @config.wont_have_run_anything
   end
 
-  describe "callbacks" do
-    before do
-      @config = Capistrano::Configuration.new
-      @config.extend(MiniTest::Capistrano::ConfigurationExtension)
-      @config.task(:startup)          { run "rails server" }
-      @config.task(:announce_startup) { run "echo starting up"}
-    end
+  it "needs to verify a callback exists for a task before another" do
+    @config.before :stop, :warn_people
 
-    it "needs to verify a callback exists for a task before another" do
-      @config.before :stop, :warn_people
+    @config.must_have_callback_before :stop, :warn_people
+  end
 
-      @config.must_have_callback_before :stop, :warn_people
-    end
+  it "needs to verify no callback exists for a task before another" do
+    @config.wont_have_callback_before :reload, :stop
+  end
 
-    it "needs to verify no callback exists for a task before another" do
-      @config.wont_have_callback_before :reload, :stop
-    end
+  it "needs to verify a callback exists for a task after another" do
+    @config.after :start, :init_database
 
-    it "needs to verify a callback exists for a task after another" do
-      @config.after :start, :init_database
+    @config.must_have_callback_after :start, :init_database
+  end
 
-      @config.must_have_callback_after :start, :init_database
-    end
+  it "needs to verify no callback exists for a task after another" do
+    @config.wont_have_callback_after :stop, :do_taxes
+  end
 
-    it "needs to verify no callback exists for a task after another" do
-      @config.wont_have_callback_after :stop, :do_taxes
-    end
+  it "needs to verify a task exists by name" do
+    @config.must_have_task "startup"
+  end
+
+  it "needs to verify no task exists by name" do
+    @config.wont_have_task "doofus"
   end
 end

metadata

@@ -1,64 +1,45 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: minitest-capistrano
-version: !ruby/object:Gem::Version 
-  hash: 1889055196096400351
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-11 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: minitest
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70263388193960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 4549645503570588592
-        segments: 
-        - 2
-        - 10
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.10.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: capistrano
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70263388193960
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: &70263388193460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 424294802847615879
-        segments: 
-        - 2
-        - 9
-        version: "2.9"
+      - !ruby/object:Gem::Version
+        version: '2.9'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *70263388193460
 description: MiniTest assertions and expectations for testing Capistrano recipes
-email: 
+email:
 - fnichol@nichol.ca
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -70,39 +51,29 @@ files:
 - lib/minitest/capistrano/version.rb
 - minitest-capistrano.gemspec
 - spec/minitest_capistrano_spec.rb
-has_rdoc: true
 homepage: https://github.com/fnichol/minitest-capistrano
 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: 2002549777813010636
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2002549777813010636
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: MiniTest assertions and expectations for testing Capistrano recipes
-test_files: 
+test_files:
 - spec/minitest_capistrano_spec.rb