Skip to content

Commit

Permalink
Merge pull request #8 from rspec/allow_isolation_from_files
Browse files Browse the repository at this point in the history
Allow isolation from local repos like other rspec repos
  • Loading branch information
JonRowe committed Nov 10, 2013
2 parents 4ee268a + a04875f commit 0d109f4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gemspec

%w[rspec rspec-core rspec-expectations rspec-mocks].each do |lib|
library_path = File.expand_path("../../#{lib}", __FILE__)
if File.exist?(library_path)
if File.exist?(library_path) && !ENV['USE_GIT_REPOS']
gem lib, :path => library_path
else
gem lib, :git => "git://github.com/rspec/#{lib}.git", :branch => '2-99-maintenance'
Expand All @@ -21,4 +21,7 @@ end
### dep for ci/coverage
gem 'coveralls', :require => false

# mime-types 2 requires ruby 1.8, so we have to specify an old version.
gem 'mime-types', '~> 1.0'

eval File.read('Gemfile-custom') if File.exist?('Gemfile-custom')
2 changes: 1 addition & 1 deletion rspec-autotest.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Gem::Specification.new do |spec|

spec.required_ruby_version = '>= 1.8.7'

spec.add_dependency "rspec-core", ">= 2.99.0.pre"
spec.add_dependency "rspec-core", ">= 2.99.0.beta1", "< 4.0.0"

spec.add_development_dependency "bundler", "~> 1.3"
spec.add_development_dependency "rake", "~> 10.0.0"
Expand Down

0 comments on commit 0d109f4

Please sign in to comment.