Remove source_location from example, favouring #location

Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-%w[rspec rspec-expectations rspec-mocks rspec-support].each do |lib|
+%w[rspec rspec-expectations rspec-mocks].each do |lib|
   library_path = File.expand_path("../../#{lib}", __FILE__)
   if File.exist?(library_path) && !ENV['USE_GIT_REPOS']
     gem lib, :path => library_path
@@ -11,6 +11,15 @@ gemspec
   end
 end
 
+%w[rspec-support].each do |lib|
+  library_path = File.expand_path("../../#{lib}", __FILE__)
+  if File.exist?(library_path) && !ENV['USE_GIT_REPOS']
+    gem lib, :path => library_path
+  else
+    gem lib, :git => "git://github.com/bestie/#{lib}.git", :branch => "warnings-module"
+  end
+end
+
 ### deps for rdoc.info
 platforms :ruby do
   gem 'yard',          '0.8.6.1', :require => false

lib/rspec/core/example.rb

@@ -56,11 +56,6 @@ def description
         RSpec.configuration.format_docstrings_block.call(description)
       end
 
-      # Returns the source location of the block passed to this spec.
-      def source_location
-        @example_block.source_location
-      end
-
       # @attr_reader
       #
       # Returns the first exception raised in the context of running this

lib/rspec/core/warnings.rb

@@ -29,7 +29,7 @@ def warn_with(message, options = {})
           if RSpec.current_example.nil?
             message << " RSpec could not determine which call generated this warning."
           else
-            message << " Warning generated from spec at `#{RSpec.current_example.source_location.join(":")}`."
+            message << " Warning generated from spec at `#{RSpec.current_example.location}`."
           end
         end
 

spec/rspec/core/warnings_spec.rb

@@ -33,7 +33,8 @@
 
       it "adds the source location of spec" do
         line = __LINE__ - 1
-        expect(Kernel).to receive(:warn).with("The warning. Warning generated from spec at `#{__FILE__}:#{line}`.")
+        file_path = RSpec::Core::Metadata.relative_path(__FILE__)
+        expect(Kernel).to receive(:warn).with("The warning. Warning generated from spec at `#{file_path}:#{line}`.")
 
         RSpec.warn_with("The warning.", options)
       end