spicycode-micronaut 0.0.7 → 0.0.9

data/examples/lib/micronaut/world_example.rb

@@ -7,7 +7,7 @@ describe Micronaut::World do
   describe "behaviour groups" do
 
     it "should contain all defined behaviour groups" do
-      behaviour_group = Micronaut::BehaviourGroup.describe(Bar, 'Empty Behaviour Group') { }
+      behaviour_group = Micronaut::Behaviour.describe(Bar, 'Empty Behaviour Group') { }
       Micronaut::World.behaviour_groups.should include(behaviour_group)       
       remove_last_describe_from_world
     end
@@ -20,9 +20,9 @@ describe Micronaut::World do
       options_1 = { :foo => 1, :color => 'blue', :feature => 'reporting' }
       options_2 = { :pending => true, :feature => 'reporting'  }
       options_3 = { :array => [1,2,3,4], :color => 'blue', :feature => 'weather status' }      
-      @bg1 = Micronaut::BehaviourGroup.describe(Bar, "find group-1", options_1) { }
-      @bg2 = Micronaut::BehaviourGroup.describe(Bar, "find group-2", options_2) { }
-      @bg3 = Micronaut::BehaviourGroup.describe(Bar, "find group-3", options_3) { }
+      @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) { }
     end
 
     after(:all) do

data/lib/micronaut/{behaviour_group.rb → behaviour.rb}

@@ -1,6 +1,5 @@
 module Micronaut
-  
-  class BehaviourGroup
+  class Behaviour
     include Micronaut::Matchers 
 
     def self.inherited(klass)
@@ -91,7 +90,7 @@ module Micronaut
       classes = []
       current_class = self
 
-      while current_class < Micronaut::BehaviourGroup
+      while current_class < Micronaut::Behaviour
         superclass_last ? classes << current_class : classes.unshift(current_class)
         current_class = current_class.superclass
       end
@@ -141,9 +140,11 @@ module Micronaut
 
     def self.run(reporter)
       return true if examples.empty?
-      
 
+      reporter.add_behaviour(self)
+      
       group = new
+      
       eval_before_alls(group)
       success = true
 
@@ -187,8 +188,8 @@ module Micronaut
     end
 
     def self.to_s
-      self == Micronaut::BehaviourGroup ? 'Micronaut::BehaviourGroup' : name
+      self == Micronaut::Behaviour ? 'Micronaut::Behaviour' : name
     end
-    
+
   end
-end
+end

data/lib/micronaut/configuration.rb

@@ -11,7 +11,7 @@ module Micronaut
                           Micronaut::Mocking::WithAbsolutelyNothing
                         end 
 
-      Micronaut::BehaviourGroup.send(:include, @mock_framework)
+      Micronaut::Behaviour.send(:include, @mock_framework)
     end
     
     def extra_modules

data/lib/micronaut/example.rb

@@ -9,7 +9,11 @@ module Micronaut
     end
     
     def inspect
-      "#{behaviour.name} - #{desc}"
+      "#{behaviour.name} - #{description}"
+    end
+    
+    def to_s
+      inspect
     end
   
   end

data/lib/micronaut/formatters/base_formatter.rb

@@ -2,7 +2,7 @@ module Micronaut
   module Formatters
     # Baseclass for formatters that implements all required methods as no-ops. 
     class BaseFormatter
-      attr_accessor :example_group, :options, :output, :total_example_failed, :total_example_pending
+      attr_accessor :behaviour, :options, :output, :total_example_failed, :total_example_pending
       
       def initialize(options, output_to)
         @options, @output = options, output_to
@@ -14,16 +14,16 @@ module Micronaut
       # formatters that need to provide progress on feedback (graphical ones)
       #
       # This method will only be invoked once, and the next one to be invoked
-      # is #add_example_group
+      # is #add_behaviour
       def start(example_count)
       end
 
-      # This method is invoked at the beginning of the execution of each example_group.
-      # +example_group+ is the example_group.
+      # This method is invoked at the beginning of the execution of each behaviour.
+      # +behaviour+ is the behaviour.
       #
       # The next method to be invoked after this is #example_failed or #example_finished
-      def add_example_group(example_group)
-        @example_group = example_group
+      def add_behaviour(behaviour)
+        @behaviour = behaviour
       end
 
       # This method is invoked when an +example+ starts.

data/lib/micronaut/formatters/base_text_formatter.rb

@@ -12,7 +12,6 @@ module Micronaut
       end
 
       def example_pending(example, message)
-        super
         @pending_examples << [example, message]
       end
 
@@ -25,7 +24,7 @@ module Micronaut
         @output.puts
         @failed_examples.each_with_index do |examples_with_exception, index|
           example, exception = examples_with_exception.first, examples_with_exception.last
-          @output.puts "#{index.next})  #{example.class.name}"
+          @output.puts "#{index.next}) #{example}"
           @output.puts colorise(exception.message, exception)
           @output.puts format_backtrace(exception.backtrace)
           @output.puts 
@@ -78,7 +77,8 @@ module Micronaut
 
       def format_backtrace(backtrace)
         return "" if backtrace.nil?
-        backtrace.map { |line| backtrace_line(line) }.join("\n")
+        cleansed = backtrace.map { |line| backtrace_line(line) }.compact.join("\n")
+        cleansed.empty? ? backtrace : cleansed
       end
 
       protected
@@ -88,22 +88,17 @@ module Micronaut
       end
 
       def backtrace_line(line)
-        line.sub(/\A([^:]+:\d+)$/, '\\1:')
+        return nil if line.rindex(Micronaut::InstallDirectory, 0)
+        line.sub!(/\A([^:]+:\d+)$/, '\\1')
+        return nil if line == '-e:1'
+        line
       end
 
       def color(text, color_code)
-        return text unless enable_color_in_output? && output_to_tty?
+        return text unless enable_color_in_output?
         "#{color_code}#{text}\e[0m"
       end
 
-      def output_to_tty?
-        begin
-          @output.tty? || ENV.has_key?("AUTOTEST")
-        rescue NoMethodError
-          false
-        end
-      end
-
       def green(text)
         color(text, "\e[32m")
       end

data/lib/micronaut/formatters/documentation_formatter.rb

@@ -0,0 +1,62 @@
+module Micronaut
+  module Formatters
+
+    class DocumentationFormatter < BaseTextFormatter
+
+      attr_reader :previous_nested_behaviours
+
+      def initialize(options, output_to)
+        super
+        @previous_nested_behaviours = []
+      end
+
+      def add_behaviour(behaviour)
+        super
+
+        described_behaviour_chain.each_with_index do |nested_behaviour, i|
+          unless nested_behaviour == previous_nested_behaviours[i]
+            desc_or_name = (i == 0) ? nested_behaviour.name : nested_behaviour.description
+            output.puts "#{'  ' * i}#{desc_or_name}"
+          end
+        end
+        
+        @previous_nested_behaviours = described_behaviour_chain
+      end
+
+      def example_failed(example, exception)
+        super
+        expectation_not_met = exception.is_a?(Micronaut::Expectations::ExpectationNotMetError)
+        
+        message = if expectation_not_met
+          "#{current_indentation}#{example.description} (FAILED)"
+        else
+          "#{current_indentation}#{example.description} (ERROR)"
+        end
+
+        @output.puts(expectation_not_met ? red(message) : magenta(message))
+        @output.flush
+      end
+
+      def example_passed(example)
+        output.puts green("#{current_indentation}#{example.description}")
+        output.flush
+      end
+
+      def example_pending(example, message)
+        super
+        output.puts yellow("#{current_indentation}#{example.description} (PENDING: #{message})")
+        output.flush
+      end
+
+      def current_indentation
+        '  ' * previous_nested_behaviours.length
+      end
+
+      def described_behaviour_chain
+        behaviour.ancestors
+      end
+
+    end
+    
+  end
+end

data/lib/micronaut/formatters/progress_formatter.rb

@@ -10,6 +10,7 @@ module Micronaut
       end
 
       def example_passed(example)
+        super
         @output.print green('.')
         @output.flush
       end

data/lib/micronaut/formatters.rb

@@ -1,5 +1,6 @@
 require 'micronaut/formatters/base_formatter'
 require 'micronaut/formatters/base_text_formatter'
+require 'micronaut/formatters/documentation_formatter'
 require 'micronaut/formatters/progress_formatter'
 
 module Micronaut

data/lib/micronaut/kernel_extensions.rb

@@ -2,7 +2,7 @@ module Micronaut
   module KernelExtensions
 
     def describe(*args, &describe_block)
-      Micronaut::BehaviourGroup.describe(*args, &describe_block)
+      Micronaut::Behaviour.describe(*args, &describe_block)
     end
 
   end

data/lib/micronaut/runner.rb

@@ -5,7 +5,7 @@ module Micronaut
     @@installed_at_exit ||= false
 
     def self.options
-      @options ||= Micronaut::RunnerOptions.new(:color => true, :formatter => :progress)
+      @options ||= Micronaut::RunnerOptions.new(:color => true, :formatter => :documentation)
     end
     
     def self.autorun
@@ -36,9 +36,6 @@ module Micronaut
        end
        duration = Time.now - starts_at
        
-       options.formatter.end
-       options.formatter.dump
-       
        options.formatter.start_dump
        options.formatter.dump_pending
        options.formatter.dump_failures

data/lib/micronaut/runner_options.rb

@@ -1,5 +1,4 @@
 module Micronaut
-
   class RunnerOptions
     
     attr_accessor :color, :formatter
@@ -10,7 +9,11 @@ module Micronaut
     end
     
     def enable_color_in_output?
-      @color
+      !textmate? && @color
+    end
+    
+    def textmate?
+      ENV['TEXTMATE'] || ENV['TM_RUBY']
     end
     
     def output
@@ -18,9 +21,13 @@ module Micronaut
     end
     
     def formatter
-      @formatter_instance ||= Micronaut::Formatters::ProgressFormatter.new(self, output)
+      @formatter_instance ||= case @formatter.to_s
+                              when 'documentation'
+                                Micronaut::Formatters::DocumentationFormatter.new(self, output)
+                              else
+                                Micronaut::Formatters::ProgressFormatter.new(self, output)
+                              end
     end
 
   end
-  
 end

data/lib/micronaut.rb

@@ -6,7 +6,7 @@ require 'micronaut/configuration'
 require 'micronaut/runner'
 require 'micronaut/runner_options'
 require 'micronaut/example'
-require 'micronaut/behaviour_group'
+require 'micronaut/behaviour'
 require 'micronaut/kernel_extensions'
 require 'micronaut/formatters'
 
@@ -24,7 +24,7 @@ module Micronaut
          end
 
   # './lib' in project dir, or '/usr/local/blahblah' if installed
-  MICRONAUT_DIR = File.expand_path(File.dirname(File.dirname(file)))
+  InstallDirectory = File.expand_path(File.dirname(File.dirname(file)))
   
   def self.configuration
     @configuration ||= Micronaut::Configuration.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spicycode-micronaut
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors: 
 - Chad Humphries
@@ -9,7 +9,7 @@ autorequire: micronaut
 bindir: bin
 cert_chain: []
 
-date: 2008-12-05 00:00:00 -08:00
+date: 2008-12-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ files:
 - lib/autotest/discover.rb
 - lib/autotest/micronaut.rb
 - lib/micronaut
-- lib/micronaut/behaviour_group.rb
+- lib/micronaut/behaviour.rb
 - lib/micronaut/configuration.rb
 - lib/micronaut/example.rb
 - lib/micronaut/expectations
@@ -55,6 +55,7 @@ files:
 - lib/micronaut/formatters
 - lib/micronaut/formatters/base_formatter.rb
 - lib/micronaut/formatters/base_text_formatter.rb
+- lib/micronaut/formatters/documentation_formatter.rb
 - lib/micronaut/formatters/progress_formatter.rb
 - lib/micronaut/formatters.rb
 - lib/micronaut/kernel_extensions.rb
@@ -88,8 +89,9 @@ files:
 - examples/example_helper.rb
 - examples/lib
 - examples/lib/micronaut
-- examples/lib/micronaut/behaviour_group_example.rb
+- examples/lib/micronaut/behaviour_example.rb
 - examples/lib/micronaut/configuration_example.rb
+- examples/lib/micronaut/example_example.rb
 - examples/lib/micronaut/expectations
 - examples/lib/micronaut/expectations/extensions
 - examples/lib/micronaut/expectations/extensions/object_example.rb
@@ -97,6 +99,7 @@ files:
 - examples/lib/micronaut/expectations/wrap_expectation_example.rb
 - examples/lib/micronaut/formatters
 - examples/lib/micronaut/formatters/base_formatter_example.rb
+- examples/lib/micronaut/formatters/documentation_formatter_example.rb
 - examples/lib/micronaut/formatters/progress_formatter_example.rb
 - examples/lib/micronaut/kernel_extensions_example.rb
 - examples/lib/micronaut/matchers