Modulesync 20160319

Author: rnelson0

.gitignore

@@ -1,6 +1,11 @@
-.*.sw?
-pkg
-spec/fixtures
-.rspec_system
-.vagrant
+pkg/
 Gemfile.lock
+vendor/
+spec/fixtures/
+.vagrant/
+.bundle/
+coverage/
+log/
+.idea/
+*.iml
+.*.sw

.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

.rubocop.yml

@@ -1,4 +1,6 @@
 AllCops:
+  Include:
+    - ./**/*.rb
   Exclude:
     - vendor/**/*
     - pkg/**/*
@@ -8,14 +10,36 @@ AllCops:
 Metrics/LineLength:
   Max: 328
 
-# dealbreaker:
-Style/TrailingComma:
+# 'Complexity' is very relative
+Metrics/PerceivedComplexity:
   Enabled: false
-Style/ClosingParenthesisIndentation:
+
+# 'Complexity' is very relative
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+# 'Complexity' is very relative
+Metrics/AbcSize:
   Enabled: false
 
-# we still support ruby 1.8
-Style/HashSyntax:
+# Method length is not necessarily an indicator of code quality
+Metrics/MethodLength:
+  Enabled: false
+
+# Module length is not necessarily an indicator of code quality
+Metrics/ModuleLength:
+  Enabled: false
+
+# Class length is not necessarily an indicator of code quality
+Metrics/ClassLength:
+  Enabled: false
+
+# dealbreaker:
+Style/TrailingCommaInArguments:
+  Enabled: false
+Style/TrailingCommaInLiteral:
+  Enabled: false
+Style/ClosingParenthesisIndentation:
   Enabled: false
 
 Lint/AmbiguousRegexpLiteral:
@@ -29,3 +53,14 @@ Style/WordArray:
 # providers
 Style/ClassAndModuleChildren:
   Enabled: false
+
+Style/Documentation:
+  Description: 'Document classes and non-namespace modules.'
+  Enabled: false
+
+# More comfortable block layouts
+Style/BlockDelimiters:
+  Enabled: False
+
+Style/MultilineBlockLayout:
+  Enabled: False

.travis.yml

@@ -1,6 +1,4 @@
 ---
-notifications:
-  email: false
 sudo: false
 language: ruby
 cache: bundler
@@ -11,18 +9,27 @@ script:
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.9.3
-    env: PUPPET_VERSION="~> 3.4" CHECK=test
   - rvm: 1.9.3
     env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
-  - rvm: 2.1.6
+  - rvm: 2.1.8
     env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
-  - rvm: 2.1.6
+  - 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
     env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
-  - rvm: 2.2.3
+  - rvm: 2.2.4
     env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
-  - rvm: 2.2.3
+  - rvm: 2.2.4
     env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=rubocop
+  - rvm: 2.3.0
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
+  allow_failures:
+    - rvm: 2.3.0
+      env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
+notifications:
+  email: false
 deploy:
   provider: puppetforge
   user: puppet
@@ -34,3 +41,4 @@ deploy:
     all_branches: true
     # Only publish if our main Ruby target builds
     rvm: 1.9.3
+    condition: "$FUTURE_PARSER = yes"

CONTRIBUTING.md

@@ -5,6 +5,8 @@ will likely make it into a release a little quicker.
 
 ## Contributing
 
+Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. [Contributor Code of Conduct](https://voxpupuli.org/coc/).
+
 1. Fork the repo.
 
 1. Create a separate branch for your change.
@@ -47,18 +49,29 @@ The test suite will run [Puppet Lint](http://puppet-lint.com/) and
 [Puppet Syntax](https://github.com/gds-operations/puppet-syntax) to
 check various syntax and style things. You can run these locally with:
 
-    bundle exec rake test
+    bundle exec rake lint
+    bundle exec rake validate
 
 ## Running the unit tests
 
 The unit test suite covers most of the code, as mentioned above please
 add tests if you're adding new functionality. If you've not used
 [rspec-puppet](http://rspec-puppet.com/) before then feel free to ask
-about how best to test your new feature. To run your specific spec test
-you can pass it to `SPEC`:
+about how best to test your new feature.
+
+To run your all the unit tests
+
+    bundle exec rake spec SPEC_OPTS='--format documentation'
+
+To run a specific spec test set the `SPEC` variable:
 
     bundle exec rake spec SPEC=spec/foo_spec.rb
 
+To run the linter, the syntax checker and the unit tests:
+
+    bundle exec rake test
+
+
 ## Integration tests
 
 The unit tests just check the code runs, not that it does exactly what
@@ -74,7 +87,7 @@ with:
 This will run the tests on an Ubuntu 12.04 virtual machine. You can also
 run the integration tests against Centos 6.5 with.
 
-    RS_SET=centos-64-x64 bundle exec rake acceptances
+    BEAKER_set=centos-64-x64 bundle exec rake acceptances
 
 If you don't want to have to recreate the virtual machine every time you
 can use `BEAKER_DESTROY=no` and `BEAKER_PROVISION=no`. On the first run you will

Gemfile

@@ -1,31 +1,64 @@
-source 'https://rubygems.org'
+source ENV['GEM_SOURCE'] || "https://rubygems.org"
+
+def location_for(place, fake_version = nil)
+  if place =~ /^(git[:@][^#]*)#(.*)/
+    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
+  elsif place =~ /^file:\/\/(.*)/
+    ['>= 0', { :path => File.expand_path($1), :require => false }]
+  else
+    [place, { :require => false }]
+  end
+end
 
 group :test do
-  gem 'rake'
-  gem 'puppet', ENV['PUPPET_VERSION'] || '~> 3.8.0'
-  gem 'rspec-puppet', git: 'https://github.com/rodjek/rspec-puppet.git'
-  gem 'puppetlabs_spec_helper'
-  gem 'metadata-json-lint'
-  gem 'rspec-puppet-facts'
-  gem 'rspec'
-  gem 'puppet-blacksmith'
-  gem 'rubocop'
-  gem 'puppet-lint-absolute_classname-check'
-  gem 'puppet-lint-leading_zero-check'
-  gem 'puppet-lint-trailing_comma-check'
-  gem 'puppet-lint-version_comparison-check'
-  gem 'puppet-lint-classes_and_types_beginning_with_digits-check'
-  gem 'puppet-lint-unquoted_string-check'
-  gem 'puppet-lint-variable_contains_upcase'
+  gem 'rake',                                                       :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-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
 end
 
 group :development do
-  gem 'travis'
-  gem 'travis-lint'
-  gem 'guard-rake'
+  gem 'travis',       :require => false
+  gem 'travis-lint',  :require => false
+  gem 'guard-rake',   :require => false
 end
 
 group :system_tests do
-  gem 'beaker'
-  gem 'beaker-rspec'
+  gem 'beaker',                        :require => false
+  if beaker_version = ENV['BEAKER_VERSION']
+    gem 'beaker', *location_for(beaker_version)
+  end
+  if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
+    gem 'beaker-rspec', *location_for(beaker_rspec_version)
+  else
+    gem 'beaker-rspec',  :require => false
+  end
+  gem 'beaker-puppet_install_helper',  :require => false
+end
+
+
+
+if facterversion = ENV['FACTER_GEM_VERSION']
+gem 'facter', facterversion.to_s, :require => false, :groups => [:test]
+else
+gem 'facter', :require => false, :groups => [:test]
 end
+
+ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 3.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
+gem 'puppet', puppetversion, :require => false, :groups => [:test]
+
+# vim:ft=ruby

README.md

@@ -1,8 +1,11 @@
-# Staging module for Puppet
+# Puppet Stagin
 
-Manages staging directory, along with download/extraction of compressed files.
+[![Puppet Forge](http://img.shields.io/puppetforge/v/puppet/staging.svg)](https://forge.puppetlabs.com/puppet/staging)
+[![Puppet Forge downloads](https://img.shields.io/puppetforge/dt/puppet/staging.svg)](https://forge.puppetlabs.com/puppet/staging)
+[![Puppet Forge score](https://img.shields.io/puppetforge/f/puppet/staging.svg)](https://forge.puppetlabs.com/puppet/staging)
+[![Build Status](https://travis-ci.org/voxpupuli/puppet-staging.png)](https://travis-ci.org/voxpupuli/puppet-staging)
 
-[![Build Status](https://secure.travis-ci.org/voxpupuli/puppet-staging.png?branch=master)](http://travis-ci.org/voxpupuli/puppet-staging)
+Manages staging directory, along with download/extraction of compressed files.
 
 WARNING: Version 0.2.0 no longer uses hiera functions. The same behavior should be available in Puppet 3.0.
 
@@ -63,7 +66,7 @@ Staging files currently support the following source:
 
 Primarily authored by Nan Liu
 
-## Contributor
+## Contributors
 
 * Adrien Thebo
 * gizero

Rakefile

@@ -3,20 +3,18 @@ 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'
 
 RuboCop::RakeTask.new
 
-PuppetLint.configuration.relative = true
-PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.log_format = '%{path}:%{linenumber}:%{check}:%{KIND}:%{message}'
 PuppetLint.configuration.fail_on_warnings = true
-
-# Forsake support for Puppet 2.6.2 for the benefit of cleaner code.
-# http://puppet-lint.com/checks/class_parameter_defaults/
-PuppetLint.configuration.send('disable_class_parameter_defaults')
-# http://puppet-lint.com/checks/class_inherits_from_params_class/
+PuppetLint.configuration.send('relative')
+PuppetLint.configuration.send('disable_140chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
+PuppetLint.configuration.send('disable_documentation')
+PuppetLint.configuration.send('disable_single_quote_string_with_variables')
 
 exclude_paths = %w(
   pkg/**/*
@@ -38,22 +36,3 @@ task test: [
   :syntax,
   :spec,
 ]
-
-Blacksmith::RakeTask.new do |t|
-  t.build = false # do not build the module nor push it to the Forge
-  # just do the tagging [:clean, :tag, :bump_commit]
-end
-
-desc 'Offload release process to Travis.'
-task travis_release: [
-  :check_changelog,  # check that the changelog contains an entry for the current release
-  :"module:release", # do everything except build / push to forge, travis will do that for us
-]
-
-desc 'Check Changelog.'
-task :check_changelog do
-  v = Blacksmith::Modulefile.new.version
-  if File.readlines('CHANGELOG.md').grep(/Releasing #{v}/).size == 0
-    fail "Unable to find a CHANGELOG.md entry for the #{v} release."
-  end
-end

manifests/extract.pp

@@ -13,7 +13,7 @@
   $subdir      = $caller_module_name #: subdir per module in staging directory.
 ) {
 
-  include staging
+  include ::staging
 
   if $source {
     $source_path = $source

manifests/file.pp

@@ -24,7 +24,7 @@
   $subdir      = $caller_module_name
 ) {
 
-  include staging
+  include ::staging
 
   $quoted_source = shellquote($source)
 

metadata.json

@@ -95,14 +95,15 @@
       "version_requirement": ">=2.7.0"
     }
   ],
-  "name": "nanliu-staging",
+  "name": "puppet-staging",
+  "description": "Manages compressed file staging and deployment.",
   "version": "1.0.4",
-  "source": "git://github.com/nanliu/puppet-staging",
-  "author": "Nan Liu",
-  "license": "Apache-2.0",
+  "author": "voxpupuli",
   "summary": "Compressed file staging and deployment",
-  "description": "Manages compressed file staging and deployment.",
-  "project_page": "https://github.com/nanliu/puppet-staging",
+  "license": "Apache-2.0",
+  "source": "https://github.com/voxpupuli/puppet-staging",
+  "project_page": "https://github.com/voxpupuli/puppet-staging",
+  "issues_url": "https://github.com/voxpupuli/puppet-staging/issues",
   "dependencies": [
 
   ]

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

@@ -0,0 +1,9 @@
+HOSTS:
+  centos-511-x64:
+    roles:
+      - master
+    platform: el-5-x86_64
+    box: puppetlabs/centos-5.11-64-nocm
+    hypervisor: vagrant
+CONFIG:
+  type: foss