Update to new Puppet module standards

leoarnold · Mar 7, 2016 · 4e99170 · 4e99170
1 parent 693e81e
commit 4e99170
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 6 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -1,9 +1,9 @@
 ---
 fixtures:
   repositories:
-    "stdlib":
-      "repo": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-      "ref": "4.10.0"
+    stdlib:
+      repo: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
+      ref: "4.10.0"
   symlinks:
-    "cups": "#{source_dir}"
+    cups: "#{source_dir}"
 
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@
 sudo: false
 language: ruby
 bundler_args: --without acceptance_testing
-script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec"
+script: bundle exec rake release_checks
 matrix:
   fast_finish: true
   include:

diff --git a/Gemfile b/Gemfile
@@ -15,7 +15,7 @@ else
 end
 
 group :development do
-  gem 'puppetlabs_spec_helper', '~> 1.0', require: false
+  gem 'puppetlabs_spec_helper', '~> 1.1.1', require: false
   gem 'rubocop', '~> 0.37', require: false
   gem 'puppet-lint', '~> 1.0', require: false
   gem 'metadata-json-lint', '~> 0.0', require: false

diff --git a/Rakefile b/Rakefile
@@ -1,6 +1,9 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'rspec-puppet/rake_task'
 
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new
+
 require 'puppet-lint/tasks/puppet-lint'
 PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.ignore_paths = ['spec/**/*.pp', 'pkg/**/*.pp', 'vendor/**/*.pp']

diff --git a/tests/ctl.pp → examples/ctl.pp b/tests/ctl.pp → examples/ctl.pp
diff --git a/tests/default_queue.pp → examples/default_queue.pp b/tests/default_queue.pp → examples/default_queue.pp
diff --git a/tests/init.pp → examples/init.pp b/tests/init.pp → examples/init.pp
diff --git a/tests/minimal_class.pp → examples/minimal_class.pp b/tests/minimal_class.pp → examples/minimal_class.pp
diff --git a/tests/minimal_printer.pp → examples/minimal_printer.pp b/tests/minimal_printer.pp → examples/minimal_printer.pp