Update from voxpupuli modulesync_config

Author: Joseph Yaworski

.gitignore

@@ -1,6 +1,8 @@
 pkg/
 Gemfile.lock
+Gemfile.local
 vendor/
+.vendor/
 spec/fixtures/
 .vagrant/
 .bundle/

.rubocop.yml

@@ -1,8 +1,11 @@
+require: rubocop-rspec
 AllCops:
+  TargetRubyVersion: 1.9
   Include:
     - ./**/*.rb
   Exclude:
     - vendor/**/*
+    - .vendor/**/*
     - pkg/**/*
     - spec/fixtures/**/*
 
@@ -64,3 +67,7 @@ Style/BlockDelimiters:
 
 Style/MultilineBlockLayout:
   Enabled: False
+
+# Rspec
+RSpec/DescribeClass:
+  Enabled: False

.sync.yml

@@ -0,0 +1,4 @@
+---
+.travis.yml:
+  secure: "Gi2pSwUXV0VzdVVfxAW8/9/2/ZYUuOaFxr7klw2lDh1/+pbvINyn3m6121AVY8Z3W3wfJGqnnsIHC/3pS1671xsVES9VPEXqc5v93P+VHmtxEBCFakEBkQ6B+EqCiB5w58L6At+ZM85ejcdTPy3Pg4gNEaJc5rKAHZkq3FMamzA="
+...

.travis.yml

@@ -2,26 +2,30 @@
 sudo: false
 language: ruby
 cache: bundler
-bundler_args: --without system_tests
-before_install: rm Gemfile.lock || true
+bundler_args: --without system_tests development
+before_install:
+  - bundle -v
+  - rm Gemfile.lock || true
+  - gem update --system
+  - gem update bundler
+  - gem --version
+  - bundle -v
 script:
   - 'bundle exec rake $CHECK'
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.9.3
+  - rvm: jruby-19mode
     env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
-  - rvm: 2.1.8
+  - rvm: jruby-19mode
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
+  - rvm: 2.1
     env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
-  - rvm: 1.9.3
-    env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test FUTURE_PARSER=yes
-  - rvm: 2.1.8
-    env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test FUTURE_PARSER=yes
-  - rvm: 2.1.8
+  - rvm: 2.1
     env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
-  - rvm: 2.2.4
+  - rvm: 2.2
     env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
-  - rvm: 2.2.4
+  - rvm: 2.3.0
     env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=rubocop
   - rvm: 2.3.0
     env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
@@ -40,5 +44,4 @@ deploy:
     # all_branches is required to use tags
     all_branches: true
     # Only publish if our main Ruby target builds
-    rvm: 1.9.3
-    condition: "$FUTURE_PARSER = yes"
+    rvm: 2.2

.yardopts

@@ -0,0 +1 @@
+--markup markdown

Gemfile

@@ -11,24 +11,23 @@ def location_for(place, fake_version = nil)
 end
 
 group :test do
-  gem 'rake',                                                       :require => false
+  gem 'puppetlabs_spec_helper',                                     :require => false
   gem 'rspec-puppet',                                               :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git'
-  gem 'puppet-lint',                                                :require => false, :git => 'https://github.com/rodjek/puppet-lint.git'
-  gem 'metadata-json-lint',                                         :require => false
   gem 'rspec-puppet-facts',                                         :require => false
-  gem 'rspec',                                                      :require => false
-  gem 'puppet-blacksmith',                                          :require => false, :git => 'https://github.com/voxpupuli/puppet-blacksmith.git'
-  gem 'voxpupuli-release',                                          :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git'
-  gem 'rubocop', '~> 0.38',                                         :require => false
   gem 'rspec-puppet-utils',                                         :require => false
-  gem 'puppetlabs_spec_helper',                                     :require => false
+  gem 'puppet-lint',                                                :require => false, :git => 'https://github.com/rodjek/puppet-lint.git'
   gem 'puppet-lint-absolute_classname-check',                       :require => false
   gem 'puppet-lint-leading_zero-check',                             :require => false
   gem 'puppet-lint-trailing_comma-check',                           :require => false
   gem 'puppet-lint-version_comparison-check',                       :require => false
   gem 'puppet-lint-classes_and_types_beginning_with_digits-check',  :require => false
   gem 'puppet-lint-unquoted_string-check',                          :require => false
   gem 'puppet-lint-variable_contains_upcase',                       :require => false
+  gem 'metadata-json-lint',                                         :require => false
+  gem 'puppet-blacksmith',                                          :require => false, :git => 'https://github.com/voxpupuli/puppet-blacksmith.git'
+  gem 'voxpupuli-release',                                          :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git'
+  gem 'puppet-strings',                                             :require => false, :git => 'https://github.com/puppetlabs/puppetlabs-strings.git'
+  gem 'rubocop-rspec', '~> 1.4',                                    :require => false
 end
 
 group :development do
@@ -58,7 +57,7 @@ else
 gem 'facter', :require => false, :groups => [:test]
 end
 
-ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 3.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
+ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 4.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim:ft=ruby

Rakefile

@@ -1,12 +1,13 @@
 require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-require 'puppet-syntax/tasks/puppet-syntax'
-require 'metadata-json-lint/rake_task'
 require 'puppet_blacksmith/rake_tasks'
 require 'voxpupuli/release/rake_tasks'
 require 'rubocop/rake_task'
+require 'puppet-strings/rake_tasks'
 
-RuboCop::RakeTask.new
+RuboCop::RakeTask.new(:rubocop) do |task|
+  # These make the rubocop experience maybe slightly less terrible
+  task.options = ['-D', '-S', '-E']
+end
 
 PuppetLint.configuration.log_format = '%{path}:%{linenumber}:%{check}:%{KIND}:%{message}'
 PuppetLint.configuration.fail_on_warnings = true
@@ -19,6 +20,7 @@ PuppetLint.configuration.send('disable_single_quote_string_with_variables')
 exclude_paths = %w(
   pkg/**/*
   vendor/**/*
+  .vendor/**/*
   spec/**/*
 )
 PuppetLint.configuration.ignore_paths = exclude_paths
@@ -29,7 +31,7 @@ RSpec::Core::RakeTask.new(:acceptance) do |t|
   t.pattern = 'spec/acceptance'
 end
 
-desc 'Run metadata_lint, lint, syntax, and spec tests.'
+desc 'Run tests metadata_lint, lint, syntax, spec'
 task test: [
   :metadata_lint,
   :lint,

metadata.json

@@ -3,7 +3,6 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "4",
         "5",
         "6",
         "7"
@@ -12,7 +11,6 @@
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "4",
         "5",
         "6",
         "7"
@@ -21,7 +19,6 @@
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
-        "4",
         "5",
         "6",
         "7"
@@ -30,7 +27,6 @@
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
-        "4",
         "5",
         "6",
         "7"
@@ -46,14 +42,16 @@
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "10.04",
-        "12.04"
+        "12.04",
+        "14.04",
+        "16.04"
       ]
     },
     {
@@ -73,7 +71,8 @@
         "Server 2012",
         "Server 2012 R2",
         "7",
-        "8"
+        "8",
+        "10"
       ]
     },
     {

spec/acceptance/nodesets/centos-59-x64.yml

@@ -135,7 +135,7 @@
     let(:title) { 'sample.deb' }
     let(:params) { { target: '/opt' } }
 
-    it 'should fail' do
+    it 'fails' do
       should compile.and_raise_error(/The .deb filetype is only supported on Debian family systems./)
     end
   end

spec/acceptance/nodesets/centos-64-x64-pe.yml

@@ -4,26 +4,26 @@
 describe 'the scope_defaults function' do
   let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
 
-  it 'should exist' do
+  it 'exists' do
     Puppet::Parser::Functions.function('scope_defaults').should == 'function_scope_defaults'
   end
 
-  it 'should raise a ParseError if there is less than 2 arguments' do
+  it 'raises a ParseError if there is less than 2 arguments' do
     expect { scope.function_scope_defaults([]) }
       .to raise_error(Puppet::ParseError)
   end
 
-  it 'should raise a ParseError if there is more than 2 arguments' do
+  it 'raises a ParseError if there is more than 2 arguments' do
     expect { scope.function_scope_defaults(%w(exec path error)) }
       .to raise_error(Puppet::ParseError)
   end
 
-  it 'should return false for invalid resource' do
+  it 'returns false for invalid resource' do
     result = scope.function_scope_defaults(%w(foo path))
     result.should(eq(false))
   end
 
-  it 'should return false for resource without default attributes' do
+  it 'returns false for resource without default attributes' do
     if scope.respond_to? :define_settings
       scope.define_settings('Exec', Puppet::Parser::Resource::Param.new(name: :path, value: '/bin'))
     else
@@ -33,7 +33,7 @@
     result.should(eq(false))
   end
 
-  it 'should return true for resource with default attributes' do
+  it 'returns true for resource with default attributes' do
     if scope.respond_to? :define_settings
       scope.define_settings('Exec', Puppet::Parser::Resource::Param.new(name: :path, value: '/bin'))
     else

spec/acceptance/nodesets/centos-65-x64.yml

@@ -4,47 +4,47 @@
 describe 'the staging parser function' do
   let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
 
-  it 'should exist' do
+  it 'exists' do
     Puppet::Parser::Functions.function('staging_parse').should == 'function_staging_parse'
   end
 
-  it 'should raise a ParseError if there is less than 1 arguments' do
+  it 'raises a ParseError if there is less than 1 arguments' do
     -> { scope.function_staging_parse([]) }.should(raise_error(Puppet::ParseError))
   end
 
-  it 'should raise a ParseError if there is more than 3 arguments' do
+  it 'raises a ParseError if there is more than 3 arguments' do
     -> { scope.function_staging_parse(['/etc', 'filename', '.zip', 'error']) }.should(raise_error(Puppet::ParseError))
   end
 
-  it 'should raise a ParseError if there is an invalid info request' do
+  it 'raises a ParseError if there is an invalid info request' do
     -> { scope.function_staging_parse(['/etc', 'sheep', '.zip']) }.should(raise_error(Puppet::ParseError))
   end
 
-  it "should raise a ParseError if 'source' doesn't have a URI path component" do
+  it "raises a ParseError if 'source' doesn't have a URI path component" do
     -> { scope.function_staging_parse(['uri:without-path']) }.should(raise_error(Puppet::ParseError, /has no URI 'path' component/))
   end
 
-  it 'should return the filename by default' do
+  it 'returns the filename by default' do
     result = scope.function_staging_parse(['/etc/puppet/sample.tar.gz'])
     result.should(eq('sample.tar.gz'))
   end
 
-  it 'should return the file basename' do
+  it 'returns the file basename' do
     result = scope.function_staging_parse(['/etc/puppet/sample.tar.gz', 'basename'])
     result.should(eq('sample.tar'))
   end
 
-  it 'should return the file basename with custom extensions' do
+  it 'returns the file basename with custom extensions' do
     result = scope.function_staging_parse(['/etc/puppet/sample.tar.gz', 'basename', '.tar.gz'])
     result.should(eq('sample'))
   end
 
-  it 'should return the file extname' do
+  it 'returns the file extname' do
     result = scope.function_staging_parse(['/etc/puppet/sample.tar.gz', 'extname'])
     result.should(eq('.gz'))
   end
 
-  it 'should return the file parent' do
+  it 'returns the file parent' do
     result = scope.function_staging_parse(['/etc/puppet/sample.tar.gz', 'parent'])
     result.should(eq('/etc/puppet'))
   end