rspec 0.9.4 → 1.0.0

data/lib/spec/runner/formatter/failing_behaviours_formatter.rb

@@ -17,7 +17,7 @@ module Spec
         def dump_failure(counter, failure)
         end
 
-        def dump_summary(duration, example_count, failure_count)
+        def dump_summary(duration, example_count, failure_count, not_implemented_count)
         end
       end
     end

data/lib/spec/runner/formatter/failing_examples_formatter.rb

@@ -14,7 +14,7 @@ module Spec
         def dump_failure(counter, failure)
         end
 
-        def dump_summary(duration, example_count, failure_count)
+        def dump_summary(duration, example_count, failure_count, not_implemented_count)
         end
       end
     end

data/lib/spec/runner/formatter/html_formatter.rb

@@ -70,6 +70,14 @@ module Spec
           @output.flush
         end
 
+        def example_not_implemented(name)
+          @current_example_number += 1
+          @output.puts "    <script type=\"text/javascript\">makeYellow('rspec-header');</script>"
+          @output.puts "    <script type=\"text/javascript\">makeYellow('behaviour_#{current_behaviour_number}');</script>"
+          move_progress
+          @output.puts "    <dd class=\"spec not_implemented\"><span class=\"not_implemented_spec_name\">#{escape(name)}</span></dd>"
+          @output.flush
+        end
         # Override this method if you wish to output extra HTML for a failed spec. For example, you
         # could output links to images or other files produced during the specs.
         #
@@ -90,11 +98,12 @@ module Spec
         def dump_failure(counter, failure)
         end
 
-        def dump_summary(duration, example_count, failure_count)
+        def dump_summary(duration, example_count, failure_count, not_implemented_count)
           if @dry_run
             totals = "This was a dry-run"
           else
             totals = "#{example_count} example#{'s' unless example_count == 1}, #{failure_count} failure#{'s' unless failure_count == 1}"
+            totals << ", #{not_implemented_count} not implemented" if not_implemented_count > 0  
           end
           @output.puts "<script type=\"text/javascript\">document.getElementById('duration').innerHTML = \"Finished in <strong>#{duration} seconds</strong>\";</script>"
           @output.puts "<script type=\"text/javascript\">document.getElementById('totals').innerHTML = \"#{totals}\";</script>"
@@ -120,8 +129,10 @@ module Spec
   <meta http-equiv="Pragma" content="no-cache" />
   <style type="text/css">
   body {
-    margin: 0; padding: 0;
+    margin: 0; 
+    padding: 0;
     background: #fff;
+    font-size: 80%;
   }
   </style>
 </head>
@@ -161,7 +172,21 @@ function moveProgressBar(percentDone) {
 }
 function makeRed(element_id) {
   document.getElementById(element_id).style.background = '#C40D0D';
-}
+    document.getElementById(element_id).style.color = '#FFFFFF'; 
+  }
+    
+  function makeYellow(element_id) {
+    if (element_id == "rspec-header" && document.getElementById(element_id).style.background != '#C40D0D')
+    {
+      document.getElementById(element_id).style.background = '#FAF834';
+      document.getElementById(element_id).style.color = '#000000'; 
+    }
+    else
+    {
+      document.getElementById(element_id).style.background = '#FAF834';
+      document.getElementById(element_id).style.color = '#000000';
+    }
+  }
 EOF
         end
         
@@ -171,15 +196,16 @@ EOF
   background: #65C400; color: #fff;
 }
 
-div.rspec-report h1 {
+.rspec-report h1 {
   margin: 0px 10px 0px 10px;
   padding: 10px;
-  font: bold 18px "Lucida Grande", Helvetica, sans-serif;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  font-size: 1.8em;
 }
 
 #summary {
   margin: 0; padding: 5px 10px;
-  font: bold 10px "Lucida Grande", Helvetica, sans-serif;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
   text-align: right;
   position: absolute;
   top: 0px;
@@ -187,11 +213,11 @@ div.rspec-report h1 {
 }
 
 #summary p {
-  margin: 0 0 2px;
+  margin: 0 0 0 2px;
 }
 
 #summary #totals {
-  font-size: 14px;
+  font-size: 1.2em;
 }
 
 .behaviour {
@@ -228,7 +254,13 @@ dd.spec.failed {
   color: #C20000; background: #FFFBD3;
 }
 
-div.backtrace {
+dd.spec.not_implemented {
+  border-left: 5px solid #FAF834;
+  border-bottom: 1px solid #FAF834;
+  background: #FCFB98; color: #131313;
+}
+
+.backtrace {
   color: #000;
   font-size: 12px;
 }
@@ -238,7 +270,7 @@ a {
 }
 
 /* Ruby code, style similar to vibrant ink */
-pre.ruby {
+.ruby {
   font-size: 12px;
   font-family: monospace;
   color: white;
@@ -246,27 +278,27 @@ pre.ruby {
   padding: 0.1em 0 0.2em 0;
 }
 
-pre.ruby .keyword { color: #FF6600; }
-pre.ruby .constant { color: #339999; }
-pre.ruby .attribute { color: white; }
-pre.ruby .global { color: white; }
-pre.ruby .module { color: white; }
-pre.ruby .class { color: white; }
-pre.ruby .string { color: #66FF00; }
-pre.ruby .ident { color: white; }
-pre.ruby .method { color: #FFCC00; }
-pre.ruby .number { color: white; }
-pre.ruby .char { color: white; }
-pre.ruby .comment { color: #9933CC; }
-pre.ruby .symbol { color: white; }
-pre.ruby .regex { color: #44B4CC; }
-pre.ruby .punct { color: white; }
-pre.ruby .escape { color: white; }
-pre.ruby .interp { color: white; }
-pre.ruby .expr { color: white; }
-
-pre.ruby .offending { background-color: gray; }
-pre.ruby .linenum {
+.ruby .keyword { color: #FF6600; }
+.ruby .constant { color: #339999; }
+.ruby .attribute { color: white; }
+.ruby .global { color: white; }
+.ruby .module { color: white; }
+.ruby .class { color: white; }
+.ruby .string { color: #66FF00; }
+.ruby .ident { color: white; }
+.ruby .method { color: #FFCC00; }
+.ruby .number { color: white; }
+.ruby .char { color: white; }
+.ruby .comment { color: #9933CC; }
+.ruby .symbol { color: white; }
+.ruby .regex { color: #44B4CC; }
+.ruby .punct { color: white; }
+.ruby .escape { color: white; }
+.ruby .interp { color: white; }
+.ruby .expr { color: white; }
+
+.ruby .offending { background-color: gray; }
+.ruby .linenum {
 	width: 75px;
 	padding: 0.1em 1em 0.2em 0;
 	color: #000000;

data/lib/spec/runner/formatter/progress_bar_formatter.rb

@@ -15,6 +15,11 @@ module Spec
           @output.flush
         end
       
+        def example_not_implemented(name)
+          @output.print yellow('*')
+          @output.flush
+        end
+        
         def start_dump
           @output.puts
           @output.flush

data/lib/spec/runner/formatter/rdoc_formatter.rb

@@ -14,6 +14,10 @@ module Spec
         def example_failed(name, counter, failure)
           @output.puts "# * #{name} [#{counter} - FAILED]"
         end
+        
+        def example_not_implemented(name)
+          @output.puts "# * #{name} [NOT IMPLEMENTED]"
+        end
       end
     end
   end

data/lib/spec/runner/formatter/specdoc_formatter.rb

@@ -17,7 +17,12 @@ module Spec
           @output.puts green("- #{name}")
           @output.flush
         end
+        
+        def example_not_implemented(name)
+          @output.puts yellow("- #{name} (NOT IMPLEMENTED)")
+          @output.flush
+        end
       end
     end
   end
-end
+end

data/lib/spec/runner/option_parser.rb

@@ -144,7 +144,7 @@ module Spec
           end
 
           opts.rspec_on(:drb) do
-            parse_drb args_copy, out, err, warn_if_no_files
+            return parse_drb(args_copy, out, err, warn_if_no_files)
           end
 
           opts.rspec_on(:version) {parse_version(out)}

data/lib/spec/runner/reporter.rb

@@ -17,9 +17,12 @@ module Spec
         @formatters.each{|f| f.example_started(name)}
       end
       
-      def example_finished(name, error=nil, failure_location=nil)
+      def example_finished(name, error=nil, failure_location=nil, not_implemented = false)
         @example_names << name
-        if error.nil?
+        
+        if not_implemented
+          example_not_implemented(name)
+        elsif error.nil?
           example_passed(name)
         else
           example_failed(name, error, failure_location)
@@ -40,7 +43,7 @@ module Spec
       def dump
         @formatters.each{|f| f.start_dump}
         dump_failures
-        @formatters.each{|f| f.dump_summary(duration, @example_names.length, @failures.length)}
+        @formatters.each{|f| f.dump_summary(duration, @example_names.length, @failures.length, @not_implemented_count)}
         @failures.length
       end
 
@@ -49,6 +52,7 @@ module Spec
       def clear!
         @behaviour_names = []
         @failures = []
+        @not_implemented_count = 0
         @example_names = []
         @start_time = nil
         @end_time = nil
@@ -66,7 +70,7 @@ module Spec
         return @end_time - @start_time unless (@end_time.nil? or @start_time.nil?)
         return "0.0"
       end
-
+      
       def example_passed(name)
         @formatters.each{|f| f.example_passed(name)}
       end
@@ -79,6 +83,11 @@ module Spec
         @formatters.each{|f| f.example_failed(name, @failures.length, failure)}
       end
       
+      def example_not_implemented(name)
+        @not_implemented_count += 1
+        @formatters.each{|f| f.example_not_implemented(name)}
+      end
+      
       class Failure
         attr_reader :exception
         

data/lib/spec/runner/spec_parser.rb

@@ -41,7 +41,7 @@ module Spec
       def parse_description(str)
         return str[1..-2] if str =~ /^['"].*['"]$/
         if matches = /^(.*)\s*,\s*['"](.*)['"]$/.match(str)
-          return "#{matches[1]}#{matches[2]}"
+          return ::Spec::DSL::Description.generate_description(matches[1], matches[2])
         end
         return str
       end

data/lib/spec/version.rb

@@ -1,13 +1,13 @@
 module Spec
   module VERSION
     unless defined? MAJOR
-      MAJOR  = 0
-      MINOR  = 9
-      TINY   = 4
+      MAJOR  = 1
+      MINOR  = 0
+      TINY   = 0
       RELEASE_CANDIDATE = nil
       
-      # RANDOM_TOKEN: 0.310952573062985
-      REV = "$LastChangedRevision: 1935 $".match(/LastChangedRevision: (\d+)/)[1]
+      # RANDOM_TOKEN: 0.805184248412641
+      REV = "$LastChangedRevision: 1986 $".match(/LastChangedRevision: (\d+)/)[1]
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')

data/spec/spec/dsl/behaviour_spec.rb

@@ -11,20 +11,12 @@ module Spec
 
     describe Behaviour, "class methods" do
       before :each do
-        @original_before_all_parts = Behaviour.before_all_parts.dup
-        @original_after_all_parts = Behaviour.after_all_parts.dup
-        @original_before_each_parts = Behaviour.before_each_parts.dup
-        @original_after_each_parts = Behaviour.after_each_parts.dup
-
         @reporter = FakeReporter.new(mock("formatter", :null_object => true), mock("backtrace_tweaker", :null_object => true))
         @behaviour = Behaviour.new("example") {}
       end
 
       after :each do
-        Behaviour.instance_variable_set(:@before_all_parts, @original_before_all_parts)
-        Behaviour.instance_variable_set(:@after_all_parts, @original_after_all_parts)
-        Behaviour.instance_variable_set(:@before_each_parts, @original_before_each_parts)
-        Behaviour.instance_variable_set(:@after_each_parts, @original_after_each_parts)
+        Behaviour.clear_before_and_after!
       end
 
       it "should not run before(:all) or after(:all) on dry run" do
@@ -96,20 +88,12 @@ module Spec
 
     describe Behaviour do
       before :each do
-        @original_before_all_parts = Behaviour.before_all_parts.dup
-        @original_after_all_parts = Behaviour.after_all_parts.dup
-        @original_before_each_parts = Behaviour.before_each_parts.dup
-        @original_after_each_parts = Behaviour.after_each_parts.dup
-
         @reporter = FakeReporter.new(mock("formatter", :null_object => true), mock("backtrace_tweaker", :null_object => true))
         @behaviour = Behaviour.new("example") {}
       end
 
       after :each do
-        Behaviour.instance_variable_set(:@before_all_parts, @original_before_all_parts)
-        Behaviour.instance_variable_set(:@after_all_parts, @original_after_all_parts)
-        Behaviour.instance_variable_set(:@before_each_parts, @original_before_each_parts)
-        Behaviour.instance_variable_set(:@after_each_parts, @original_after_each_parts)
+        Behaviour.clear_before_and_after!
       end
 
       it "should send reporter add_behaviour" do
@@ -255,6 +239,50 @@ module Spec
         @behaviour.run(@reporter)
         context_instance_value_in.should == context_instance_value_out
       end
+
+      it "should not add global before callbacks for untargetted behaviours" do
+        fiddle = []
+
+        Behaviour.before(:all) { fiddle << "Behaviour.before(:all)" }
+        Behaviour.prepend_before(:all) { fiddle << "Behaviour.prepend_before(:all)" }
+        Behaviour.before(:each, :behaviour_type => :special) { fiddle << "Behaviour.before(:each, :behaviour_type => :special)" }
+        Behaviour.prepend_before(:each, :behaviour_type => :special) { fiddle << "Behaviour.prepend_before(:each, :behaviour_type => :special)" }
+        Behaviour.before(:all, :behaviour_type => :special) { fiddle << "Behaviour.before(:all, :behaviour_type => :special)" }
+        Behaviour.prepend_before(:all, :behaviour_type => :special) { fiddle << "Behaviour.prepend_before(:all, :behaviour_type => :special)" }
+
+        behaviour = Behaviour.new("I'm not special", :behaviour_type => :not_special) {}
+        behaviour.run(@reporter)
+        fiddle.should == [
+          'Behaviour.prepend_before(:all)',
+          'Behaviour.before(:all)',
+        ]
+      end
+    
+      it "should add global before callbacks for targetted behaviours" do
+        fiddle = []
+
+        Behaviour.before(:all) { fiddle << "Behaviour.before(:all)" }
+        Behaviour.prepend_before(:all) { fiddle << "Behaviour.prepend_before(:all)" }
+        Behaviour.before(:each, :behaviour_type => :special) { fiddle << "Behaviour.before(:each, :behaviour_type => :special)" }
+        Behaviour.prepend_before(:each, :behaviour_type => :special) { fiddle << "Behaviour.prepend_before(:each, :behaviour_type => :special)" }
+        Behaviour.before(:all, :behaviour_type => :special) { fiddle << "Behaviour.before(:all, :behaviour_type => :special)" }
+        Behaviour.prepend_before(:all, :behaviour_type => :special) { fiddle << "Behaviour.prepend_before(:all, :behaviour_type => :special)" }
+
+        Behaviour.append_before(:behaviour_type => :special) { fiddle << "Behaviour.append_before(:each, :behaviour_type => :special)" }
+
+        behaviour = Behaviour.new("I'm not special", :behaviour_type => :special) {}
+        behaviour.it("test") {true}
+        behaviour.run(@reporter)
+        fiddle.should == [
+          'Behaviour.prepend_before(:all)',
+          'Behaviour.before(:all)',
+          'Behaviour.prepend_before(:all, :behaviour_type => :special)',
+          'Behaviour.before(:all, :behaviour_type => :special)',
+          'Behaviour.prepend_before(:each, :behaviour_type => :special)',
+          'Behaviour.before(:each, :behaviour_type => :special)',
+          'Behaviour.append_before(:each, :behaviour_type => :special)',
+        ]
+      end
     
       it "before callbacks are ordered from global to local" do
         fiddle = []
@@ -399,14 +427,50 @@ module Spec
         mod1_method_called.should be_true
         mod2_method_called.should be_true
       end
+      
+      it "should not include untargeted modules" do
+        special_method_called = false
+        special_mod = Module.new do
+          define_method :special_method do
+            special_method_called = true
+          end
+        end
+
+        behaviour = Behaviour.new("I'm not special", :behaviour_type => :not_special) {}
+        behaviour.include special_mod, :behaviour_type => :special
+        behaviour.it "test" do
+          special_method
+        end
+        behaviour.run(@reporter)
+
+        special_method_called.should be_false
+      end
+
+      it "should include targeted modules" do
+        special_method_called = false
+        special_mod = Module.new do
+          define_method :special_method do
+            special_method_called = true
+          end
+        end
+
+        behaviour = Behaviour.new("I'm not special", :behaviour_type => :special) {}
+        behaviour.include special_mod, :behaviour_type => :special
+        behaviour.it "test" do
+          special_method
+        end
+        behaviour.run(@reporter)
+
+        special_method_called.should be_true
+      end
 
       it "should have accessible class methods from included module" do
         mod1_method_called = false
         mod1 = Module.new do
           class_methods = Module.new do
-              define_method :mod1_method do
-                mod1_method_called = true
-              end
+            define_method :mod1_method do
+              mod1_method_called = true
+            end
           end
 
           metaclass.class_eval do
@@ -419,9 +483,9 @@ module Spec
         mod2_method_called = false
         mod2 = Module.new do
           class_methods = Module.new do
-              define_method :mod2_method do
-                mod2_method_called = true
-              end
+            define_method :mod2_method do
+              mod2_method_called = true
+            end
           end
 
           metaclass.class_eval do