Merge branch 'master' into resource_validation

Author: kpaulisse

.travis.yml

@@ -7,14 +7,22 @@ script: "script/cibuild"
 matrix:
   include:
     # Build with latest ruby
-    - rvm: 2.4
-      env: RUBOCOP_TEST="true" RSPEC_TEST="true"
+    - rvm: 2.5
+      env: RUBOCOP_TEST="false" RSPEC_TEST="true" ENFORCE_COVERAGE="true" PUPPET_VERSIONS="3.8.7"
+    - rvm: 2.5
+      env: RUBOCOP_TEST="false" RSPEC_TEST="true" ENFORCE_COVERAGE="true" PUPPET_VERSIONS="4.10.8"
+    - rvm: 2.5
+      env: RUBOCOP_TEST="true" RSPEC_TEST="true" ENFORCE_COVERAGE="true" PUPPET_VERSIONS="5.0.0"
     # Build with older ruby versions
+    - rvm: 2.4
+      env: RUBOCOP_TEST="false" RSPEC_TEST="true" PUPPET_VERSIONS="3.8.7"
     - rvm: 2.3.2
-      env: RUBOCOP_TEST="false" RSPEC_TEST="true"
+      env: RUBOCOP_TEST="false" RSPEC_TEST="true" PUPPET_VERSIONS="4.10.8"
     - rvm: 2.2.3
-      env: RUBOCOP_TEST="false" RSPEC_TEST="true"
+      env: RUBOCOP_TEST="false" RSPEC_TEST="true" PUPPET_VERSIONS="5.0.0"
     - rvm: 2.1
-      env: RUBOCOP_TEST="false" RSPEC_TEST="true"
+      env: RUBOCOP_TEST="false" RSPEC_TEST="true" PUPPET_VERSIONS="3.8.7"
+    - rvm: 2.0
+      env: RUBOCOP_TEST="false" RSPEC_TEST="true" PUPPET_VERSIONS="3.8.7"
     - rvm: 2.0
-      env: RUBOCOP_TEST="false" RSPEC_TEST="true"
+      env: RUBOCOP_TEST="false" RSPEC_TEST="true" PUPPET_VERSIONS="5.0.0"

lib/octocatalog-diff/util/util.rb

@@ -27,7 +27,9 @@ def self.object_is_any_of?(object, classes)
       def self.safe_dup(object)
         object.dup
       rescue TypeError
+        # :nocov:
         object
+        # :nocov:
       end
 
       # Utility Method!

octocatalog-diff.gemspec

@@ -37,7 +37,7 @@ EOF
   s.add_development_dependency 'rubocop', '= 0.48.1'
 
   s.add_development_dependency 'simplecov', '~> 0.14.1'
-  s.add_development_dependency 'simplecov-json'
+  s.add_development_dependency 'simplecov-erb', '~> 0.1.1'
 
   puppet_version = ENV['PUPPET_VERSION'] || DEFAULT_PUPPET_VERSION
   s.add_development_dependency 'puppet', "~> #{puppet_version}"

script/cibuild

@@ -6,7 +6,11 @@
 # with one or more Puppet versions, with PUPPET_VERSIONS set to a space-separated list
 # of versions to test.
 
-[ -z "$PUPPET_VERSIONS" ] && export PUPPET_VERSIONS='3.8.7 4.10.8 5.0.0'
+if [ -z "$PUPPET_VERSIONS" ]; then
+  echo "Required PUPPET_VERSIONS!"
+  exit 255
+fi
+
 [ -z "$RUBOCOP_TEST" ] && export RUBOCOP_TEST='true'
 [ -z "$RSPEC_TEST" ] && export RSPEC_TEST='true'
 
@@ -19,9 +23,7 @@ env
 echo "travis_fold:end:cibuild-environment-dump"
 
 # Create a temporary file to capture output of various steps.
-export OUTPUT_FILE="$(mktemp)"
 function cleanup() {
-  rm -rf "$OUTPUT_FILE"
   rm -f "${DIR}/.ruby-version"
 }
 trap cleanup EXIT
@@ -67,6 +69,7 @@ fi
 if [ "$RSPEC_TEST" = "true" ]; then
   SAVED_PATH="$PATH"
   RSPEC_EXITCODE="0"
+  COVERAGE_EXITCODE="0"
   for pv in $PUPPET_VERSIONS ; do
     export PUPPET_VERSION="$pv"
 
@@ -95,23 +98,63 @@ if [ "$RSPEC_TEST" = "true" ]; then
     fi
 
     # Run the tests
-    echo "Running tests"
-    time bundle exec rake test
+    echo "Running rspec unit tests"
+    export COVERAGE=true
+    time bundle exec rspec "${DIR}/spec/octocatalog-diff/tests"
     exitcode=$?
+    unset COVERAGE
     if [ "$exitcode" -ne 0 ]; then RSPEC_EXITCODE="$exitcode"; fi
-    cat "$OUTPUT_FILE"
+
+    # Quick coverage report
+    cat "$DIR/coverage/coverage.txt"
+    if grep -q "100% test coverage. You're all set, friend" "$DIR/coverage/coverage.txt"; then
+      :
+    else
+      COVERAGE_EXITCODE=1
+    fi
     echo ""
+
+    # To avoid travis getting hung if it gets confused, we'll run each of these
+    # scripts individually with a timeout. This will hopefully address the problem
+    # of hung builds.
+    echo "Running rspec integration tests"
+    for file in "${DIR}"/spec/octocatalog-diff/integration/*_spec.rb; do
+      retry=1
+      for try in 1 2 3 ; do
+        if [ $retry -eq 1 ]; then
+          retry=0
+          echo "$(basename "$file") try ${try}"
+          "$DIR/script/timeout" 180 bundle exec rspec "$file"
+          exitcode=$?
+          if [ $exitcode -eq 124 ] && [ $try -eq 3 ]; then
+            RSPEC_EXITCODE="255"
+          elif [ $exitcode -eq 124 ] && [ $try -lt 3 ]; then
+            retry=1
+          elif [ $exitcode -ne 0 ]; then
+            RSPEC_EXITCODE="$exitcode"
+          fi
+        fi
+      done
+    done
   done
   export PATH="$SAVED_PATH"
   unset PUPPET_VERSION
   rm -f "${DIR}/.puppet_version"
 else
   RSPEC_EXITCODE=-1
+  COVERAGE_EXITCODE=-1
   echo ""
 fi
 
 # Finish off script
 echo "Finished script/cibuild:"
-[ "$RUBOCOP_EXITCODE" -ge 0 ] && echo "  - rubocop: exit ${RUBOCOP_EXITCODE}"
-[ "$RSPEC_EXITCODE" -ge 0 ] && echo "  - rspec:   exit ${RSPEC_EXITCODE}"
-if [ "$RUBOCOP_EXITCODE" -gt 0 ] || [ "$RSPEC_EXITCODE" -gt 0 ]; then exit 1; else exit 0; fi
+[ "$RUBOCOP_EXITCODE" -ge 0 ]  && echo "  - rubocop:  exit ${RUBOCOP_EXITCODE}"
+[ "$RSPEC_EXITCODE" -ge 0 ]    && echo "  - rspec:    exit ${RSPEC_EXITCODE}"
+[ "$COVERAGE_EXITCODE" -ge 0 ] && echo "  - coverage: exit ${COVERAGE_EXITCODE}"
+if [ "$RUBOCOP_EXITCODE" -gt 0 ] || [ "$RSPEC_EXITCODE" -gt 0 ]; then
+  exit 1
+fi
+if [ "$COVERAGE_EXITCODE" -gt 0 ] && [ "$ENFORCE_COVERAGE" == "true" ]; then
+  exit 1
+fi
+exit 0

script/timeout

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require 'shellwords'
+require 'timeout'
+
+seconds = ARGV.shift
+raise "Usage: #{__FILE__} <seconds> <command>" unless seconds
+begin
+  Timeout::timeout(seconds.to_i) do
+    system ARGV.map { |i| Shellwords.escape(i) }.join(" ")
+    exit $?.exitstatus
+  end
+rescue Timeout::Error
+  STDERR.puts "Timed out after #{seconds} seconds"
+  exit 124
+end

spec/octocatalog-diff/tests/spec_helper.rb

@@ -7,10 +7,10 @@
 # Enable SimpleCov coverage testing?
 if ENV['COVERAGE']
   require 'simplecov'
-  require 'simplecov-json'
+  require 'simplecov-erb'
   SimpleCov.formatters = [
     SimpleCov::Formatter::HTMLFormatter,
-    SimpleCov::Formatter::JSONFormatter
+    SimpleCov::Formatter::ERBFormatter
   ]
   SimpleCov.start do
     # don't show specs as missing coverage for themselves