RubyGems - mack - Versions diffs - 0.8.2 → 0.8.3 - Mend

mack 0.8.2 → 0.8.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (602) hide show

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

File without changes

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

@@ -10,6 +10,7 @@ module Spec
         # responsibility of the ExampleGroupRunner. Some implementations (like)
         # the one using DRb may choose *not* to load files, but instead tell
         # someone else to do it over the wire.
+        $KCODE = 'u' if RUBY_VERSION < '1.9'
         files.each do |file|
           load file
         end
@@ -19,7 +20,7 @@ module Spec
         prepare
         success = true
         example_groups.each do |example_group|
-          success = success & example_group.run
+          success = success & example_group.run(@options)
         end
         return success
       ensure
@@ -53,7 +54,17 @@ module Spec
         @options.number_of_examples
       end
     end
-    # TODO: BT - Deprecate BehaviourRunner?
-    BehaviourRunner = ExampleGroupRunner
+    class BehaviourRunner < ExampleGroupRunner
+      def initialize(options)
+        Kernel.warn <<-WARNING
+DEPRECATED: The BeheviourRunner class is deprecated and will
+be removed from rspec-1.2.
+Use ExampleGroupRunner instead.
+WARNING
+        super
+      end
+    end
   end
-end
+end

data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/base_formatter.rb RENAMED

File without changes

data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/base_text_formatter.rb RENAMED

@@ -14,6 +14,7 @@ module Spec
         def initialize(options, where)
           super
           if where.is_a?(String)
+            FileUtils.mkdir_p(File.dirname(where))
             @output = File.open(where, 'w')
           else
             @output = where
@@ -22,7 +23,7 @@ module Spec
         end
         def example_pending(example, message, pending_caller)
-          @pending_examples << [example.__full_description, message, pending_caller]
+          @pending_examples << [example.full_description, message, pending_caller]
         end
         def dump_failure(counter, failure)
@@ -69,8 +70,8 @@ module Spec
             @output.puts
             @output.puts "Pending:"
             @pending_examples.each do |pending_example|
-              @output.puts "#{pending_example[0]} (#{pending_example[1]})"
-              @output.puts "  Called from #{pending_example[2]}"
+              @output.puts "\n#{pending_example[0]} (#{pending_example[1]})"
+              @output.puts "#{pending_example[2]}\n"
             end
           end
           @output.flush

data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/failing_example_groups_formatter.rb RENAMED

File without changes

data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/failing_examples_formatter.rb RENAMED

File without changes

data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/html_formatter.rb RENAMED

@@ -154,14 +154,6 @@ module Spec
     font-size: 80%;
   }
   </style>
-</head>
-<body>
-EOF
-        end
-        def report_header
-          <<-EOF
-<div class="rspec-report">
   <script type="text/javascript">
     // <![CDATA[
 #{global_scripts}
@@ -170,9 +162,19 @@ EOF
   <style type="text/css">
 #{global_styles}
   </style>
+</head>
+<body>
+EOF
+        end
+        def report_header
+          <<-EOF
+<div class="rspec-report">
 <div id="rspec-header">
-  <h1>RSpec Results</h1>
+  <div id="label">
+    <h1>RSpec Results</h1>
+  </div>
   <div id="summary">
     <p id="totals">&nbsp;</p>
@@ -212,7 +214,7 @@ EOF
         def global_styles
           <<-EOF
 #rspec-header {
-  background: #65C400; color: #fff;
+  background: #65C400; color: #fff; height: 42px;
 }
 .rspec-report h1 {
@@ -220,15 +222,16 @@ EOF
   padding: 10px;
   font-family: "Lucida Grande", Helvetica, sans-serif;
   font-size: 1.8em;
+  float: left;
 }
 #summary {
   margin: 0; padding: 5px 10px;
   font-family: "Lucida Grande", Helvetica, sans-serif;
   text-align: right;
-  position: absolute;
   top: 0px;
   right: 0px;
+  float:right;
 }
 #summary p {

data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/nested_text_formatter.rb RENAMED

@@ -16,7 +16,7 @@ module Spec
           current_nested_example_groups = described_example_group_chain
           current_nested_example_groups.each_with_index do |nested_example_group, i|
             unless nested_example_group == previous_nested_example_groups[i]
-              output.puts "#{'  ' * i}#{nested_example_group.description_args}"
+              output.puts "#{'  ' * i}#{nested_example_group.description_args.join}"
             end
           end
@@ -52,7 +52,7 @@ module Spec
         def described_example_group_chain
           example_group_chain = []
-          example_group.__send__(:each_ancestor_example_group_class) do |example_group_class|
+          example_group.__send__(:example_group_hierarchy).each do |example_group_class|
             unless example_group_class.description_args.empty?
               example_group_chain << example_group_class
             end

data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/profile_formatter.rb RENAMED

File without changes

data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/progress_bar_formatter.rb RENAMED

File without changes

data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/snippet_extractor.rb RENAMED

File without changes

data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/specdoc_formatter.rb RENAMED

File without changes

data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/story/html_formatter.rb RENAMED

File without changes

data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/story/plain_text_formatter.rb RENAMED

File without changes

data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/story/progress_bar_formatter.rb RENAMED

File without changes

data/lib/gems/{rspec-1.1.11 → rspec-1.1.12}/lib/spec/runner/formatter/text_mate_formatter.rb RENAMED

File without changes

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

@@ -0,0 +1,74 @@
+unless Spec::Ruby.version.to_f == 1.9
+  begin
+    require 'rubygems'
+    require 'heckle'
+  rescue LoadError ; raise "You must gem install heckle to use --heckle" ; end
+  module Spec
+    module Runner
+      # Creates a new Heckler configured to heckle all methods in the classes
+      # whose name matches +filter+
+      class HeckleRunner
+        def initialize(filter, heckle_class=Heckler)
+          @filter = filter
+          @heckle_class = heckle_class
+        end
+        # Runs all the example groups held by +rspec_options+ once for each of the
+        # methods in the matched classes.
+        def heckle_with
+          if @filter =~ /(.*)[#\.](.*)/
+            heckle_method($1, $2)
+          else
+            heckle_class_or_module(@filter)
+          end
+        end
+        def heckle_method(class_name, method_name)
+          verify_constant(class_name)
+          heckle = @heckle_class.new(class_name, method_name, Spec::Runner.options)
+          heckle.validate
+        end
+        def heckle_class_or_module(class_or_module_name)
+          verify_constant(class_or_module_name)
+          pattern = /^#{class_or_module_name}/
+          classes = []
+          ObjectSpace.each_object(Class) do |klass|
+            classes << klass if klass.name =~ pattern
+          end
+          classes.each do |klass|
+            klass.instance_methods(false).each do |method_name|
+              heckle = @heckle_class.new(klass.name, method_name, Spec::Runner.options)
+              heckle.validate
+            end
+          end
+        end
+        def verify_constant(name)
+          begin
+            # This is defined in Heckle
+            name.to_class
+          rescue
+            raise "Heckling failed - \"#{name}\" is not a known class or module"
+          end
+        end
+      end
+      #Supports Heckle 1.2 and prior (earlier versions used Heckle::Base)
+      class Heckler < (Heckle.const_defined?(:Base) ? Heckle::Base : Heckle)
+        def initialize(klass_name, method_name, rspec_options)
+          super(klass_name, method_name)
+          @rspec_options = rspec_options
+        end
+        def tests_pass?
+          success = @rspec_options.run_examples
+          success
+        end
+      end
+    end
+  end
+end

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

File without changes

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

@@ -10,6 +10,10 @@ module Spec
           parser.parse(args)
           parser.options
         end
+        def spec_command?
+          $0.split('/').last == 'spec'
+        end
       end
       attr_reader :options
@@ -34,8 +38,8 @@ module Spec
                                                           "an example name directly, causing RSpec to run just the example",
                                                           "matching that name"],
         :specification => ["-s", "--specification [NAME]", "DEPRECATED - use -e instead", "(This will be removed when autotest works with -e)"],
-        :line => ["-l", "--line LINE_NUMBER", Integer, "Execute behaviour or specification at given line.",
-                                                       "(does not work for dynamically generated specs)"],
+        :line => ["-l", "--line LINE_NUMBER", Integer, "Execute example group or example at given line.",
+                                                       "(does not work for dynamically generated examples)"],
         :format => ["-f", "--format FORMAT[:WHERE]","Specifies what format to use for output. Specify WHERE to tell",
                                                     "the formatter where to write the output. All built-in formats",
                                                     "expect WHERE to be a file name, and will write to $stdout if it's",
@@ -115,10 +119,10 @@ module Spec
         on(*OPTIONS[:version])          {parse_version}
         on_tail(*OPTIONS[:help])        {parse_help}
       end
       def order!(argv, &blk)
         @argv = argv.dup
-        @argv = (@argv.empty? && Spec.spec_command?) ? ['--help'] : @argv
+        @argv = (@argv.empty? && self.class.spec_command?) ? ['--help'] : @argv
         @options.argv = @argv.dup
         return if parse_generate_options
         return if parse_drb

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

@@ -40,7 +40,6 @@ module Spec
         :diff_format,
         :dry_run,
         :profile,
-        :examples,
         :heckle_runner,
         :line_number,
         :loadby,
@@ -51,12 +50,10 @@ module Spec
         :user_input_for_runner,
         :error_stream,
         :output_stream,
-        :before_suite_parts,
-        :after_suite_parts,
         # TODO: BT - Figure out a better name
         :argv
       )
-      attr_reader :colour, :differ_class, :files, :example_groups
+      attr_reader :colour, :differ_class, :files, :examples, :example_groups
       def initialize(error_stream, output_stream)
         @error_stream = error_stream
@@ -76,7 +73,6 @@ module Spec
         @examples_run = false
         @examples_should_be_run = nil
         @user_input_for_runner = nil
-        @before_suite_parts = []
         @after_suite_parts = []
       end
@@ -123,6 +119,14 @@ module Spec
           end
         end
       end
+      def before_suite_parts
+        Spec::Example::BeforeAndAfterHooks.before_suite_parts
+      end
+      def after_suite_parts
+        Spec::Example::BeforeAndAfterHooks.after_suite_parts
+      end
       def examples_run?
         @examples_run
@@ -130,7 +134,17 @@ module Spec
       def examples_should_not_be_run
         @examples_should_be_run = false
-      end
+      end
+      def predicate_matchers
+        # TODO - don't like this dependency - perhaps store these in here instead?
+        Spec::Runner.configuration.predicate_matchers
+      end
+      def mock_framework
+        # TODO - don't like this dependency - perhaps store this in here instead?
+        Spec::Runner.configuration.mock_framework
+      end
       def colour=(colour)
         @colour = colour
@@ -163,7 +177,7 @@ module Spec
       def parse_example(example)
         if(File.file?(example))
-          @examples = File.open(example).read.split("\n")
+          @examples = [File.open(example).read.split("\n")].flatten
         else
           @examples = [example]
         end
@@ -209,11 +223,8 @@ module Spec
       end
       def number_of_examples
-        total = 0
-        @example_groups.each do |example_group|
-          total += example_group.number_of_examples
-        end
-        total
+        return examples.size unless examples.empty?
+        @example_groups.inject(0) {|sum, group| sum + group.number_of_examples}
       end
       def files_to_load
@@ -232,6 +243,10 @@ module Spec
         result
       end
+      def dry_run?
+        @dry_run == true
+      end
       protected
       def examples_should_be_run?
         return @examples_should_be_run unless @examples_should_be_run.nil?
@@ -265,7 +280,7 @@ module Spec
       def custom_runner
         return nil unless custom_runner?
         klass_name, arg = ClassAndArgumentsParser.parse(user_input_for_runner)
-        runner_type = load_class(klass_name, 'behaviour runner', '--runner')
+        runner_type = load_class(klass_name, 'example group runner', '--runner')
         return runner_type.new(self, arg)
       end
@@ -299,7 +314,7 @@ module Spec
               error_stream.puts "You must specify one file, not a directory when using the --line option"
               exit(1) if stderr?
             else
-              example = SpecParser.new.spec_name_for(files[0], line_number)
+              example = SpecParser.new(self).spec_name_for(files[0], line_number)
               @examples = [example]
             end
           else

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

@@ -159,7 +159,7 @@ module Spec
         protected
         def example_name
-          @example.__full_description
+          @example.full_description
         end
       end
     end

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

@@ -4,15 +4,16 @@ module Spec
     class SpecParser
       attr_reader :best_match
-      def initialize
+      def initialize(run_options)
         @best_match = {}
+        @run_options = run_options
       end
       def spec_name_for(file, line_number)
         best_match.clear
         file = File.expand_path(file)
-        Spec::Runner.options.example_groups.each do |example_group|
-          consider_example_groups_for_best_match example_group, file, line_number
+        @run_options.example_groups.each do |example_group|
+          consider_example_group_for_best_match example_group, file, line_number
           example_group.examples.each do |example|
             consider_example_for_best_match example, example_group, file, line_number
@@ -31,8 +32,8 @@ module Spec
     protected
-      def consider_example_groups_for_best_match(example_group, file, line_number)
-        parsed_backtrace = parse_backtrace(example_group.registration_backtrace)
+      def consider_example_group_for_best_match(example_group, file, line_number)
+        parsed_backtrace = parse_backtrace(example_group.backtrace)
         parsed_backtrace.each do |example_file, example_line|
           if is_best_match?(file, line_number, example_file, example_line)
             best_match.clear
@@ -43,7 +44,7 @@ module Spec
       end
       def consider_example_for_best_match(example, example_group, file, line_number)
-        parsed_backtrace = parse_backtrace(example.implementation_backtrace)
+        parsed_backtrace = parse_backtrace(example.backtrace)
         parsed_backtrace.each do |example_file, example_line|
           if is_best_match?(file, line_number, example_file, example_line)
             best_match.clear
@@ -61,9 +62,10 @@ module Spec
       end
       def parse_backtrace(backtrace)
-        backtrace.collect do |trace_line|
-          split_line = trace_line.split(':')
-          [split_line[0], Integer(split_line[1])]
+        Array(backtrace).collect do |trace_line|
+          trace_line =~ /(.*)\:(\d*)(\:|$)/
+          file, number = $1, $2
+          [file, Integer(number)]
         end
       end
     end