14 files changed, 77 insertions, 84 deletions
@@ -28,9 +28,9 @@ module Bundler
 dependencies = gems.map {|g| Bundler::Dependency.new(g, version, options) }
 Injector.inject(dependencies,
- :conservative_versioning => options[:version].nil?, # Perform conservative versioning only when version is not specified
- :optimistic => options[:optimistic],
- :strict => options[:strict])
 end
 def validate_options!
@@ -17,9 +17,9 @@ module Bundler
 installer = Installer.new(Bundler.root, Bundler.definition)
 installer_opts = {
- :force => options[:force],
- :binstubs_cmd => true,
- :all_platforms => options["all-platforms"],
 }
 if options[:all]
@@ -45,7 +45,7 @@ module Bundler
 next
 end
- Bundler.settings.temporary(:path => (Bundler.settings[:path] || Bundler.root)) do
 installer.generate_standalone_bundler_executable_stubs(spec, installer_opts)
 end
 else
@@ -19,7 +19,7 @@ module Bundler
 # TODO: move cache contents here now that all bundles are locked
 custom_path = Bundler.settings[:path] if options[:path]
- Bundler.settings.temporary(:cache_all_platforms => options["all-platforms"]) do
 Bundler.load.cache(custom_path)
 end
 end
@@ -32,7 +32,7 @@ module Bundler
 Bundler.ui.error "This bundle has been frozen, but there is no #{SharedHelpers.relative_lockfile_path} present"
 exit 1
 else
- Bundler.load.lock(:preserve_unknown_sections => true) unless options[:"dry-run"]
 Bundler.ui.info "The Gemfile's dependencies are satisfied"
 end
 end
@@ -2,17 +2,17 @@
 module Bundler
 class CLI::Config < Thor
- class_option :parseable, :type => :boolean, :banner => "Use minimal formatting for more parseable output"
 def self.scope_options
- method_option :global, :type => :boolean, :banner => "Only change the global config"
- method_option :local, :type => :boolean, :banner => "Only change the local config"
 end
 private_class_method :scope_options
- desc "base NAME [VALUE]", "The Bundler 1 config interface", :hide => true
 scope_options
- method_option :delete, :type => :boolean, :banner => "delete"
 def base(name = nil, *value)
 new_args =
 if ARGV.size == 1
@@ -27,7 +27,7 @@ module Bundler
 message = "Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle #{new_args.join(" ")}` instead."
 removed_message = "Using the `config` command without a subcommand [list, get, set, unset] is has been removed. Use `bundle #{new_args.join(" ")}` instead."
- SharedHelpers.major_deprecation 3, message, :removed_message => removed_message
 Base.new(options, name, value, self).run
 end
@@ -11,7 +11,7 @@ module Bundler
 def run
 message = "bundle console will be replaced by `bin/console` generated by `bundle gem <name>`"
 removed_message = "bundle console has been replaced by `bin/console` generated by `bundle gem <name>`"
- Bundler::SharedHelpers.major_deprecation 2, message, :removed_message => removed_message
 group ? Bundler.require(:default, *group.split(" ").map!(&:to_sym)) : Bundler.require
 ARGV.clear
@@ -12,7 +12,7 @@ module Bundler
 @options = options
 @cmd = args.shift
 @args = args
- @args << { :close_others => !options.keep_file_descriptors? } unless Bundler.current_ruby.jruby?
 end
 def run
@@ -59,23 +59,23 @@ module Bundler
 end
 config = {
- :name => name,
- :underscored_name => underscored_name,
- :namespaced_path => namespaced_path,
- :makefile_path => "#{underscored_name}/#{underscored_name}",
- :constant_name => constant_name,
- :constant_array => constant_array,
- :author => git_author_name.empty? ? "TODO: Write your name" : git_author_name,
- :email => git_user_email.empty? ? "TODO: Write your email address" : git_user_email,
- :test => options[:test],
- :ext => extension,
- :exe => options[:exe],
- :bundler_version => bundler_dependency_version,
- :git => use_git,
- :_username => _username.empty? ? "[USERNAME]" : _username,
- :required_ruby_version => required_ruby_version,
- :rust_builder_required_rubygems_version => rust_builder_required_rubygems_version,
- :minitest_constant_name => minitest_constant_name,
 }
 ensure_safe_gem_name(name, constant_array)
@@ -236,7 +236,7 @@ module Bundler
 end
 if use_git
- IO.popen(%w[git add .], { :chdir => target }, &:read)
 end
 # Open gemspec in editor
@@ -382,18 +382,18 @@ module Bundler
 if options[:rubocop]
 Bundler::SharedHelpers.major_deprecation 2,
 "--rubocop is deprecated, use --linter=rubocop",
- :removed_message => "--rubocop has been removed, use --linter=rubocop"
 "rubocop"
 else
 Bundler::SharedHelpers.major_deprecation 2,
 "--no-rubocop is deprecated, use --linter",
- :removed_message => "--no-rubocop has been removed, use --linter"
 false
 end
 elsif !Bundler.settings["gem.rubocop"].nil?
 Bundler::SharedHelpers.major_deprecation 2,
 "config gem.rubocop is deprecated; we've updated your config to use gem.linter instead",
- :removed_message => "config gem.rubocop has been removed; we've updated your config to use gem.linter instead"
 Bundler.settings["gem.rubocop"] ? "rubocop" : false
 end
 end
@@ -52,7 +52,7 @@ module Bundler
 if options["binstubs"]
 Bundler::SharedHelpers.major_deprecation 2,
 "The --binstubs option will be removed in favor of `bundle binstubs --all`",
- :removed_message => "The --binstubs option have been removed in favor of `bundle binstubs --all`"
 end
 Plugin.gemfile_install(Bundler.default_gemfile) if Bundler.feature_flag.plugins?
@@ -62,7 +62,7 @@ module Bundler
 installer = Installer.install(Bundler.root, definition, options)
- Bundler.settings.temporary(:cache_all_platforms => options[:local] ? false : Bundler.settings[:cache_all_platforms]) do
 Bundler.load.cache(nil, options[:local]) if Bundler.app_cache.exist? && !options["no-cache"] && !Bundler.frozen_bundle?
 end
@@ -96,7 +96,7 @@ module Bundler
 def warn_if_root
 return if Bundler.settings[:silence_root_warning] || Gem.win_platform? || !Process.uid.zero?
 Bundler.ui.warn "Don't run Bundler as root. Installing your bundle as root " \
- "will break this application for all non-root users on this machine.", :wrap => true
 end
 def dependencies_count_for(definition)
@@ -149,7 +149,7 @@ module Bundler
 Bundler.settings.set_command_option_if_given :path, options[:path]
 if options["standalone"] && Bundler.settings[:path].nil? && !options["local"]
- Bundler.settings.temporary(:path_relative_to_cwd => false) do
 Bundler.settings.set_command_option :path, "bundle"
 end
 end
@@ -26,14 +26,14 @@ module Bundler
 if update.is_a?(Array) # unlocking specific gems
 Bundler::CLI::Common.ensure_all_gems_in_lockfile!(update)
- update = { :gems => update, :conservative => conservative }
 elsif update && conservative
- update = { :conservative => conservative }
 elsif update && bundler
- update = { :bundler => bundler }
 end
- Bundler.settings.temporary(:frozen => false) do
 definition = Bundler.definition(update)
 Bundler::CLI::Common.configure_gem_version_promoter(definition, options) if options[:update]
@@ -21,7 +21,7 @@ module Bundler
 require "shellwords"
 command = Shellwords.split(editor) << File.join([root_path, path].compact)
 Bundler.with_original_env do
- system(*command, { :chdir => root_path })
 end || Bundler.ui.info("Could not run '#{command.join(" ")}'")
 end
 end
@@ -41,12 +41,12 @@ module Bundler
 # We're doing a full update
 Bundler.definition(true)
 else
- Bundler.definition(:gems => gems, :sources => sources)
 end
 Bundler::CLI::Common.configure_gem_version_promoter(
 Bundler.definition,
- options.merge(:strict => @strict)
 )
 definition_resolution = proc do
@@ -90,10 +90,10 @@ module Bundler
 end
 outdated_gems << {
- :active_spec => active_spec,
- :current_spec => current_spec,
- :dependency => dependency,
- :groups => groups,
 }
 end
@@ -105,7 +105,7 @@ module Bundler
 end
 else
 relevant_outdated_gems = if options_include_groups
- by_group(outdated_gems, :filter => options[:group])
 else
 outdated_gems
 end
@@ -188,7 +188,7 @@ module Bundler
 )
 end
- data = { :outdated_count => gems_list.count, :outdated_gems => data }
 Bundler.ui.info data.to_json
 end
@@ -233,21 +233,21 @@ module Bundler
 def gem_data_for(current_spec, active_spec, dependency, groups)
 {
- :current_spec => spec_data_for(current_spec),
- :active_spec => spec_data_for(active_spec),
- :dependency => dependency&.to_s,
- :groups => (groups || "").split(", "),
 }
 end
 def spec_data_for(spec)
 {
- :name => spec.name,
- :version => spec.version.to_s,
- :platform => spec.platform,
- :source => spec.source.to_s,
- :required_ruby_version => spec.required_ruby_version.to_s,
- :required_rubygems_version => spec.required_rubygems_version.to_s,
 }
 end
@@ -7,18 +7,12 @@ module Bundler
 long_desc <<-D
 Install plugins either from the rubygems source provided (with --source option) or from a git source provided with --git (for remote repos) or --local_git (for local repos). If no sources are provided, it uses Gem.sources
 D
- method_option "source", :type => :string, :default => nil, :banner =>
- "URL of the RubyGems source to fetch the plugin from"
- method_option "version", :type => :string, :default => nil, :banner =>
- "The version of the plugin to fetch"
- method_option "git", :type => :string, :default => nil, :banner =>
- "URL of the git repo to fetch from"
- method_option "local_git", :type => :string, :default => nil, :banner =>
- "Path of the local git repo to fetch from"
- method_option "branch", :type => :string, :default => nil, :banner =>
- "The git branch to checkout"
- method_option "ref", :type => :string, :default => nil, :banner =>
- "The git revision to check out"
 def install(*plugins)
 Bundler::Plugin.install(plugins, options)
 end
@@ -27,8 +21,7 @@ module Bundler
 long_desc <<-D
 Uninstall given list of plugins. To uninstall all the plugins, use -all option.
 D
- method_option "all", :type => :boolean, :default => nil, :banner =>
- "Uninstall all the installed plugins. If no plugin is installed, then it does nothing."
 def uninstall(*plugins)
 Bundler::Plugin.uninstall(plugins, options)
 end
@@ -35,7 +35,7 @@ module Bundler
 if full_update
 if conservative
- Bundler.definition(:conservative => conservative)
 else
 Bundler.definition(true)
 end
@@ -51,9 +51,9 @@ module Bundler
 gems.concat(deps.map(&:name))
 end
- Bundler.definition(:gems => gems, :sources => sources, :ruby => options[:ruby],
- :conservative => conservative,
- :bundler => update_bundler)
 end
 Bundler::CLI::Common.configure_gem_version_promoter(Bundler.definition, options)
@@ -71,7 +71,7 @@ module Bundler
 if locked_gems = Bundler.definition.locked_gems
 previous_locked_info = locked_gems.specs.reduce({}) do |h, s|
- h[s.name] = { :spec => s, :version => s.version, :source => s.source.identifier }
 h
 end
 end