summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHomu <homu@barosl.com>2016-05-05 04:07:31 +0900
committerSamuel Giddins <segiddins@segiddins.me>2016-05-04 18:23:18 -0500
commit4c9d42a62fd2074b898ffc7c5b4952859d91f4b4 (patch)
treee069e27560891040ebeda91b660dde896885b322
parentf935e2fe3f6ed29616fa7b206de9ccca4b90d6a0 (diff)
downloadbundler-4c9d42a62fd2074b898ffc7c5b4952859d91f4b4.tar.gz
Auto merge of #4524 - grzuy:fix_frozen_string, r=segiddins
Fixes frozen string exception when checking equivalent gemfile and lockfile closes #4520
-rw-r--r--lib/bundler/definition.rb2
-rw-r--r--spec/install/deploy_spec.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 4a8eb08abe..0e2062eab3 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -428,7 +428,7 @@ module Bundler
end
def pretty_dep(dep, source = false)
- msg = "#{dep.name}"
+ msg = String.new(dep.name)
msg << " (#{dep.requirement})" unless dep.requirement == Gem::Requirement.default
msg << " from the `#{dep.source}` source" if source && dep.source
msg
diff --git a/spec/install/deploy_spec.rb b/spec/install/deploy_spec.rb
index 2b714b37df..d8e7ff7c08 100644
--- a/spec/install/deploy_spec.rb
+++ b/spec/install/deploy_spec.rb
@@ -172,13 +172,13 @@ describe "install with --deployment or --frozen" do
gemfile <<-G
source "file://#{gem_repo1}"
gem "rack"
- gem "rack-obama"
+ gem "rack-obama", "1.1"
G
bundle "install --frozen"
expect(out).to include("deployment mode")
expect(out).to include("You have added to the Gemfile")
- expect(out).to include("* rack-obama")
+ expect(out).to include("* rack-obama (= 1.1)")
expect(out).not_to include("You have deleted from the Gemfile")
expect(out).not_to include("You have changed in the Gemfile")
end