rspec-core 2.0.0.a10 → 2.0.0.beta.1

data/Rakefile

@@ -28,9 +28,9 @@ begin
 
   Thank you for installing #{gem.summary}
 
-  The 'a' in #{gem.version} means this is alpha software.
-  If you are looking for a supported production release,
-  please "gem install rspec" (without --pre).
+  This is beta software. If you are looking
+  for a supported production release, please
+  "gem install rspec" (without --pre).
   
 #{"*"*50}
 EOM
@@ -39,17 +39,13 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-begin
-  Rspec::Core::RakeTask.new :spec
+Rspec::Core::RakeTask.new(:spec)
 
-  desc "Run all examples using rcov"
-  Rspec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|
-    t.rcov = true
-    t.rcov_opts =  %[-Ilib -Ispec --exclude "mocks,expectations,gems/*,spec/resources,spec/lib,spec/spec_helper.rb,db/*,/Library/Ruby/*,config/*"]
-    t.rcov_opts << %[--no-html --aggregate coverage.data]
-  end
-rescue LoadError
-  puts "Rspec core or one of its dependencies is not installed. Install it with: gem install rspec-meta"
+desc "Run all examples using rcov"
+Rspec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|
+  t.rcov = true
+  t.rcov_opts =  %[-Ilib -Ispec --exclude "mocks,expectations,gems/*,spec/resources,spec/lib,spec/spec_helper.rb,db/*,/Library/Ruby/*,config/*"]
+  t.rcov_opts << %[--no-html --aggregate coverage.data]
 end
 
 task :cleanup_rcov_files do
@@ -79,7 +75,6 @@ else
   task :default => [:check_dependencies, :rcov, :features]
 end
 
-
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "rspec-core #{Rspec::Core::Version::STRING}"

data/VERSION

@@ -1 +1 @@
-2.0.0.a10
+2.0.0.beta.1

data/bin/autospec

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+ENV['RSPEC'] = 'true'     # allows autotest to discover rspec
+ENV['AUTOTEST'] = 'true'  # allows autotest to run w/ color on linux
+system (RUBY_PLATFORM =~ /mswin|mingw/ ? 'autotest.bat' : 'autotest'), *ARGV

data/features/hooks/described_class.feature

@@ -0,0 +1,14 @@
+Feature: described class
+
+  Scenario: access the described class from the example
+    Given a file named "spec/example_spec.rb" with:
+      """
+      describe Fixnum do
+        it "is available as described_class" do
+          described_class.should == Fixnum
+        end
+      end
+      """
+    When I run "rspec spec/example_spec.rb"
+    Then I should see "1 example, 0 failures"
+

data/features/support/env.rb

@@ -1,2 +1,16 @@
-require 'aruba'
+$LOAD_PATH << File.expand_path("../../../../rspec-expectations/lib", __FILE__)
 require 'rspec/expectations'
+require 'aruba'
+
+module ArubaOverrides
+  def detect_ruby_script(cmd)
+    if cmd =~ /^rspec /
+      "ruby -I../../lib -S ../../bin/#{cmd}"
+    else
+      super(cmd)
+    end
+  end
+end
+
+World(ArubaOverrides)
+

data/lib/rspec/core.rb

@@ -42,3 +42,6 @@ module Rspec
     yield Core.configuration if block_given?
   end
 end
+
+# TODO - make this configurable with default 'on'
+require 'rspec/expectations'

data/lib/rspec/core/example.rb

@@ -31,6 +31,14 @@ module Rspec
         @metadata[:file_path] || example_group.file_path
       end
 
+      def inspect
+        @metadata[:full_description]
+      end
+
+      def to_s
+        inspect
+      end
+
       def run_started
         record_results :started_at => Time.now
       end
@@ -118,14 +126,6 @@ module Rspec
         all_systems_nominal
       end
 
-      def inspect
-        @metadata[:full_description]
-      end
-
-      def to_s
-        inspect
-      end
-
     end
 
   end

data/lib/rspec/core/example_group.rb

@@ -87,18 +87,14 @@ module Rspec
         friendly ? metadata[:example_group][:name] : super()
       end
 
-      def self.describes
-        metadata[:example_group][:describes]
-      end
-
-      def self.described_class
-        describes || description
-      end
-
       def self.description
         metadata[:example_group][:description]
       end
 
+      def self.describes
+        metadata[:example_group][:describes]
+      end
+
       def self.file_path
         metadata[:example_group][:file_path]
       end
@@ -206,9 +202,8 @@ module Rspec
       end
 
       def self.let(name, &block)
-        # Should we block defining method names already defined?
         define_method(name) do
-          assignments[name] ||= instance_eval(&block)
+          __memoized[name] ||= instance_eval(&block)
         end
       end
 
@@ -216,17 +211,17 @@ module Rspec
         metadata.all_apply?(filters)
       end
 
-      def assignments
-        @assignments ||= {}
+      def described_class
+        self.class.describes
       end
 
-      def described_class
-        running_example.metadata[:example_group][:describes]
+      def __memoized
+        @__memoized ||= {}
       end
 
       def __reset__
         instance_variables.each { |ivar| remove_instance_variable(ivar) }
-        assignments.clear
+        __memoized.clear
       end
 
     end

data/lib/rspec/core/example_group_subject.rb

@@ -58,7 +58,7 @@ module Rspec
       
         attr_reader :explicit_subject_block # :nodoc:
 
-        private
+      private
 
         def explicit_subject
           group = self
@@ -69,7 +69,11 @@ module Rspec
         end
 
         def implicit_subject
-          described_class.is_a?(Class) ? lambda { described_class.new } : lambda { described_class }
+          Class === described ? lambda { described.new } : lambda { described }
+        end
+
+        def described
+          @described ||= describes || description
         end
       end
     end

data/lib/rspec/core/rake_task.rb

@@ -51,7 +51,7 @@ module Rspec
 
       def define # :nodoc:
         actual_name = Hash === name ? name.keys.first : name
-        desc("Run all examples") unless ::Rake.application.last_comment
+        desc("Run Rspec code examples") unless ::Rake.application.last_comment
 
         task name do
           RakeFileUtils.send(:verbose, verbose) do

metadata

@@ -6,8 +6,9 @@ version: !ruby/object:Gem::Version
   - 2
   - 0
   - 0
-  - a10
-  version: 2.0.0.a10
+  - beta
+  - 1
+  version: 2.0.0.beta.1
 platform: ruby
 authors: 
 - Chad Humphries
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-27 00:00:00 -06:00
+date: 2010-03-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,8 +31,9 @@ dependencies:
         - 2
         - 0
         - 0
-        - a10
-        version: 2.0.0.a10
+        - beta
+        - 1
+        version: 2.0.0.beta.1
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,8 +47,9 @@ dependencies:
         - 2
         - 0
         - 0
-        - a10
-        version: 2.0.0.a10
+        - beta
+        - 1
+        version: 2.0.0.beta.1
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -66,6 +69,7 @@ dependencies:
 description: Rspec runner and example group classes
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: 
+- autospec
 - rspec
 - spec
 extensions: []
@@ -81,6 +85,7 @@ files:
 - Rakefile
 - TODO.markdown
 - VERSION
+- bin/autospec
 - bin/rspec
 - bin/spec
 - cucumber.yml
@@ -156,13 +161,12 @@ files:
 - features/example_groups/nested_groups.feature
 - features/hooks/around_hook.feature
 - features/hooks/before_and_after_hooks.feature
+- features/hooks/described_class.feature
 - features/hooks/halt.feature
 - features/mock_framework_integration/use_flexmock.feature
 - features/mock_framework_integration/use_mocha.feature
 - features/mock_framework_integration/use_rr.feature
 - features/mock_framework_integration/use_rspec.feature
-- features/mocks/block_local_expectations.feature
-- features/mocks/mix_stubs_and_mocks.feature
 - features/subject/explicit_subject.feature
 - features/subject/implicit_subject.feature
 - features/support/env.rb
@@ -230,11 +234,11 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-core-2.0.0.a10
+    Thank you for installing rspec-core-2.0.0.beta.1
   
-    The 'a' in 2.0.0.a10 means this is alpha software.
-    If you are looking for a supported production release,
-    please "gem install rspec" (without --pre).
+    This is beta software. If you are looking
+    for a supported production release, please
+    "gem install rspec" (without --pre).
     
   **************************************************
 
@@ -264,7 +268,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.0.0.a10
+summary: rspec-core-2.0.0.beta.1
 test_files: 
 - spec/rspec/core/command_line_options_spec.rb
 - spec/rspec/core/configuration_spec.rb

data/features/mocks/block_local_expectations.feature

@@ -1,68 +0,0 @@
-Feature: block local expectations
-
-  In order to set message expectations on ...
-  As an RSpec user
-  I want to configure the evaluation context
-
-  Background:
-    Given a file named "account.rb" with:
-      """
-      class Account
-        def self.create
-          yield new
-        end
-
-        def opening_balance(amount, currency)
-        end
-      end
-      """
-
-  Scenario: passing example
-    Given a file named "account_passing_spec.rb" with:
-      """
-      require 'account'
-
-      Rspec.configure do |config|
-        config.mock_framework = :rspec
-      end
-
-      describe "account DSL" do
-        it "it succeeds when the block local receives the given call" do
-          account = Account.new
-          Account.should_receive(:create).and_yield do |account|
-            account.should_receive(:opening_balance).with(100, :USD)
-          end
-          Account.create do
-            opening_balance 100, :USD
-          end
-        end
-      end
-      """
-    When I run "rspec account_passing_spec.rb"
-    Then I should see "1 example, 0 failures"
-    
-  Scenario: failing example
-    
-    Given a file named "account_failing_spec.rb" with:
-      """
-      require 'account'
-
-      Rspec.configure do |config|
-        config.mock_framework = :rspec
-      end
-
-      describe "account DSL" do
-        it "fails when the block local does not receive the expected call" do
-          account = Account.new
-          Account.should_receive(:create).and_yield do |account|
-            account.should_receive(:opening_balance).with(100, :USD)
-          end
-          Account.create do
-            # opening_balance is not called here
-          end
-        end
-      end
-      """
-
-    When I run "rspec account_failing_spec.rb"
-    Then I should see "1 example, 1 failure"

data/features/mocks/mix_stubs_and_mocks.feature

@@ -1,28 +0,0 @@
-Feature: Spec and test together
-
-  As an RSpec user
-  I want to use stubs and mocks together
-
-  Scenario: stub in before
-    Given a file named "stub_and_mocks_spec.rb" with:
-      """
-      require 'rspec/expectations'
-
-      Rspec.configure do |config|
-        config.mock_framework = :rspec
-      end
-
-      describe "a stub in before" do
-        before(:each) do
-          @messenger = mock('messenger').as_null_object
-        end
-
-        it "a" do
-          @messenger.should_receive(:foo).with('first')
-          @messenger.foo('second')
-          @messenger.foo('third')
-        end
-      end
-      """
-    When I run "rspec stub_and_mocks_spec.rb -fs"
-    Then I should see "'messenger' expected :foo with"