Merge pull request #4379 from chef/tm/add_chefstyle

Per RFC 64, do style checking of the Chef repo

4 files changed, 16 insertions, 0 deletions

diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 0000000000..c4272bd0f4
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,4 @@
+AllCops:
+  Exclude:
+    - "spec/data/**/*"
+    - "vendor/**/*"
diff --git a/.travis.yml b/.travis.yml
index 078a20613a..cd91884f68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,8 @@ branches:
 
 # do not run expensive spec tests on PRs, only on branches
 script: "
+set -e;
+bundle exec rake style;
 echo '--color\n-fp' > .rspec;
 sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers;
 sudo -E $(which bundle) exec rake spec;
diff --git a/Gemfile b/Gemfile
index 822a6a8217..3a29aa52aa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,6 +27,9 @@ group(:development, :test) do
   gem "simplecov"
   gem 'rack', "~> 1.5.1"
 
+  # for testing new chefstyle rules
+  # gem 'chefstyle', github: 'chef/chefstyle'
+  gem 'chefstyle', '= 0.1.0'
 
   gem 'ruby-shadow', :platforms => :ruby unless RUBY_PLATFORM.downcase.match(/(aix|cygwin)/)
 
diff --git a/Rakefile b/Rakefile
index 25ad13f097..9fe1147928 100644
--- a/Rakefile
+++ b/Rakefile
@@ -45,6 +45,13 @@ task :register_eventlog do
   end
 end
 
+
+require "chefstyle"
+require "rubocop/rake_task"
+RuboCop::RakeTask.new(:style) do |task|
+  task.options += ["--display-cop-names", "--no-color"]
+end
+
 begin
   require 'yard'
   DOC_FILES = [ "README.rdoc", "LICENSE", "spec/tiny_server.rb", "lib/**/*.rb" ]