Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions bundler/lib/bundler/ruby_version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ def initialize(versions, patchlevel, engine, engine_version)

def to_s(versions = self.versions)
output = String.new("ruby #{versions_string(versions)}")
output << "p#{patchlevel}" if patchlevel && patchlevel != "-1"
output << " (#{engine} #{versions_string(engine_versions)})" unless engine == "ruby"

output
Expand Down Expand Up @@ -72,8 +71,7 @@ def single_version_string
def ==(other)
versions == other.versions &&
engine == other.engine &&
engine_versions == other.engine_versions &&
patchlevel == other.patchlevel
engine_versions == other.engine_versions
end

def host
Expand Down
10 changes: 2 additions & 8 deletions bundler/spec/bundler/ruby_version_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@

describe "#to_s" do
it "should return info string with the ruby version, patchlevel, engine, and engine version" do
expect(subject.to_s).to eq("ruby 2.0.0p645 (jruby 2.0.1)")
expect(subject.to_s).to eq("ruby 2.0.0 (jruby 2.0.1)")
end

context "no patchlevel" do
Expand All @@ -115,7 +115,7 @@
let(:engine) { "ruby" }

it "should return info string with the ruby version and patchlevel" do
expect(subject.to_s).to eq("ruby 2.0.0p645")
expect(subject.to_s).to eq("ruby 2.0.0")
end
end

Expand Down Expand Up @@ -149,12 +149,6 @@
it_behaves_like "two ruby versions are not equal"
end

context "the patchlevels do not match" do
let(:other_patchlevel) { "21" }

it_behaves_like "two ruby versions are not equal"
end

context "the engines do not match" do
let(:other_engine) { "ruby" }

Expand Down
2 changes: 1 addition & 1 deletion bundler/spec/install/gemfile/ruby_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def locked_ruby_version
myrack
RUBY VERSION
ruby 2.1.4p422
ruby 2.1.4
BUNDLED WITH
#{Bundler::VERSION}
Expand Down