spicycode-micronaut 0.1.5.2 → 0.1.6

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 require 'rubygems/specification'
 
 GEM = "micronaut"
-GEM_VERSION = "0.1.5.2"
+GEM_VERSION = "0.1.6"
 AUTHOR = "Chad Humphries"
 EMAIL = "chad@spicycode.com"
 HOMEPAGE = "http://spicycode.com"
@@ -44,48 +44,45 @@ task :make_gemspec do
   end
 end
 
-namespace :micronaut do
-  
-  desc 'Run all examples'
-  task :examples do
-    examples = Dir["examples/**/*_example.rb"].map { |g| Dir.glob(g) }.flatten
-    ruby examples.join(" ")
-  end
-  
-  desc "List files that don't have examples"
-  task :untested do
-    code = Dir["lib/**/*.rb"].map { |g| Dir.glob(g) }.flatten
-    examples = Dir["examples/**/*_example.rb"].map { |g| Dir.glob(g) }.flatten
-    examples.map! { |f| f =~ /examples\/(.*)_example/; "#{$1}.rb" }
-    missing_examples = (code - examples)
-    puts
-    puts "The following files seem to be missing their examples:"
-    missing_examples.each do |missing|
-      puts "  #{missing}"
-    end
-  end
-  
-  desc "Run all examples using rcov"
-  task :coverage do
-    examples = Dir["examples/**/*_example.rb"].map { |g| Dir.glob(g) }.flatten
-    result = system "rcov --exclude \"examples/*,gems/*,db/*,/Library/Ruby/*,config/*\" --text-summary  --sort coverage --no-validator-links #{examples.join(' ')}"
-    fail_build unless result
-  end
-  
-  def fail_build
-    puts
-    puts "-" * 79
-    puts "Build Failed"
-    puts "-" * 79
-    abort
-  end
-    
-  desc "Delete coverage artifacts" 
-  task :clean_coverage do
-    rm_rf Dir["coverage/**/*"]
+desc 'Run all examples'
+task :examples do
+  examples = Dir["examples/**/*_example.rb"].map { |g| Dir.glob(g) }.flatten
+  ruby examples.join(" ")
+end
+
+desc "List files that don't have examples"
+task :untested do
+  code = Dir["lib/**/*.rb"].map { |g| Dir.glob(g) }.flatten
+  examples = Dir["examples/**/*_example.rb"].map { |g| Dir.glob(g) }.flatten
+  examples.map! { |f| f =~ /examples\/(.*)_example/; "#{$1}.rb" }
+  missing_examples = (code - examples)
+  puts
+  puts "The following files seem to be missing their examples:"
+  missing_examples.each do |missing|
+    puts "  #{missing}"
   end
-  
 end
 
-task :default => 'micronaut:coverage'
-task :clobber_package => 'micronaut:clean_coverage'
+desc "Run all examples using rcov"
+task :coverage do
+  examples = Dir["examples/**/*_example.rb"].map { |g| Dir.glob(g) }.flatten
+  result = system "rcov --exclude \"examples/*,gems/*,db/*,/Library/Ruby/*,config/*\" --text-summary  --sort coverage --no-validator-links #{examples.join(' ')}"
+  fail_build unless result
+end
+
+def fail_build
+  puts
+  puts "-" * 79
+  puts "Build Failed"
+  puts "-" * 79
+  abort
+end
+
+desc "Delete coverage artifacts" 
+task :clean_coverage do
+  rm_rf Dir["coverage/**/*"]
+end
+
+
+task :default => 'coverage'
+task :clobber_package => 'clean_coverage'

data/examples/example_helper.rb

@@ -36,7 +36,7 @@ Micronaut.configure do |config|
   config.mock_with :mocha
   config.color_enabled = use_color?
   config.formatter = :progress
-  config.profile_examples = false
-  config.filter_run :options => { :focused => true }
+  config.profile_examples = true
+  config.filter_run :focused => true
   config.autorun!
 end

data/examples/lib/micronaut/behaviour_example.rb

@@ -9,12 +9,12 @@ describe Micronaut::Behaviour do
 
   describe "describing behaviour with #describe" do
 
-    it "should raise an ArgumentError if no name is given" do
-      lambda { Micronaut::Behaviour.describe() {} }.should raise_error(ArgumentError)
+    example "an ArgumentError is raised if no name is given" do
+      lambda { Micronaut::Behaviour.describe() {} }.should raise_error(ArgumentError, "No arguments given.  You must a least supply a type or description")
     end
 
-    it "should raise an ArgumentError if no block is given" do
-      lambda { Micronaut::Behaviour.describe('foo') }.should raise_error(ArgumentError)
+    example "an ArgumentError is raised if no block is given" do
+      lambda { Micronaut::Behaviour.describe('foo') }.should raise_error(ArgumentError, "You must supply a block when calling describe")
     end
 
     describe '#name' do
@@ -46,23 +46,19 @@ describe Micronaut::Behaviour do
       it "should expose the second parameter as description" do
         Micronaut::Behaviour.describe(Object, "my desc") { }.description.should == 'my desc'
       end
-
+      
       it "should allow the second parameter to be nil" do
         Micronaut::Behaviour.describe(Object, nil) { }.description.size.should == 0
       end
 
     end
 
-    describe '#options' do
-
-      it "should expose the third parameter as options" do
-        Micronaut::Behaviour.describe(Object, nil, 'foo' => 'bar') { }.options.should == { "foo" => 'bar' }
-      end
-
-      it "should be an empty hash if no options are supplied" do
-        Micronaut::Behaviour.describe(Object, nil) { }.options.should == {}
+    describe '#metadata' do
+      
+      it "should add the third parameter to the metadata" do
+        Micronaut::Behaviour.describe(Object, nil, 'foo' => 'bar') { }.metadata.should include({ "foo" => 'bar' })
       end
-
+      
     end
 
     describe "adding before and after hooks" do
@@ -179,8 +175,8 @@ describe Micronaut::Behaviour do
         running_example.behaviour.description.should == 'A sample nested describe'
       end
       
-      it "should have :just_testing => 'yep' in the options" do
-        running_example.behaviour.options.should include(:just_testing => 'yep')
+      it "should have :just_testing => 'yep' in the metadata" do
+        running_example.behaviour.metadata.should include(:just_testing => 'yep')
       end
 
     end

data/examples/lib/micronaut/configuration_example.rb

@@ -3,28 +3,28 @@ require File.expand_path(File.dirname(__FILE__) + "/../../example_helper")
 describe Micronaut::Configuration do
 
   describe "#mock_with" do
-    
+
     it "should require and include the mocha adapter when called with :mocha" do
       Micronaut.configuration.expects(:require).with('micronaut/mocking/with_mocha')
       Micronaut::Behaviour.expects(:send)
       Micronaut.configuration.mock_with :mocha
     end
-  
+
     it "should include the do absolutely nothing mocking adapter for all other cases" do
       Micronaut::Behaviour.expects(:send).with(:include, Micronaut::Mocking::WithAbsolutelyNothing)
       Micronaut.configuration.mock_with
     end
-    
-  end
-  
+
+  end  
+ 
   describe "#include" do
-    
+
     module InstanceLevelMethods
       def you_call_this_a_blt?
         "egad man, where's the mayo?!?!?"
       end
     end
-    
+
     it "should include the given module into each behaviour group" do
       Micronaut.configuration.include(InstanceLevelMethods)
       group = Micronaut::Behaviour.describe(Object, 'does like, stuff and junk') { }
@@ -33,39 +33,38 @@ describe Micronaut::Configuration do
 
       group.new.you_call_this_a_blt?.should == "egad man, where's the mayo?!?!?"
     end
-    
+
   end
 
   describe "#extend" do
-    
+
     module ThatThingISentYou
-      
-      def that_thing(desc, options={}, &block)
-        it(desc, options.update(:that_thing => true), &block)
+
+      def that_thing
       end
-      
+
     end
-    
+
     it "should extend the given module into each behaviour group" do
       Micronaut.configuration.extend(ThatThingISentYou)
-      group = Micronaut::Behaviour.describe(ThatThingISentYou, 'the focused support ') { }
+      group = Micronaut::Behaviour.describe(ThatThingISentYou) { }
       group.should respond_to(:that_thing)
       remove_last_describe_from_world
     end
-    
+
   end
-  
+
   describe "#run_all_when_everything_filtered" do
-    
+
     it "defaults to true" do
       Micronaut::Configuration.new.run_all_when_everything_filtered.should == true
     end
-    
+
     it "can be queried with question method" do
       config = Micronaut::Configuration.new
       config.run_all_when_everything_filtered = false
       config.run_all_when_everything_filtered?.should == false
     end
   end
-  
+
 end

data/examples/lib/micronaut/example_example.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + "/../../example_helper")
 describe Micronaut::Example do
 
   before do
-    behaviour = stub('behaviour', :name => 'behaviour_name')
+    behaviour = stub('behaviour', :name => 'behaviour_name', :metadata => {})
     @example = Micronaut::Example.new(behaviour, 'description', {}, (lambda {}))
   end
   
@@ -17,8 +17,8 @@ describe Micronaut::Example do
       @example.should respond_to(:description)
     end
   
-    it "should have one for it's options" do
-      @example.should respond_to(:options)
+    it "should have one for it's metadata" do
+      @example.should respond_to(:metadata)
     end
   
     it "should have one for it's block" do

data/examples/lib/micronaut/formatters/base_formatter_example.rb

@@ -108,10 +108,10 @@ describe Micronaut::Formatters::BaseFormatter do
     
     it "should ensure ':' in the first backtrace" do
       backtrace = ["/tmp/x.rb:1", "/tmp/x.rb:2", "/tmp/x.rb:3"]
-      @formatter.format_backtrace(backtrace).should == backtrace
+      @formatter.format_backtrace(backtrace, running_example).should == backtrace
 
       backtrace = ["/tmp/x.rb:1: message", "/tmp/x.rb:2", "/tmp/x.rb:3"]
-      @formatter.format_backtrace(backtrace).first.should == "/tmp/x.rb:1: message"
+      @formatter.format_backtrace(backtrace, running_example).first.should == "/tmp/x.rb:1: message"
     end
     
   end

data/examples/lib/micronaut/world_example.rb

@@ -39,7 +39,7 @@ describe Micronaut::World do
     end
 
     it "should find awesome examples" do
-      @world.find(@bg4.examples, :options => {:awesome => true}).should == [@bg4.examples[1], @bg4.examples[2]]
+      @world.find(@bg4.examples, :awesome => true).should == [@bg4.examples[1], @bg4.examples[2]]
     end
     
     it "should find no groups when given no search parameters" do
@@ -62,28 +62,28 @@ describe Micronaut::World do
       @world.find(@behaviours, :description => /find group/).should == [@bg1, @bg2, @bg3]
     end
     
-    it "should find one group when searching for :options => { :foo => 1 }" do
-      @world.find(@behaviours, :options => { :foo => 1 }).should == [@bg1]
+    it "should find one group when searching for :foo => 1" do
+      @world.find(@behaviours, :foo => 1 ).should == [@bg1]
     end
     
-    it "should find one group when searching for :options => { :pending => true }" do
-      @world.find(@behaviours, :options => { :pending => true }).should == [@bg2]
+    it "should find one group when searching for :pending => true" do
+      @world.find(@behaviours, :pending => true ).should == [@bg2]
     end
 
-    it "should find one group when searching for :options => { :array => [1,2,3,4] }" do
-      @world.find(@behaviours, :options => { :array => [1,2,3,4] }).should == [@bg3]
+    it "should find one group when searching for :array => [1,2,3,4]" do
+      @world.find(@behaviours, :array => [1,2,3,4]).should == [@bg3]
     end
 
-    it "should find no group when searching for :options => { :array => [4,3,2,1] }" do
-      @world.find(@behaviours, :options => { :array => [4,3,2,1] }).should be_empty
+    it "should find no group when searching for :array => [4,3,2,1]" do
+      @world.find(@behaviours, :array => [4,3,2,1]).should be_empty
     end    
 
-    it "should find two groups when searching for :options => { :color => 'blue' }" do
-      @world.find(@behaviours, :options => { :color => 'blue' }).should == [@bg1, @bg3]
+    it "should find two groups when searching for :color => 'blue'" do
+      @world.find(@behaviours, :color => 'blue').should == [@bg1, @bg3]
     end
 
-    it "should find two groups when searching for :options => { :feature => 'reporting' }" do
-      @world.find(@behaviours, :options => { :feature => 'reporting' }).should == [@bg1, @bg2]
+    it "should find two groups when searching for :feature => 'reporting' }" do
+      @world.find(@behaviours, :feature => 'reporting').should == [@bg1, @bg2]
     end
 
   end

data/lib/micronaut/behaviour.rb

@@ -46,14 +46,24 @@ module Micronaut
       afters[type] << [options, block]
     end
 
-    def self.it(desc=nil, options={}, &block)
+    def self.example(desc=nil, options={}, &block)
       examples << Micronaut::Example.new(self, desc, options.update(:caller => caller[0]), block)
     end
-    
-    def self.focused(desc=nil, options={}, &block)
-      it(desc, options.update(:focused => true), &block)
-    end
 
+    def self.alias_example_to(new_alias, extra_options={})
+      new_alias = <<-END_RUBY
+                    def self.#{new_alias}(desc=nil, options={}, &block)
+                      updated_options = options.update(:caller => caller[0])
+                      updated_options.update(#{extra_options.inspect})
+                      examples << Micronaut::Example.new(self, desc, updated_options, block)
+                    end
+                  END_RUBY
+      module_eval(new_alias, __FILE__, __LINE__)
+    end
+    
+    alias_example_to :it
+    alias_example_to :focused, :focused => true
+ 
     def self.examples
       @_examples ||= []
     end
@@ -62,13 +72,23 @@ module Micronaut
       @_examples_to_run ||= []
     end
 
+    # This method is friggin' gigantic, and must be stopped
+    # 
     def self.set_it_up(*args)
-      metadata[:options] = args.last.is_a?(Hash) ? args.pop : {}
-      metadata[:described_type] = args.first.is_a?(String) ? self.superclass.described_type : args.shift
-      metadata[:description] = args.shift || ''
-      metadata[:name] = "#{metadata[:described_type]} #{metadata[:description]}".strip
-      metadata[:describe_block] = metadata[:options].delete(:describe_block)
-      metadata[:file_path] = eval("caller(0)[0]", metadata[:describe_block].binding)
+      @metadata = {}
+      extra_metadata = args.last.is_a?(Hash) ? args.pop : {}
+      if args.first.is_a?(String)
+        @metadata[:described_type] = self.superclass.metadata && self.superclass.metadata[:described_type]
+      else
+        @metadata[:described_type] = args.shift
+      end
+      @metadata[:description] = args.shift || ''
+      @metadata[:name] = "#{@metadata[:described_type]} #{@metadata[:description]}".strip
+      extra_metadata.each do |k,v|
+        @metadata[k] = v unless @metadata.has_key?(k)
+      end
+      @metadata[:file_path] = eval("caller(0)[0]", @metadata[:describe_block].binding)
+
       Micronaut.configuration.find_modules(self).each do |include_or_extend, mod, opts|
         if include_or_extend == :extend
           send(:extend, mod) unless extended_modules.include?(mod)
@@ -79,27 +99,25 @@ module Micronaut
     end
 
     def self.metadata
-      @_metadata ||= {}
+      @metadata
     end
 
     def self.name
-      metadata[:name]
+      @metadata[:name]
     end
 
     def self.described_type
-      metadata[:described_type]
+      @metadata[:described_type]
     end
 
     def self.description
-      metadata[:description]
-    end
-
-    def self.options
-      metadata[:options]
+      @metadata[:description]
     end
-
+   
     def self.describe(*args, &describe_block)
-      raise ArgumentError if args.empty? || describe_block.nil?
+      raise(ArgumentError, "No arguments given.  You must a least supply a type or description") if args.empty? 
+      raise(ArgumentError, "You must supply a block when calling describe") if describe_block.nil?
+      
       subclass('NestedLevel') do
         args << {} unless args.last.is_a?(Hash)
         args.last.update(:describe_block => describe_block)

data/lib/micronaut/configuration.rb

@@ -20,8 +20,7 @@ module Micronaut
 
     # Enable profiling of the top 10 slowest examples - defaults to false
     attr_accessor :profile_examples
-    
-    
+      
     def initialize
       @backtrace_clean_patterns = [/\/lib\/ruby\//, /bin\/rcov:/, /vendor\/rails/, /bin\/micronaut/]
       @profile_examples = false
@@ -30,6 +29,10 @@ module Micronaut
       @before_and_afters = []
     end
     
+    def alias_example_to(new_name, extra_options={})
+      Micronaut::Behaviour.alias_example_to(new_name, extra_options)
+    end
+        
     def cleaned_from_backtrace?(line)
       return true if line =~ /#{::Micronaut::InstallDirectory}/
       
@@ -150,4 +153,4 @@ module Micronaut
     
   end
   
-end
+end

data/lib/micronaut/example.rb

@@ -2,19 +2,28 @@ module Micronaut
 
   class Example
   
-    attr_reader :behaviour, :description, :options, :example_block
+    attr_reader :behaviour, :description, :metadata, :example_block
   
     def initialize(behaviour, desc, options, example_block=nil)
       @behaviour, @description, @options, @example_block = behaviour, desc, options, example_block
-    end
-    
-    def metadata
-      @metadata ||= behaviour.metadata.dup
+      @metadata = {}
+      behaviour.metadata.each do |k, v|
+        @metadata[k] = v
+      end
       @metadata[:description] = description
-      @metadata[:options].update(options)
-      @metadata
+      options.each do |k,v|
+        @metadata[k] = v
+      end
+          #       
+          # if @metadata[:options].has_key?(:focused)
+          #   puts "self.inspect => #{self.inspect}"
+          #   puts "@metadata[:description] => #{@metadata[:description]}"
+          #   puts "@options.has_key?(:focused) => #{@options.has_key?(:focused)}"
+          #   puts "@metadata[:options].has_key?(:focused) => #{@metadata[:options].has_key?(:focused)}"
+          #   puts
+          # end
     end
-    
+
     def inspect
       "#{behaviour.name} - #{description}"
     end

data/lib/micronaut/formatters/base_formatter.rb

@@ -126,7 +126,7 @@ module Micronaut
       end
       
       def read_failed_line(exception, example)
-        original_file = example.options[:caller].split(':').first.strip
+        original_file = example.metadata[:caller].split(':').first.strip
         matching_line = exception.backtrace.find do |line|
           line.split(':').first.downcase == original_file.downcase
         end

data/lib/micronaut/formatters/base_text_formatter.rb

@@ -74,9 +74,9 @@ module Micronaut
         if profile_examples? && failure_count == 0
           sorted_examples = example_profiling_info.sort_by { |desc, time| time }.last(10)
           output.puts "\nTop #{sorted_examples.size} slowest examples:\n"        
-          sorted_examples.reverse.each do |desc, time|
-            output.puts "  (#{sprintf("%.7f", time)} seconds) #{desc}"
-            output.puts grey("   # #{desc.options[:caller]}")
+          sorted_examples.reverse.each do |ex, time|
+            output.puts "  (#{sprintf("%.7f", time)} seconds) #{ex}"
+            output.puts grey("   # #{ex.metadata[:caller]}")
           end
         end
         

data/lib/micronaut/world.rb

@@ -37,7 +37,7 @@ module Micronaut
 
     def filter_behaviours
       behaviours.inject([]) do |list, b|
-        b.examples_to_run.replace(find(b.examples, filter))
+        b.examples_to_run.replace(find(b.examples, filter).uniq)
         list << (b.examples_to_run.size == 0 ? nil : b)
       end.compact
     end

metadata

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