spicycode-micronaut 0.1.2 → 0.1.3

data/Rakefile

@@ -4,7 +4,7 @@ require 'rubygems/specification'
 require 'date'
 
 GEM = "micronaut"
-GEM_VERSION = "0.1.2"
+GEM_VERSION = "0.1.3"
 AUTHOR = "Chad Humphries"
 EMAIL = "chad@spicycode.com"
 HOMEPAGE = "http://spicycode.com"
@@ -50,9 +50,7 @@ namespace :micronaut do
   desc 'Run all examples'
   task :examples do
     examples = Dir["examples/**/*_example.rb"].map { |g| Dir.glob(g) }.flatten
-    examples.map! {|f| %Q(require "#{f}")}
-    command = "-e '#{examples.join("; ")}'"
-    ruby command
+    ruby examples.join(" ")
   end
   
   desc "List files that don't have examples"

data/examples/example_helper.rb

@@ -30,6 +30,6 @@ end
 Micronaut.configure do |config|
   config.mock_with :mocha
   config.options = Micronaut::RunnerOptions.new(:color => true, :formatter => :documentation)
-  config.add_filter :options => { :focused => true }
+  # config.add_filter :options => { :focused => true }
   config.autorun!
 end

data/lib/micronaut/configuration.rb

@@ -18,7 +18,11 @@ module Micronaut
     def mock_with(make_a_mockery_with=nil)
       @mock_framework = case make_a_mockery_with
                         when :mocha
+                          require 'micronaut/mocking/with_mocha'
                           Micronaut::Mocking::WithMocha
+                        when :rr
+                          require 'micronaut/mocking/with_rr'
+                          Micronaut::Mocking::WithRR
                         else
                           Micronaut::Mocking::WithAbsolutelyNothing
                         end 
@@ -108,4 +112,4 @@ module Micronaut
     
   end
   
-end
+end

data/lib/micronaut/expectations.rb

@@ -1,6 +1,6 @@
 require 'micronaut/matchers'
-require 'micronaut/expectations/errors'
-require 'micronaut/expectations/extensions'
+require 'micronaut/expectations/extensions/object'
+require 'micronaut/expectations/extensions/string_and_symbol'
 require 'micronaut/expectations/handler'
 require 'micronaut/expectations/wrap_expectation'
 
@@ -31,6 +31,8 @@ module Micronaut
   # Micronaut ships with a standard set of useful matchers, and writing your own
   # matchers is quite simple. See Micronaut::Matchers for details.
   module Expectations
+
+    class ExpectationNotMetError < ::StandardError; end
   
     def self.fail_with(message, expected=nil, target=nil) # :nodoc:
       if Array === message && message.length == 3
@@ -41,4 +43,4 @@ module Micronaut
   
   end
   
-end
+end

data/lib/micronaut/expectations/extensions/object.rb

@@ -1,7 +1,6 @@
 module Micronaut
   module Expectations
-    # rspec adds #should and #should_not to every Object (and,
-    # implicitly, every Class).
+    # rspec adds #should and #should_not to every Object (and, implicitly, every Class).
     module ObjectExpectations
       # :call-seq:
       #   should(matcher)

data/lib/micronaut/expectations/extensions/string_and_symbol.rb

@@ -1,9 +1,11 @@
 module Micronaut
   module Expectations
     module StringHelpers
+
       def starts_with?(prefix)
         to_s[0..(prefix.to_s.length - 1)] == prefix.to_s
       end
+
     end
   end
 end

data/lib/micronaut/expectations/wrap_expectation.rb

@@ -52,5 +52,6 @@ module Micronaut
         return false
       end
     end
+
   end
 end

data/lib/micronaut/matchers.rb

@@ -17,7 +17,7 @@ require 'micronaut/matchers/operator_matcher'
 
 module Micronaut
 
-  # We ship (courtesy of OSS and Micronaut) with a number of useful Expression Matchers. An Expression Matcher
+  # We ship (courtesy of RSpec and Micronaut) with a number of useful Expression Matchers. An Expression Matcher
   # is any object that responds to the following methods:
   #
   #   matches?(actual)

data/lib/micronaut/matchers/be.rb

@@ -199,5 +199,6 @@ it reads really poorly.
     def be(*args)
       Matchers::Be.new(*args)
     end
+
   end
 end

data/lib/micronaut/matchers/be_close.rb

@@ -17,5 +17,6 @@ module Micronaut
         (actual - expected).abs < delta
       end
     end
+
   end
 end

data/lib/micronaut/matchers/change.rb

@@ -22,7 +22,7 @@ module Micronaut
         return (@before + @amount == @after) if @amount
         return ((@after - @before) >= @minimum) if @minimum
         return ((@after - @before) <= @maximum) if @maximum        
-        return @before != @after
+        @before != @after
       end
       
       def raise_block_syntax_error

data/lib/micronaut/matchers/eql.rb

@@ -21,5 +21,6 @@ module Micronaut
         actual.eql?(expected)
       end
     end
+
   end
 end

data/lib/micronaut/matchers/equal.rb

@@ -21,5 +21,6 @@ module Micronaut
         actual.equal?(expected)
       end
     end
+
   end
 end

data/lib/micronaut/matchers/have.rb

@@ -31,7 +31,7 @@ module Micronaut
         raise not_a_collection if @given.nil?
         return @given >= @expected if @relativity == :at_least
         return @given <= @expected if @relativity == :at_most
-        return @given == @expected
+        @given == @expected
       end
       
       def not_a_collection
@@ -150,4 +150,4 @@ EOF
     end
     
   end
-end
+end

data/lib/micronaut/matchers/operator_matcher.rb

@@ -1,6 +1,7 @@
 module Micronaut
   module Matchers
     class OperatorMatcher
+
       def initialize(actual)
         @actual = actual
       end

data/lib/micronaut/matchers/respond_to.rb

@@ -2,6 +2,7 @@ module Micronaut
   module Matchers
     
     class RespondTo #:nodoc:
+
       def initialize(*names)
         @names = names
         @names_not_responded_to = []
@@ -14,7 +15,7 @@ module Micronaut
             @names_not_responded_to << name
           end
         end
-        return @names_not_responded_to.empty?
+        @names_not_responded_to.empty?
       end
       
       def failure_message
@@ -29,6 +30,7 @@ module Micronaut
         # Ruby 1.9 returns the same thing for array.to_s as array.inspect, so just use array.inspect here
         "respond to #{@names.inspect}"
       end
+
     end
     
     # :call-seq:
@@ -43,5 +45,6 @@ module Micronaut
     def respond_to(*names)
       Matchers::RespondTo.new(*names)
     end
+
   end
 end

data/lib/micronaut/matchers/satisfy.rb

@@ -2,6 +2,7 @@ module Micronaut
   module Matchers
     
     class Satisfy #:nodoc:
+
       def initialize(&block)
         @block = block
       end
@@ -19,6 +20,7 @@ module Micronaut
       def negative_failure_message
         "expected #{@given} not to satisfy block"
       end
+
     end
     
     # :call-seq:
@@ -43,5 +45,6 @@ module Micronaut
     def satisfy(&block)
       Matchers::Satisfy.new(&block)
     end
+    
   end
 end

data/lib/micronaut/matchers/simple_matcher.rb

@@ -1,6 +1,7 @@
 module Micronaut
   module Matchers
     class SimpleMatcher
+
       attr_writer :failure_message, :negative_failure_message, :description
       
       def initialize(description, &match_block)
@@ -33,6 +34,7 @@ module Micronaut
       def explanation
         "No description provided. See RDoc for simple_matcher()"
       end
+      
     end
   
     # simple_matcher makes it easy for you to create your own custom matchers
@@ -128,5 +130,6 @@ module Micronaut
     def simple_matcher(description=nil, &match_block)
       SimpleMatcher.new(description, &match_block)
     end
+    
   end
-end
+end

data/lib/micronaut/matchers/throw_symbol.rb

@@ -2,6 +2,7 @@ module Micronaut
   module Matchers
     
     class ThrowSymbol #:nodoc:
+
       def initialize(expected_symbol = nil, expected_arg=nil)
         @expected_symbol = expected_symbol
         @expected_arg = expected_arg
@@ -27,7 +28,6 @@ module Micronaut
         rescue NameError, ArgumentError => e
           raise e unless e.message =~ /uncaught throw (`|\:)([a-zA-Z0-9_]*)(')?/
           @caught_symbol = $2.to_sym
-
         ensure
           if @expected_symbol.nil?
             return !@caught_symbol.nil?
@@ -41,6 +41,7 @@ module Micronaut
             end
           end
         end
+
       end
 
       def failure_message
@@ -102,5 +103,6 @@ module Micronaut
     def throw_symbol(sym=nil)
       Matchers::ThrowSymbol.new(sym)
     end
+
   end
 end

data/lib/micronaut/mocking.rb

@@ -1,6 +1,7 @@
+require 'micronaut/mocking/with_absolutely_nothing'
+
 module Micronaut
   module Mocking   
-    autoload :WithMocha, 'micronaut/mocking/with_mocha'
-    autoload :WithAbsolutelyNothing, 'micronaut/mocking/with_absolutely_nothing'
+
   end
-end
+end

data/lib/micronaut/mocking/with_rr.rb

@@ -0,0 +1,24 @@
+require 'rr'
+
+Micronaut.configuration.backtrace_clean_patterns.push(RR::Errors::BACKTRACE_IDENTIFIER)
+
+module Micronaut
+  module Mocking
+    module WithRR
+      include RR::Extensions::InstanceMethods
+
+      def _setup_mocks
+        RR::Space.instance.reset
+      end
+
+      def _verify_mocks
+        RR::Space.instance.verify_doubles
+      end
+
+      def _teardown_mocks
+        RR::Space.instance.reset
+      end
+
+    end
+  end
+end

data/lib/micronaut/runner.rb

@@ -14,18 +14,23 @@ module Micronaut
     def options
       Micronaut.configuration.options
     end
-    
-    def run(args = [])
-      args.inject([]) { |files, arg| files.concat(Dir[arg].map { |g| Dir.glob(g) }.flatten) }.each do |file|
+
+    def load_all_behaviours(files_from_args=[])
+      files_from_args.inject([]) { |files, arg| files.concat(Dir[arg].map { |g| Dir.glob(g) }.flatten) }.each do |file|
         load file
       end
+    end
+    
+    def run(args = [])
+      load_all_behaviours(args)
       
       behaviours_to_run = Micronaut::World.behaviours_to_run
-      total_behaviours = behaviours_to_run.inject(0) { |sum, b| sum + b.examples_to_run.size }
+
+      total_examples = behaviours_to_run.inject(0) { |sum, b| sum + b.examples_to_run.size }
 
       old_sync, options.formatter.output.sync = options.formatter.output.sync, true if options.formatter.output.respond_to?(:sync=)
 
-      options.formatter.start(total_behaviours)
+      options.formatter.start(total_examples)
 
       suite_success = true
 
@@ -38,7 +43,9 @@ module Micronaut
       options.formatter.start_dump
       options.formatter.dump_pending
       options.formatter.dump_failures
-      options.formatter.dump_summary(duration, total_behaviours, options.formatter.failed_examples.size, options.formatter.pending_examples.size)
+
+      # TODO: Stop passing in the last two items, the formatter knows this info
+      options.formatter.dump_summary(duration, total_examples, options.formatter.failed_examples.size, options.formatter.pending_examples.size)
 
       options.formatter.output.sync = old_sync if options.formatter.output.respond_to? :sync=
 
@@ -47,4 +54,4 @@ module Micronaut
 
   end
 
-end
+end

data/lib/micronaut/world.rb

@@ -20,11 +20,13 @@ module Micronaut
         end
       end      
       
-      # if behaviours.inject(0) { |sum, b| sum += b.examples_to_run.size }.zero?
-      #   behaviours.each do |behaviour|
-      #     behaviour.examples_to_run.concat(behaviour.examples)
-      #   end
-      # end
+      number_of_behaviours_left = behaviours.inject(0) { |sum, b| sum += b.examples_to_run.size }
+
+      if number_of_behaviours_left.zero? && Micronaut.configuration.filters.size.zero?
+        behaviours.each do |behaviour|
+          behaviour.examples_to_run.concat(behaviour.examples)
+        end
+      end
       
       behaviours
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spicycode-micronaut
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Chad Humphries
@@ -9,7 +9,7 @@ autorequire: micronaut
 bindir: bin
 cert_chain: []
 
-date: 2008-12-12 00:00:00 -08:00
+date: 2008-12-15 00:00:00 -08:00
 default_executable: micronaut
 dependencies: []
 
@@ -73,6 +73,7 @@ files:
 - lib/micronaut/mocking
 - lib/micronaut/mocking/with_absolutely_nothing.rb
 - lib/micronaut/mocking/with_mocha.rb
+- lib/micronaut/mocking/with_rr.rb
 - lib/micronaut/mocking.rb
 - lib/micronaut/runner.rb
 - lib/micronaut/runner_options.rb

data/lib/micronaut/expectations/errors.rb

@@ -1,7 +0,0 @@
-module Micronaut
-  module Expectations
-    class ExpectationNotMetError < ::StandardError
-      
-    end
-  end
-end

data/lib/micronaut/expectations/extensions.rb

@@ -1,2 +0,0 @@
-require 'micronaut/expectations/extensions/object'
-require 'micronaut/expectations/extensions/string_and_symbol'