spicycode-micronaut 0.2.1.3 → 0.2.1.4

data/Rakefile

@@ -4,7 +4,7 @@ require 'rubygems/specification'
 require 'lib/micronaut/rake_task'
 
 GEM = "micronaut"
-GEM_VERSION = "0.2.1.3"
+GEM_VERSION = "0.2.1.4"
 AUTHOR = "Chad Humphries"
 EMAIL = "chad@spicycode.com"
 HOMEPAGE = "http://github.com/spicycode/micronaut"
@@ -72,4 +72,4 @@ namespace :examples do
 
 end
 
-task :default => 'examples:coverage'
+task :default => 'examples:coverage'

data/examples/example_helper.rb

@@ -33,12 +33,8 @@ def not_in_editor?
   ['TM_MODE', 'EMACS', 'VIM'].all? { |k| !ENV.has_key?(k) }
 end
 
-def runcoderun?
-  ENV["RUN_CODE_RUN"]
-end
-
 Micronaut.configure do |c|
-  c.formatter = :documentation if runcoderun?
+  c.formatter = :documentation
   c.mock_with :mocha
   c.color_enabled = not_in_editor?
   c.filter_run :focused => true

data/examples/lib/micronaut/behaviour_example.rb

@@ -188,9 +188,9 @@ describe Micronaut::Behaviour do
 
   end
 
-  describe Object, "describing nested behaviours" do 
+  describe Object, "describing nested behaviours", :little_less_nested => 'yep' do 
 
-    describe "A sample nested describe", :just_testing => 'yep' do
+    describe "A sample nested describe", :nested_describe => "yep" do
     
       it "should set the described type to the constant Object" do
         running_example.behaviour.describes.should == Object
@@ -200,8 +200,12 @@ describe Micronaut::Behaviour do
         running_example.behaviour.description.should == 'A sample nested describe'
       end
       
-      it "should have :just_testing => 'yep' in the metadata" do
-        running_example.behaviour.metadata.should include(:just_testing => 'yep')
+      it "should have top level metadata from the behaviour and its ancestors" do
+        running_example.behaviour.metadata.should include(:little_less_nested => 'yep', :nested_describe => 'yep')
+      end
+      
+      it "should make the parent metadata available on the contained examples" do
+        running_example.metadata.should include(:little_less_nested => 'yep', :nested_describe => 'yep')
       end
 
     end

data/examples/lib/micronaut/configuration_example.rb

@@ -93,14 +93,14 @@ describe Micronaut::Configuration do
     it "does nothing if trace is false" do
       config = Micronaut::Configuration.new
       config.trace = false
-      config.output.expects(:puts).never
+      config.expects(:puts).with("my trace string is awesome").never
       config.trace { "my trace string is awesome" }
     end
     
     it "allows overriding tracing an optional param" do
       config = Micronaut::Configuration.new
       config.trace = false
-      config.output.expects(:puts).with(includes("my trace string is awesome"))
+      config.expects(:puts).with(includes("my trace string is awesome"))
       config.trace(true) { "my trace string is awesome" }
     end
        
@@ -120,6 +120,7 @@ describe Micronaut::Configuration do
       config = Micronaut::Configuration.new
       lambda { config.formatter = :progresss }.should raise_error(ArgumentError)
     end
+    
   end
 
-end
+end

data/examples/lib/micronaut/example_example.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../example_helper")
 
-describe Micronaut::Example do
+describe Micronaut::Example, :parent_metadata => 'sample' do
 
   before do
     behaviour = stub('behaviour', :metadata => { :behaviour => { :name => 'behaviour_name' }})
@@ -48,6 +48,12 @@ describe Micronaut::Example do
     it "should have a reference to itself when running" do
       running_example.description.should == "should have a reference to itself when running"
     end
+
+    it "should be able to access the behaviours top level metadata as if it were its own" do
+      running_example.metadata.each { |k,v| puts "#{k} => #{v.inspect}\n\n" }
+      running_example.behaviour.metadata.should include(:parent_metadata => 'sample')
+      running_example.metadata.should include(:parent_metadata => 'sample')
+    end
   
   end
   

data/lib/micronaut/behaviour.rb

@@ -77,10 +77,11 @@ module Micronaut
     end
 
     def self.set_it_up(*args)
-      @metadata = { :behaviour => {} }
+      @metadata = { }
       extra_metadata = args.last.is_a?(Hash) ? args.pop : {}
       extra_metadata.delete(:behaviour) # Remove it when present to prevent it clobbering the one we setup
-      
+      @metadata.update(self.superclass.metadata) 
+      @metadata[:behaviour] = {}
       @metadata[:behaviour][:describes] = args.shift unless args.first.is_a?(String)
       @metadata[:behaviour][:describes] ||= self.superclass.metadata && self.superclass.metadata[:behaviour][:describes]
       @metadata[:behaviour][:description] = args.shift || ''
@@ -221,4 +222,4 @@ module Micronaut
     end
     
   end
-end
+end

data/lib/micronaut/configuration.rb

@@ -108,7 +108,11 @@ module Micronaut
     def trace(override = false)
       raise(ArgumentError, "Must yield a block with your string to trace.") unless block_given?
       return unless trace? || override
-      Micronaut.configuration.output.puts("[TRACE] #{yield}")
+      puts("[TRACE] #{yield}")
+    end
+
+    def puts(msg)
+      output.puts(msg)    
     end
     
     # If true, Micronaut will provide detailed trace output of its self as it runs.
@@ -151,4 +155,4 @@ module Micronaut
     
   end
   
-end
+end

data/lib/micronaut/example.rb

@@ -73,4 +73,4 @@ module Micronaut
   
   end
   
-end
+end

data/lib/micronaut/formatters/base_text_formatter.rb

@@ -29,16 +29,20 @@ module Micronaut
       def dump_failures
         output.puts
         failed_examples.each_with_index do |examples_with_exception, index|
-          example, exception = examples_with_exception.first, examples_with_exception.last
+          failed_example, exception = examples_with_exception.first, examples_with_exception.last
           padding = '    '
-          output.puts "#{index.next}) #{example}"
-          output.puts "#{padding}Failure/Error: #{read_failed_line(exception, example).strip}"
+          
+          output.puts "#{index.next}) #{failed_example}"
+          output.puts "#{padding}Failure/Error: #{read_failed_line(exception, failed_example).strip}"
+          
           exception.message.split("\n").each do |line|
             output.puts "#{padding}#{colorise(line, exception).strip}"
           end
-          format_backtrace(exception.backtrace, example).each do |backtrace_info|
+
+          format_backtrace(exception.backtrace, failed_example).each do |backtrace_info|
             output.puts grey("#{padding}# #{backtrace_info}")
           end
+          
           output.puts 
           output.flush
         end

data/lib/micronaut/formatters/documentation_formatter.rb

@@ -52,7 +52,7 @@ module Micronaut
       end
 
       def current_indentation
-        '  ' * previous_nested_behaviours.length
+        '  ' * previous_nested_behaviours.size
       end
 
       def described_behaviour_chain

metadata

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