Merge branch 'master' into update-httparty

Author: cjmartian

.github/workflows/main.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v1
       - name: Build container
-        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}}
+        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}} --build-arg PUPPET_VERSION=${{env.PUPPET_VERSION}}
       - name: Tests
         run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild
 
@@ -35,7 +35,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v1
       - name: Build container
-        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}}-buster
+        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}} --build-arg PUPPET_VERSION=${{env.PUPPET_VERSION}}
       - name: Tests
         run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild
 
@@ -54,15 +54,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v1
       - name: Build container
-        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}}-buster
+        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}} --build-arg PUPPET_VERSION=${{env.PUPPET_VERSION}}
       - name: Tests
         run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild
-      - name: Rubocop and Coverage
-        run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild
-        if: matrix.ruby-version == '2.6'
-        env:
-          RUBOCOP_TEST: true
-          ENFORCE_COVERAGE: true
 
   puppet-7-3-0:
     env:
@@ -79,6 +73,6 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v1
       - name: Build container
-        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}}-buster
+        run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}} --build-arg PUPPET_VERSION=${{env.PUPPET_VERSION}}
       - name: Tests
         run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild

.travis.yml

@@ -8,6 +8,8 @@ RUN sed -i'' -e 's/CipherString = DEFAULT@SECLEVEL=2/CipherString = DEFAULT@SECL
 RUN sed -i'' -e 's/MinProtocol = TLSv1.2/MinProtocol = TLSv1/g' /etc/ssl/openssl.cnf
 
 FROM scratch AS app
+ARG PUPPET_VERSION
+ENV PUPPET_VERSION="${PUPPET_VERSION}"
 COPY --from=ruby / /
 WORKDIR /app
 ENV LANG="C.UTF-8"

Dockerfile

@@ -457,7 +457,7 @@ def self.class_name_for_diffy(class_name)
         def self.stringify_for_diffy(obj)
           return JSON.pretty_generate(obj) if OctocatalogDiff::Util::Util.object_is_any_of?(obj, [Hash, Array])
           return '""' if obj.is_a?(String) && obj == ''
-          return obj if OctocatalogDiff::Util::Util.object_is_any_of?(obj, [String, Fixnum, Integer, Float])
+          return obj if OctocatalogDiff::Util::Util.object_is_any_of?(obj, [String, Integer, Float])
           "#{class_name_for_diffy(obj.class)}: #{obj.inspect}"
         end
 

lib/octocatalog-diff/catalog-diff/display/text.rb

@@ -1,9 +1,10 @@
 require 'json'
 
-DEFAULT_PUPPET_VERSION = '5.5.8'.freeze
+DEFAULT_PUPPET_VERSION = '5.5.22'.freeze
 
 Gem::Specification.new do |s|
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.6.0'
+  puppet_version = ENV['PUPPET_VERSION'] || DEFAULT_PUPPET_VERSION
 
   s.name        = 'octocatalog-diff'
   s.version     = ENV['OCTOCATALOG_DIFF_VERSION'] || File.read(File.join(File.dirname(__FILE__), '.version')).strip
@@ -29,20 +30,28 @@ EOF
   s.add_runtime_dependency 'hashdiff', '>= 0.3.0'
   s.add_runtime_dependency 'parallel', '>= 1.12.0'
   s.add_runtime_dependency 'rugged', '>= 0.25.0b2'
+  if puppet_version == '4.10.10'
+    s.add_runtime_dependency 'puppet', '4.10.10'
+    s.add_development_dependency 'puppet', '4.10.10'
+  elsif puppet_version == '5.5.22'
+    s.add_runtime_dependency 'puppet', '5.5.22'
+    s.add_development_dependency 'puppet', '5.5.22'
+  elsif puppet_version == '6.18.0'
+    s.add_runtime_dependency 'puppet', '6.18.0'
+    s.add_development_dependency 'puppet', '6.18.0'
+  elsif puppet_version == '7.3.0'
+    s.add_runtime_dependency 'puppet', '7.3.0'
+    s.add_development_dependency 'puppet', '7.3.0'
+  end
 
   s.add_development_dependency 'rspec', '~> 3.4.0'
   s.add_development_dependency 'rake', '12.3.3'
   s.add_development_dependency 'parallel_tests', '2.7.1'
   s.add_development_dependency 'rspec-retry', '0.5.0'
-
   s.add_development_dependency 'rubocop', '= 0.49.0'
-
   s.add_development_dependency 'simplecov', '~> 0.14.1'
   s.add_development_dependency 'simplecov-erb', '~> 0.1.1'
 
-  puppet_version = ENV['PUPPET_VERSION'] || DEFAULT_PUPPET_VERSION
-  s.add_development_dependency 'puppet', "~> #{puppet_version}"
-
   puppet_v = Gem::Version.new(puppet_version)
   version_config = JSON.parse(File.read(File.join(File.dirname(__FILE__), 'config', 'puppet-versions.json')))
   version_config.each do |data|

octocatalog-diff.gemspec

@@ -23,16 +23,20 @@ if [ $? -ne 0 ]; then
 fi
 
 # Symlink the git pre-commit script to the right place
+mkdir -p "${DIR}/.git/hooks/" 2>/dev/null
 ln -fs "${DIR}/script/git-pre-commit" "${DIR}/.git/hooks/pre-commit"
 
 # Create the .puppet_version file for use during CI
 # This value is consumed by script/puppet.
 if [ -f "${DIR}/Gemfile.lock" ]; then
-  grep ' puppet ' "${DIR}/Gemfile.lock" | head -1 | awk '{ print $2 }' | tr -d "()" > "${DIR}/.puppet_version"
+  grep ' puppet ' "${DIR}/Gemfile.lock" | head -1 | awk -F '[ ()]+' '{ print $4 }' | tr -d "()" > "${DIR}/.puppet_version"
 else
   echo "Expected file ${DIR}/Gemfile.lock is missing!"
   exit 1
 fi
 
+echo "This is what .puppet_version contains:"
+cat "${DIR}/.puppet_version"
+
 echo 'Completed script/bootstrap successfully'
 exit 0

script/bootstrap

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
-# Unified 'cibuild' script for compatibility with Travis, to reduce the overall number
-# of jobs for performance purposes. This script supports the rubocop testing (with
+# This script supports the rubocop testing (with
 # RUBOCOP_TEST=true) and rspec testing (with RSPEC_TEST=true). It also supports testing
 # with one or more Puppet versions, with PUPPET_VERSIONS set to a space-separated list
 # of versions to test.
@@ -18,10 +17,6 @@ echo 'Starting script/cibuild'
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
 
-echo "travis_fold:start:cibuild-environment-dump"
-env
-echo "travis_fold:end:cibuild-environment-dump"
-
 # Create a temporary file to capture output of various steps.
 function cleanup() {
   rm -f "${DIR}/.ruby-version"
@@ -35,10 +30,8 @@ ruby -e "print RUBY_VERSION" > "${DIR}/.ruby-version"
 # Bootstrapping
 BOOTSTRAPPING_COUNTER=0
 function bootstrap() {
-  echo "travis_fold:start:bootstrap.${BOOTSTRAPPING_COUNTER}"
   time "${DIR}/script/bootstrap"
   bootstrap_exitcode=$?
-  echo "travis_fold:end:bootstrap.${BOOTSTRAPPING_COUNTER}"
 
   if [ $? -ne 0 ]; then
     echo "Bootstrap failed!"