From 1b12ebb94e50e16ca9f226e583ee2a3d418402d6 Mon Sep 17 00:00:00 2001 From: Simon Fish Date: Tue, 26 Oct 2021 17:50:55 +0100 Subject: [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 --- lib/bundler/cli.rb | 1 + lib/bundler/injector.rb | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'lib/bundler') 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 -- cgit v1.2.3