Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Commit

Permalink
Merge pull request #3623 from bundler/seg-bundled-with-compatibility
Browse files Browse the repository at this point in the history
[Lockfile] Make the BUNDLED WITH section backwards compatible
  • Loading branch information
indirect committed May 7, 2015
2 parents 9bd2e51 + b9b662d commit acef4ba
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 46 deletions.
2 changes: 1 addition & 1 deletion lib/bundler/definition.rb
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ def to_lock

# Record the version of Bundler that was used to create the lockfile
out << "\nBUNDLED WITH\n"
out << " #{lock_version}\n"
out << " #{lock_version}\n"

out
end
Expand Down
2 changes: 1 addition & 1 deletion lib/bundler/lockfile_parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ def parse_platform(line)
end

def parse_bundled_with(line)
line = line.strip
line = line[3..-1]
if Gem::Version.correct?(line)
@bundler_version = Gem::Version.create(line)
end
Expand Down
2 changes: 1 addition & 1 deletion spec/commands/lock_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def read_lockfile(file = "Gemfile.lock")
with_license
BUNDLED WITH
#{Bundler::VERSION}
#{Bundler::VERSION}
L
end

Expand Down
2 changes: 1 addition & 1 deletion spec/install/gems/flex_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@
rack
BUNDLED WITH
#{Bundler::VERSION}
#{Bundler::VERSION}
L
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/install/gems/install_if.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
thin
BUNDLED WITH
1.9.4
#{Bundler::VERSION}
L
end
end
Loading

0 comments on commit acef4ba

Please sign in to comment.