spicycode-micronaut 0.1.7.1 → 0.1.7.2

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 require 'rubygems/specification'
 
 GEM = "micronaut"
-GEM_VERSION = "0.1.7.1"
+GEM_VERSION = "0.1.7.2"
 AUTHOR = "Chad Humphries"
 EMAIL = "chad@spicycode.com"
 HOMEPAGE = "http://spicycode.com"

data/lib/micronaut/behaviour.rb

@@ -187,7 +187,7 @@ module Micronaut
     end
 
     def self.run(reporter)
-      return true if examples.size == 0
+      return true if examples.empty?
 
       reporter.add_behaviour(self)
       

data/lib/micronaut/configuration.rb

@@ -8,7 +8,7 @@ module Micronaut
     attr_reader :before_and_afters
     
     # Allows you to control what examples are ran by filtering 
-    attr_reader :filter_run
+    attr_reader :filter
     
     # Modules that will be included or extended based on given filters
     attr_reader :include_or_extend_modules
@@ -27,6 +27,7 @@ module Micronaut
       @before_and_afters = { :before => { :each => [], :all => [] }, :after => { :each => [], :all => [] } }
       @include_or_extend_modules = []
       @formatter_to_use = Micronaut::Formatters::ProgressFormatter
+      @filter = nil
     end
     
     # E.g. alias_example_to :crazy_slow, :speed => 'crazy_slow' defines
@@ -69,7 +70,7 @@ module Micronaut
     end
     
     def filter_run(options={})
-      @filter_run = options
+      @filter = options
     end
     
     def run_all_when_everything_filtered?

data/lib/micronaut/world.rb

@@ -7,21 +7,28 @@ module Micronaut
     def initialize
       @behaviours = []
     end
+    
+    def filter
+      Micronaut.configuration.filter
+    end
 
     def behaviours_to_run
       return @behaviours_to_run if @behaviours_to_run
-
-      if Micronaut.configuration.filter_run
+      
+      if filter
         @behaviours_to_run = filter_behaviours
-        puts "\nRun filtered using #{Micronaut.configuration.filter_run.inspect}"
+        behaviours_to_run.size == 0 && Micronaut.configuration.run_all_when_everything_filtered?
         if @behaviours_to_run.size == 0 && Micronaut.configuration.run_all_when_everything_filtered?
-          puts "No behaviours were matched, running all"
+          puts "No behaviours were matched by #{filter.inspect}, running all"
           # reset the behaviour list to all behaviours, and add back all examples
           @behaviours_to_run = @behaviours
           @behaviours.each { |b| b.examples_to_run.replace(b.examples) }
+        else
+          puts "Run filtered using #{filter.inspect}"          
         end
       else
         @behaviours_to_run = @behaviours
+        @behaviours.each { |b| b.examples_to_run.replace(b.examples) }
       end      
 
       @behaviours_to_run
@@ -33,7 +40,7 @@ module Micronaut
 
     def filter_behaviours
       behaviours.inject([]) do |list, b|
-        b.examples_to_run.replace(find(b.examples, Micronaut.configuration.filter_run).uniq)
+        b.examples_to_run.replace(find(b.examples, filter).uniq)
         # Do not add behaviours with 0 examples to run
         list << (b.examples_to_run.size == 0 ? nil : b)
       end.compact

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spicycode-micronaut
 version: !ruby/object:Gem::Version 
-  version: 0.1.7.1
+  version: 0.1.7.2
 platform: ruby
 authors: 
 - Chad Humphries