diff options
author | Thom May <thom@chef.io> | 2016-05-05 11:33:01 +0100 |
---|---|---|
committer | Thom May <thom@may.lt> | 2016-05-05 11:33:01 +0100 |
commit | b8ac88bcd8377380f5c072309c4ac7ec303695bc (patch) | |
tree | 756f4093dc49c906362486a6d8cb19cec62bdb0a | |
parent | d4a68ec78296443a2a08495de18c7a944d30dd71 (diff) | |
download | mixlib-cli-b8ac88bcd8377380f5c072309c4ac7ec303695bc.tar.gz |
Fix chefstyle issues
Signed-off-by: Thom May <thom@may.lt>
-rw-r--r-- | Rakefile | 10 | ||||
-rw-r--r-- | lib/mixlib/cli.rb | 4 | ||||
-rw-r--r-- | spec/mixlib/cli_spec.rb | 6 |
3 files changed, 15 insertions, 5 deletions
@@ -21,3 +21,13 @@ RDoc::Task.new do |rdoc| rdoc.rdoc_files.include("README*") rdoc.rdoc_files.include("lib/**/*.rb") end + +begin + require "chefstyle" + require "rubocop/rake_task" + RuboCop::RakeTask.new(:style) do |task| + task.options += ["--display-cop-names", "--no-color"] + end +rescue LoadError + puts "chefstyle/rubocop is not available. gem install chefstyle to do style checking." +end diff --git a/lib/mixlib/cli.rb b/lib/mixlib/cli.rb index 9d7d596..31e44be 100644 --- a/lib/mixlib/cli.rb +++ b/lib/mixlib/cli.rb @@ -51,8 +51,8 @@ module Mixlib # contents will be iterated and cloned as well. def deep_dup(object) cloned_object = object.respond_to?(:dup) ? object.dup : object - if(cloned_object.kind_of?(Enumerable)) - if(cloned_object.kind_of?(Hash)) + if cloned_object.kind_of?(Enumerable) + if cloned_object.kind_of?(Hash) new_hash = cloned_object.class.new cloned_object.each do |key, value| cloned_key = deep_dup(key) diff --git a/spec/mixlib/cli_spec.rb b/spec/mixlib/cli_spec.rb index 034fe25..39b1eb1 100644 --- a/spec/mixlib/cli_spec.rb +++ b/spec/mixlib/cli_spec.rb @@ -81,7 +81,7 @@ describe Mixlib::CLI do :show_options => false, :exit => nil, :in => nil, - } + }, } end @@ -142,7 +142,7 @@ describe Mixlib::CLI do it "should set the corresponding config value according to a supplied proc" do TestCLI.option(:number, :short => "-n NUMBER", - :proc => Proc.new { |config| config.to_i + 2 }, + :proc => Proc.new { |config| config.to_i + 2 } ) @cli = TestCLI.new @cli.parse_options([ "-n", "2" ]) @@ -264,7 +264,7 @@ describe Mixlib::CLI do context "when subclassed" do before do - TestCLI.options = {:arg1 => {:boolean => true}} + TestCLI.options = { :arg1 => { :boolean => true } } end it "should retain previously defined options from parent" do |