spicycode-micronaut 0.1.6.1 → 0.1.6.8

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 require 'rubygems/specification'
 
 GEM = "micronaut"
-GEM_VERSION = "0.1.6.1"
+GEM_VERSION = "0.1.6.8"
 AUTHOR = "Chad Humphries"
 EMAIL = "chad@spicycode.com"
 HOMEPAGE = "http://spicycode.com"
@@ -85,4 +85,4 @@ end
 
 
 task :default => 'coverage'
-task :clobber_package => 'clean_coverage'
+task :clobber_package => 'clean_coverage'

data/lib/micronaut/configuration.rb

@@ -102,21 +102,12 @@ module Micronaut
     
     def find_modules(group)
       extra_modules.select do |include_or_extend, mod, options|
-        options.all? do |key, value|
-          case value
-          when Hash
-            value.all? { |k, v| group.metadata[key][k] == v }
-          when Regexp
-            group.metadata[key] =~ value
-          when Proc
-            value.call(group.metadata[key]) rescue false
-          else
-            group.metadata[key] == value
-          end
+        options.all? do |filter_on, filter|
+          Micronaut.world.apply_condition(filter_on, filter, group.metadata)
         end
       end
     end
-    
+      
     def filter_run(options={})
       @filter = options
     end
@@ -135,18 +126,10 @@ module Micronaut
     
     def find_before_or_after(desired_type, desired_each_or_all, group)
       before_and_afters.select do |type, each_or_all, options, block|
-        type == desired_type && each_or_all == desired_each_or_all &&
-        options.all? do |key, value|
-          case value
-          when Hash
-            value.all? { |k, v| group.metadata[key][k] == v }
-          when Regexp
-            group.metadata[key] =~ value
-          when Proc
-            value.call(group.metadata[key]) rescue false
-          else
-            group.metadata[key] == value
-          end
+        type == desired_type && 
+        each_or_all == desired_each_or_all &&
+        options.all? do |filter_on, filter|
+          Micronaut.world.apply_condition(filter_on, filter, group.metadata)
         end
       end.map { |type, each_or_all, options, block| block }
     end

data/lib/micronaut/formatters/base_formatter.rb

@@ -108,9 +108,9 @@ module Micronaut
         return "" if backtrace.nil?
         cleansed = backtrace.map { |line| backtrace_line(line) }.compact
         original_file = example.behaviour.metadata[:behaviour][:file_path].split(':').first.strip
-        # cleansed = cleansed.select do |line|
-        #   line.split(':').first.downcase == original_file.downcase
-        # end
+        cleansed = cleansed.select do |line|
+          line.split(':').first.downcase == original_file.downcase
+        end
         # we really just want it to remove the last line if there are more than 1 lines, as it is always
         # junk
         cleansed.empty? ? backtrace : cleansed

data/lib/micronaut/formatters/base_text_formatter.rb

@@ -94,7 +94,7 @@ module Micronaut
           output.puts "Pending:"
           pending_examples.each do |pending_example, message|
             output.puts "\n  #{pending_example.behaviour}\n  - #{pending_example.description}"
-            output.puts grey("    # #{pending_example.options[:caller]}")
+            output.puts grey("    # #{pending_example.metadata[:caller]}")
           end
         end
         output.flush

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spicycode-micronaut
 version: !ruby/object:Gem::Version 
-  version: 0.1.6.1
+  version: 0.1.6.8
 platform: ruby
 authors: 
 - Chad Humphries
@@ -9,7 +9,7 @@ autorequire: micronaut
 bindir: bin
 cert_chain: []
 
-date: 2008-12-23 00:00:00 -08:00
+date: 2008-12-24 00:00:00 -08:00
 default_executable: micronaut
 dependencies: []