summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgrim Mittal <agrimmittal97@gmail.com>2018-07-15 13:45:53 +0530
committerAgrim Mittal <agrimmittal97@gmail.com>2018-07-17 16:46:32 +0530
commit38e761e4babb6ef69872337cfc3d2da20e64215b (patch)
tree58693ceae783b637404bc3d60e9b6994ab650c93
parent8d53c82ab384a18ce0da0524fcbef275ce4683df (diff)
downloadbundler-38e761e4babb6ef69872337cfc3d2da20e64215b.tar.gz
Fix singular groups on injecting gem
-rw-r--r--lib/bundler/injector.rb2
-rw-r--r--spec/commands/add_spec.rb4
-rw-r--r--spec/commands/inject_spec.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/bundler/injector.rb b/lib/bundler/injector.rb
index 0eae0c6ece..1bb29f0b36 100644
--- a/lib/bundler/injector.rb
+++ b/lib/bundler/injector.rb
@@ -107,7 +107,7 @@ module Bundler
end
if d.groups != Array(:default)
- group = d.groups.size == 1 ? ", :group => #{d.groups.inspect}" : ", :groups => #{d.groups.inspect}"
+ group = d.groups.size == 1 ? ", :group => #{d.groups.first.inspect}" : ", :groups => #{d.groups.inspect}"
end
source = ", :source => \"#{d.source}\"" unless d.source.nil?
diff --git a/spec/commands/add_spec.rb b/spec/commands/add_spec.rb
index 2e9ef6b923..9f11adbcf8 100644
--- a/spec/commands/add_spec.rb
+++ b/spec/commands/add_spec.rb
@@ -69,7 +69,7 @@ RSpec.describe "bundle add" do
describe "with --group" do
it "adds dependency for the specified group" do
bundle "add 'foo' --group='development'"
- expect(bundled_app("Gemfile").read).to match(/gem "foo", "~> 2.0", :group => \[:development\]/)
+ expect(bundled_app("Gemfile").read).to match(/gem "foo", "~> 2.0", :group => :development/)
expect(the_bundle).to include_gems "foo 2.0"
end
@@ -100,7 +100,7 @@ RSpec.describe "bundle add" do
it "using combination of short form options works like long form" do
bundle "add 'foo' -s='file://#{gem_repo2}' -g='development' -v='~>1.0'"
- expect(bundled_app("Gemfile").read).to include %(gem "foo", "~> 1.0", :group => [:development], :source => "file://#{gem_repo2}")
+ expect(bundled_app("Gemfile").read).to include %(gem "foo", "~> 1.0", :group => :development, :source => "file://#{gem_repo2}")
expect(the_bundle).to include_gems "foo 1.1"
end
diff --git a/spec/commands/inject_spec.rb b/spec/commands/inject_spec.rb
index 6c1994b59d..b7ffc89a34 100644
--- a/spec/commands/inject_spec.rb
+++ b/spec/commands/inject_spec.rb
@@ -64,7 +64,7 @@ Usage: "bundle inject GEM VERSION"
it "add gem with group option in gemfile" do
bundle "inject 'rack-obama' '>0' --group=development"
gemfile = bundled_app("Gemfile").read
- str = "gem \"rack-obama\", \"> 0\", :group => [:development]"
+ str = "gem \"rack-obama\", \"> 0\", :group => :development"
expect(gemfile).to include str
end