summaryrefslogtreecommitdiff
path: root/lib/bundler
diff options
context:
space:
mode:
authorSimon Fish <si@mon.fish>2021-10-26 17:50:55 +0100
committergit <svn-admin@ruby-lang.org>2021-12-08 01:49:20 +0900
commit1b12ebb94e50e16ca9f226e583ee2a3d418402d6 (patch)
tree5965b5c76cb8ff508f4519f37e76fccde884f58a /lib/bundler
parent26303c31f0939d093f88f609c846590ad538114f (diff)
[rubygems/rubygems] Add require parameter to `bundle add``
Test and ensure "false" is handled Don't use yield_self to operate on autorequire Remove duplicate autorequire Add banner to require option Don't use json to break down require params Pass linter https://github.com/rubygems/rubygems/commit/a4f2f8ac17
Diffstat (limited to 'lib/bundler')
-rw-r--r--lib/bundler/cli.rb1
-rw-r--r--lib/bundler/injector.rb9
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index d271086b25..9046c0115c 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -367,6 +367,7 @@ module Bundler
method_option "version", :aliases => "-v", :type => :string
method_option "group", :aliases => "-g", :type => :string
method_option "source", :aliases => "-s", :type => :string
+ method_option "require", :aliases => "-r", :type => :string, :banner => "Adds require path to gem. Provide false, or a path as a string."
method_option "git", :type => :string
method_option "branch", :type => :string
method_option "skip-install", :type => :boolean, :banner =>
diff --git a/lib/bundler/injector.rb b/lib/bundler/injector.rb
index 613bda4f84..5e5dfca02e 100644
--- a/lib/bundler/injector.rb
+++ b/lib/bundler/injector.rb
@@ -113,8 +113,9 @@ module Bundler
source = ", :source => \"#{d.source}\"" unless d.source.nil?
git = ", :git => \"#{d.git}\"" unless d.git.nil?
branch = ", :branch => \"#{d.branch}\"" unless d.branch.nil?
+ require_path = ", :require => #{convert_autorequire(d.autorequire)}" unless d.autorequire.nil?
- %(gem #{name}#{requirement}#{group}#{source}#{git}#{branch})
+ %(gem #{name}#{requirement}#{group}#{source}#{git}#{branch}#{require_path})
end.join("\n")
end
@@ -269,5 +270,11 @@ module Bundler
def show_warning(message)
Bundler.ui.info Bundler.ui.add_color(message, :yellow)
end
+
+ def convert_autorequire(autorequire)
+ autorequire = autorequire.first
+ return autorequire if autorequire == "false"
+ autorequire.inspect
+ end
end
end