Merge pull request #1 from mpdude/merge-pr-142

Merge upstream PR ajcurated#142

Author: mpdude

.fixtures.yml

@@ -1,10 +1,6 @@
 fixtures:
-  repositories:
-    'stdlib':
-      repo: 'git://github.com/puppetlabs/puppetlabs-stdlib'
-      ref: '4.9.0'
-    'concat':
-      repo: 'git://github.com/puppetlabs/puppetlabs-concat'
-      ref: '1.2.4'
   symlinks:
     supervisord: "#{source_dir}"
+  forge_modules:
+    concat: puppetlabs-concat
+    stdlib: puppetlabs-stdlib

.puppet-lint.rc

@@ -0,0 +1,14 @@
+--relative
+--no-lookup_in_parameter-check
+--no-parameter_documentation-check
+--no-parameter_types-check
+--no-params_empty_string_assignment-check
+--no-relative_classname_inclusion-check
+--no-relative_classname_reference-check
+--no-strict_indent-check
+--no-top_scope_facts-check
+--no-topscope_variable-check
+--no-trailing_comma-check
+--no-selector_inside_resource-check
+--no-documentation-check
+--no-140chars-check

Gemfile

@@ -1,26 +1,70 @@
-source 'https://rubygems.org'
-
-group :test do
-  gem 'rake', '10.5.0'
-  gem 'puppet-lint'
-  gem 'puppet-syntax'
-  gem 'puppetlabs_spec_helper', '1.0.1'
-  gem 'rspec-puppet', '2.2.0'
-  gem 'rspec', '2.99.0'
+source ENV['GEM_SOURCE'] || 'https://gems.ftven.net'
+
+def location_for(place_or_version, fake_version = nil)
+  git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?}
+  file_url_regex = %r{\Afile:\/\/(?<path>.*)}
+
+  if place_or_version && (git_url = place_or_version.match(git_url_regex))
+    [fake_version, { git: git_url[:url], branch: git_url[:branch], require: false }].compact
+  elsif place_or_version && (file_url = place_or_version.match(file_url_regex))
+    ['>= 0', { path: File.expand_path(file_url[:path]), require: false }]
+  else
+    [place_or_version, { require: false }]
+  end
 end
 
 group :development do
-  gem 'travis'
-  gem 'travis-lint'
-  gem 'beaker'
-  gem 'beaker-rspec'
-  gem 'pry'
-  gem 'guard-rake'
+  gem "json", '= 2.1.0',                           require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.3.0',                           require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.5.1',                           require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.6.1',                           require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.6.3',                           require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "voxpupuli-puppet-lint-plugins", '~> 4.0',   require: false
+  gem "facterdb", '~> 1.18',                       require: false
+  gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false
+  gem "puppetlabs_spec_helper", '~> 5.0',          require: false
+  gem "rspec-puppet-facts", '~> 2.0',              require: false
+  gem "codecov", '~> 0.2',                         require: false
+  gem "dependency_checker", '~> 0.2',              require: false
+  gem "parallel_tests", '= 3.12.1',                require: false
+  gem "pry", '~> 0.10',                            require: false
+  gem "simplecov-console", '~> 0.5',               require: false
+  gem "puppet-debugger", '~> 1.0',                 require: false
+  gem "rubocop", '= 1.6.1',                        require: false
+  gem "rubocop-performance", '= 1.9.1',            require: false
+  gem "rubocop-rspec", '= 2.0.1',                  require: false
+  gem "rb-readline", '= 0.5.5',                    require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "rspec-puppet-utils",                        require: false
+  gem "webmock",                                   require: false
+  gem "ipaddress",                                 require: false
+  gem "hashie",                                    require: false
+  gem "vault",                                     require: false
+  gem "debouncer",                                 require: false
+  gem "concurrent-ruby",                           require: false
+  gem "sdk_api", '= 0.4.0.9',                      require: false
+  gem "minitest", '= 5.15.0',                      require: false
+  gem "net-ssh", '= 6.1.0',                        require: false
 end
+group :system_tests do
+  gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby, :x64_mingw]
+  gem "serverspec", '~> 2.41',    require: false
+end
+
+puppet_version = ENV['PUPPET_GEM_VERSION']
+facter_version = ENV['FACTER_GEM_VERSION']
+hiera_version = ENV['HIERA_GEM_VERSION']
+
+gems = {}
+
+gems['puppet'] = location_for(puppet_version)
+
+# If facter or hiera versions have been specified via the environment
+# variables
 
+gems['facter'] = location_for(facter_version) if facter_version
+gems['hiera'] = location_for(hiera_version) if hiera_version
 
-if puppetversion = ENV['PUPPET_VERSION']
-  gem 'puppet', puppetversion
-else
-  gem 'puppet', '~> 3.8.0'
+gems.each do |gem_name, gem_params|
+  gem gem_name, *gem_params
 end
+# vim: syntax=ruby

tests/ctlplugin.pp examples/ctlplugin.pptests/ctlplugin.pp renamed to examples/ctlplugin.pp

@@ -1,4 +1,4 @@
 supervisord::group { 'mygroup':
   priority => 100,
   program  => ['program1', 'program2', 'program3']
-}
+}

tests/group.pp examples/group.pptests/group.pp renamed to examples/group.pp

@@ -32,4 +32,4 @@
   directory               => undef,
   umask                   => '022',
   serverurl               => 'AUTO'
-}
+}

tests/init.pp examples/init.pptests/init.pp renamed to examples/init.pp

@@ -3,7 +3,6 @@
 # Configuration class for supervisor init and conf directories
 #
 class supervisord::config inherits supervisord {
-
   if ($supervisord::manage_config) {
     file { $supervisord::config_include:
       ensure  => directory,
@@ -34,7 +33,7 @@
 
   if $supervisord::install_init {
     file { $supervisord::init_script:
-      ensure  => present,
+      ensure  => file,
       owner   => 'root',
       mode    => $supervisord::init_mode,
       content => template($supervisord::init_script_template),
@@ -43,7 +42,7 @@
 
     if $supervisord::init_defaults {
       file { $supervisord::init_defaults:
-        ensure  => present,
+        ensure  => file,
         owner   => 'root',
         mode    => '0755',
         content => template($supervisord::init_defaults_template),

tests/program.pp examples/program.pptests/program.pp renamed to examples/program.pp

@@ -9,19 +9,13 @@
 # Documentation on parameters available at:
 # http://supervisord.org/configuration.html#program-x-section-settings
 #
-define supervisord::ctlplugin(
-  $ctl_factory,
-  $ensure      = present,
+define supervisord::ctlplugin (
+  String $ctl_factory,
+  $ensure = present,
 ) {
-  include supervisord
-
-  # parameter validation
-  validate_string($ctl_factory)
-
   concat::fragment { "ctlplugin:${name}":
     target  => $supervisord::config_file,
     content => template('supervisord/conf/ctlplugin.erb'),
     order   => 70,
   }
-
 }