spicycode-micronaut 0.1.1 → 0.1.2

data/Rakefile

@@ -4,7 +4,7 @@ require 'rubygems/specification'
 require 'date'
 
 GEM = "micronaut"
-GEM_VERSION = "0.1.1"
+GEM_VERSION = "0.1.2"
 AUTHOR = "Chad Humphries"
 EMAIL = "chad@spicycode.com"
 HOMEPAGE = "http://spicycode.com"
@@ -21,7 +21,9 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  
+  s.bindir = 'bin'
+  s.default_executable = 'micronaut'
+  s.executables = ["micronaut"]
   s.require_path = 'lib'
   s.autorequire = GEM
   s.files = %w(LICENSE README RSPEC-LICENSE Rakefile) + Dir.glob("{lib,examples}/**/*")

data/bin/micronaut

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+require 'micronaut'
+Micronaut::Runner.autorun

data/examples/example_helper.rb

@@ -18,7 +18,7 @@ module Micronaut
 end
 
 def remove_last_describe_from_world
-  Micronaut::World.behaviour_groups.pop
+  Micronaut::World.behaviours.pop
 end
 
 class DummyFormatter <  Micronaut::Formatters::BaseTextFormatter; end
@@ -28,9 +28,8 @@ def dummy_reporter
 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.autorun!
-  config.options = Micronaut::RunnerOptions.new(:color => true, :formatter => :progress)
-  
 end

data/examples/lib/micronaut/configuration_example.rb

@@ -40,12 +40,12 @@ describe Micronaut::Configuration do
     module FocusedSupport
       
       def fit(desc, options={}, &block)
-        it(desc, options.merge(:focused => true), &block)
+        it(desc, options.update(:focused => true), &block)
       end
       
     end
     
-    it "should extend the given module into each behaviour group" do
+    focused "should extend the given module into each behaviour group" do
       Micronaut.configuration.extend(FocusedSupport)
       group = Micronaut::Behaviour.describe(FocusedSupport, 'the focused support ') { }
       group.should respond_to(:fit)

data/examples/lib/micronaut/world_example.rb

@@ -8,7 +8,7 @@ describe Micronaut::World do
 
     it "should contain all defined behaviour groups" do
       behaviour_group = Micronaut::Behaviour.describe(Bar, 'Empty Behaviour Group') { }
-      Micronaut::World.behaviour_groups.should include(behaviour_group)       
+      Micronaut::World.behaviours.should include(behaviour_group)       
       remove_last_describe_from_world
     end
 
@@ -23,56 +23,57 @@ describe Micronaut::World do
       @bg1 = Micronaut::Behaviour.describe(Bar, "find group-1", options_1) { }
       @bg2 = Micronaut::Behaviour.describe(Bar, "find group-2", options_2) { }
       @bg3 = Micronaut::Behaviour.describe(Bar, "find group-3", options_3) { }
+      @behaviours = [@bg1, @bg2, @bg3]
     end
 
     after(:all) do
-      Micronaut::World.behaviour_groups.delete(@bg1)
-      Micronaut::World.behaviour_groups.delete(@bg2)
-      Micronaut::World.behaviour_groups.delete(@bg3)
+      Micronaut::World.behaviours.delete(@bg1)
+      Micronaut::World.behaviours.delete(@bg2)
+      Micronaut::World.behaviours.delete(@bg3)
     end
     
     it "should find no groups when given no search parameters" do
-      Micronaut::World.find.should == []
+      Micronaut::World.find([]).should == []
     end
   
     it "should find three groups when searching for :described_type => Bar" do
-      Micronaut::World.find(:described_type => Bar).should == [@bg1, @bg2, @bg3]
+      Micronaut::World.find(@behaviours, :described_type => Bar).should == [@bg1, @bg2, @bg3]
     end
     
     it "should find one group when searching for :description => 'find group-1'" do
-      Micronaut::World.find(:description => 'find group-1').should == [@bg1]
+      Micronaut::World.find(@behaviours, :description => 'find group-1').should == [@bg1]
     end
     
     it "should find two groups when searching for :description => lambda { |v| v.include?('-1') || v.include?('-3') }" do
-      Micronaut::World.find(:description => lambda { |v| v.include?('-1') || v.include?('-3') }).should == [@bg1, @bg3]
+      Micronaut::World.find(@behaviours, :description => lambda { |v| v.include?('-1') || v.include?('-3') }).should == [@bg1, @bg3]
     end
     
     it "should find three groups when searching for :description => /find group/" do
-      Micronaut::World.find(:description => /find group/).should == [@bg1, @bg2, @bg3]
+      Micronaut::World.find(@behaviours, :description => /find group/).should == [@bg1, @bg2, @bg3]
     end
     
     it "should find one group when searching for :options => { :foo => 1 }" do
-      Micronaut::World.find(:options => { :foo => 1 }).should == [@bg1]
+      Micronaut::World.find(@behaviours, :options => { :foo => 1 }).should == [@bg1]
     end
     
     it "should find one group when searching for :options => { :pending => true }" do
-      Micronaut::World.find(:options => { :pending => true }).should == [@bg2]
+      Micronaut::World.find(@behaviours, :options => { :pending => true }).should == [@bg2]
     end
 
     it "should find one group when searching for :options => { :array => [1,2,3,4] }" do
-      Micronaut::World.find(:options => { :array => [1,2,3,4] }).should == [@bg3]
+      Micronaut::World.find(@behaviours, :options => { :array => [1,2,3,4] }).should == [@bg3]
     end
 
     it "should find no group when searching for :options => { :array => [4,3,2,1] }" do
-      Micronaut::World.find(:options => { :array => [4,3,2,1] }).should be_empty
+      Micronaut::World.find(@behaviours, :options => { :array => [4,3,2,1] }).should be_empty
     end    
 
     it "should find two groups when searching for :options => { :color => 'blue' }" do
-      Micronaut::World.find(:options => { :color => 'blue' }).should == [@bg1, @bg3]
+      Micronaut::World.find(@behaviours, :options => { :color => 'blue' }).should == [@bg1, @bg3]
     end
 
     it "should find two groups when searching for :options => { :feature => 'reporting' }" do
-      Micronaut::World.find(:options => { :feature => 'reporting' }).should == [@bg1, @bg2]
+      Micronaut::World.find(@behaviours, :options => { :feature => 'reporting' }).should == [@bg1, @bg2]
     end
 
   end
@@ -80,13 +81,13 @@ describe Micronaut::World do
   describe "reset" do
 
     it "should clear the list of behaviour groups" do
-      original_groups = Micronaut::World.behaviour_groups
+      original_groups = Micronaut::World.behaviours
 
-      Micronaut::World.behaviour_groups.should_not be_empty
+      Micronaut::World.behaviours.should_not be_empty
       Micronaut::World.reset
-      Micronaut::World.behaviour_groups.should be_empty
+      Micronaut::World.behaviours.should be_empty
 
-      Micronaut::World.behaviour_groups.concat(original_groups)
+      Micronaut::World.behaviours.concat(original_groups)
     end
 
   end

data/lib/autotest/micronaut.rb

@@ -40,9 +40,8 @@ class Autotest::Micronaut < Autotest
     
     examples = files_to_test.keys.flatten
     
-    examples.map! {|f| %Q(require "#{f}")}
 
-    return "#{ruby} -e '#{examples.join("; ")}'"
+    "#{ruby} #{examples.join(" ")}"
   end
   
 end

data/lib/micronaut/behaviour.rb

@@ -4,7 +4,7 @@ module Micronaut
 
     def self.inherited(klass)
       super
-      Micronaut::World.behaviour_groups << klass
+      Micronaut::World.behaviours << klass
     end
     
     def self.extended_modules #:nodoc:
@@ -47,10 +47,18 @@ module Micronaut
     def self.it(desc=nil, options={}, &block)
       examples << Micronaut::Example.new(self, desc, options, block)
     end
+    
+    def self.focused(desc=nil, options={}, &block)
+      it(desc, options.update(:focused => true), &block)
+    end
 
     def self.examples
       @_examples ||= []
     end
+    
+    def self.examples_to_run
+      @_examples_to_run ||= []
+    end
 
     def self.set_it_up(*args)
       metadata[:options] = args.last.is_a?(Hash) ? args.pop : {}
@@ -148,7 +156,7 @@ module Micronaut
     end
 
     def self.run(reporter)
-      return true if examples.empty?
+      return true if examples_to_run.empty?
 
       reporter.add_behaviour(self)
       
@@ -156,7 +164,7 @@ module Micronaut
       eval_before_alls(group)
       success = true
 
-      examples.each do |ex|
+      examples_to_run.each do |ex|
         reporter.example_started(ex)
 
         execution_error = nil

data/lib/micronaut/configuration.rb

@@ -1,7 +1,7 @@
 module Micronaut
 
   class Configuration
-    attr_reader :mock_framework, :backtrace_clean_patterns
+    attr_reader :mock_framework, :backtrace_clean_patterns, :behaviour_filters
     
     def initialize
       @backtrace_clean_patterns = [/\/lib\/ruby\//, /bin\/rcov:/, /vendor\/rails/]
@@ -68,6 +68,14 @@ module Micronaut
       end
     end
     
+    def filters
+      @filters ||= []
+    end
+    
+    def add_filter(options={})
+      filters << options
+    end
+    
     def before_and_afters
       @before_and_afters ||= []
     end

data/lib/micronaut/example.rb

@@ -8,6 +8,13 @@ module Micronaut
       @behaviour, @description, @options, @example_block = behaviour, desc, options, example_block
     end
     
+    def metadata
+      @metadata ||= behaviour.metadata.dup
+      @metadata[:description] = description
+      @metadata[:options].update(options)
+      @metadata
+    end
+    
     def inspect
       "#{behaviour.name} - #{description}"
     end

data/lib/micronaut/runner.rb

@@ -1,7 +1,7 @@
 module Micronaut
 
   class Runner
-        
+
     def self.installed_at_exit?
       @installed_at_exit ||= false
     end
@@ -10,38 +10,41 @@ module Micronaut
       at_exit { Micronaut::Runner.new.run(ARGV) ? exit(0) : exit(1) } unless installed_at_exit?
       @installed_at_exit = true
     end
-    
+
     def options
       Micronaut.configuration.options
     end
-
+    
     def run(args = [])
-      @verbose = args.delete('-v')
+      args.inject([]) { |files, arg| files.concat(Dir[arg].map { |g| Dir.glob(g) }.flatten) }.each do |file|
+        load file
+      end
+      
+      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 = Micronaut::World.behaviour_groups.inject(0) { |sum, eg| sum + eg.examples.size }
-       
-       old_sync, options.formatter.output.sync = options.formatter.output.sync, true if options.formatter.output.respond_to?(:sync=)
-              
-       options.formatter.start(total_examples)
+      old_sync, options.formatter.output.sync = options.formatter.output.sync, true if options.formatter.output.respond_to?(:sync=)
 
-       suite_success = true
-      
-       starts_at = Time.now
-       Micronaut::World.behaviour_groups.each do |example_group|
-         suite_success &= example_group.run(options.formatter)
-       end
-       duration = Time.now - starts_at
-       
-       options.formatter.start_dump
-       options.formatter.dump_pending
-       options.formatter.dump_failures
-       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=
-       
-       suite_success
+      options.formatter.start(total_behaviours)
+
+      suite_success = true
+
+      starts_at = Time.now
+      behaviours_to_run.each do |behaviour|
+        suite_success &= behaviour.run(options.formatter)
+      end
+      duration = Time.now - starts_at
+
+      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)
+
+      options.formatter.output.sync = old_sync if options.formatter.output.respond_to? :sync=
+
+      suite_success
     end
-    
+
   end
-  
+
 end

data/lib/micronaut/world.rb

@@ -1,36 +1,53 @@
 module Micronaut
 
   class World
-  
+
     def self.reset
-      @behaviour_groups = []
+      @behaviours = []
     end
 
     reset
-  
-    def self.behaviour_groups
-      @behaviour_groups
+
+    def self.behaviours
+      @behaviours
     end
-    
-    def self.find(conditions={})
-      return [] if conditions.empty?
+
+    def self.behaviours_to_run
+      Micronaut.configuration.filters.each do |filter|
+        puts "  Run filtered using: #{filter.inspect}"
+        behaviours.each do |behaviour|
+          behaviour.examples_to_run.concat find(behaviour.examples, filter)
+        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
       
-      behaviour_groups.select do |group|
+      behaviours
+    end
+
+    def self.find(collection, conditions={})
+      return [] if conditions.empty?
+
+      collection.select do |item|
         conditions.all? do |key, value|
           case value
           when Hash
-            value.all? { |k, v| group.metadata[key][k] == v }
+            value.all? { |k, v| item.metadata[key][k] == v }
           when Regexp
-            group.metadata[key] =~ value
+            item.metadata[key] =~ value
           when Proc
-            value.call(group.metadata[key]) rescue false
+            value.call(item.metadata[key]) rescue false
           else
-            group.metadata[key] == value
+            item.metadata[key] == value
           end
         end
       end
     end
-    
+
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spicycode-micronaut
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Chad Humphries
@@ -9,14 +9,14 @@ autorequire: micronaut
 bindir: bin
 cert_chain: []
 
-date: 2008-12-10 00:00:00 -08:00
-default_executable: 
+date: 2008-12-12 00:00:00 -08:00
+default_executable: micronaut
 dependencies: []
 
 description: An excellent replacement for the wheel...
 email: chad@spicycode.com
-executables: []
-
+executables: 
+- micronaut
 extensions: []
 
 extra_rdoc_files: 
@@ -119,6 +119,7 @@ files:
 - examples/lib/micronaut_example.rb
 - examples/resources
 - examples/resources/example_classes.rb
+- bin/micronaut
 has_rdoc: true
 homepage: http://spicycode.com
 post_install_message: