spicycode-micronaut 0.0.4 → 0.0.5

data/lib/micronaut/behaviour_group_class_methods.rb

@@ -3,7 +3,7 @@ module Micronaut
     
     def inherited(klass)
       super
-      Micronaut::ExampleWorld.example_groups << klass
+      Micronaut::World.behaviour_groups << klass
     end
     
     def befores
@@ -46,88 +46,73 @@ module Micronaut
       @_examples ||= []
     end
     
-    def set_it_up(name_or_const, given_description, given_options)
-      @_behaviour_group_name = name_or_const.to_s
-      @_behaviour_described_type = name_or_const.is_a?(String) ? Object : name_or_const
-      @_behaviour_group_description = given_description
-      @_behaviour_group_options =  given_options
+    def 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
+    end
+    
+    def metadata
+      @_metadata ||= {}
     end
     
     def name
-      @_behaviour_group_name
+      metadata[:name]
     end
     
     def described_type
-      @_behaviour_described_type
+      metadata[:described_type]
     end
     
     def description
-      @_behaviour_group_description
+      metadata[:description]
     end
     
     def options
-      @_behaviour_group_options
+      metadata[:options]
     end
     
-    def describe(name_or_const, desc=nil, options={}, &block)
-      raise ArgumentError if block.nil? || name_or_const.nil?
+    def describe(*args, &describe_block)
+      raise ArgumentError if args.empty? || describe_block.nil?
+      
+      args << {} unless Hash === args.last
+     # args.last[:spec_path] ||= File.expand_path(caller(0)[2])
       
       subclass('NestedLevel') do
-        set_it_up(name_or_const, desc, options)
-        
-        module_eval(&block)
+        set_it_up(*args)
+        module_eval(&describe_block)
       end
     end
     
-    def create_example_group(name_or_const, desc=nil, options={}, &describe_block)
-      describe(name_or_const, desc, options, &describe_block)
-    end
-    
     def each_ancestor(superclass_last=false)
       classes = []
       current_class = self
-      while is_example_group_class?(current_class)
+
+      while current_class < Micronaut::BehaviourGroup
         superclass_last ? classes << current_class : classes.unshift(current_class)
         current_class = current_class.superclass
       end
       
-      classes.each do |example_group|
-        yield example_group
-      end
+      classes.each { |example_group| yield example_group }
     end
-    
-    def is_example_group_class?(klass)
-      klass.kind_of?(Micronaut::BehaviourGroup)
-    end    
   
-    def all_before_alls
-      all_before_alls = []
-      each_ancestor do |ancestor|
-        all_before_alls << ancestor.before_alls
-      end
-      all_before_alls.concat(before_alls)
-    end
-    
     def run(runner)
       new.execute(runner)
     end
     
-    def subclass(base_name, &body)
+    def subclass(base_name, &body) # :nodoc:
+      @_sub_class_count ||= 0
+      @_sub_class_count += 1
       klass = Class.new(self)
-      class_name = "#{base_name}_#{_sub_class_count!}"
-      instance_eval do
-        const_set(class_name, klass)
-      end
-      klass.instance_eval(&body) if block_given?
+      class_name = "#{base_name}_#{@_sub_class_count}"
+      const_set(class_name, klass)
+      klass.instance_eval(&body)
       klass
     end
     
-    private
-    
-    def _sub_class_count!
-      @_sub_class_count ||= 0
-      @_sub_class_count += 1
-      @_sub_class_count
+    def to_s
+      name
     end
     
   end

data/lib/micronaut/expectations.rb

@@ -34,22 +34,10 @@ module Micronaut
     class << self
       attr_accessor :differ
 
-      # raises a Micronaut::Expectations::ExpectationNotMetError with message
-      #
-      # When a differ has been assigned and fail_with is passed
-      # <code>expected</code> and <code>target</code>, passes them
-      # to the differ to append a diff message to the failure message.
       def fail_with(message, expected=nil, target=nil) # :nodoc:
         if Array === message && message.length == 3
           message, expected, target = message[0], message[1], message[2]
         end
-        unless (differ.nil? || expected.nil? || target.nil?)
-          if expected.is_a?(String)
-            message << "\nDiff:" << self.differ.diff_as_string(target.to_s, expected)
-          elsif !target.is_a?(Proc)
-            message << "\nDiff:" << self.differ.diff_as_object(target, expected)
-          end
-        end
         Kernel::raise(Micronaut::Expectations::ExpectationNotMetError.new(message))
       end
     end

data/lib/micronaut/extensions/kernel.rb

@@ -2,8 +2,8 @@ module Micronaut
   module Extensions
     module Kernel
 
-      def describe(name_or_const, desc=nil, options={}, &describe_block)
-        Micronaut::BehaviourGroup.create_example_group(name_or_const, desc, options, &describe_block)
+      def describe(*args, &describe_block)
+        Micronaut::BehaviourGroup.describe(*args, &describe_block)
       end
 
     end

data/lib/micronaut/formatters/base_formatter.rb

@@ -2,9 +2,10 @@ module Micronaut
   module Formatters
     # Baseclass for formatters that implements all required methods as no-ops. 
     class BaseFormatter
-      attr_accessor :example_group, :options, :where, :total_example_failed, :total_example_pending
-      def initialize(options, where)
-        @options, @where = options, where
+      attr_accessor :example_group, :options, :output, :total_example_failed, :total_example_pending
+      
+      def initialize(options, output_to)
+        @options, @output = options, output_to
         @total_example_failed, @total_example_pending = 0, 0
       end
 

data/lib/micronaut/formatters/base_text_formatter.rb

@@ -1,22 +1,21 @@
 module Micronaut
+
   module Formatters
 
     class BaseTextFormatter < BaseFormatter
-      attr_reader :output, :pending_examples, :failed_examples
+      attr_reader :pending_examples, :failed_examples
 
       def initialize(options, output_to)
         super
-        @output = output_to
         @pending_examples = []
         @failed_examples = []
       end
-      
+
       def example_pending(example, message)
         super
-        # @pending_examples << [example.full_description, message, pending_caller]
         @pending_examples << [example, message]
       end
-      
+
       def example_failed(example, exception)
         super
         @failed_examples << [example, exception]
@@ -25,11 +24,11 @@ module Micronaut
       def dump_failures        
         @output.puts
         @failed_examples.each_with_index do |examples_with_exception, index|
-          @output.puts "#{index.next})"
           example, exception = examples_with_exception.first, examples_with_exception.last
-          @output.puts colorise("#{example}\n#{exception.message}", exception)
+          @output.puts "#{index.next})  #{example.class.name}"
+          @output.puts colorise(exception.message, exception)
           @output.puts format_backtrace(exception.backtrace)
-          @output.puts "\n"
+          @output.puts 
           @output.flush
         end
       end
@@ -43,9 +42,7 @@ module Micronaut
       end
 
       def dump_summary(duration, example_count, failure_count, pending_count)
-        @output.puts
-        @output.puts "Finished in #{duration} seconds"
-        @output.puts
+        @output.puts "\nFinished in #{duration} seconds\n"
 
         summary = "#{example_count} example#{'s' unless example_count == 1}, #{failure_count} failure#{'s' unless failure_count == 1}"
         summary << ", #{pending_count} pending" if pending_count > 0  
@@ -107,13 +104,28 @@ module Micronaut
         end
       end
 
-      def green(text); color(text, "\e[32m"); end
-      def red(text); color(text, "\e[31m"); end
-      def magenta(text); color(text, "\e[35m"); end
-      def yellow(text); color(text, "\e[33m"); end
-      def blue(text); color(text, "\e[34m"); end
+      def green(text)
+        color(text, "\e[32m")
+      end
+
+      def red(text)
+        color(text, "\e[31m")
+      end
+
+      def magenta(text)
+        color(text, "\e[35m")
+      end
+
+      def yellow(text)
+        color(text, "\e[33m")
+      end
+
+      def blue(text)
+        color(text, "\e[34m")
+      end
 
     end
+    
   end
-  
+
 end

data/lib/micronaut/formatters/progress_formatter.rb

@@ -5,7 +5,7 @@ module Micronaut
       
       def example_failed(example, exception)
         super
-        @output.print colorise('F',exception)
+        @output.print colorise('F', exception)
         @output.flush
       end
 

data/lib/micronaut/runner.rb

@@ -30,7 +30,7 @@ module Micronaut
                  /./ # anything - ^example_ already filtered by #examples
                end
 
-       total_examples = Micronaut::ExampleWorld.example_groups.inject(0) { |sum, eg| sum + eg.examples.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=)
               
@@ -39,7 +39,7 @@ module Micronaut
        suite_success = true
       
        starts_at = Time.now
-       Micronaut::ExampleWorld.example_groups.each do |example_group|
+       Micronaut::World.behaviour_groups.each do |example_group|
          suite_success &= example_group.run(options.formatter)
        end
        duration = Time.now - starts_at

data/lib/micronaut/world.rb

@@ -0,0 +1,36 @@
+module Micronaut
+
+  class World
+  
+    def self.reset
+      @behaviour_groups = []
+    end
+
+    reset
+  
+    def self.behaviour_groups
+      @behaviour_groups
+    end
+    
+    def self.find(conditions={})
+      return [] if conditions.empty?
+      
+      behaviour_groups.select do |group|
+        conditions.all? do |key, value|
+          case value
+          when Hash
+            value.all? { |k, v| group.metadata[key][k] == v }
+          when Regexp
+            group.metadata[key] =~ value
+          when Proc
+            value.call(group.metadata[key]) rescue false
+          else
+            group.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.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Chad Humphries
@@ -9,7 +9,7 @@ autorequire: micronaut
 bindir: bin
 cert_chain: []
 
-date: 2008-11-27 00:00:00 -08:00
+date: 2008-12-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,6 +33,7 @@ extra_rdoc_files:
 files: 
 - LICENSE
 - README
+- RSPEC-LICENSE
 - Rakefile
 - lib/autotest
 - lib/autotest/discover.rb
@@ -40,10 +41,7 @@ files:
 - lib/micronaut
 - lib/micronaut/behaviour_group.rb
 - lib/micronaut/behaviour_group_class_methods.rb
-- lib/micronaut/example_world.rb
 - lib/micronaut/expectations
-- lib/micronaut/expectations/differs
-- lib/micronaut/expectations/differs/default.rb
 - lib/micronaut/expectations/errors.rb
 - lib/micronaut/expectations/extensions
 - lib/micronaut/expectations/extensions/object.rb
@@ -66,7 +64,6 @@ files:
 - lib/micronaut/matchers/eql.rb
 - lib/micronaut/matchers/equal.rb
 - lib/micronaut/matchers/errors.rb
-- lib/micronaut/matchers/exist.rb
 - lib/micronaut/matchers/generated_descriptions.rb
 - lib/micronaut/matchers/has.rb
 - lib/micronaut/matchers/have.rb
@@ -84,15 +81,13 @@ files:
 - lib/micronaut/mocking/with_mocha.rb
 - lib/micronaut/runner.rb
 - lib/micronaut/runner_options.rb
+- lib/micronaut/world.rb
 - lib/micronaut.rb
 - examples/example_helper.rb
 - examples/lib
 - examples/lib/micronaut
 - examples/lib/micronaut/behaviour_group_example.rb
-- examples/lib/micronaut/example_runner_example.rb
 - examples/lib/micronaut/expectations
-- examples/lib/micronaut/expectations/differs
-- examples/lib/micronaut/expectations/differs/default_example.rb
 - examples/lib/micronaut/expectations/extensions
 - examples/lib/micronaut/expectations/extensions/object_example.rb
 - examples/lib/micronaut/expectations/fail_with_example.rb
@@ -107,7 +102,6 @@ files:
 - examples/lib/micronaut/matchers/description_generation_example.rb
 - examples/lib/micronaut/matchers/eql_example.rb
 - examples/lib/micronaut/matchers/equal_example.rb
-- examples/lib/micronaut/matchers/exist_example.rb
 - examples/lib/micronaut/matchers/handler_example.rb
 - examples/lib/micronaut/matchers/has_example.rb
 - examples/lib/micronaut/matchers/have_example.rb
@@ -120,6 +114,9 @@ files:
 - examples/lib/micronaut/matchers/satisfy_example.rb
 - examples/lib/micronaut/matchers/simple_matcher_example.rb
 - examples/lib/micronaut/matchers/throw_symbol_example.rb
+- examples/lib/micronaut/runner_example.rb
+- examples/lib/micronaut/runner_options_example.rb
+- examples/lib/micronaut/world_example.rb
 - examples/lib/micronaut_example.rb
 - examples/resources
 - examples/resources/example_classes.rb

data/examples/lib/micronaut/expectations/differs/default_example.rb

@@ -1,125 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../../../example_helper")
-require 'micronaut/expectations/differs/default'
-
-module Micronaut
-  module Fixtures
-    class Animal
-      def initialize(name,species)
-        @name,@species = name,species
-      end
-
-      def inspect
-        <<-EOA
-<Animal
-  name=#{@name},
-  species=#{@species}
->
-        EOA
-      end
-    end
-  end
-end
-
-describe "Diff" do
-  before do
-    @differ = Micronaut::Expectations::Differs::Default.new(:unified)
-  end
-
-  it "should output unified diff of two strings" do
-    expected="foo\nbar\nzap\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nline\n"
-    actual="foo\nzap\nbar\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nanother\nline\n"
-    expected_diff= <<'EOD'
-
-
-@@ -1,6 +1,6 @@
- foo
--zap
- bar
-+zap
- this
- is
- soo
-@@ -9,6 +9,5 @@
- equal
- insert
- a
--another
- line
-EOD
-
-    diff = @differ.diff_as_string(expected, actual)
-    diff.should eql(expected_diff)
-  end
-
-  it "should output unified diff message of two arrays" do
-    expected = [ :foo, 'bar', :baz, 'quux', :metasyntactic, 'variable', :delta, 'charlie', :width, 'quite wide' ]
-    actual   = [ :foo, 'bar', :baz, 'quux', :metasyntactic, 'variable', :delta, 'tango'  , :width, 'very wide'  ]
-
-    expected_diff = <<'EOD'
-
-
-@@ -5,7 +5,7 @@
-  :metasyntactic,
-  "variable",
-  :delta,
-- "tango",
-+ "charlie",
-  :width,
-- "very wide"]
-+ "quite wide"]
-EOD
-
-
-    diff = @differ.diff_as_object(expected,actual)
-    diff.should == expected_diff
-  end
-
-  it "should output unified diff message of two objects" do
-    expected = Micronaut::Fixtures::Animal.new "bob", "giraffe"
-    actual   = Micronaut::Fixtures::Animal.new "bob", "tortoise"
-
-    expected_diff = <<'EOD'
-
-@@ -1,5 +1,5 @@
- <Animal
-   name=bob,
--  species=tortoise
-+  species=giraffe
- >
-EOD
-
-    diff = @differ.diff_as_object(expected,actual)
-    diff.should == expected_diff
-  end
-
-end
-
-
-describe "Diff in context format" do
-  before do
-    @differ = Micronaut::Expectations::Differs::Default.new(:context)
-  end
-
-  it "should output unified diff message of two objects" do
-    expected = Micronaut::Fixtures::Animal.new "bob", "giraffe"
-    actual   = Micronaut::Fixtures::Animal.new "bob", "tortoise"
-
-    expected_diff = <<'EOD'
-
-***************
-*** 1,5 ****
-  <Animal
-    name=bob,
-!   species=tortoise
-  >
---- 1,5 ----
-  <Animal
-    name=bob,
-!   species=giraffe
-  >
-EOD
-
-    diff = @differ.diff_as_object(expected,actual)
-    diff.should == expected_diff
-  end
-end