mack 0.8.2 → 0.8.3

data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/mocks/message_expectation.rb

@@ -32,6 +32,7 @@ module Spec
         child.expected_from = expected_from
         child.method_block = method_block
         child.expected_received_count = expected_received_count
+        child.clear_actual_received_count!
         new_gen = error_generator.clone
         new_gen.opts = opts
         child.error_generator = new_gen
@@ -39,11 +40,6 @@ module Spec
         child
       end
       
-      def error_generator_opts=(opts={})
-        @error_generator.opts = opts
-      end
-      protected :error_generator_opts=
-      
       def expected_args
         @args_expectation.args
       end
@@ -92,7 +88,7 @@ module Spec
         @args_to_yield << args
         self
       end
-  
+      
       def matches(sym, args)
         @sym == sym and @args_expectation.args_match?(args)
       end
@@ -196,7 +192,7 @@ module Spec
         @sym == sym and not @args_expectation.args_match?(args)
       end
        
-      def verify_messages_received   
+      def verify_messages_received
         return if expected_messages_received? || failed_fast?
     
         generate_error
@@ -314,6 +310,10 @@ module Spec
               2
           end
         end
+        
+        def clear_actual_received_count!
+          @actual_received_count = 0
+        end
       
     end
     

data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/mocks/proxy.rb

@@ -60,7 +60,7 @@ module Spec
         @stubs.unshift MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, nil, :any, opts)
         @stubs.first
       end
-
+      
       def verify #:nodoc:
         verify_expectations
       ensure
@@ -91,14 +91,14 @@ module Spec
           if expectation = find_almost_matching_expectation(sym, *args)
             expectation.advise(args, block) unless expectation.expected_messages_received?
           end
-          stub.invoke([], block)
+          stub.invoke(args, block)
         elsif expectation
           expectation.invoke(args, block)
         elsif expectation = find_almost_matching_expectation(sym, *args)
           expectation.advise(args, block) if null_object? unless expectation.expected_messages_received?
           raise_unexpected_message_args_error(expectation, *args) unless (has_negative_expectation?(sym) or null_object?)
         else
-          @target.send :method_missing, sym, *args, &block
+          @target.__send__ :method_missing, sym, *args, &block
         end
       end
 
@@ -125,14 +125,16 @@ module Spec
       
       def define_expected_method(sym)
         visibility_string = "#{visibility(sym)} :#{sym}"
-        if target_responds_to?(sym) && !target_metaclass.method_defined?(munge(sym))
-          munged_sym = munge(sym)
-          target_metaclass.instance_eval do
-            alias_method munged_sym, sym if method_defined?(sym.to_s)
+        unless @proxied_methods.include?(sym)
+          if target_responds_to?(sym)
+            munged_sym = munge(sym)
+            target_metaclass.instance_eval do
+              alias_method munged_sym, sym if method_defined?(sym.to_s)
+            end
+            @proxied_methods << sym
           end
-          @proxied_methods << sym
         end
-        
+
         target_metaclass.class_eval(<<-EOF, __FILE__, __LINE__)
           def #{sym}(*args, &block)
             __mock_proxy.message_received :#{sym}, *args, &block
@@ -142,9 +144,9 @@ module Spec
       end
 
       def target_responds_to?(sym)
-        return @target.send(munge(:respond_to?),sym) if @already_proxied_respond_to
+        return @target.__send__(munge(:respond_to?),sym) if @already_proxied_respond_to
         return @already_proxied_respond_to = true if sym == :respond_to?
-        return @target.respond_to?(sym)
+        return @target.respond_to?(sym, true)
       end
 
       def visibility(sym)
@@ -193,7 +195,7 @@ module Spec
               alias_method sym, munged_sym
               undef_method munged_sym
             else
-              undef_method sym
+              remove_method sym
             end
           end
         end

data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/rake/spectask.rb

@@ -56,12 +56,10 @@ module Spec
     #   end
     #
     class SpecTask < ::Rake::TaskLib
-      class << self
-        def attr_accessor(*names)
-          super(*names)
-          names.each do |name|
-            module_eval "def #{name}() evaluate(@#{name}) end" # Allows use of procs
-          end
+      def self.attr_accessor(*names)
+        super(*names)
+        names.each do |name|
+          module_eval "def #{name}() evaluate(@#{name}) end" # Allows use of procs
         end
       end
 

data/lib/gems/rspec-1.1.12/lib/spec/ruby.rb

@@ -0,0 +1,9 @@
+module Spec
+  module Ruby
+    class << self
+      def version
+        RUBY_VERSION
+      end
+    end
+  end
+end

data/lib/gems/rspec-1.1.12/lib/spec/runner.rb

@@ -0,0 +1,88 @@
+require 'spec/runner/configuration'
+require 'spec/runner/options'
+require 'spec/runner/option_parser'
+require 'spec/runner/example_group_runner'
+require 'spec/runner/command_line'
+require 'spec/runner/drb_command_line'
+require 'spec/runner/backtrace_tweaker'
+require 'spec/runner/reporter'
+require 'spec/runner/spec_parser'
+require 'spec/runner/class_and_arguments_parser'
+
+module Spec
+  module Runner
+    
+    class ExampleGroupCreationListener
+      def register_example_group(klass)
+        Spec::Runner.options.add_example_group klass
+        Spec::Runner.register_at_exit_hook
+      end
+    end
+    
+    Spec::Example::ExampleGroupMethods.example_group_creation_listeners << ExampleGroupCreationListener.new
+    
+    class << self
+      def configuration # :nodoc:
+        @configuration ||= Spec::Runner::Configuration.new
+      end
+
+      # Use this to configure various configurable aspects of
+      # RSpec:
+      #
+      #   Spec::Runner.configure do |configuration|
+      #     # Configure RSpec here
+      #   end
+      #
+      # The yielded <tt>configuration</tt> object is a
+      # Spec::Runner::Configuration instance. See its RDoc
+      # for details about what you can do with it.
+      #
+      def configure
+        yield configuration
+      end
+    
+      def register_at_exit_hook # :nodoc:
+        unless @already_registered_at_exit_hook
+          at_exit do
+            unless $! || run? || Spec::Example::ExampleGroupFactory.registered_or_ancestor_of_registered?(options.example_groups)
+              success = run
+              exit success if exit?
+            end
+          end
+          @already_registered_at_exit_hook = true
+        end
+      end
+
+      def options # :nodoc:
+        @options ||= begin
+          parser = ::Spec::Runner::OptionParser.new($stderr, $stdout)
+          parser.order!(ARGV)
+          parser.options
+        end
+      end
+    
+      def use options
+        @options = options
+      end
+
+      def test_unit_defined?
+        Object.const_defined?(:Test) && Test.const_defined?(:Unit) && Test::Unit.respond_to?(:run?)
+      end
+
+      def run?
+        Runner.options.examples_run?
+      end
+
+      def run
+        return true if run?
+        options.run_examples
+      end
+
+      def exit?
+        !test_unit_defined? || Test::Unit.run?
+      end
+    end
+  end
+end
+
+require 'spec/interop/test' if Spec::Runner::test_unit_defined?

data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/backtrace_tweaker.rb

@@ -9,9 +9,11 @@ module Spec
     class NoisyBacktraceTweaker < BacktraceTweaker
       def tweak_backtrace(error)
         return if error.backtrace.nil?
-        error.backtrace.each do |line|
+        tweaked = error.backtrace.collect do |line|
           clean_up_double_slashes(line)
+          line
         end
+        error.set_backtrace(tweaked)
       end
     end
 
@@ -40,7 +42,7 @@ module Spec
       
       def tweak_backtrace(error)
         return if error.backtrace.nil?
-        error.backtrace.collect! do |message|
+        tweaked = error.backtrace.collect do |message|
           clean_up_double_slashes(message)
           kept_lines = message.split("\n").select do |line|
             IGNORE_PATTERNS.each do |ignore|
@@ -49,7 +51,7 @@ module Spec
           end
           kept_lines.empty?? nil : kept_lines.join("\n")
         end
-        error.backtrace.compact!
+        error.set_backtrace(tweaked.select {|line| line})
       end
     end
   end

data/lib/gems/rspec-1.1.12/lib/spec/runner/class_and_arguments_parser.rb

@@ -0,0 +1,14 @@
+module Spec
+  module Runner
+    class ClassAndArgumentsParser
+      def self.parse(s)
+        if s =~ /([a-zA-Z_]+(?:::[a-zA-Z_]+)*):?(.*)/
+          arg = $2 == "" ? nil : $2
+          [$1, arg]
+        else
+          raise "Couldn't parse #{s.inspect}"
+        end
+      end
+    end
+  end
+end

data/lib/gems/rspec-1.1.12/lib/spec/runner/command_line.rb

@@ -0,0 +1,15 @@
+require 'spec/runner/option_parser'
+
+module Spec
+  module Runner
+    class CommandLine
+      def self.run(tmp_options=Spec::Runner.options)
+        orig_options = Spec::Runner.options
+        Spec::Runner.use tmp_options
+        tmp_options.run_examples
+      ensure
+        Spec::Runner.use orig_options
+      end
+    end
+  end
+end

data/lib/gems/{rspec-1.1.11/lib/spec/example → rspec-1.1.12/lib/spec/runner}/configuration.rb

@@ -1,5 +1,5 @@
 module Spec
-  module Example
+  module Runner
     class Configuration
       # Chooses what mock framework to use. Example:
       #
@@ -47,44 +47,48 @@ module Spec
       #   include(My::Helpers, :type => :key)
       #
       # Declares modules to be included in multiple example groups
-      # (<tt>describe</tt> blocks). With no :type, the modules listed will be
-      # included in all example groups. Use :type to restrict the inclusion to
-      # a subset of example groups. The value assigned to :type should be a
-      # key that maps to a class that is either a subclass of
-      # Spec::Example::ExampleGroup or extends Spec::Example::ExampleGroupMethods
-      # and includes Spec::Example::ExampleMethods
+      # (<tt>describe</tt> blocks). With no <tt>:type</tt>, the modules listed
+      # will be included in all example groups.
       #
-      #   config.include(My::Pony, My::Horse, :type => :farm)
+      # Use <tt>:type</tt> to restrict
+      # the inclusion to a subset of example groups. The value assigned to
+      # <tt>:type</tt> should be a key that maps to a class that is either a
+      # subclass of Spec::Example::ExampleGroup or extends
+      # Spec::Example::ExampleGroupMethods and includes
+      # Spec::Example::ExampleMethods.
+      #
+      # For example, the rspec-rails gem/plugin extends Test::Unit::TestCase
+      # with Spec::Example::ExampleGroupMethods and includes
+      # Spec::Example::ExampleMethods in it. So if you have a module of helper
+      # methods for controller examples, you could do this:
+      #
+      #   config.include(ControllerExampleHelpers, :type => :controller)
       #
       # Only example groups that have that type will get the modules included:
       #
-      #   describe "Downtown", :type => :city do
-      #     # Will *not* get My::Pony and My::Horse included
+      #   describe Account, :type => :model do
+      #     # Will *not* include ControllerExampleHelpers
       #   end
       #
-      #   describe "Old Mac Donald", :type => :farm do
-      #     # *Will* get My::Pony and My::Horse included
+      #   describe AccountsController, :type => :controller do
+      #     # *Will* include ControllerExampleHelpers
       #   end
       #
       def include(*args)
         include_or_extend(:include, *args)
       end
       
+      # :call-seq:
+      #   extend(Some::Helpers)
+      #   extend(Some::Helpers, More::Helpers)
+      #   extend(My::Helpers, :type => :key)
+      #
+      # Works just like #include, but extends the example groups
+      # with the modules rather than including them.
       def extend(*args)
         include_or_extend(:extend, *args)
       end
       
-      def include_or_extend(*args)
-        action = args.shift
-        args << {} unless Hash === args.last
-        modules, options = args_and_options(*args)
-        required_example_group = get_type_from_options(options)
-        required_example_group = required_example_group.to_sym if required_example_group
-        modules.each do |mod|
-          ExampleGroupFactory.get(required_example_group).send(action, mod)
-        end
-      end
-
       # Defines global predicate matchers. Example:
       #
       #   config.predicate_matchers[:swim] = :can_swim?
@@ -100,11 +104,7 @@ module Spec
       # Prepends a global <tt>before</tt> block to all example groups.
       # See #append_before for filtering semantics.
       def prepend_before(*args, &proc)
-        scope, options = scope_and_options(*args)
-        example_group = ExampleGroupFactory.get(
-          get_type_from_options(options)
-        )
-        example_group.prepend_before(scope, &proc)
+        add_callback(:prepend_before, *args, &proc)
       end
       
       # Appends a global <tt>before</tt> block to all example groups.
@@ -119,40 +119,39 @@ module Spec
       #   config.prepend_before(:type => :farm)
       #
       def append_before(*args, &proc)
-        scope, options = scope_and_options(*args)
-        example_group = ExampleGroupFactory.get(
-          get_type_from_options(options)
-        )
-        example_group.append_before(scope, &proc)
+        add_callback(:append_before, *args, &proc)
       end
       alias_method :before, :append_before
 
       # Prepends a global <tt>after</tt> block to all example groups.
       # See #append_before for filtering semantics.
       def prepend_after(*args, &proc)
-        scope, options = scope_and_options(*args)
-        example_group = ExampleGroupFactory.get(
-          get_type_from_options(options)
-        )
-        example_group.prepend_after(scope, &proc)
+        add_callback(:prepend_after, *args, &proc)
       end
       alias_method :after, :prepend_after
       
       # Appends a global <tt>after</tt> block to all example groups.
       # See #append_before for filtering semantics.
       def append_after(*args, &proc)
-        scope, options = scope_and_options(*args)
-        example_group = ExampleGroupFactory.get(
-          get_type_from_options(options)
-        )
-        example_group.append_after(scope, &proc)
+        add_callback(:append_after, *args, &proc)
       end
 
     private
+    
+      def include_or_extend(action, *args)
+        modules, options = Spec::Example.args_and_options(*args)
+        [get_type_from_options(options)].flatten.each do |required_example_group|
+          required_example_group = required_example_group.to_sym if required_example_group
+          modules.each do |mod|
+            Spec::Example::ExampleGroupFactory.get(required_example_group).__send__(action, mod)
+          end
+        end
+      end
 
-      def scope_and_options(*args)
-        args, options = args_and_options(*args)
-        scope = (args[0] || :each), options
+      def add_callback(sym, *args, &proc)
+        scope, options = Spec::Example.scope_and_options(*args)
+        example_group = Spec::Example::ExampleGroupFactory.get(get_type_from_options(options))
+        example_group.__send__(sym, scope, &proc)
       end
 
       def get_type_from_options(options)
@@ -160,7 +159,7 @@ module Spec
       end
     
       def mock_framework_path(framework_name)
-        File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "plugins", "mock_frameworks", framework_name))
+        File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "adapters", "mock_frameworks", framework_name))
       end
     end
   end