diff options
author | Asutosh Palai <asupalai@gmail.com> | 2016-06-10 11:37:09 +0530 |
---|---|---|
committer | Asutosh Palai <asupalai@gmail.com> | 2016-06-10 11:37:11 +0530 |
commit | 0aaa3f3a9b236acfc5198196c845cc9d6320ce30 (patch) | |
tree | fec0a5852306c660e34bc84981d2734871619b3d | |
parent | b126b40bbddf8af631b949ffdc7e20ab64f75c6a (diff) | |
download | bundler-0aaa3f3a9b236acfc5198196c845cc9d6320ce30.tar.gz |
Included plugins in bool_keys for settings
-rw-r--r-- | lib/bundler/cli.rb | 4 | ||||
-rw-r--r-- | lib/bundler/cli/install.rb | 2 | ||||
-rw-r--r-- | lib/bundler/inline.rb | 2 | ||||
-rw-r--r-- | lib/bundler/settings.rb | 2 | ||||
-rw-r--r-- | spec/spec_helper.rb | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index df6c7128fd..8585142352 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -83,7 +83,7 @@ module Bundler end def self.handle_no_command_error(command, has_namespace = $thor_runner) - if Bundler.settings[:plugin] && Bundler::Plugin.command?(command) + if Bundler.settings[:plugins] && Bundler::Plugin.command?(command) return Bundler::Plugin.exec_command(command, ARGV[1..-1]) end @@ -442,7 +442,7 @@ module Bundler Env.new.write($stdout) end - if Bundler.settings[:plugin] + if Bundler.settings[:plugins] require "bundler/cli/plugin" desc "plugin SUBCOMMAND ...ARGS", "manage the bundler plugins" subcommand "plugin", Plugin diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb index 5db9463cbe..dbe25977a4 100644 --- a/lib/bundler/cli/install.rb +++ b/lib/bundler/cli/install.rb @@ -56,7 +56,7 @@ module Bundler # rubygems plugins sometimes hook into the gem install process Gem.load_env_plugins if Gem.respond_to?(:load_env_plugins) - Plugin.gemfile_install(Bundler.default_gemfile) if Bundler.settings[:plugin] + Plugin.gemfile_install(Bundler.default_gemfile) if Bundler.settings[:plugins] definition = Bundler.definition definition.validate_ruby! diff --git a/lib/bundler/inline.rb b/lib/bundler/inline.rb index 5916485a19..fcccf6a3bf 100644 --- a/lib/bundler/inline.rb +++ b/lib/bundler/inline.rb @@ -41,7 +41,7 @@ def gemfile(install = false, options = {}, &gemfile) end ENV["BUNDLE_GEMFILE"] ||= "Gemfile" - Bundler::Plugin.gemfile_install(&gemfile) if Bundler.settings[:plugin] + Bundler::Plugin.gemfile_install(&gemfile) if Bundler.settings[:plugins] builder = Bundler::Dsl.new builder.instance_eval(&gemfile) diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb index 72d37a8913..0dd1d762e6 100644 --- a/lib/bundler/settings.rb +++ b/lib/bundler/settings.rb @@ -3,7 +3,7 @@ require "uri" module Bundler class Settings - BOOL_KEYS = %w(frozen cache_all no_prune disable_local_branch_check disable_shared_gems ignore_messages gem.mit gem.coc silence_root_warning no_install).freeze + BOOL_KEYS = %w(frozen cache_all no_prune disable_local_branch_check disable_shared_gems ignore_messages gem.mit gem.coc silence_root_warning no_install plugins).freeze NUMBER_KEYS = %w(retry timeout redirect ssl_verify_mode).freeze DEFAULT_CONFIG = { :retry => 3, :timeout => 10, :redirect => 5 }.freeze diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 0fc875a739..7aaaa0871c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -41,7 +41,7 @@ Spec::Rubygems.setup FileUtils.rm_rf(Spec::Path.gem_repo1) ENV["RUBYOPT"] = "#{ENV["RUBYOPT"]} -r#{Spec::Path.root}/spec/support/hax.rb" ENV["BUNDLE_SPEC_RUN"] = "true" -ENV["BUNDLE_PLUGIN"] = "true" +ENV["BUNDLE_PLUGINS"] = "true" # Don't wrap output in tests ENV["THOR_COLUMNS"] = "10000" |