simp-test 0.2.1 → 0.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a7452c216077fae5abd56d8ddb7a59eebbe5fc049dcaa4e84e951033880160f
-  data.tar.gz: 1330cbc2f378886a7450eac4410c07d8d990a24324f016a83563adea523ca7ce
+  metadata.gz: b9487aa15fe2637c98a02a33941d7b9c1201b3ee2350cb6b0d6f8a3d73b03ea1
+  data.tar.gz: 423dfbd08bd5e74cad21f0bae8a8547955650ff1032b2353906ea5b21450c6ca
 SHA512:
-  metadata.gz: 34c3d2ace990ca8e88254df4efae372507a983424b7025481a9820ae6ab27e4e39574b9a47763cc7611da46e8c673ce4381ecf51c8a81322c9ef4ad2960f0402
-  data.tar.gz: 536c02e54798ed7d7234f9c9c8f5d9f5ace88ad828a5cf5aef3faa438ac57ad510005372dbe56b4fa0b72a06f11a07db512e81e4c7c7ee8cedbc39fc8aa95c99
+  metadata.gz: 6dc2e7f81f6f8f1ecbd55fe0498a246fbdbca9836b2b89057a73c148837019f63ba41a9a7090d44d7369b0bf263350685e8dfa7d894c8ee145b8ddb1e919b4fb
+  data.tar.gz: 54fa02608b2eb5c2845315740dd425486514d36e80339d1b5f6678adccb43d7721b2f4ba48d3019e4fdb1dc64a49e338baf2be41aeb23a829ac3008333965126

data/.github/workflows.local.json

@@ -0,0 +1,5 @@
+{
+  "gem_build_command": "bundle exec rake pkg:gem",
+  "gem_release_command": "gem push dist/*.gem",
+  "gem_pkg_dir": "dist"
+}

data/.github/workflows/pr_tests.yml

@@ -38,24 +38,6 @@ jobs:
           bundle show
           bundle exec rake rubocop
 
-#  releng-checks:
-#    name: 'RELENG checks'
-#    runs-on: ubuntu-18.04
-#    steps:
-#      - uses: actions/checkout@v2
-#      - name: 'Install Ruby ${{matrix.puppet.ruby_version}}'
-#        uses: ruby/setup-ruby@v1
-#        with:
-#          ruby-version: 2.5
-#          bundler-cache: true
-#      - name: 'Tags and changelogs'
-#        run: |
-#          bundle exec rake pkg:check_version
-#          bundle exec rake pkg:compare_latest_tag
-#          bundle exec rake pkg:create_tag_changelog
-#      - name: 'Test-build the Puppet module'
-#        run: 'bundle exec pdk build --force'
-
   spec-tests:
     name: 'Spec tests'
     runs-on: ubuntu-18.04

data/.github/workflows/tag_deploy_rubygem.yml

@@ -1,9 +1,11 @@
 # Build & Deploy RubyGem & GitHub release when a SemVer tag is pushed
+#
+# This workflow's jobs are only triggered in repos under the `simp` organization
 # ------------------------------------------------------------------------------
 #
 #             NOTICE: **This file is maintained with puppetsync**
 #
-# This file is updated automatically as part of an asset baseline.
+# This file is updated automatically as part of a standardized asset baseline.
 #
 # The next baseline sync will overwrite any local changes to this file!
 #
@@ -21,6 +23,19 @@
 #
 # * The CHANGLOG text is altered to remove RPM-style date headers, which don't
 #   render well as markdown on the GitHub release pages
+#
+# * By default, the gem is built and released using the standard rake tasks
+#   from "bundler/gem_tasks".  To override these, create a JSON file at
+#   `.github/workflows.local.json`, using the format:
+#
+#         {
+#           "gem_build_command": "bundle exec rake build",
+#           "gem_release_command": "bundle exec rake build release:rubygem_push",
+#           "gem_pkg_dir": "pkg"
+#         }
+#
+#   All keys are optional.
+#
 ---
 name: 'Tag: Release to GitHub & rubygems.org'
 
@@ -36,10 +51,12 @@ env:
 jobs:
   releng-checks:
     name: "RELENG checks"
+    if: github.repository_owner == 'simp'
     runs-on: ubuntu-18.04
     outputs:
       build_command: ${{ steps.commands.outputs.build_command }}
       release_command: ${{ steps.commands.outputs.release_command }}
+      pkg_dir: ${{ steps.commands.outputs.pkg_dir }}
     steps:
       - name: "Assert '${{ github.ref }}' is a tag"
         run: '[[ "$GITHUB_REF" =~ ^refs/tags/ ]] || { echo "::error ::GITHUB_REF is not a tag: ${GITHUB_REF}"; exit 1 ; }'
@@ -53,27 +70,48 @@ jobs:
           # By default, these are the standard tasks from "bundler/gem_tasks"
           # To override them in the LOCAL_WORKFLOW_CONFIG_FILE
           GEM_BUILD_COMMAND='bundle exec rake build'
-          GEM_RELEASE_COMMAND='gem push pkg/*.gem'
+          GEM_RELEASE_COMMAND='bundle exec rake build release:rubygem_push'
+          GEM_PKG_DIR='pkg'
+          if jq -r '. | keys' "$LOCAL_WORKFLOW_CONFIG_FILE" 2>/dev/null | \
+              grep -w '"gem_pkg_dir"' &> /dev/null; then
+            GEM_PKG_DIR="$(jq -r .gem_pkg_dir "$LOCAL_WORKFLOW_CONFIG_FILE" )"
+          fi
           if jq -r '. | keys' "$LOCAL_WORKFLOW_CONFIG_FILE" 2>/dev/null | \
               grep -w '"gem_build_command"' &> /dev/null; then
-            GEM_BUILD_COMMAND="$(jq .gem_build_command "$LOCAL_WORKFLOW_CONFIG_FILE" )"
+            GEM_BUILD_COMMAND="$(jq -r .gem_build_command "$LOCAL_WORKFLOW_CONFIG_FILE" )"
           fi
           if jq -r '. | keys' "$LOCAL_WORKFLOW_CONFIG_FILE" 2>/dev/null | \
               grep -w '"gem_release_command"' &> /dev/null; then
-            GEM_RELEASE_COMMAND="$(jq .gem_release_command "$LOCAL_WORKFLOW_CONFIG_FILE" )"
+            GEM_RELEASE_COMMAND="$(jq -r .gem_release_command "$LOCAL_WORKFLOW_CONFIG_FILE" )"
           fi
           echo "::set-output name=build_command::${GEM_BUILD_COMMAND}"
+          echo "::set-output name=pkg_dir::${GEM_PKG_DIR}"
           echo "::set-output name=release_command::${GEM_RELEASE_COMMAND}"
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.5
           bundler-cache: true
       - name: Test build the package
-        run: "${{ steps.commands.outputs.build_command }}"
+        env:
+          GEM_BUILD_COMMAND: ${{ steps.commands.outputs.build_command }}
+        run: "$GEM_BUILD_COMMAND"
+      - name: "Assert '${{ github.ref }}' matches the package version"
+        run: |
+          tag="${GITHUB_REF/refs\/tags\//}"
+          ls -lart
+          ls -lart  ${{ steps.commands.outputs.pkg_dir }}
+          ls -lart  ${{ steps.commands.outputs.pkg_dir }}/*.gem
+          [ -d  "${{ steps.commands.outputs.pkg_dir }}" ] || \
+             { echo "::error ::No directory found at ${{ steps.commands.outputs.pkg_dir }}/" ; exit 3 ; }
+          ls -1 "${{ steps.commands.outputs.pkg_dir }}"/*.gem || \
+             {  echo "::error ::No gem file found at ${{ steps.commands.outputs.pkg_dir }}/*.gem" ; exit 2 ; }
+          [ -f "${{ steps.commands.outputs.pkg_dir }}"/*-${tag}.gem ] || \
+             { echo "::error ::tag '${tag}' does not match package $(ls -1 ${{ steps.commands.outputs.pkg_dir }}/*.gem)"; exit 1 ; }
 
   create-github-release:
     name: Deploy GitHub Release
     needs: [ releng-checks ]
+    if: github.repository_owner == 'simp'
     runs-on: ubuntu-18.04
     steps:
       - name: Checkout code
@@ -117,6 +155,7 @@ jobs:
   deploy-rubygem:
     name: Deploy RubyGem Release
     needs: [ releng-checks ]
+    if: github.repository_owner == 'simp'
     runs-on: ubuntu-18.04
     env:
       RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
@@ -133,7 +172,12 @@ jobs:
           ruby-version: 2.5
           bundler-cache: true
       - name: Build RubyGem
-        run: '$BUILD_COMMAND'
+        run: |
+          echo "Setting up file permissions..."
+          chmod -R go=u-w .
+
+          echo "Running '$BUILD_COMMAND'..."
+          $BUILD_COMMAND
 
       - name: Release RubyGem
         run: |
@@ -146,7 +190,5 @@ jobs:
           EOF
           chmod 0600 ~/.gem/credentials
 
-          chmod -R go=u-w .
-
           echo "Running '$RELEASE_COMMAND'..."
           $RELEASE_COMMAND

data/Rakefile

@@ -1,8 +1,145 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
+require 'rake/clean'
+require 'fileutils'
+require 'find'
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
+@package='simp-test'
+@rakefile_dir=File.dirname(__FILE__)
+
+CLEAN.include "#{@package}-*.gem"
+CLEAN.include 'pkg'
+CLEAN.include 'dist'
+CLEAN.include '.vendor'
+Find.find( @rakefile_dir ) do |path|
+  if File.directory? path
+    CLEAN.include path if File.basename(path) == 'tmp'
+  else
+    Find.prune
+  end
+end
+
+
+desc 'Ensure gemspec-safe permissions on all files'
+task :chmod do
+  gemspec = File.expand_path( "#{@package}.gemspec", @rakefile_dir ).strip
+  spec = Gem::Specification::load( gemspec )
+  spec.files.each do |file|
+    FileUtils.chmod 'go=r', file unless File.symlink?(file)
+  end
+end
+
+desc 'special notes about these rake commands'
+task :help do
+  puts %Q{
+== environment variables ==
+SIMP_RPM_BUILD     when set, alters the gem produced by pkg:gem to be RPM-safe.
+                   'pkg:gem' sets this automatically.
+  }
+end
+
+desc "Run spec tests"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ['--color']
+  t.pattern = 'spec/lib/**/*_spec.rb'
+end
+
+desc %q{run all RSpec tests (alias of 'spec')}
+task :test => :spec
+
+desc "Run acceptance tests"
+RSpec::Core::RakeTask.new(:acceptance) do |t|
+  t.pattern = 'spec/acceptance'
+end
+
+namespace :pkg do
+  @specfile_template = "rubygem-#{@package}.spec.template"
+  @specfile          = "build/rubygem-#{@package}.spec"
+
+  # ----------------------------------------
+  # DO NOT UNCOMMENT THIS: the spec file requires a lot of tweaking
+  # ----------------------------------------
+  #  desc "generate RPM spec file for #{@package}"
+  #  task :spec => [:clean, :gem] do
+  #    Dir.glob("pkg/#{@package}*.gem") do |pkg|
+  #      sh %Q{gem2rpm -t "#{@specfile_template}" "#{pkg}" > "#{@specfile}"}
+  #    end
+  #  end
+
+  desc "build rubygem package for #{@package}"
+  task :gem => :chmod do
+    Dir.chdir @rakefile_dir
+    Dir['*.gemspec'].each do |spec_file|
+      rpm_build = ENV.fetch('SIMP_RPM_BUILD', '1')
+      cmd = %Q{SIMP_RPM_BUILD=#{rpm_build} bundle exec gem build "#{spec_file}"}
+      sh cmd
+      FileUtils.mkdir_p 'dist'
+      FileUtils.mv Dir.glob("#{@package}*.gem"), 'dist/'
+    end
+  end
+
+
+  desc "build and install rubygem package for #{@package}"
+  task :install_gem => [:clean, :gem] do
+    Dir.chdir @rakefile_dir
+    Dir.glob("dist/#{@package}*.gem") do |pkg|
+      sh %Q{bundle exec gem install #{pkg}}
+    end
+  end
+
+
+  desc "generate RPM for #{@package}"
+    require 'tmpdir'
+    task :rpm, [:mock_root] => [:clean, :gem] do |t, args|
+      mock_root  = args[:mock_root]
+      # TODO : Get rid of this terrible code.  Shoe-horned in until
+      # we have a better idea for auto-decet
+      if mock_root =~ /^epel-6/ then el_version = '6'
+      elsif mock_root =~ /^epel-7/ then el_version = '7'
+      else puts 'WARNING: Did not detect epel version'
+      end
+      tmp_dir = ''
+
+      if tmp_dir = ENV.fetch( 'SIMP_MOCK_SIMPGEM_ASSETS_DIR', false )
+         FileUtils.mkdir_p tmp_dir
+      else
+         tmp_dir = Dir.mktmpdir( "build_#{@package}" )
+      end
+
+      begin
+        Dir.chdir tmp_dir
+        specfile     = "#{@rakefile_dir}/build/rubygem-#{@package}.el#{el_version}.spec"
+        tmp_specfile = "#{tmp_dir}/rubygem-#{@package}.el#{el_version}.spec"
+
+        # We have to copy to a local directory because mock bugs out in NFS
+        # home directories (where SIMP devs often work)
+        FileUtils.cp specfile, tmp_specfile, :preserve => true
+        Dir.glob("#{@rakefile_dir}/dist/#{@package}*.gem") do |pkg|
+          FileUtils.cp pkg, tmp_dir, :preserve => true
+        end
+
+        # Build SRPM from specfile
+        sh %Q{mock -r #{mock_root} --buildsrpm --source="#{tmp_dir}" --spec="#{tmp_specfile}" --resultdir="#{tmp_dir}"}
+
+        # Build RPM from SRPM
+        Dir.glob("#{tmp_dir}/rubygem-#{@package}-*.el#{el_version}*.src.rpm") do |pkg|
+          sh %Q{mock -r #{mock_root} --rebuild "#{pkg}" --resultdir=#{tmp_dir} --no-cleanup-after}
+        end
+
+        sh %Q{ls -l "#{tmp_dir}"}
+
+        # copy RPM back into pkg/
+        Dir.glob("#{tmp_dir}/rubygem-#{@package}-*.el#{el_version}*.rpm") do |pkg|
+          sh %Q{cp "#{pkg}" "#{@rakefile_dir}/dist/"}
+          FileUtils.cp pkg, "#{@rakefile_dir}/dist/"
+        end
+      ensure
+        Dir.chdir @rakefile_dir
+        # cleanup if needed
+        if ! ENV.fetch( 'SIMP_MOCK_SIMPGEM_ASSETS_DIR', false )
+           FileUtils.remove_entry_secure tmp_dir
+        end
+      end
+  end
+end
 
-task default: :spec
+# vim: syntax=ruby

data/lib/simp/test/version.rb

@@ -2,6 +2,6 @@
 
 module Simp
   module Test
-    VERSION = '0.2.1'
+    VERSION = '0.3.19'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simp-test
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.19
 platform: ruby
 authors:
 - SIMP Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-30 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -17,6 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows.local.json"
 - ".github/workflows/pr_glci.yml"
 - ".github/workflows/pr_glci_cleanup.yml"
 - ".github/workflows/pr_glci_manual.yml"