From 36f67cef93d55e3910cbc019e39f9cb3f0f1915f Mon Sep 17 00:00:00 2001 From: Matt Ray Date: Mon, 23 Dec 2013 15:21:06 -0600 Subject: [PATCH] Initial rubocop support. Per the mailing list thread, introducing Rubocop as a replacement for Tailor. Assuming Jenkins likes this, more pedantic patches will follow to make Rubocop happy. Change-Id: I0e2f2a7ede649d8b2f04f7b795e411835e29710f --- Gemfile | 2 +- Gemfile.lock | 22 ++++++++++++---------- Strainerfile | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 3491dfb..840af0a 100644 --- a/Gemfile +++ b/Gemfile @@ -6,4 +6,4 @@ gem "berkshelf", "~> 2.0.10" gem "chefspec", "~> 3.0.2" gem "foodcritic", "~> 3.0.3" gem "strainer" -gem "tailor" +gem "rubocop" diff --git a/Gemfile.lock b/Gemfile.lock index 30830d8..0b478ca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,6 +8,7 @@ GEM akami (1.2.0) gyoku (>= 0.4.0) nokogiri (>= 1.4.0) + ast (1.1.0) berkshelf (2.0.10) activesupport (~> 3.2.0) addressable (~> 2.3.4) @@ -88,7 +89,6 @@ GEM ipaddress (0.8.0) json (1.7.7) little-plugger (1.1.3) - log_switch (0.4.0) logging (1.8.1) little-plugger (>= 1.1.3) multi_json (>= 1.3.6) @@ -120,8 +120,13 @@ GEM mixlib-shellout systemu (~> 2.5.2) yajl-ruby + parser (2.0.0) + ast (~> 1.1) + slop (~> 3.4, >= 3.4.5) polyglot (0.3.3) + powerpack (0.0.9) rack (1.5.2) + rainbow (1.1.4) rake (10.1.0) rbzip2 (0.2.0) rest-client (1.6.7) @@ -155,6 +160,10 @@ GEM rspec-expectations (2.14.4) diff-lcs (>= 1.1.3, < 2.0) rspec-mocks (2.14.4) + rubocop (0.15.0) + parser (~> 2.0) + powerpack (~> 0.0.6) + rainbow (>= 1.1.4) rubyntlm (0.1.1) savon (0.9.5) akami (~> 1.0) @@ -164,21 +173,14 @@ GEM nokogiri (>= 1.4.0) nori (~> 1.0) wasabi (~> 1.0) + slop (3.4.7) solve (0.8.2) strainer (3.3.0) berkshelf (~> 2.0) buff-platform (~> 0.1) systemu (2.5.2) - tailor (1.3.1) - log_switch (>= 0.3.0) - term-ansicolor (>= 1.0.5) - text-table (>= 1.2.2) - term-ansicolor (1.2.2) - tins (~> 0.8) - text-table (1.2.3) thor (0.18.1) timers (1.1.0) - tins (0.13.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) @@ -207,5 +209,5 @@ DEPENDENCIES chefspec (~> 3.0.2) foodcritic (~> 3.0.3) json (<= 1.7.7) + rubocop strainer - tailor diff --git a/Strainerfile b/Strainerfile index 7e292b4..44e3e14 100644 --- a/Strainerfile +++ b/Strainerfile @@ -1,5 +1,5 @@ # Strainerfile -tailor: bundle exec tailor +rubocop: bundle exec rubocop $SANDBOX/$COOKBOOK knife test: bundle exec knife cookbook test $COOKBOOK foodcritic: bundle exec foodcritic -f any -t ~FC003 -t ~FC023 $SANDBOX/$COOKBOOK chefspec: bundle exec rspec $SANDBOX/$COOKBOOK/spec