lib/bundler/definition.rb in bundler-1.2.0 vs lib/bundler/definition.rb in bundler-1.2.1
- old
+ new
@@ -28,11 +28,11 @@
dependency are stale.
* If all fresh dependencies are satisfied by the locked
specs, then we can try to resolve locally.
=end
- def initialize(lockfile, dependencies, sources, unlock, ruby_version = "")
+ def initialize(lockfile, dependencies, sources, unlock, ruby_version = nil)
@unlocking = unlock == true || !unlock.empty?
@dependencies, @sources, @unlock = dependencies, sources, unlock
@remote = false
@specs = nil
@@ -106,13 +106,13 @@
@remote = true
@sources.each { |s| s.remote! }
specs
end
- def specs(deps = requested_dependencies)
+ def specs
@specs ||= begin
- specs = resolve.materialize(deps)
+ specs = resolve.materialize(requested_dependencies)
unless specs["bundler"].any?
local = Bundler.settings[:frozen] ? rubygems_index : index
bundler = local.search(Gem::Dependency.new('bundler', VERSION)).last
specs["bundler"] = bundler if bundler
@@ -126,13 +126,9 @@
specs - @locked_specs
end
def removed_specs
@locked_specs - specs
- end
-
- def all_specs
- specs(dependencies)
end
def new_platform?
@new_platform
end