puppet-magnum 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a030e0c24caedcd5eff49e87bb83756ecef462e8
-  data.tar.gz: 15b277f93c5f95517b7090d836c8ee308a2e89a3
+  metadata.gz: c24663450943b47282e03f3441fe1c7cb3585096
+  data.tar.gz: 0e710162293ecfe9d1aa1d5196a75460584b5bf9
 SHA512:
-  metadata.gz: 6ed50a6d3674ceb5634cf85c19aee46e345a61424fa575fd3d176d19c4781654ab05c3f655efbec29a74a073b16eb81040b4f00ddffcaac086f95bfdd0150f4d
-  data.tar.gz: 982712d91e32b13cd3cdb4a887f6844df88c8720e4b96c014192e50eefd4f5048b5f3059ff61d0b0f339c9664fc92b27d7f7b0f307cf8909b1631dc2e887c813
+  metadata.gz: 37505447030f2b8efec1a1e43c69af4f5fcaf6c6090b43e3c58ad7daff9a9fdad08f23a3ab1996aa99a8dc4cfa324e518e7b5323e8c2819b89ba10c2e8378465
+  data.tar.gz: 7463e8027bb0ec286a7963b4ce8e1923b1581eeec09f1ec9a8df54ae46f12785fc5d4dddce0ee78266ac5b92c2b8320c7e481213bee4b9ffd7ff294bf155a833

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [4.0.3]
+
+### FIXES:
+
+  * Reintro .fixtures.yml support since Beaker doesn't support private git repos properly.
+
+### IMPROVEMENTS:
+
+  * Update gem versions.
+
 ## [4.0.2]
 
 ### IMPROVEMENTS:
@@ -10,6 +20,7 @@
       - Vagrantfile (removed)
       - spec => spec.old (renamed)
       - serverspec => serverspec.old (renamed)
+    * In `puppet-magnum` 4.x - `.puppet-magnum.init` is now `.puppet-magnum` and it is in YAML format.
 
 ## [4.0.1]
 

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    puppet-magnum (4.0.2)
+    puppet-magnum (4.0.3)
       beaker-hostgenerator (~> 0.8.4)
       bundler (>= 1.14.6)
-      puppet (~> 4.10.0)
+      puppet (~> 4.10.1)
       puppet-lint (~> 2.2.1)
       puppetlabs_spec_helper (~> 2.1.2)
       rspec (~> 3.5.0)
@@ -35,7 +35,7 @@ GEM
     metaclass (0.0.4)
     mocha (1.2.1)
       metaclass (~> 0.0.1)
-    puppet (4.10.0)
+    puppet (4.10.1)
       facter (> 2.0, < 4)
       gettext-setup (>= 0.10, < 1)
       hiera (>= 2.0, < 4)

data/VERSION

@@ -1 +1 @@
-4.0.2
+4.0.3

data/generator_files/git/gitignore.erb

@@ -36,3 +36,6 @@ bin/*
 pkg
 junit
 log
+
+# ignore all fixtures dirs; simply using fixtures to manage module dependencies
+spec/fixtures/*

data/generator_files/spec/fixtures.yml.erb

@@ -0,0 +1,5 @@
+# For puppetlabs_spec_helper documentation - see https://github.com/puppetlabs/puppetlabs_spec_helper
+
+fixtures:
+  repositories:
+    stdlib: 'git://github.com/puppetlabs/puppetlabs-stdlib'

data/generator_files/spec/{acceptance/spec_helper_acceptance.rb.erb → spec_helper_acceptance.rb.erb}

@@ -1,22 +1,24 @@
+require 'pathname'
 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__), '..'))
+  proj_root   = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+  modules_dir = Pathname.new("#{proj_root}/spec/fixtures/modules")
 
   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]}
+      # copy all fixtures module dirs to host (if any)
+      modules_dir.each_child do |module_dir|
+        unless File.symlink?(module_dir)
+          copy_module_to(host, :source => module_dir.to_s, :module_name => module_dir.basename.to_s)
+        end
       end
 
+      # copy this main module to host
       copy_module_to(host, :source => proj_root, :module_name => '<%= module_name %>')
     end
   end

data/generator_files/util/Gemfile.erb

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rake'
 
-gem 'puppet', '~> 4.10.0'
+gem 'puppet', '~> 4.10.1'
 gem 'rspec', '~> 3.5.0'
 gem 'puppet-lint', '~> 2.2.1'
 gem 'rspec-puppet', '~> 2.5.0'

data/generator_files/util/Rakefile.erb

@@ -7,6 +7,8 @@ desc 'Run syntax, lint and acceptance tests'
 task :test do
   Rake::Task[:syntax].invoke
   Rake::Task[:lint].invoke
+
+  Rake::Task[:spec_prep].invoke
   Rake::Task[:acceptance].invoke
 end
 
@@ -19,7 +21,7 @@ PuppetLint::RakeTask.new :lint do |config|
   config.fail_on_warnings = false
 end
 
-desc 'Run acceptance tests (VirtualBox)'
+desc 'Run acceptance tests with VirtualBox'
 task :acceptance, [:all] do |t, args|
 
   # beaker default options
@@ -35,7 +37,18 @@ task :acceptance, [:all] do |t, args|
   Rake::Task['beaker:ubuntu-server-1604-x64'].invoke
 end
 
-desc 'Run acceptance tests (Docker/Ubuntu 1404)'
+desc 'Run acceptance tests with Docker'
+task :acceptance_docker, [:all] do |t, args|
+
+  all = args[:all]
+
+  unless all.nil?
+    Rake::Task['acceptance_docker1404'].invoke
+  end
+
+  Rake::Task['acceptance_docker1604'].invoke
+end
+
 task :acceptance_docker1404 do
 
   # beaker default options
@@ -47,7 +60,6 @@ task :acceptance_docker1404 do
   Rake::Task['beaker'].invoke
 end
 
-desc 'Run acceptance tests (Docker/Ubuntu 1604)'
 task :acceptance_docker1604 do
 
   # beaker default options

data/lib/puppet-magnum.rb

@@ -1,5 +1,5 @@
-require 'thor'
 require 'pathname'
+require 'thor'
 
 module PuppetMagnum
 

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

@@ -25,7 +25,7 @@ module PuppetMagnum
     def write_remove_legacy_files_dirs
       if File.exist?(target.join('.puppet-magnum.init'))
 
-        legacy_files = ['.fixtures.yml', '.vagrant_puppet', 'Vagrantfile']
+        legacy_files = ['.vagrant_puppet', 'Vagrantfile']
         legacy_files.each do |legacy_file|
           if File.exist?(target.join("#{legacy_file}"))
             remove_file target.join("#{legacy_file}")
@@ -35,7 +35,7 @@ module PuppetMagnum
         legacy_dirs = ['spec', 'serverspec']
         legacy_dirs.each do |legacy_dir|
           if File.exist?(target.join("#{legacy_dir}"))
-            directory target.join("#{legacy_dir}"), target.join("#{legacy_dir}.old")
+            FileUtils.cp_r target.join("#{legacy_dir}"), target.join("#{legacy_dir}.old")
             remove_file target.join("#{legacy_dir}")
           end
         end
@@ -46,7 +46,8 @@ module PuppetMagnum
 
     def write_dirs
       dirs = ['manifests', 'data', 'templates', 'files',
-              'spec', 'spec/acceptance', 'spec/acceptance/nodesets', 'spec/acceptance/nodesets/docker',
+              'spec', 'spec/fixtures', 'spec/fixtures/modules',
+              'spec/acceptance', 'spec/acceptance/nodesets', 'spec/acceptance/nodesets/docker',
              ]
 
       dirs.each do |dir|
@@ -78,11 +79,10 @@ module PuppetMagnum
     end
 
     def write_spec_setup
-      template 'spec/rspec.erb', target.join('.rspec')
-      template 'spec/acceptance/init_spec.rb.erb', target.join("spec/acceptance/#{module_name}_spec.rb")
-
-      # beaker test files
-      template 'spec/acceptance/spec_helper_acceptance.rb.erb', target.join('spec/spec_helper_acceptance.rb')
+      template 'spec/fixtures.yml.erb',              target.join('.fixtures.yml')
+      template 'spec/rspec.erb',                     target.join('.rspec')
+      template 'spec/spec_helper_acceptance.rb.erb', target.join('spec/spec_helper_acceptance.rb')
+      template 'spec/acceptance/init_spec.rb.erb',   target.join("spec/acceptance/#{module_name}_spec.rb")
 
       beaker_sut_files = [
         'ubuntu-server-1404-x64.yml',

data/puppet-magnum.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'thor', '>= 0.19.4'
   spec.add_runtime_dependency 'version', '>= 1.1.1'
 
-  spec.add_runtime_dependency 'puppet', '~> 4.10.0'
+  spec.add_runtime_dependency 'puppet', '~> 4.10.1'
   spec.add_runtime_dependency 'rspec', '~> 3.5.0'
   spec.add_runtime_dependency 'puppet-lint', '~> 2.2.1'
   spec.add_runtime_dependency 'rspec-puppet', '~> 2.5.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-magnum
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Tehmasp Chaudhri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sem_ver
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.10.0
+        version: 4.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.10.0
+        version: 4.10.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -198,10 +198,11 @@ files:
 - 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/fixtures.yml.erb
 - generator_files/spec/rspec.erb
+- generator_files/spec/spec_helper_acceptance.rb.erb
 - generator_files/util/Gemfile.erb
 - generator_files/util/Rakefile.erb
 - generator_files/util/puppet-magnum.erb