Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

More cleanup

  • Loading branch information...
commit c3c08e32d6a4468afa499f81f6a6cb0d635a5773 1 parent 75feca1
Carlhuda authored
Showing with 2 additions and 10 deletions.
  1. +1 −1  lib/bundler/dsl.rb
  2. +1 −9 lib/bundler/environment.rb
View
2  lib/bundler/dsl.rb
@@ -132,7 +132,7 @@ def _find_directory_source(path)
return @directory, Pathname.new(path || '')
end
- path = @environment.filename.dirname.join(path)
+ path = @bundle.gemfile.dirname.join(path)
@directory_sources.each do |s|
if s.location.expand_path.to_s < path.expand_path.to_s
View
10 lib/bundler/environment.rb
@@ -18,14 +18,10 @@ def initialize(bundle)
@system_gems = true
end
- def filename
- @bundle.gemfile
- end
-
def environment_rb(specs, options)
load_paths = load_paths_for_specs(specs, options)
bindir = @bundle.bindir.relative_path_from(@bundle.gem_path).to_s
- filename = self.filename.relative_path_from(@bundle.gem_path).to_s
+ filename = @bundle.gemfile.relative_path_from(@bundle.gem_path).to_s
template = File.read(File.join(File.dirname(__FILE__), "templates", "environment.erb"))
erb = ERB.new(template, nil, '-')
@@ -66,10 +62,6 @@ def default_sources
[GemSource.new(@bundle, :uri => "http://gems.rubyforge.org")]
end
- def repository
- @repository ||= Bundle.new(self)
- end
-
def load_paths_for_specs(specs, options)
load_paths = []
specs.each do |spec|
Please sign in to comment.
Something went wrong with that request. Please try again.