puppet-ci-testing 0.12.6 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df3b8f8b63c59ed2524d8724061072e6f85435cd
-  data.tar.gz: 547020b0ebabbb65c74d6d3a3adefc69ff290812
+  metadata.gz: f99d1e3fe768586804350933c4dc5211259a532a
+  data.tar.gz: b9d60de3ec1c6bcd2621531d3ef927afe2aebc8e
 SHA512:
-  metadata.gz: f0caa7931c4d5c3c000a466634fea83fa0d741de2d47653698e123bf646d9c7972c2cc93c8fc6dc332a9f45e1454c5882495ac43335121314a1a0c094856c4de
-  data.tar.gz: 4a36e949b099c732f9b48c87952f710cb655d978db6fdaff90dad15e174452b7aea185dc93184f7a5f859fc3763067a0419580e4a45a7f23afba98d8345ef28b
+  metadata.gz: ed1f2b9bd912e5c304606a8e6ff808b7c43fc313bf2c37e1fd8ed83288cc06a54ca15b6e2749abf88930d072d7515a7cb3c884f4f49a4c854456b41fc215854e
+  data.tar.gz: c6ef1ad60388beab4f430e4c0d17899dd5e3b33caa6667ef7e959d4803f0354878e7251f845ce5297037b80ce407b6fabbb0ec8b3c6fc9f38e09d122f34f777c

data/bin/puppet_unittest_workflow

@@ -17,6 +17,30 @@ require 'check_file_syntax'
 PUPPET_DIRS = ['files', 'lib', 'manifest', 'spec', 'templates', 'tests',
                '.git_hooks']
 
+# .fixtures.yml file is how the RSpec testing pulls in dependent
+# puppet modules. We are able to generate it from the dependency
+# information specified in the metadata.json file.
+def create_fixtures_yml
+  metadata = JSON.parse(File.read('metadata.json'))
+  File.open('.fixtures.yml', 'w') do |fix|
+    fix.puts "fixtures:"
+    fix.puts "  symlinks:"
+    fix.puts "    #{(metadata['name'].split(/[\/\-]/))[-1]}: \"\#{source_dir}\""
+    if metadata.key? 'dependencies'
+      fix.puts "  forge_modules:"
+      metadata['dependencies'].each do |dep|
+        if dep.key? 'version_requirement'
+          fix.puts "    #{(dep['name'].split(/[\/\-]/))[-1]}:"
+          fix.puts "      repo: \"#{dep['name']}\""
+          fix.puts "      ref: \"#{dep['version_requirement'].gsub(/[=\<\>~\s]/, '')}\""
+        else
+          fix.puts "    #{(dep['name'].split(/\/\-/))[1]}: \"#{dep['name']}\""
+        end
+      end
+    end
+  end
+end
+
 
 def process_syntax_checks(opts)
   # collect all the current directories
@@ -30,7 +54,7 @@ def process_syntax_checks(opts)
 ========================================================================
 ========================================================================
 
-  Performaning syntax checks
+  Performing syntax checks
 
     File types:  #{opts.syntax_checks.map {|i| i.to_s}.join(', ')}
     Directories: #{checked_dirs.join(', ')}
@@ -92,6 +116,7 @@ EOM
   end
 
   begin
+    # TODO: gather lint output and generate JUnit reports
     Rake.application['lint'].invoke
   rescue SystemExit => e
     puts <<-EOM
@@ -132,18 +157,18 @@ EOM
     Rake.application['spec_clean'].invoke
   end
 
+  # Add a spec job to generate JUnit reports
   RSpec::Core::RakeTask.new(:spec) do |task|
     task.rspec_opts = %w[--format RspecJunitFormatter --out test-reports/rspec.xml]
     task.pattern = 'spec/{classes,defines,unit,functions,hosts,integration}/**/*_spec.rb'
   end
-  Rake.application['spec_fixtures'].invoke
-  Rake.application['spec_prep'].invoke
+
+  # we need a .fixtures.yml file to pull in dependent modules
+  create_fixtures_yml
   Rake.application['spec'].invoke
 end
 
 
-
-
 if ENV['PUPPET_CI_CONF']
   CONF_FILE = ENV['PUPPET_CI_CONF']
 else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-ci-testing
 version: !ruby/object:Gem::Version
-  version: 0.12.6
+  version: 0.13.0
 platform: ruby
 authors:
 - Gerard Hickey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-17 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -28,16 +28,16 @@ dependencies:
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: puppet-lint
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: rake-version
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
-description: ''
+description: Create an end to end CI workflow for integrating Puppet module testing
+  and publication.
 email: hickey@kinetic-compute.com
 executables:
 - check_file_syntax
@@ -216,5 +217,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: ''
+summary: Utilities to perform Puppet testing in a CI workflow
 test_files: []