Merge pull request #9 from puppet-community/rubocop-only-4

Rubocop only 4
voxpupuli · Oct 4, 2015 · 5595645 · 5595645
2 parents 6df8b9b + 13a3c87
commit 5595645
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/moduleroot/.travis.yml b/moduleroot/.travis.yml
@@ -7,18 +7,20 @@ cache: bundler
 bundler_args: --without system_tests
 before_install: rm Gemfile.lock || true
 script:
-  - 'bundle exec rake test'
+  - 'bundle exec rake $CHECK'
 matrix:
   fast_finish: true
   include:
   - rvm: 1.9.3
-    env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes"
+    env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
   - rvm: 2.1.6
-    env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes"
+    env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
   - rvm: 2.1.6
-    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
   - rvm: 2.2.3
-    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
+  - rvm: 2.2.3
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=rubocop
 deploy:
   provider: puppetforge
   user: puppet

diff --git a/moduleroot/Gemfile b/moduleroot/Gemfile
@@ -23,6 +23,7 @@ group :test do
   gem 'rspec-puppet-facts'
   gem 'rspec'
   gem 'puppet-blacksmith'
+  gem 'rubocop'
 end
 
 group :development do

diff --git a/moduleroot/Rakefile b/moduleroot/Rakefile
@@ -50,7 +50,6 @@ task test: [
   :metadata_lint,
   :lint,
   :syntax,
-  :rubocop,
   :spec,
 ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,7 +50,6 @@ task test: [ @@
       :metadata_lint,
       :lint,
       :syntax,
-      :rubocop,
       :spec,
     ]
@@ Expand Down @@