puppet-magnum 3.1.5 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 003a8c71b4d188c9e3768fc6758478ecad5046ed
-  data.tar.gz: 147017e94585043df5819052fe620ae4f8727522
+  metadata.gz: 748039c14ee38cd19f95edd8b2ed8a64881ff3c8
+  data.tar.gz: 1c2ecade7ad694e133d7b3217c85f5e049ce7414
 SHA512:
-  metadata.gz: 3574bc027fba825698bafbfcc0caab9603cc05830d44d0d4c2c5c19ceaf18cc27956e125066a20f4c8b9fb639443fd526c2bb9c621804577e03d3ef3355d5b4c
-  data.tar.gz: 93fa579d8aa99ee6606be9389fcc74e1fb0590bb0cde7495f9f5ba16d9e5b2038f9289f72d35f11c76818dd221eb82dedfbb112669236046fab1a174c443ed22
+  metadata.gz: '03933ffd363ec826f4f7bf636fd8467f98ce01aedc54b2935f07a11f34aeb65a6afa903c3ad92c319402e7f552eceb51fabf5343bdec6289e6f69180d74729eb'
+  data.tar.gz: d07bef53339d343b3363a464707363cd2435284db5b35fd7fbaeefc7713ca31538a2ebddceb4ab36f108503e092b4a8d1ce9c77647e918a0560bb1206dc57ed3

data/.ruby-version

@@ -1 +1 @@
-2.3.3
+2.4.1

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [4.0.0]
+
+### IMPROVEMENTS:
+
+  * Upgrading to use Ruby `2.4.x` by default.
+  * Switching over to [Beaker](https://github.com/puppetlabs/beaker) for acceptance/integration testing. All tests are now through Beaker.
+  * Adding `hiera` v5 support; more [details](https://docs.puppet.com/puppet/4.10/hiera_migrate_modules.html).
+  * `puppet-magnum` 4.x is NOT backwards compatible with `puppet-magnum` 3.x managed repos.
+
 ## [3.1.5]
 
 ### IMPROVEMENTS:

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    puppet-magnum (3.1.5)
+    puppet-magnum (4.0.0)
+      beaker-hostgenerator (~> 0.8.4)
       bundler (>= 1.14.6)
       puppet (~> 4.10.0)
       puppet-lint (~> 2.2.1)
@@ -14,6 +15,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    beaker-hostgenerator (0.8.4)
+      deep_merge (~> 1.0)
+      stringify-hash (~> 0.0.0)
+    deep_merge (1.1.1)
     diff-lcs (1.3)
     facter (2.4.6)
     fast_gettext (1.1.0)
@@ -61,6 +66,7 @@ GEM
       rspec
     rspec-support (3.5.0)
     sem_ver (0.1.1)
+    stringify-hash (0.0.2)
     text (1.3.1)
     thor (0.19.4)
     version (1.1.1)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013-2016 Tehmasp Chaudhri <tehmasp@chaudhri.me>
+Copyright 2013-2017 Tehmasp Chaudhri <tehmasp@chaudhri.me>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -2,6 +2,8 @@
 
 [![Build Status](https://travis-ci.org/tehmaspc/puppet-magnum.svg?branch=master)](https://travis-ci.org/tehmaspc/puppet-magnum)
 
+**NOTE: `puppet-magnum` 4.x is NOT backwards compatible with `puppet-magnum` 3.x managed repos.**
+
 `puppet-magnum` is a tool for rapid, consistent, and best practice Puppet (4+) module development.
 
 `puppet-magnum` helps the Puppet module developer create or maintain a Puppet module and test the module with tools like the following:
@@ -15,10 +17,10 @@
 
 ### Requirements
 
-* Install Ruby 2.3.x.
+* Install Ruby 2.4.x.
 * Install [Vagrant](https://www.vagrantup.com).
-* Install [vagrant-serverspec](https://github.com/jvoorhis/vagrant-serverspec).
-* Install [vagrant-cachier](https://github.com/fgrehm/vagrant-cachier) (optional).
+* Install [VirtualBox](https://www.virtualbox.org/wiki/VirtualBox).
+* Install [Docker](https://www.docker.com) (optional).
 
 ### Install `puppet-magnum`
 
@@ -32,23 +34,29 @@
       puppet-magnum module          # Module related tasks. Type 'puppet-magnum module' for more help.
       puppet-magnum version         # Display version and copyright information
 
-## Example: Creating An `nginx` Puppet Module
+## Example: Creating an `nginx` Puppet Module
 
 The following shows how one can get started quickly creating an 'nginx' Puppet module:
 
     % puppet-magnum module create nginx
           create  nginx/manifests
+          create  nginx/data
           create  nginx/templates
           create  nginx/files
           create  nginx/spec
-          create  nginx/serverspec
+          create  nginx/spec/acceptance
+          create  nginx/spec/acceptance/nodesets
           ...
-          create  nginx/Vagrantfile
-          create  nginx/.vagrant_puppet/init.sh
-          create  nginx/.vagrant_puppet/environments/vagrant/environment.conf
-          create  nginx/.vagrant_puppet/environments/vagrant/manifests/init.pp
-          remove  nginx/.puppet-magnum.init
           create  nginx/.puppet-magnum.init
+          create  nginx/metadata.json
+          create  nginx/manifests/init.pp
+          create  nginx/hiera.yaml
+          create  nginx/data/common.yaml
+          create  nginx/.rspec
+          create  nginx/spec/acceptance/nginx_spec.rb
+          create  nginx/spec/spec_helper_acceptance.rb
+          create  nginx/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+          create  nginx/spec/acceptance/nodesets/ubuntu-server-1604-x64.yml
           remove  nginx/.gitignore
           create  nginx/.gitignore
              run  git init from "./nginx"
@@ -78,7 +86,7 @@ Thanks to the following projects and folks!:
 
 ## Authors and License
 
-Copyright 2013-2016 Tehmasp Chaudhri <tehmasp@chaudhri.me>
+Copyright 2013-2017 Tehmasp Chaudhri <tehmasp@chaudhri.me>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/Rakefile

@@ -10,11 +10,4 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = ['--color --format progress']
 end
 
-desc 'Display the list of available rake tasks'
-task :help do
-  system 'rake -T'
-end
-
-task :unit    => 'spec'
-task :test    => 'spec'
 task :default => 'spec'

data/VERSION

@@ -1 +1 @@
-3.1.5
+4.0.0

data/bin/puppet-magnum

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 $:.push File.expand_path('../../lib', __FILE__)
-require 'rubygems' # ruby1.9 doesn't 'require' it though
 require 'puppet-magnum'
 
 PuppetMagnum::Cli.start

data/generator_files/CHANGELOG.md.erb

@@ -0,0 +1 @@
+## [1.0.0]

data/generator_files/git/gitignore.erb

@@ -15,6 +15,8 @@
 *.log
 *.sql
 *.sqlite
+*.swp
+*.vdi
 .DS_Store*
 ._*
 *~
@@ -30,11 +32,7 @@ Thumbs.db
 Gemfile.lock
 bin/*
 .bundle/*
+.vagrant/*
 pkg
-
-.vagrant
-.vagrant_puppet/environments/vagrant/modules
-
-# ignore all fixtures modules, except this module.
-spec/fixtures/modules/*
-!spec/fixtures/modules/<%= module_name %>
+junit
+log

data/generator_files/puppet/common.yaml.erb

@@ -0,0 +1,2 @@
+---
+<%= module_name %>::test_message: "foobar"

data/generator_files/puppet/hiera.yaml.erb

@@ -0,0 +1,8 @@
+---
+version: 5
+defaults:
+  datadir: data
+  data_hash: yaml_data
+hierarchy:
+  - name: "common"
+    path: "common.yaml"

data/generator_files/puppet/init.pp.erb

@@ -1,29 +1,8 @@
 # Class: <%= module_name %>
-# ===========================
+# =========================
 #
 # Full description of class <%= module_name %> here.
 #
-# Parameters
-# ----------
-#
-# Document parameters here.
-#
-# * `sample parameter`
-#  Explanation of what this parameter affects and what it defaults to.
-#  e.g. "Specify one or more upstream ntp servers as an array."
-#
-# Variables
-# ---------
-#
-# Here you should define a list of variables that this module would require.
-#
-# * `sample variable`
-#  Explanation of how this variable affects the function of this class and if
-#  it has a default. e.g. "The parameter enc_ntp_servers must be set by the
-#  External Node Classifier as a comma separated list of hostnames." (Note,
-#  global variables should be avoided in favor of class parameters as
-#  of Puppet 2.6.)
-#
 # Examples
 # --------
 #

data/generator_files/puppet/metadata.json.erb

@@ -7,20 +7,19 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 3.2.0"
+      "version_requirement": ">= 4.16.0"
     }
   ],
   "operatingsystem_support": [
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-          "14.04"
+          "16.04"
       ]
     }
   ],
   "source": "https://example.com",
   "project_page": "https://example.com",
   "issues_url": "https://example.com",
-  "data_provider": null,
   "version": "1.0.0"
 }

data/generator_files/spec/acceptance/docker/ubuntu-server-1404-x64.yml.erb

@@ -0,0 +1,14 @@
+---
+HOSTS:
+  ubuntu-1404-x64:
+    roles:
+      - agent
+    platform: ubuntu-14.04-amd64
+    hypervisor: docker
+    image: ubuntu:14.04
+    docker_preserve_image: true
+CONFIG:
+  trace_limit: 200
+  masterless: true
+  log_level: verbose
+  type: aio

data/generator_files/spec/acceptance/docker/ubuntu-server-1604-x64.yml.erb

@@ -0,0 +1,14 @@
+---
+HOSTS:
+  ubuntu-1604-x64:
+    roles:
+      - agent
+    platform: ubuntu-16.04-amd64
+    hypervisor: docker
+    image: ubuntu:16.04
+    docker_preserve_image: true
+CONFIG:
+  trace_limit: 200
+  masterless: true
+  log_level: verbose
+  type: aio

data/generator_files/spec/acceptance/init_spec.rb.erb

@@ -0,0 +1,16 @@
+require_relative '../spec_helper_acceptance'
+
+describe '<%= module_name %>' do
+  let(:manifest) {
+    <<-EOS
+include <%= module_name %>
+EOS
+  }
+
+  it_behaves_like "an idempotent resource"
+
+  describe "something" do
+    it "does something"
+  end
+
+end

data/generator_files/spec/acceptance/spec_helper_acceptance.rb.erb

@@ -0,0 +1,33 @@
+require 'beaker-rspec'
+require 'beaker/puppet_install_helper'
+
+default_modules = [
+  "puppetlabs-stdlib",
+]
+
+run_puppet_install_helper
+
+RSpec.configure do |c|
+  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+  c.before :suite do
+    hosts.each do |host|
+
+      default_modules.each do |default_module|
+        on host, puppet("module install #{default_module}"), {:acceptable_exit_codes => [0]}
+      end
+
+      copy_module_to(host, :source => proj_root, :module_name => '<%= module_name %>')
+    end
+  end
+end
+
+shared_examples "an idempotent resource" do
+  it 'should apply without errors' do
+    apply_manifest(manifest, :catch_failures => true)
+  end
+
+  it 'should apply a second time without changes' do
+    apply_manifest(manifest, :catch_changes => true)
+  end
+end

data/generator_files/spec/acceptance/ubuntu-server-1404-x64.yml.erb

@@ -0,0 +1,11 @@
+---
+HOSTS:
+  ubuntu-server-1404-x64:
+    roles:
+      - master
+    platform: ubuntu-14.04-amd64
+    box: puppetlabs/ubuntu-14.04-64-nocm
+    hypervisor: vagrant
+CONFIG:
+  log_level: verbose
+  type: foss

data/generator_files/spec/acceptance/ubuntu-server-1604-x64.yml.erb

@@ -0,0 +1,11 @@
+---
+HOSTS:
+  ubuntu-server-1604-x64:
+    roles:
+      - master
+    platform: ubuntu-16.04-amd64
+    box: puppetlabs/ubuntu-16.04-64-nocm
+    hypervisor: vagrant
+CONFIG:
+  log_level: verbose
+  type: foss

data/generator_files/util/Gemfile.erb

@@ -7,3 +7,8 @@ gem 'rspec', '~> 3.5.0'
 gem 'puppet-lint', '~> 2.2.1'
 gem 'rspec-puppet', '~> 2.5.0'
 gem 'puppetlabs_spec_helper', '~> 2.1.2'
+
+# testing
+gem 'beaker', '~> 3.13.0'
+gem 'beaker-rspec', '~> 6.1.0'
+gem 'beaker-puppet_install_helper', '~> 0.7.1'

data/generator_files/util/Rakefile.erb

@@ -3,28 +3,11 @@ require 'rspec/core/rake_task'
 require 'puppet-lint/tasks/puppet-lint'
 require 'puppetlabs_spec_helper/rake_tasks'
 
-desc 'Run unit tests'
-task :unit do
-  Rake::Task[:spec_prep].invoke
-  Rake::Task[:spec_standalone].invoke
-end
-task :spec => []; Rake::Task[:spec].clear
-task :spec => :unit
-
-desc 'Run integration tests'
-task :integ do
-  Rake::Task[:spec_prep].invoke
-
-  puts 'Launching Vagrant to run integration tests...'
-  sh 'vagrant up --provision'
-end
-
-desc 'Run syntax, lint and unit tests'
+desc 'Run syntax, lint and acceptance tests'
 task :test do
   Rake::Task[:syntax].invoke
   Rake::Task[:lint].invoke
-  Rake::Task[:unit].invoke
-  Rake::Task[:integ].invoke
+  Rake::Task[:acceptance].invoke
 end
 
 # puppet-lint options
@@ -32,10 +15,50 @@ Rake::Task[:lint].clear
 PuppetLint::RakeTask.new :lint do |config|
   config.ignore_paths = ['spec/**/*.pp']
   config.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
-  config.disable_checks = [ "class_inherits_from_params_class", "80chars" ]
+  config.disable_checks = [ 'class_inherits_from_params_class', '80chars' ]
   config.fail_on_warnings = false
 end
 
+desc 'Run acceptance tests (VirtualBox)'
+task :acceptance, [:all] do |t, args|
+
+  # beaker default options
+  ENV['PUPPET_INSTALL_TYPE'] = 'agent'
+  ENV['BEAKER_destroy'] = 'onpass'
+
+  all = args[:all]
+
+  unless all.nil?
+    Rake::Task['beaker:ubuntu-server-1404-x64'].invoke
+  end
+
+  Rake::Task['beaker:ubuntu-server-1604-x64'].invoke
+end
+
+desc 'Run acceptance tests (Docker/Ubuntu 1404)'
+task :acceptance_docker1404 do
+
+  # beaker default options
+  ENV['PUPPET_INSTALL_TYPE'] = 'agent'
+  ENV['BEAKER_destroy'] = 'onpass'
+
+  ENV['BEAKER_set'] = 'docker/ubuntu-server-1404-x64'
+
+  Rake::Task['beaker'].invoke
+end
+
+desc 'Run acceptance tests (Docker/Ubuntu 1604)'
+task :acceptance_docker1604 do
+
+  # beaker default options
+  ENV['PUPPET_INSTALL_TYPE'] = 'agent'
+  ENV['BEAKER_destroy'] = 'onpass'
+
+  ENV['BEAKER_set'] = 'docker/ubuntu-server-1604-x64'
+
+  Rake::Task['beaker'].invoke
+end
+
 # remove undesired rake tasks
 task :build => []; Rake::Task[:build].clear
 task :clean => []; Rake::Task[:clean].clear

data/lib/puppet-magnum/generators/create_generator.rb

@@ -20,90 +20,51 @@ module PuppetMagnum
     class_option :copyright_holder,
       type: :string
 
-    def write_emptydirs
-      empty_directory target.join('manifests')
-      empty_directory target.join('templates')
-      empty_directory target.join('files')
-      empty_directory target.join('spec')
-      empty_directory target.join('serverspec')
-      empty_directory target.join('.vagrant_puppet')
-    end
+    def write_dirs
+      dirs = ['manifests', 'data', 'templates', 'files',
+              'spec', 'spec/acceptance', 'spec/acceptance/nodesets', 'spec/acceptance/nodesets/docker',
+             ]
 
-    def write_readme
-      template 'README.md.erb', target.join('README.md')
+      dirs.each do |dir|
+        empty_directory target.join("#{dir}")
+      end
     end
 
-    def write_changelog
+    def write_base_files
+      template license_file,       target.join('LICENSE')
+      template 'README.md.erb',    target.join('README.md')
       template 'CHANGELOG.md.erb', target.join('CHANGELOG.md')
     end
 
-    def write_license
-      template license_file, target.join('LICENSE')
-    end
-
-    def write_metadata_json
+    def write_puppet_files
       template 'puppet/metadata.json.erb', target.join('metadata.json')
-    end
-
-    def write_manifests_templates_files
-      template 'puppet/init.pp.erb', target.join('manifests/init.pp')
-      template 'puppet/params.pp.erb', target.join('manifests/params.pp')
+      template 'puppet/init.pp.erb',       target.join('manifests/init.pp')
+      template 'puppet/hiera.yaml.erb',    target.join('hiera.yaml')
+      template 'puppet/common.yaml.erb',   target.join('data/common.yaml')
     end
 
     def write_spec_setup
-      spec_dirs = [ 'classes', 'defines', 'functions', 'hosts', 'unit' ]
-      spec_dirs.each do |dir|
-        empty_directory target.join("spec/#{dir}")
-      end
-
-      empty_directory target.join('spec/fixtures/manifests')
-      create_file target.join('spec/fixtures/manifests/site.pp')
-
-      empty_directory target.join("spec/fixtures/modules/#{module_name}")
-      spec_dirs = ['manifests', 'templates', 'files']
-      spec_dirs.each { |spec_dir|
-        remove_file target.join("spec/fixtures/modules/#{module_name}/#{spec_dir}")
-        create_link target.join("spec/fixtures/modules/#{module_name}/#{spec_dir}"), "../../../../#{spec_dir}"
-      }
-
-      template 'spec/rspec/spec_helper.rb.erb', target.join('spec/spec_helper.rb')
-      template 'spec/rspec/init_spec.rb.erb', target.join("spec/classes/#{module_name}_spec.rb")
-
       template 'spec/rspec.erb', target.join('.rspec')
-    end
+      template 'spec/acceptance/init_spec.rb.erb', target.join("spec/acceptance/#{module_name}_spec.rb")
 
-    def write_serverspec_setup
-      template 'spec/serverspec/init_spec.rb.erb', target.join("serverspec/#{module_name}_spec.rb")
-    end
+      # beaker test files
+      template 'spec/acceptance/spec_helper_acceptance.rb.erb',  target.join('spec/spec_helper_acceptance.rb')
 
-    def write_fixtures
-       template 'spec/fixtures.yml.erb', target.join('.fixtures.yml')
-    end
+      template 'spec/acceptance/ubuntu-server-1404-x64.yml.erb', target.join('spec/acceptance/nodesets/ubuntu-server-1404-x64.yml')
+      template 'spec/acceptance/ubuntu-server-1604-x64.yml.erb', target.join('spec/acceptance/nodesets/ubuntu-server-1604-x64.yml')
 
-    def write_gemfile
-      remove_file target.join('Gemfile')
-      template 'util/Gemfile.erb', target.join('Gemfile')
+      template 'spec/acceptance/docker/ubuntu-server-1404-x64.yml.erb', target.join('spec/acceptance/nodesets/docker/ubuntu-server-1404-x64.yml')
+      template 'spec/acceptance/docker/ubuntu-server-1604-x64.yml.erb', target.join('spec/acceptance/nodesets/docker/ubuntu-server-1604-x64.yml')
     end
 
-    def write_rakefile
+    def write_util_files
+      remove_file target.join('Gemfile')
       remove_file target.join('Rakefile')
-      template 'util/Rakefile.erb', target.join('Rakefile')
-    end
-
-    def write_vagrantfile
-      template 'vagrant/Vagrantfile.erb', target.join('Vagrantfile')
-      template 'vagrant/init.sh.erb', target.join('.vagrant_puppet/init.sh')
-
-      # create default puppet environment
-      template 'vagrant/environment/environment.conf.erb',
-                target.join('.vagrant_puppet/environments/vagrant/environment.conf')
-      template 'vagrant/environment/manifests/init.pp.erb',
-                target.join('.vagrant_puppet/environments/vagrant/manifests/init.pp')
-    end
-
-    def write_puppet_magnum_init
       remove_file target.join('.puppet-magnum.init')
-      template 'puppet-magnum.init.erb', target.join('.puppet-magnum.init')
+
+      template 'util/Gemfile.erb', target.join('Gemfile')
+      template 'util/Rakefile.erb', target.join('Rakefile')
+      template 'util/puppet-magnum.init.erb', target.join('.puppet-magnum.init')
     end
 
     # due to the 'git add' operation, this function should be called last
@@ -121,10 +82,6 @@ module PuppetMagnum
 
     private
 
-    def commented(content)
-      content.split("\n").collect { |s| "# #{s}" }.join("\n")
-    end
-
     def license_name
       case options[:license]
       when 'apachev2'; 'Apache 2.0'
@@ -149,17 +106,6 @@ module PuppetMagnum
       end
     end
 
-    def which(cmd)
-      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-        exts.each { |ext|
-          exe = File.join(path, "#{cmd}#{ext}")
-          return exe if File.executable? exe
-        }
-      end
-      return nil
-    end
-
     def maintainer
       options[:maintainer]
     end

data/puppet-magnum.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = '>= 2.4.0'
 
   spec.add_development_dependency 'sem_ver', '>= 0.1.1'
   spec.add_development_dependency 'rake', '>= 12.0.0'
@@ -34,5 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'puppet-lint', '~> 2.2.1'
   spec.add_runtime_dependency 'rspec-puppet', '~> 2.5.0'
   spec.add_runtime_dependency 'puppetlabs_spec_helper', '~> 2.1.2'
+  spec.add_runtime_dependency 'beaker-hostgenerator', '~> 0.8.4'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-magnum
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 4.0.0
 platform: ruby
 authors:
 - Tehmasp Chaudhri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sem_ver
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: beaker-hostgenerator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.4
 description: puppet-magnum - a tool for rapid, consistent, and best practice Puppet
   module development.
 email:
@@ -177,21 +191,20 @@ files:
 - generator_files/licenses/apachev2.erb
 - generator_files/licenses/mit.erb
 - generator_files/licenses/reserved.erb
-- generator_files/puppet-magnum.init.erb
+- generator_files/puppet/common.yaml.erb
+- generator_files/puppet/hiera.yaml.erb
 - generator_files/puppet/init.pp.erb
 - generator_files/puppet/metadata.json.erb
-- generator_files/puppet/params.pp.erb
-- generator_files/spec/fixtures.yml.erb
+- generator_files/spec/acceptance/docker/ubuntu-server-1404-x64.yml.erb
+- generator_files/spec/acceptance/docker/ubuntu-server-1604-x64.yml.erb
+- generator_files/spec/acceptance/init_spec.rb.erb
+- generator_files/spec/acceptance/spec_helper_acceptance.rb.erb
+- generator_files/spec/acceptance/ubuntu-server-1404-x64.yml.erb
+- generator_files/spec/acceptance/ubuntu-server-1604-x64.yml.erb
 - generator_files/spec/rspec.erb
-- generator_files/spec/rspec/init_spec.rb.erb
-- generator_files/spec/rspec/spec_helper.rb.erb
-- generator_files/spec/serverspec/init_spec.rb.erb
 - generator_files/util/Gemfile.erb
 - generator_files/util/Rakefile.erb
-- generator_files/vagrant/Vagrantfile.erb
-- generator_files/vagrant/environment/environment.conf.erb
-- generator_files/vagrant/environment/manifests/init.pp.erb
-- generator_files/vagrant/init.sh.erb
+- generator_files/util/puppet-magnum.init.erb
 - lib/puppet-magnum.rb
 - lib/puppet-magnum/cli.rb
 - lib/puppet-magnum/cli/module.rb
@@ -216,7 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -224,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: puppet-magnum - a tool for rapid, consistent, and best practice Puppet module

data/generator_files/puppet/params.pp.erb

@@ -1,16 +0,0 @@
-# Class: <%= module_name %>::params
-# ===========================
-#
-# Authors
-# -------
-#
-# Author Name: <%= maintainer_email %>
-#
-# Copyright
-# ---------
-#
-# Copyright (C) <%= copyright_year %> <%= copyright_holder %>
-#
-class <%= module_name %>::params {
-
-}

data/generator_files/spec/fixtures.yml.erb

@@ -1,9 +0,0 @@
-# For puppetlabs_spec_helper documentation - see https://github.com/puppetlabs/puppetlabs_spec_helper
-
-fixtures:
-  repositories:
-    stdlib: 'git://github.com/puppetlabs/puppetlabs-stdlib'
-  symlinks:
-    <%= module_name %>/files: '../../../../files'
-    <%= module_name %>/manifests: '../../../../manifests'
-    <%= module_name %>/templates: '../../../../templates'

data/generator_files/spec/rspec/init_spec.rb.erb

@@ -1,6 +0,0 @@
-# for rspec-puppet documentation - see http://rspec-puppet.com/tutorial/
-require_relative '../spec_helper'
-
-describe '<%= module_name %>' do
-  it 'should do something'
-end

data/generator_files/spec/rspec/spec_helper.rb.erb

@@ -1,10 +0,0 @@
-require 'rspec-puppet'
-require 'puppetlabs_spec_helper/module_spec_helper'
-require 'puppetlabs_spec_helper/puppetlabs_spec_helper'
-
-fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
-
-RSpec.configure do |c|
-  c.module_path = File.join(fixture_path, 'modules')
-  c.manifest_dir = File.join(fixture_path, 'manifests')
-end

data/generator_files/spec/serverspec/init_spec.rb.erb

@@ -1,5 +0,0 @@
-# For serverspec documentation - see http://serverspec.org/tutorial.html
-
-describe '<%= module_name %>' do
-  it 'should do something'
-end

data/generator_files/vagrant/Vagrantfile.erb

@@ -1,38 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-VAGRANTFILE_API_VERSION = '2'
-
-Vagrant.require_version '>= 1.8.0'
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-
-  # Using Puppet Labs official Vagrant boxes, from: https://atlas.hashicorp.com/puppetlabs
-  config.vm.box = 'puppetlabs/ubuntu-14.04-64-puppet'
-
-  config.vm.provider 'virtualbox' do |vbox|
-    vbox.memory = 1024
-#   vbox.cpus = 2
-  end
-
-  if Vagrant.has_plugin?('vagrant-cachier')
-    config.cache.scope = :box
-  end
-
-  config.vm.provision :shell, :path => '.vagrant_puppet/init.sh'
-
-  config.vm.provision :puppet do |puppet|
-    puppet.environment_path = '.vagrant_puppet/environments'
-    puppet.environment = 'vagrant'
-    puppet.options = '--verbose'
-  end
-
-  config.vm.provision :serverspec do |spec|
-    spec.pattern = 'serverspec/*_spec.rb'
-  end
-
-end
-
-unless Vagrant.has_plugin?('vagrant-serverspec')
-  raise "\n\n'vagrant-serverspec' is NOT installed." +
-        "\nTo install, run: 'vagrant plugin install vagrant-serverspec'."
-end

data/generator_files/vagrant/environment/environment.conf.erb

@@ -1,18 +0,0 @@
-# Each environment can have an environment.conf file. Its settings will only
-# affect its own environment. See docs for more info:
-# https://docs.puppetlabs.com/puppet/latest/reference/config_file_environment.html
-
-# Any unspecified settings use default values; some of those defaults are based
-# on puppet.conf settings.
-
-# If these settings include relative file paths, they'll be resolved relative to
-# this environment's directory.
-
-# Allowed settings and default values:
-
-# modulepath = ./modules:$basemodulepath
-# manifest = (default_manifest from puppet.conf, which defaults to ./manifests)
-# config_version = (no script; Puppet will use the time the catalog was compiled)
-# environment_timeout = (environment_timeout from puppet.conf, which defaults to 0)
-    # Note: unless you have a specific reason, we recommend only setting
-    # environment_timeout in puppet.conf.

data/generator_files/vagrant/environment/manifests/init.pp.erb

@@ -1 +0,0 @@
-include <%= module_name %>

data/generator_files/vagrant/init.sh.erb

@@ -1,38 +0,0 @@
-#!/bin/bash
-
-set -e
-
-STAGE='/tmp/magnum-vagrant-stage'
-KEYFILE='/tmp/puppetlabs-gpg'
-
-FIXTURES_DIR='/vagrant/spec/fixtures/modules'
-PUPPET_MODULES_DIR='/etc/puppetlabs/code/modules'
-VAGRANT_PUPPET_ENV_DIR='/tmp/vagrant-puppet/environments/vagrant'
-
-if [ ! -e $STAGE ]; then
-
-  echo "Initial provision, running the magnum-vagrant shell provisioner script..."
-
-  wget -q -O $KEYFILE https://apt.puppetlabs.com/pubkey.gpg &>/dev/null
-  apt-key add $KEYFILE
-
-  echo "Updating system packages..."
-  apt-get update &>/dev/null
-
-  echo "Updating Puppet packages..."
-  DEBIAN_FRONTEND=noninteractive apt-get install -y puppet-agent &>/dev/null
-
-  echo "Creating test environment..."
-  mkdir -p $VAGRANT_PUPPET_ENV_DIR
-  ln -sfn $FIXTURES_DIR $VAGRANT_PUPPET_ENV_DIR/modules
-
-  rm -rf $PUPPET_MODULES_DIR
-  ln -sfn $VAGRANT_PUPPET_ENV_DIR/modules $PUPPET_MODULES_DIR
-
-  touch $STAGE
-
-else
-  echo "Not initial provision, skipping the magnum-vagrant shell provisioner script..."
-fi
-
-exit 0