summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2016-06-08 12:15:53 -0500
committerSamuel Giddins <segiddins@segiddins.me>2016-06-08 12:15:53 -0500
commit515c4cb90866c26ac702e8e745709e1dc7d8efc1 (patch)
tree20e370e4255dd743a90134ae42a76580e24f4270
parent58d81f331d21445352de887eb6b88d30540caaaf (diff)
downloadbundler-515c4cb90866c26ac702e8e745709e1dc7d8efc1.tar.gz
[RubyVersion] Fix pattern
-rw-r--r--lib/bundler/ruby_version.rb2
-rw-r--r--spec/commands/install_spec.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/ruby_version.rb b/lib/bundler/ruby_version.rb
index c22e44c236..9c1444485c 100644
--- a/lib/bundler/ruby_version.rb
+++ b/lib/bundler/ruby_version.rb
@@ -43,7 +43,7 @@ module Bundler
ruby\s
([\d.]+) # ruby version
(?:p(\d+))? # optional patchlevel
- (?: \((\S+) (.+)\))? # optional engine info
+ (?:\s\((\S+)\s(.+)\))? # optional engine info
/xo
# Returns a RubyVersion from the given string.
diff --git a/spec/commands/install_spec.rb b/spec/commands/install_spec.rb
index efefdbef4f..d7617cb370 100644
--- a/spec/commands/install_spec.rb
+++ b/spec/commands/install_spec.rb
@@ -391,7 +391,7 @@ describe "bundle install with gem sources" do
L
end
- it "does not update Gemfile.lock with updated ruby versions" do
+ it "updates Gemfile.lock with updated incompatible ruby version" do
install_gemfile <<-G, :expect_err => true
::RUBY_VERSION = '2.2.3'
::RUBY_PATCHLEVEL = 100
@@ -408,7 +408,7 @@ describe "bundle install with gem sources" do
DEPENDENCIES
RUBY VERSION
- ruby 2.1.3p100
+ ruby 2.2.3p100
BUNDLED WITH
#{Bundler::VERSION}