diff options
author | Carl Lerche <carllerche@mac.com> | 2010-05-05 02:21:10 -0700 |
---|---|---|
committer | Carl Lerche <carllerche@mac.com> | 2010-05-05 02:21:10 -0700 |
commit | fb498a48e042d4f56df9fc0a94b9ed18815b4e6d (patch) | |
tree | 27127f15ead490c58f2021848e8db9e2a0db993e /lib | |
parent | 684dd751c5cbcad0d65ca952be5ad0724b5bbb76 (diff) | |
download | bundler-fb498a48e042d4f56df9fc0a94b9ed18815b4e6d.tar.gz |
Remove more old lock code
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bundler/cli.rb | 4 | ||||
-rw-r--r-- | lib/bundler/environment.rb | 6 | ||||
-rw-r--r-- | lib/bundler/runtime.rb | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index 823367f1..07b2606d 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -197,10 +197,6 @@ module Bundler private - def locked? - File.exist?("#{Bundler.root}/Gemfile.lock") || File.exist?("#{Bundler.root}/.bundle/environment.rb") - end - def remove_lockfiles FileUtils.rm_f "#{Bundler.root}/Gemfile.lock" FileUtils.rm_f "#{Bundler.root}/.bundle/environment.rb" diff --git a/lib/bundler/environment.rb b/lib/bundler/environment.rb index 806c6b92..67387f68 100644 --- a/lib/bundler/environment.rb +++ b/lib/bundler/environment.rb @@ -31,11 +31,13 @@ module Bundler end def lock - Bundler.ui.info("The bundle is already locked, relocking.") if locked? FileUtils.mkdir_p("#{root}/.bundle") write_yml_lock write_rb_lock - Bundler.ui.confirm("The bundle is now locked. Use `bundle show` to list the gems in the environment.") + end + + def update(*gems) + # Nothing end private diff --git a/lib/bundler/runtime.rb b/lib/bundler/runtime.rb index 2535c6ca..f5d0f539 100644 --- a/lib/bundler/runtime.rb +++ b/lib/bundler/runtime.rb @@ -6,9 +6,7 @@ module Bundler def initialize(*) super - if locked? - write_rb_lock - end + lock end def setup(*groups) |