aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-04-26 16:25:36 -0700
committerCarl Lerche <carllerche@mac.com>2010-04-26 16:25:36 -0700
commit172317b26317ffcde36696d02a08c65cb2943b60 (patch)
tree6a5e38b7380f6a080b32096edd0406d54c06348d /lib
parent8f8a61770e8af20bd9fb4e4fd72eca93c728fb8f (diff)
downloadbundler-172317b26317ffcde36696d02a08c65cb2943b60.tar.gz
Remove Source#lock as it is no longer needed
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/environment.rb6
-rw-r--r--lib/bundler/source.rb7
2 files changed, 1 insertions, 12 deletions
diff --git a/lib/bundler/environment.rb b/lib/bundler/environment.rb
index c80d4a48..806c6b92 100644
--- a/lib/bundler/environment.rb
+++ b/lib/bundler/environment.rb
@@ -32,7 +32,6 @@ module Bundler
def lock
Bundler.ui.info("The bundle is already locked, relocking.") if locked?
- sources.each { |s| s.lock if s.respond_to?(:lock) }
FileUtils.mkdir_p("#{root}/.bundle")
write_yml_lock
write_rb_lock
@@ -41,11 +40,6 @@ module Bundler
private
- # TODO: remote this method
- def sources
- @definition.sources
- end
-
def specs_for(groups)
deps = dependencies.select { |d| (d.groups & groups).any? }
specs.for(deps)
diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb
index 5dfcd503..845d46e0 100644
--- a/lib/bundler/source.rb
+++ b/lib/bundler/source.rb
@@ -327,7 +327,7 @@ module Bundler
end
def path
- Bundler.install_path.join("#{base_name}-#{uri_hash}-#{shortref_for(revision)}")
+ Bundler.install_path.join("#{base_name}-#{shortref_for(revision)}")
end
def specs
@@ -350,11 +350,6 @@ module Bundler
generate_bin(spec)
end
- def lock
- @ref = @options["ref"] = revision
- checkout
- end
-
def load_spec_files
super
rescue PathError