another chefstyle catchup + pull masterlcg/chefstyle-catchup2

bunch of merges over the weekend need re-fixing again.

seems like pointing at master of chefstyle is probably a good idea to
start making people fix their code before merging.

1 files changed, 17 insertions, 18 deletions

diff --git a/Gemfile b/Gemfile
index cacfa3096c..4809c65216 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,9 +1,9 @@
 source "https://rubygems.org"
-gemspec :name => "chef"
+gemspec name: "chef"
 
-gem "activesupport", "< 4.0.0", :group => :compat_testing, :platform => "ruby"
+gem "activesupport", "< 4.0.0", group: :compat_testing, platform: "ruby"
 
-gem "chef-config", path: "chef-config" if File.exists?(__FILE__ + "../chef-config")
+gem "chef-config", path: "chef-config" if File.exist?(__FILE__ + "../chef-config")
 
 group(:docgen) do
   gem "yard"
@@ -23,32 +23,31 @@ group(:ruby_prof) do
 end
 
 group(:development, :test) do
-
   gem "simplecov"
   gem "rack", "~> 1.5.1"
 
   # for testing new chefstyle rules
   # gem 'chefstyle', github: 'chef/chefstyle'
-  gem "chefstyle"
+  gem "chefstyle", github: "chef/chefstyle", branch: "master"
 
-  gem "ruby-shadow", :platforms => :ruby unless RUBY_PLATFORM.downcase.match(/(aix|cygwin)/)
+  gem "ruby-shadow", platforms: :ruby unless RUBY_PLATFORM.downcase.match(/(aix|cygwin)/)
 
   # For external tests
-#  gem 'chef-zero', github: 'chef/chef-zero'
-#  gem 'cheffish', github: 'chef/cheffish'
-#  gem 'chef-provisioning'#, github: 'chef/chef-provisioning'
-#  gem 'chef-provisioning-aws', github: 'chef/chef-provisioning-aws'
-#  gem 'test-kitchen'
-#  gem 'chefspec'
-#  gem 'chef-sugar'
-#  gem 'poise', github: 'poise/poise', branch: 'deeecb890a6a0bc2037dfb09ce0fd0a8931519aa'
-#  gem 'halite', github: 'poise/halite'
-#  gem 'foodcritic', github: 'acrmp/foodcritic', branch: 'v5.0.0'
-#  gem 'chef-rewind'
+  #  gem 'chef-zero', github: 'chef/chef-zero'
+  #  gem 'cheffish', github: 'chef/cheffish'
+  #  gem 'chef-provisioning'#, github: 'chef/chef-provisioning'
+  #  gem 'chef-provisioning-aws', github: 'chef/chef-provisioning-aws'
+  #  gem 'test-kitchen'
+  #  gem 'chefspec'
+  #  gem 'chef-sugar'
+  #  gem 'poise', github: 'poise/poise', branch: 'deeecb890a6a0bc2037dfb09ce0fd0a8931519aa'
+  #  gem 'halite', github: 'poise/halite'
+  #  gem 'foodcritic', github: 'acrmp/foodcritic', branch: 'v5.0.0'
+  #  gem 'chef-rewind'
 end
 
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
 
 # If you want to load debugging tools into the bundle exec sandbox,
 # add these additional dependencies into chef/Gemfile.local
-eval(IO.read(__FILE__ + ".local"), binding) if File.exists?(__FILE__ + ".local")
+eval(IO.read(__FILE__ + ".local"), binding) if File.exist?(__FILE__ + ".local")