puppet-ci-testing 0.13.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 484b2ce86b7e5130c7bcfbe73de6256cfac8b8b4
-  data.tar.gz: 5ea6821808cbe97a025e81254f0a86b719ada38c
+SHA256:
+  metadata.gz: 550788cd9c65b34842411b5d7ca976b33f5326ce83c975e0629669c380f76098
+  data.tar.gz: 73aece062fb6d483bae81f8865c8a64da5e346363778d80e8df176de3b3dc9e0
 SHA512:
-  metadata.gz: 7c1c4c00c177060642ab1dc5286d9675c996350fca7c4b68360af57ee5714fd1831aed649abd813abf1ccbd2d007be7961fd758cb1d18c7931f666d368123b5d
-  data.tar.gz: 5e21700cd599332f28797e53062edceb483d64bd7c87fce7d79c0ae5d0ffb444a677f0ef5fde62e04ce545f9c7f10553f0dc8ccb8fde65d8dcc9070f4084bb44
+  metadata.gz: e859a8d0a415e0b539a93860f4726e58478070674e09efd56d7af153d8c2cb5e493c83d9c749b55421fa63e92cbbb96478f047fc86f6d1703af62328ad82e29d
+  data.tar.gz: ac2f04edd9ac2b9ad8b8fd732314c6632da606d270f35cd5309adff20ad902cd8ee81135a84b416f1361f277d0e6b4f69690289326b15458b1d1fcbb86e95c2e

data/bin/puppet_unittest_workflow

@@ -8,8 +8,10 @@ require 'rake'
 require 'rspec/core/rake_task'
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
+require 'metadata-json-lint/rake_task'
 
 require 'puppet-lint'
+require 'metadata_json_lint'
 
 require 'check_file_syntax'
 
@@ -32,9 +34,9 @@ def create_fixtures_yml
         if dep.key? 'version_requirement'
           fix.puts "    #{(dep['name'].split(/[\/\-]/))[-1]}:"
           fix.puts "      repo: \"#{dep['name']}\""
-          fix.puts "      ref: \"#{dep['version_requirement'].gsub(/[=\<\>~\s]/, '')}\""
+          fix.puts "      ref: \"#{dep['version_requirement'].gsub(/[=\<\>~\s]+([\d\.]+).*$/, '\1')}\""
         else
-          fix.puts "    #{(dep['name'].split(/\/\-/))[1]}: \"#{dep['name']}\""
+          fix.puts "    #{(dep['name'].split(/\/\-/))[-1]}: \"#{dep['name']}\""
         end
       end
     end
@@ -84,10 +86,10 @@ EOM
 end
 
 
-def process_lint_parsing(opts)
+def process_puppet_lint_parsing(opts)
 
   all_checks = PuppetLint.configuration.checks.map {|chk| chk.to_s}
-  enables = opts.lint_enable || all_checks
+  enables = opts.puppet_lint_enable.empty? ? all_checks : opts.puppet_lint_enable
   disables = all_checks - enables
 
   puts <<-EOM
@@ -95,7 +97,7 @@ def process_lint_parsing(opts)
 ========================================================================
 ========================================================================
 
-  Performing lint parsing
+  Performing puppet manifest lint parsing
 
     Enabled lint options:
           #{enables.join("\n          ")}
@@ -109,7 +111,7 @@ EOM
     Rake::Task['lint'].clear
     PuppetLint::RakeTask.new :lint do |config|
       config.ignore_paths = ['spec/**/*.pp', 'vendor/**/*.pp']
-      config.log_format = '%{path}:%{linenumber}:%{check}:%{KIND}:%{message}'
+      config.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
       config.fail_on_warnings = false
       config.disable_checks = disables
     end
@@ -136,6 +138,51 @@ EOM
 end
 
 
+def process_metadata_lint_parsing(opts)
+
+  all_checks = MetadataJsonLint.options.members.select {|check| check.to_s if check != :format }
+  enables = opts.metadata_lint_enable.empty? ? all_checks : opts.metadata_lint_enable
+  disables = all_checks - enables
+
+  puts <<-EOM
+
+========================================================================
+========================================================================
+
+  Performing metadata.json lint parsing
+
+    Enabled lint options:
+          #{enables.join("\n          ")}
+
+************************************************************************
+
+EOM
+
+  # configure the rake task to disable specific checks
+  enables.each {|check| MetadataJsonLint.options[check] = true }
+  disables.each {|check| MetadataJsonLint.options[check] = false}
+
+  begin
+    # TODO: gather lint output and generate JUnit reports
+    Rake.application['metadata_lint'].invoke
+  rescue SystemExit => e
+    puts <<-EOM
+
+************************************************************************
+
+                            BUILD HAS FAILED
+
+             Correct the above metadata.json LINT errors to correct
+
+************************************************************************
+
+EOM
+    return false
+  end
+  return true
+end
+
+
 def process_rspec_tests(opts)
 
   puts <<-EOM
@@ -180,29 +227,36 @@ options = OpenStruct.new
 options.syntax_run = true
 options.syntax_checks = CheckFileSyntax::ALL_CHECKS
 options.syntax_exclude_dirs = []
-options.lint_run = true
-options.lint_enable = []
+options.puppet_lint_run = true
+options.puppet_lint_enable = []
+options.metadata_lint_run = true
+options.metadata_lint_enable = []
 options.rspec_run = true
 options.rspec_clean_sources = false
 
 
 # read in config file and set options
 defaults = YAML.load_file(CONF_FILE)
-defaults.keys.each do |test|
-  opts = defaults[test]
+defaults.keys.each do |test_type|
+  opts = defaults[test_type]
 
-  if test == 'syntax'
+  if test_type == 'syntax'
     options.syntax_run = opts['run'] if opts.has_key? 'run'
     options.syntax_checks = opts['checks'] if opts.has_key? 'checks'
     options.syntax_exclude_dirs = opts['exclude_dirs'] if opts.has_key? 'exclude_dirs'
   end
 
-  if test == 'lint'
-    options.lint_run = opts['run'] if opts.has_key? 'run'
-    options.lint_enable = opts['enable'] if opts.has_key? 'enable'
+  if test_type == 'puppet_lint'
+    options.puppet_lint_run = opts['run'] if opts.has_key? 'run'
+    options.puppet_lint_enable = opts['enable'] if opts.has_key? 'enable'
   end
 
-  if test == 'rspec'
+  if test_type == 'metadata_lint'
+    options.metadata_lint_run = opts['run'] if opts.has_key? 'run'
+    options.metadata_lint_enable = opts['enable'] if opts.has_key? 'enable'
+  end
+
+  if test_type == 'rspec'
     options.rspec_run = opts['run'] if opts.has_key? 'run'
     options.rspec_clean_sources = opts['clean_sources'] if opts.has_key? 'clean_sources'
   end
@@ -212,8 +266,9 @@ end
 
 # process the command line options and override prev set settings
 OptionParser.new do |opts|
-  opts.on('--[no-]lint', "Enable/disable lint parsing (Default: #{options[:lint]})") do |val|
-    options.lint_run = val
+  opts.on('--[no-]lint', "Enable/disable lint parsing (Default: #{options[:puppet_lint_run]})") do |val|
+    options.puppet_lint_run = val
+    options.metadata_lint_run = val
   end
 
   opts.on('--disable-syntax-check [TYPE]', 'Disable syntax check for TYPE') do |val|
@@ -267,12 +322,17 @@ if options.syntax_run
 end
 
 
-if options.lint_run
-  unless process_lint_parsing(options)
+if options.puppet_lint_run
+  unless process_puppet_lint_parsing(options)
     exit(2)
   end
 end
 
+if options.metadata_lint_run
+  unless process_metadata_lint_parsing(options)
+    exit(2)
+  end
+end
 
 if options.rspec_run
   process_rspec_tests(options)

data/etc/puppet_unittest_workflow.yaml

@@ -16,7 +16,7 @@
       - spec
 #
 # Configuration for lint parsing
-  lint:
+  puppet_lint:
     run: true
 # enable turns on lint parsing options. They are puppet-lint options
 # with '--no-' and '-check' removed from the option. Not specifying
@@ -55,6 +55,14 @@
       - ensure_not_symlink_target
       - unquoted_node_name
 #
+# Configuration for metadata.json linting
+  metadata_lint:
+    run: true
+    enable:
+#      - strict_dependencies
+      - strict_license
+      - fail_on_warnings
+#
 # Configuration for RSpec unit testing
   rspec:
     run: true

data/lib/check_file_syntax.rb

@@ -38,7 +38,7 @@ module CheckFileSyntax
   end
 
   def ruby_file?(path)
-    type_of_file(path, :ruby, '.rb')
+    type_of_file(path, :ruby, ['.rb', '.rake'])
   end
 
   def perl_file?(path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-ci-testing
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Gerard Hickey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -123,19 +123,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: metadata-json-lint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.3.0
-  type: :development
+        version: 2.0.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.3.0
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -213,8 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Utilities to perform Puppet testing in a CI workflow