Permalink
Browse files

Rename vendor/lock.yml to Gemfile.lock

  • Loading branch information...
1 parent 0a443e9 commit 78a6b48ef5a4a70cdf97acc7a7575a40b5878a85 Carl Lerche committed Feb 2, 2010
Showing with 6 additions and 6 deletions.
  1. +2 −2 lib/bundler.rb
  2. +1 −1 lib/bundler/environment.rb
  3. +3 −3 spec/lock/gems_spec.rb
View
4 lib/bundler.rb
@@ -35,7 +35,7 @@ class VersionConflict < BundlerError; status_code(6) ; end
class GemfileError < BundlerError; status_code(4) ; end
class << self
- attr_accessor :ui, :bundle_path
+ attr_writer :ui, :bundle_path
def configure
@configured ||= begin
@@ -65,7 +65,7 @@ def load(gemfile = default_gemfile)
def definition(gemfile = default_gemfile)
configure
root = Pathname.new(gemfile).dirname
- lockfile = root.join("vendor/lock.yml")
+ lockfile = root.join("Gemfile.lock")
if lockfile.exist?
Definition.from_lock(lockfile)
else
View
2 lib/bundler/environment.rb
@@ -110,7 +110,7 @@ def write_rb_lock
def write_yml_lock
yml = details.to_yaml
- File.open("#{root}/vendor/lock.yml", 'w') do |f|
+ File.open("#{root}/Gemfile.lock", 'w') do |f|
f.puts yml
end
end
View
6 spec/lock/gems_spec.rb
@@ -23,14 +23,14 @@
end
it "creates a lock.yml file in ./vendor" do
- bundled_app("vendor/lock.yml").should_not exist
+ bundled_app("Gemfile.lock").should_not exist
bundle :lock
- bundled_app("vendor/lock.yml").should exist
+ bundled_app("Gemfile.lock").should exist
end
it "creates an environment.rb file in ./vendor" do
bundled_app("vendor/environment.rb").should_not exist
bundle :lock
- bundled_app("vendor/lock.yml").should exist
+ bundled_app("vendor/environment.rb").should exist
end
end

0 comments on commit 78a6b48

Please sign in to comment.