diff options
author | André Arko <mail@arko.net> | 2015-05-07 09:15:17 +0100 |
---|---|---|
committer | André Arko <mail@arko.net> | 2015-05-07 09:15:17 +0100 |
commit | acef4ba0546091d28566a77eb31c1adb8587c835 (patch) | |
tree | 7fdd3194f9dd5a1352d7e2a5eef362f06be09a81 | |
parent | 9bd2e5178cbebb26b3660d4a9d65f1ccd5ad9415 (diff) | |
parent | b9b662d9eb7fb6cf6113b8439d7dcd1f9a08ceda (diff) | |
download | bundler-acef4ba0546091d28566a77eb31c1adb8587c835.tar.gz |
Merge pull request #3623 from bundler/seg-bundled-with-compatibility
[Lockfile] Make the BUNDLED WITH section backwards compatible
-rw-r--r-- | lib/bundler/definition.rb | 2 | ||||
-rw-r--r-- | lib/bundler/lockfile_parser.rb | 2 | ||||
-rw-r--r-- | spec/commands/lock_spec.rb | 2 | ||||
-rw-r--r-- | spec/install/gems/flex_spec.rb | 2 | ||||
-rw-r--r-- | spec/install/gems/install_if.rb | 2 | ||||
-rw-r--r-- | spec/lock/lockfile_spec.rb | 82 |
6 files changed, 46 insertions, 46 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index eb97b81a..4df61766 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -317,7 +317,7 @@ module Bundler # 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 diff --git a/lib/bundler/lockfile_parser.rb b/lib/bundler/lockfile_parser.rb index 21367fe7..c08aa763 100644 --- a/lib/bundler/lockfile_parser.rb +++ b/lib/bundler/lockfile_parser.rb @@ -179,7 +179,7 @@ module Bundler 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 diff --git a/spec/commands/lock_spec.rb b/spec/commands/lock_spec.rb index 07d92fb6..86290c40 100644 --- a/spec/commands/lock_spec.rb +++ b/spec/commands/lock_spec.rb @@ -49,7 +49,7 @@ describe "bundle lock" do with_license BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} L end diff --git a/spec/install/gems/flex_spec.rb b/spec/install/gems/flex_spec.rb index bd6ba2db..583bb340 100644 --- a/spec/install/gems/flex_spec.rb +++ b/spec/install/gems/flex_spec.rb @@ -269,7 +269,7 @@ describe "bundle flex_install" do rack BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} L end end diff --git a/spec/install/gems/install_if.rb b/spec/install/gems/install_if.rb index 79e6dd87..11c7a8a1 100644 --- a/spec/install/gems/install_if.rb +++ b/spec/install/gems/install_if.rb @@ -32,7 +32,7 @@ describe "bundle install with install_if conditionals" do thin BUNDLED WITH - 1.9.4 + #{Bundler::VERSION} L end end diff --git a/spec/lock/lockfile_spec.rb b/spec/lock/lockfile_spec.rb index c5707227..727ddea2 100644 --- a/spec/lock/lockfile_spec.rb +++ b/spec/lock/lockfile_spec.rb @@ -24,7 +24,7 @@ describe "the lockfile format" do rack BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -51,7 +51,7 @@ describe "the lockfile format" do rack BUNDLED WITH - 1.8.2 + 1.8.2 L install_gemfile <<-G @@ -73,7 +73,7 @@ describe "the lockfile format" do rack BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -111,7 +111,7 @@ describe "the lockfile format" do rack BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -129,7 +129,7 @@ describe "the lockfile format" do rack BUNDLED WITH - 9999999.1.0 + 9999999.1.0 L simulate_bundler_version "9999999.0.0" do @@ -156,7 +156,7 @@ describe "the lockfile format" do rack BUNDLED WITH - 9999999.1.0 + 9999999.1.0 G end @@ -174,7 +174,7 @@ describe "the lockfile format" do rack BUNDLED WITH - 9999999.0.0 + 9999999.0.0 L install_gemfile <<-G @@ -209,7 +209,7 @@ describe "the lockfile format" do rake BUNDLED WITH - 9999999.0.0 + 9999999.0.0 L install_gemfile <<-G @@ -239,7 +239,7 @@ describe "the lockfile format" do rack BUNDLED WITH - 1.10.0 + 1.10.0 L simulate_bundler_version "9999999.0.0" do @@ -266,7 +266,7 @@ describe "the lockfile format" do rack BUNDLED WITH - 9999999.0.0 + 9999999.0.0 G end @@ -292,7 +292,7 @@ describe "the lockfile format" do rack-obama BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -318,7 +318,7 @@ describe "the lockfile format" do rack-obama (>= 1.0) BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -348,7 +348,7 @@ describe "the lockfile format" do rack-obama (>= 1.0) BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -373,7 +373,7 @@ describe "the lockfile format" do net-sftp BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G should_be_installed "net-sftp 1.1.1", "net-ssh 1.0.0" @@ -403,7 +403,7 @@ describe "the lockfile format" do foo! BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -439,7 +439,7 @@ describe "the lockfile format" do rack BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} L bundle "install" @@ -472,7 +472,7 @@ describe "the lockfile format" do foo! BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -502,7 +502,7 @@ describe "the lockfile format" do foo! BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -532,7 +532,7 @@ describe "the lockfile format" do foo! BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -559,7 +559,7 @@ describe "the lockfile format" do foo! BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -601,7 +601,7 @@ describe "the lockfile format" do rack BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -636,7 +636,7 @@ describe "the lockfile format" do thin BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -675,7 +675,7 @@ describe "the lockfile format" do rails BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -701,7 +701,7 @@ describe "the lockfile format" do double_deps BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -727,7 +727,7 @@ describe "the lockfile format" do rack-obama (>= 1.0) BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -753,7 +753,7 @@ describe "the lockfile format" do rack-obama (>= 1.0) BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -781,7 +781,7 @@ describe "the lockfile format" do foo BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -809,7 +809,7 @@ describe "the lockfile format" do foo BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -837,7 +837,7 @@ describe "the lockfile format" do foo BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -864,7 +864,7 @@ describe "the lockfile format" do foo! BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -882,7 +882,7 @@ describe "the lockfile format" do rack BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G install_gemfile <<-G @@ -907,7 +907,7 @@ describe "the lockfile format" do rack BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -936,7 +936,7 @@ describe "the lockfile format" do platform_specific BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -967,7 +967,7 @@ describe "the lockfile format" do rack BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -991,7 +991,7 @@ describe "the lockfile format" do rack BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -1015,7 +1015,7 @@ describe "the lockfile format" do rack (= 1.0) BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -1039,7 +1039,7 @@ describe "the lockfile format" do rack (= 1.0) BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -1085,7 +1085,7 @@ describe "the lockfile format" do rack (> 0.9, < 1.0) BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} G end @@ -1135,7 +1135,7 @@ describe "the lockfile format" do omg! BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} L FileUtils.rm_rf(bundled_app('vendor')) @@ -1162,7 +1162,7 @@ describe "the lockfile format" do omg! BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} L end @@ -1253,7 +1253,7 @@ describe "the lockfile format" do rack BUNDLED WITH - #{Bundler::VERSION} + #{Bundler::VERSION} L error = install_gemfile(<<-G, :expect_err => true) |