purobu 0.0.3 → 0.0.4

data/lib/purobu/configuration.rb

@@ -2,6 +2,7 @@ require 'singleton'
 module Purobu
   class Configuration
     include Singleton
+    include Purobu::Helpers::HelpersHelper
 
     # Run verbosely
     attr_accessor :verbose
@@ -12,18 +13,9 @@ module Purobu
     # Which test files to run
     attr_accessor :files
 
-    # Global teardown to run after the entire suite
-    attr_accessor :global_teardown
-
     # Heroku api key to be used by the heroku-api client
     attr_accessor :heroku_api_key
 
-    def self.run(&block)
-      self.instance.heroku_api_key = ENV['HEROKU_API_KEY']
-
-      yield self.instance
-    end
-
     def global_setup(&block)
       if block_given?
         @global_setup = block
@@ -40,6 +32,12 @@ module Purobu
       end
     end
 
+    def self.run(&block)
+      self.instance.heroku_api_key = ENV['HEROKU_API_KEY']
+
+      yield self.instance
+    end
+
     class << self
       def method_missing(method)
         if self.instance.respond_to?(method)

data/lib/purobu/test.rb

@@ -25,12 +25,13 @@ module Purobu
           Purobu.log(verification: true) do
             @fail = !@verification.call
           end
-          Purobu.log(teardown: true) do
-            @teardowns.each { |s| s.call }
-          end
         end
-      rescue => e
+      rescue
         @fail = true
+      ensure
+        Purobu.log(teardown: true) do
+          @teardowns.each { |s| s.call }
+        end
       end
       pass?
     end

data/lib/purobu/version.rb

@@ -1,3 +1,3 @@
 module Purobu
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/purobu.rb

@@ -1,11 +1,11 @@
 require "purobu/version"
 require "purobu/log"
-require "purobu/configuration"
 require "purobu/test"
 require "purobu/runner"
 require "purobu/dsl"
 require "purobu/helpers"
-require "purobu/database_connection"
 require "purobu/heroku_helpers"
+require "purobu/configuration"
+require "purobu/database_connection"
 require "purobu/heroku"
 require "purobu/reporter"

data/spec/purobu/configuration_spec.rb

@@ -0,0 +1,16 @@
+require 'purobu'
+
+describe Purobu::Configuration do
+  it 'allows you to add helpers' do
+    Purobu::Configuration.run do |config|
+      config.helpers do
+        def help
+          throw :a_helper
+        end
+      end
+    end
+
+    test = Purobu::Test.new
+    expect { test.help }.to throw_symbol :a_helper
+  end
+end

data/spec/purobu/test_spec.rb

@@ -27,6 +27,14 @@ describe Purobu::Test, '#run' do
 
     -> { test.run }.should throw_symbol :teardown
   end
+
+  it 'tears down even if something blows up earlier' do
+    test = Purobu::Test.new
+    test.verify { raise "oh noes" }
+    test.teardown { throw :teardown }
+
+    -> { test.run }.should throw_symbol :teardown
+  end
 end
 
 describe Purobu::Test, 'pass/fail' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: purobu
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &70206819644680 !ruby/object:Gem::Requirement
+  requirement: &70341729351560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.28.2
   type: :runtime
   prerelease: false
-  version_requirements: *70206819644680
+  version_requirements: *70341729351560
 - !ruby/object:Gem::Dependency
   name: heroku-api
-  requirement: &70206819643240 !ruby/object:Gem::Requirement
+  requirement: &70341729350880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206819643240
+  version_requirements: *70341729350880
 - !ruby/object:Gem::Dependency
   name: scrolls
-  requirement: &70206819641660 !ruby/object:Gem::Requirement
+  requirement: &70341729349140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70206819641660
+  version_requirements: *70341729349140
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70206819639980 !ruby/object:Gem::Requirement
+  requirement: &70341729347960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206819639980
+  version_requirements: *70341729347960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70206819639320 !ruby/object:Gem::Requirement
+  requirement: &70341729346800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206819639320
+  version_requirements: *70341729346800
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70206819638540 !ruby/object:Gem::Requirement
+  requirement: &70341729345820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206819638540
+  version_requirements: *70341729345820
 description: ! ' Black-box integration test framework for components on the Heroku
   platform. '
 email:
@@ -105,6 +105,7 @@ files:
 - lib/purobu/test.rb
 - lib/purobu/version.rb
 - purobu.gemspec
+- spec/purobu/configuration_spec.rb
 - spec/purobu/database_connection_spec.rb
 - spec/purobu/dsl_spec.rb
 - spec/purobu/helpers_spec.rb
@@ -136,6 +137,7 @@ signing_key:
 specification_version: 3
 summary: Black-box integration test framework for components on the Heroku platform.
 test_files:
+- spec/purobu/configuration_spec.rb
 - spec/purobu/database_connection_spec.rb
 - spec/purobu/dsl_spec.rb
 - spec/purobu/helpers_spec.rb