rspec-core 2.0.0.a4 → 2.0.0.a5

data/.gitignore

@@ -6,3 +6,4 @@ rdoc
 pkg
 tmp
 tags
+rerun.txt

data/TODO.markdown

@@ -5,7 +5,6 @@
     * from command line
     * in rake task definitions
   * formatters
-* Ensure context works everywhere describe does
 * For self testing
 ** shared example groups should not be merged into the real 'world'
 * make sure all behaviour refs are now examplegroup

data/cucumber.yml

@@ -1,3 +1,7 @@
-default: features -r features -t ~@wip
-wip:     features -r features -t @wip
-all:     features -r features
+<%
+rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "#{rerun_opts} --require features --format rerun --out rerun.txt --strict --tags ~@wip"
+%>
+default: <%= std_opts %>
+wip: --tags @wip:3 --wip features

data/features/configuration/spec_opts.feature

@@ -0,0 +1,76 @@
+Feature: spec/spec.opts
+
+  For backwards compatibility with rspec-1, you can write command
+  line options in a spec/spec.opts file and it will be loaded
+  automatically.
+
+  Options declared in spec/spec.opts will override configuration
+  set up in Rspec::Core.configure blocks.
+
+  Background:
+    Given a directory named "spec"
+
+  Scenario: color set in Rspec::Core.configure
+    Given a file named "spec/spec_helper.rb" with:
+      """
+      Rspec::Core.configure do |c|
+        c.color_enabled = true
+      end
+      """
+    And a file named "spec/example_spec.rb" with:
+      """
+      require "spec_helper"
+      describe "color_enabled" do
+        context "when set with Rspec::Core.configure" do
+          it "is true" do
+            Rspec::Core.configuration.color_enabled?.should be_true
+          end
+        end
+      end
+      """
+    When I run "rspec spec/example_spec.rb"
+    Then the stdout should match "1 example, 0 failures"
+            
+  Scenario: color set in spec/spec.opts
+    Given a file named "spec/spec.opts" with:
+      """
+      --color
+      """
+    And a file named "spec/example_spec.rb" with:
+      """
+      describe "color_enabled" do
+        context "when set with Rspec::Core.configure" do
+          it "is true" do
+            Rspec::Core.configuration.color_enabled?.should be_true
+          end
+        end
+      end
+      """
+    When I run "rspec spec/example_spec.rb"
+    Then the stdout should match "1 example, 0 failures"
+            
+  Scenario: formatter set in both (spec.opts wins)
+    Given a file named "spec/spec.opts" with:
+      """
+      --formatter documentation
+      """
+
+    And a file named "spec/spec_helper.rb" with:
+      """
+      Rspec::Core.configure do |c|
+        c.formatter = 'pretty'
+      end
+      """
+    And a file named "spec/example_spec.rb" with:
+      """
+      describe "formatter" do
+        context "when set with Rspec::Core.configure and in spec.opts" do
+          it "takes the value set in spec.opts" do
+            Rspec::Core.configuration.formatter.should be_an(Rspec::Core::Formatters::DocumentationFormatter)
+          end
+        end
+      end
+      """
+    When I run "rspec spec/example_spec.rb"
+    Then the stdout should match "1 example, 0 failures"
+

data/features/step_definitions/running_rspec_steps.rb

@@ -1,12 +1,16 @@
-Given %r{^a file named "([^"]+)" with:$} do |file_name, code|
+Given /^a directory named "([^"]+)"$/ do |dirname|
+  create_dir(dirname)
+end
+
+Given /^a file named "([^"]+)" with:$/ do |file_name, code|
   create_file(file_name, code)
 end
 
-When %r{^I run "r?spec ([^"]+)"$} do |file_and_args|
+When /^I run "r?spec ([^"]+)"$/ do |file_and_args|
   spec(file_and_args)
 end
 
-When %r{^I run "ruby ([^"]+)"$} do |file_and_args|
+When /^I run "ruby ([^"]+)"$/ do |file_and_args|
   ruby(file_and_args)
 end
 

data/features/support/env.rb

@@ -26,6 +26,10 @@ class RspecWorld
     ruby("#{spec_command} #{args}")
   end
 
+  def create_dir(dirname)
+    FileUtils.mkdir_p File.join(working_dir, dirname)
+  end
+
   def create_file(file_name, contents)
     file_path = File.join(working_dir, file_name)
     File.open(file_path, "w") { |f| f << contents }

data/features/support/matchers/smart_match.rb

@@ -1,14 +1,33 @@
 require 'rspec/expectations'
 
 Rspec::Matchers.define :smart_match do |expected|
+  def regexp?
+    /^\/.*\/?$/
+  end
+
+  def quoted?
+    /^".*"$/
+  end
+
   match do |actual|
     case expected
-    when /^\/.*\/?$/
+    when regexp?
       actual =~ eval(expected)
-    when /^".*"$/
+    when quoted?
       actual.index(eval(expected))
-    else
-      false
+    else # multi-line string
+      actual.index(expected)
     end
   end
+
+  failure_message_for_should do |actual|
+    <<-MESSAGE
+#{'*'*50}
+got:
+#{'*'*30}
+#{actual}
+#{'*'*50}
+MESSAGE
+  end
+
 end

data/lib/rspec/core/command_line_options.rb

@@ -5,6 +5,7 @@ module Rspec
   module Core
 
     class CommandLineOptions
+      DEFAULT_OPTIONS_FILE = 'spec/spec.opts'
       
       attr_reader :args, :options
       
@@ -38,6 +39,10 @@ module Rspec
             options[:full_description] = /#{o}/
           end
 
+          opts.on('-o', '--options [PATH]', 'Read configuration options from a file path.  (Defaults to spec/spec.opts)') do |o|
+            options[:options_file] = o || DEFAULT_OPTIONS_FILE
+          end
+
           opts.on('-p', '--profile', 'Enable profiling of examples with output of the top 10 slowest examples') do |o|
             options[:profile_examples] = o
           end
@@ -56,11 +61,26 @@ module Rspec
       end
 
       def apply(config)
+        # 1) option file, cli options, rspec core configure
+        # TODO: Add options_file to configuration
+        # TODO: Store command line options for reference
+        options_file = options.delete(:options_file) || DEFAULT_OPTIONS_FILE
+        merged_options = parse_spec_file_contents(options_file).merge!(options)
+        options.replace merged_options
+        
         options.each do |key, value|
           config.send("#{key}=", value)
         end
       end
 
+      private
+
+      def parse_spec_file_contents(options_file)
+        return {} unless File.exist?(options_file)
+        spec_file_contents = File.readlines(options_file).map {|l| l.split}.flatten
+        self.class.new(spec_file_contents).parse.options
+      end
+
     end
 
   end

data/lib/rspec/core/version.rb

@@ -5,7 +5,7 @@ module Rspec # :nodoc:
         MAJOR  = 2
         MINOR  = 0
         TINY   = 0
-        PRE    = 'a4'
+        PRE    = 'a5'
 
         STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
 

data/rspec-core.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-core}
-  s.version = "2.0.0.a4"
+  s.version = "2.0.0.a5"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Humphries", "David Chelimsky"]
-  s.date = %q{2010-02-04}
+  s.date = %q{2010-02-07}
   s.default_executable = %q{rspec}
   s.description = %q{Rspec runner and example group classes}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
@@ -96,6 +96,7 @@ Gem::Specification.new do |s|
      "features/command_line/example_name_option.feature",
      "features/command_line/line_number_appended_to_path.feature",
      "features/command_line/line_number_option.feature",
+     "features/configuration/spec_opts.feature",
      "features/example_groups/describe_aliases.feature",
      "features/example_groups/nested_groups.feature",
      "features/expectations/customized_message.feature",
@@ -175,7 +176,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{rspec-core 2.0.0.a4}
+  s.summary = %q{rspec-core 2.0.0.a5}
   s.test_files = [
     "spec/rspec/core/command_line_options_spec.rb",
      "spec/rspec/core/configuration_spec.rb",
@@ -208,17 +209,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.a4"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.a4"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.a5"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.a5"])
       s.add_development_dependency(%q<cucumber>, [">= 0.5.3"])
     else
-      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a4"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a4"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a5"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a5"])
       s.add_dependency(%q<cucumber>, [">= 0.5.3"])
     end
   else
-    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a4"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a4"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a5"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a5"])
     s.add_dependency(%q<cucumber>, [">= 0.5.3"])
   end
 end

data/spec/rspec/core/command_line_options_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'ostruct'
 
 describe Rspec::Core::CommandLineOptions do
   
@@ -7,7 +8,6 @@ describe Rspec::Core::CommandLineOptions do
   end
 
   describe 'color_enabled' do
-    
     example "-c, --colour, or --color should be parsed as true" do
       options_from_args('-c').should include(:color_enabled => true)
       options_from_args('--color').should include(:color_enabled => true)
@@ -17,11 +17,9 @@ describe Rspec::Core::CommandLineOptions do
     example "--no-color should be parsed as false" do
       options_from_args('--no-color').should include(:color_enabled => false)
     end
-
   end
 
   describe  'formatter' do
-
     example '-f or --formatter with no arguments should be parsed as nil' do
       options_from_args('--formatter').should include(:formatter => nil)
     end
@@ -31,16 +29,13 @@ describe Rspec::Core::CommandLineOptions do
       options_from_args('-f', 'd').should include(:formatter => 'd')
       options_from_args('-fd').should include(:formatter => 'd')
     end
-
   end
 
   describe 'profile_examples' do
-    
     example "-p or --profile should be parsed as true" do
       options_from_args('-p').should include(:profile_examples => true)
       options_from_args('--profile').should include(:profile_examples => true)
     end
-
   end
 
   describe 'line_number' do
@@ -57,8 +52,54 @@ describe Rspec::Core::CommandLineOptions do
     end
   end
 
-  describe "files_or_directories_to_run" do
+  describe "options" do
+    it "is parsed from --options or -o" do
+      options_from_args('--options', 'spec/spec.opts').should include(:options_file => "spec/spec.opts")
+      options_from_args('-o', 'foo/spec.opts').should include(:options_file => "foo/spec.opts")
+    end
+
+    it "defaults to spec/spec.opts when you don't give it a file path" do
+      options_from_args('-o').should include(:options_file => "spec/spec.opts")
+      options_from_args('--options').should include(:options_file => "spec/spec.opts")
+    end
 
+    it "loads automatically" do
+      cli_options = Rspec::Core::CommandLineOptions.new([]).parse
+      File.stub(:exist?) { true }
+      File.stub(:readlines) { ["--formatter", "doc"] }
+      config = OpenStruct.new
+      cli_options.apply(config)
+      config.formatter.should == 'doc'
+    end
+
+    it "allows options on one line" do
+      cli_options = Rspec::Core::CommandLineOptions.new([]).parse
+      File.stub(:exist?) { true }
+      File.stub(:readlines) { ["--formatter doc"] }
+      config = OpenStruct.new
+      cli_options.apply(config)
+      config.formatter.should == 'doc'
+    end
+    
+    it "merges options from the CLI and file options gracefully" do
+      cli_options = Rspec::Core::CommandLineOptions.new(['--formatter', 'progress', '--options', 'spec/spec.opts']).parse
+      cli_options.stub!(:parse_spec_file_contents).and_return(:full_backtrace => true)
+      config = OpenStruct.new
+      cli_options.apply(config)
+      config.full_backtrace.should == true
+      config.formatter.should == 'progress'
+    end
+
+    it "CLI options trump file options" do
+      cli_options = Rspec::Core::CommandLineOptions.new(['--formatter', 'progress', '--options', 'spec/spec.opts']).parse
+      cli_options.stub!(:parse_spec_file_contents).and_return(:formatter => 'documentation')
+      config = OpenStruct.new
+      cli_options.apply(config)
+      config.formatter.should == 'progress'
+    end
+  end
+
+  describe "files_or_directories_to_run" do
     it "parses files from '-c file.rb dir/file.rb'" do
       options_from_args("-c", "file.rb", "dir/file.rb").should include(:files_or_directories_to_run => ["file.rb", "dir/file.rb"])
     end

data/spec/spec_helper.rb

@@ -56,13 +56,13 @@ ensure
   Rspec::Core.configuration.instance_variable_set(:@formatter, original_formatter)
 end
 
-def not_in_editor?
-  !(ENV.has_key?('TM_MODE') || ENV.has_key?('EMACS') || ENV.has_key?('VIM'))
+def in_editor?
+  ENV.has_key?('TM_MODE') || ENV.has_key?('EMACS') || ENV.has_key?('VIM')
 end
 
 Rspec::Core.configure do |c|
   c.mock_framework = :rspec
   c.filter_run :focused => true
   c.run_all_when_everything_filtered = true
-  c.color_enabled = not_in_editor?
+  c.color_enabled = !in_editor?
 end

data/specs.watchr

@@ -20,7 +20,7 @@ end
 
 def run(files_to_run)
   puts("Running: #{files_to_run}")
-  system("clear;bin/rspec -cfn #{files_to_run}")
+  system("clear;rspec -cfs #{files_to_run}")
   no_int_for_you
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-core
 version: !ruby/object:Gem::Version 
-  version: 2.0.0.a4
+  version: 2.0.0.a5
 platform: ruby
 authors: 
 - Chad Humphries
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 -06:00
+date: 2010-02-07 00:00:00 -04:00
 default_executable: rspec
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a4
+        version: 2.0.0.a5
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec-mocks
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a4
+        version: 2.0.0.a5
     version: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
@@ -130,6 +130,7 @@ files:
 - features/command_line/example_name_option.feature
 - features/command_line/line_number_appended_to_path.feature
 - features/command_line/line_number_option.feature
+- features/configuration/spec_opts.feature
 - features/example_groups/describe_aliases.feature
 - features/example_groups/nested_groups.feature
 - features/expectations/customized_message.feature
@@ -230,7 +231,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: rspec-core 2.0.0.a4
+summary: rspec-core 2.0.0.a5
 test_files: 
 - spec/rspec/core/command_line_options_spec.rb
 - spec/rspec/core/configuration_spec.rb