diff options
-rw-r--r-- | .rubocop_todo.yml | 6 | ||||
-rw-r--r-- | lib/bundler/cli.rb | 12 | ||||
-rw-r--r-- | spec/install/gemfile/git_spec.rb | 6 | ||||
-rw-r--r-- | spec/install/gemfile/path_spec.rb | 6 |
4 files changed, 12 insertions, 18 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 4cdb0752b2..6920837690 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -57,12 +57,6 @@ Metrics/PerceivedComplexity: Style/AccessorMethodName: Enabled: false -# Offense count: 12 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles. -Style/AlignHash: - Enabled: false - # Offense count: 16 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles. diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index 150df56c7f..bc03b015ad 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -37,7 +37,7 @@ module Bundler default_task :install class_option "no-color", :type => :boolean, :desc => "Disable colorization in output" class_option "retry", :type => :numeric, :aliases => "-r", :banner => "NUM", - :desc => "Specify the number of times you wish to attempt network commands" + :desc => "Specify the number of times you wish to attempt network commands" class_option "verbose", :type => :boolean, :desc => "Enable verbose output mode", :aliases => "-V" def help(cli = nil) @@ -196,9 +196,9 @@ module Bundler Calling show with [GEM] will list the exact location of that gem on your machine. D method_option "paths", :type => :boolean, - :banner => "List the paths of all gems that are required by your Gemfile." + :banner => "List the paths of all gems that are required by your Gemfile." method_option "outdated", :type => :boolean, - :banner => "Show verbose output including whether gems are outdated." + :banner => "Show verbose output including whether gems are outdated." def show(gem_name = nil) require "bundler/cli/show" Show.new(options, gem_name).run @@ -351,12 +351,12 @@ module Bundler method_option :bin, :type => :boolean, :default => false, :aliases => "-b", :desc => "Generate a binary for your library." method_option :coc, :type => :boolean, :desc => "Generate a code of conduct file. Set a default with `bundle config gem.coc true`." method_option :edit, :type => :string, :aliases => "-e", :required => false, :banner => "EDITOR", - :lazy_default => [ENV["BUNDLER_EDITOR"], ENV["VISUAL"], ENV["EDITOR"]].find {|e| !e.nil? && !e.empty? }, - :desc => "Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)" + :lazy_default => [ENV["BUNDLER_EDITOR"], ENV["VISUAL"], ENV["EDITOR"]].find {|e| !e.nil? && !e.empty? }, + :desc => "Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)" method_option :ext, :type => :boolean, :default => false, :desc => "Generate the boilerplate for C extension code" method_option :mit, :type => :boolean, :desc => "Generate an MIT license file. Set a default with `bundle config gem.mit true`." method_option :test, :type => :string, :lazy_default => "rspec", :aliases => "-t", :banner => "rspec", - :desc => "Generate a test directory for your library, either rspec or minitest. Set a default with `bundle config gem.test rspec`." + :desc => "Generate a test directory for your library, either rspec or minitest. Set a default with `bundle config gem.test rspec`." def gem(name) require "bundler/cli/gem" Gem.new(options, name, self).run diff --git a/spec/install/gemfile/git_spec.rb b/spec/install/gemfile/git_spec.rb index 6a77768ff8..84e437744d 100644 --- a/spec/install/gemfile/git_spec.rb +++ b/spec/install/gemfile/git_spec.rb @@ -796,7 +796,7 @@ describe "bundle install with git sources" do end bundle :install, :expect_err => true, - :requires => [lib_path("install_hooks.rb")] + :requires => [lib_path("install_hooks.rb")] expect(err).to eq("Ran pre-install hook: foo-1.0") end @@ -816,7 +816,7 @@ describe "bundle install with git sources" do end bundle :install, :expect_err => true, - :requires => [lib_path("install_hooks.rb")] + :requires => [lib_path("install_hooks.rb")] expect(err).to eq("Ran post-install hook: foo-1.0") end @@ -836,7 +836,7 @@ describe "bundle install with git sources" do end bundle :install, :expect_err => true, - :requires => [lib_path("install_hooks.rb")] + :requires => [lib_path("install_hooks.rb")] expect(out).to include("failed for foo-1.0") end end diff --git a/spec/install/gemfile/path_spec.rb b/spec/install/gemfile/path_spec.rb index 65d6577db5..74f068116e 100644 --- a/spec/install/gemfile/path_spec.rb +++ b/spec/install/gemfile/path_spec.rb @@ -494,7 +494,7 @@ describe "bundle install with explicit source paths" do end bundle :install, :expect_err => true, - :requires => [lib_path("install_hooks.rb")] + :requires => [lib_path("install_hooks.rb")] expect(err).to eq("Ran pre-install hook: foo-1.0") end @@ -514,7 +514,7 @@ describe "bundle install with explicit source paths" do end bundle :install, :expect_err => true, - :requires => [lib_path("install_hooks.rb")] + :requires => [lib_path("install_hooks.rb")] expect(err).to eq("Ran post-install hook: foo-1.0") end @@ -534,7 +534,7 @@ describe "bundle install with explicit source paths" do end bundle :install, :expect_err => true, - :requires => [lib_path("install_hooks.rb")] + :requires => [lib_path("install_hooks.rb")] expect(out).to include("failed for foo-1.0") end end |