From d308d2dd6374dc49d52be7737f297ba1f7fb4518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Sun, 4 Oct 2015 13:07:07 -0700
Subject: [PATCH 1/2] actually add rubocop to the Gemfile

---
 moduleroot/Gemfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/moduleroot/Gemfile b/moduleroot/Gemfile
index c9e13207..cd5c7d57 100644
--- 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

From 13a3c87c0488aa4bf9a070118d1d13844e57d58f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Sun, 4 Oct 2015 16:34:08 -0700
Subject: [PATCH 2/2] only run rubocop on puppet 4

it fails on puppet 3 because of vendored safeyaml
---
 moduleroot/.travis.yml | 12 +++++++-----
 moduleroot/Rakefile    |  1 -
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/moduleroot/.travis.yml b/moduleroot/.travis.yml
index ecaf191e..d0d3af2a 100644
--- 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/Rakefile b/moduleroot/Rakefile
index 02b9ed6e..7b1e6c29 100644
--- a/moduleroot/Rakefile
+++ b/moduleroot/Rakefile
@@ -50,7 +50,6 @@ task test: [
   :metadata_lint,
   :lint,
   :syntax,
-  :rubocop,
   :spec,
 ]