simp-rake-helpers 5.5.0 → 5.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 834fc98fb63f04a0f5e9bb98c275ffd42738123c
-  data.tar.gz: c0d3fc5372f4e3c99893e33d3e345886d41c069c
+SHA256:
+  metadata.gz: 55923c19133642bbedd90f75926344b61c8ca0fc72d12a83d5a3f265a027f0dc
+  data.tar.gz: 595956bbaa3b3b3af35f3bfdbd4ec9acfdf6dc858d15057eb1f3fd0491f1c060
 SHA512:
-  metadata.gz: efee59c86535eaa39046ea0c06133a57e8b4a1bf4a3f4419983741a516493aaf17f590764630b44c3d2bbaeb0a0f0d6d55d4b758595e341a616b9d39f75f61b0
-  data.tar.gz: 3f70e19f9587f9aa5124255f3bb9305d976c107879a0f348c8cb44aff119504e98d010c7755d0a046e4156777a05956100505cfc12bb9321dfc65cb51cae6b22
+  metadata.gz: 8959c27f5a86af2921336dfa3e55bc0872473c1edf6b1fd10eaa55e2881c7d56d11830b0c9bc8392ace4c3666364199d533725aac2ed540eabf269a061be03f4
+  data.tar.gz: 44084a5f896837b8f591311da3ac744e9913844d60c0dfaa2a8b39195efb2aed5a91902de78962311d08b1408659e369e8385245f2e36aa61219aa5fcc8b0a6a

data/.travis.yml

@@ -31,7 +31,7 @@ jobs:
       services:
         - docker
       script:
-        - bundle exec rake acceptance
+        - travis_wait 30 unbuffer bundle exec rake acceptance
 
     - stage: deploy
       rvm: 2.1.9

data/CHANGELOG.md

@@ -1,10 +1,31 @@
+### 5.5.2 / 2018-08-21
+* Add additional UEFI support options to the ISO build based on user feedback.
+  All of our testing could use the ISO on different UEFI systems successfully
+  but apparently there can be vendor differences and this solves at least one
+  of them.
+
+### 5.5.1 / 2018-07-09
+* It is possible to build RPMs for other OSes again (broken since 5.0.0)
+* Fix regression that broke env var `SIMP_BUILD_distro`
+* Add env var `SIMP_RPM_dist` to `SIMP::RPM` to target a specific `dist` while
+  building RPMs from spec files.
+* During a `rake build:auto`, the information from env var `SIMP_BUILD_distro`
+  is used to set `SIMP_RPM_dist`
+* Remove the dependency pin attempt on fog-openstack since this is handled by
+  the simp-beaker-helpers dependency
+* Update pkg:create_tag_change to verify all CHANGELOG entries for a component
+  are in reverse chronological order, not just the entries for the latest
+  version.
+* Add pkg:check_rpm_changelog task to verify the 'rpm' command can parse a
+  component's changelog.
+
 ### 5.5.0 / 2018-06-22
 * Pin fog-openstack to 0.1.25 if Ruby is prior to 2.2.0 due to a deprecation
 * Fix regression that broke env var `SIMP_BUILD_distro`
 * Add support for setting SIMP_RSPEC_PUPPETFILE and/or SIMP_RSPEC_MODULEPATH to
   create a custom fixtures.yml based on a Puppetfile, the modules in a
   directory, or the combination of both.
-  
+
 ### 5.4.3 / 2018-03-29
 * Fix RPM release processing when generating 'Obsoletes' metadata
 

data/lib/simp/rake/build/constants.rb

@@ -19,6 +19,12 @@ module Simp::Rake::Build::Constants
     @build_version = version || Facter.fact('operatingsystemmajrelease').value
     @build_arch = arch || Facter.fact('architecture').value
 
+    # Working around the SIMP::RPM.system_dist workaround
+    if ENV['SIMP_RPM_dist'].nil? && @build_distro =~ /CentOS|RedHat/i
+      @build_rpm_dist = ".el#{@build_version}"
+      ENV['SIMP_RPM_dist'] = @build_rpm_dist
+    end
+
     @run_dir           = Dir.pwd
     @base_dir          = base_dir
     @build_dir         = File.join(@base_dir, 'build')

data/lib/simp/rake/build/iso.rb

@@ -307,6 +307,11 @@ module Simp::Rake::Build
                 '-boot-load-size 4',
                 '-boot-info-table',
                 '-no-emul-boot',
+                '-eltorito-alt-boot',
+                '-e images/efiboot.img',
+                # This is apparently needed twice to get the lines above it to
+                # take. Not sure why.
+                '-no-emul-boot',
                 '-m TRANS.TBL',
                 '-x ./lost+found',
                 "-o #{@simp_output_iso}",

data/lib/simp/rake/helpers/version.rb

@@ -2,5 +2,5 @@ module Simp; end
 module Simp::Rake; end
 
 class Simp::Rake::Helpers
-  VERSION = '5.5.0'
+  VERSION = '5.5.2'
 end

data/lib/simp/rake/pkg.rb

@@ -107,6 +107,7 @@ module Simp::Rake
       define_clobber
       define_pkg_tar
       define_pkg_rpm
+      define_pkg_check_rpm_changelog
       define_pkg_check_version
       define_pkg_compare_latest_tag
       define_pkg_create_tag_changelog
@@ -415,6 +416,28 @@ module Simp::Rake
       end
     end
 
+   def define_pkg_check_rpm_changelog
+      # :pkg:check_rpm_changelog
+      # -----------------------------
+      namespace :pkg do
+        desc <<-EOM
+        Check the #{@pkg_name} RPM changelog using the 'rpm' command.
+
+        This task will fail if 'rpm' detects any changelog problems,
+        such as changelog entries not being in reverse chronological
+        order.
+        EOM
+        task :check_rpm_changelog, [:verbose] do |t,args|
+          if args[:verbose].to_s == 'true'
+            verbose = true
+          else
+            verbose = false
+          end
+          Simp::RelChecks::check_rpm_changelog(@base_dir, @spec_file, verbose)
+        end
+      end
+    end
+
     def define_pkg_check_version
       namespace :pkg do
         # :pkg:check_version
@@ -581,13 +604,13 @@ module Simp::Rake
               the release in a changelog entry for the version.
             - Any changelog entry below the first entry has a version
               greater than that of the first entry.
-            - The changelog entries for the latest version are out of
-              date order.
+            - The changelog entries for all versions are out of date
+              order.
             - The weekday for a changelog entry for the latest version
               does not match the date specified.
 
         EOM
-        task :create_tag_changelog, [:verbose] do |t,args|
+        task :create_tag_changelog, [:verbose] => [:check_rpm_changelog] do |t,args|
           if args[:verbose].to_s == 'true'
             verbose = true
           else

data/lib/simp/relchecks.rb

@@ -1,11 +1,50 @@
 require 'date'
 require 'simp/componentinfo'
+require 'tmpdir'
 
 module Simp; end
 
 # Class that provide release-related checks
 class Simp::RelChecks
 
+  # Check a component's RPM changelog using the 'rpm' command.
+  #
+  # This task will fail if 'rpm' detects any changelog problems,
+  # such as changelog entries not being in reverse chronological
+  # order.
+  #
+  # +component_dir+:: The root directory of the component project.
+  # +spec_file+::     The RPM specfile for the component.
+  # +verbose+::       Set to 'true' if you want to see details about the
+  #                   RPM command executed.
+  def self.check_rpm_changelog(component_dir, spec_file, verbose = false)
+    rpm_opts = [
+      # for modules, '_sourcedir' tells the RPM LUA code the location
+      # of the CHANGELOG and metadata.json files
+      %(-D '_sourcedir #{component_dir}'),
+      '-q',
+      '--changelog',
+      "--specfile  #{spec_file}"
+    ]
+    rpm_opts << '-v' if verbose
+
+    cmd = %(rpm #{rpm_opts.join(' ')} 2>&1)
+    puts "==== Simp::RelChecks::check_rpm_changelog: #{cmd}" if verbose
+    console = %x(#{cmd})
+    result = $?
+    if result
+      if result.exitstatus != 0
+        err_msg = [ "ERROR: Invalid changelog for #{File.basename(component_dir)}:\n" ]
+        err_msg << console.split("\n").map { |line| "   #{line}" }
+        err_msg << "\n"
+        fail(err_msg.flatten.join("\n"))
+      end
+    else
+      # Ruby can return nil for spawned shells, sigh
+      fail("Unable to determine changelog for #{File.basename(component_dir)}")
+    end
+  end
+
   # Compares mission-impacting (significant) files with the latest
   # tag and identifies the relevant files that have changed.
   #

data/lib/simp/rpm.rb

@@ -6,6 +6,9 @@ module Simp
   #
   # Simp::RPM also contains class methods that are useful for
   # processing RPMs in the SIMP build process.
+  #
+  # @note Set the environment variable `SIMP_RPM_dist` to ensure all
+  #       packages use a particular dist.
   class Simp::RPM
     require 'expect'
     require 'pty'
@@ -58,7 +61,6 @@ module Simp
         @info[package_info[:basename]] = package_info
       end
 
-
       @packages = @info.keys
 
       if @verbose
@@ -68,8 +70,11 @@ module Simp
       end
     end
 
-    # @returns The RPM '.dist' of the system. 'nil' will be will be returned if
-    # the dist is not found.
+    # @returns The RPM '.dist' of the system. 'nil' will be will be
+    #          returned if the dist is not found.
+    # @note This causes problems for ISO builds that target a particular
+    #       OS if it doesn't match the host.  Set the environment variable
+    #       `SIMP_RPM_dist` to ensure all packages use a particular dist.
     def self.system_dist
       # We can only have one of these
       unless defined?(@@system_dist)
@@ -82,10 +87,11 @@ module Simp
         puts "  result = '#{dist}'" if @verbose
 
         if dist.size > 1
-          @@system_dist = '.' + dist[1]
+          @@system_dist = (dist[1] =~ /^\./) ? dist[1] : ('.' + dist[1])
         else
           @@system_dist = nil
         end
+        puts "  @@system_dist = #{@@system_dist ||'nil'}" if @verbose
       end
 
       return @@system_dist
@@ -101,11 +107,9 @@ module Simp
       unless defined?(@@macros_updated)
 
         # Workaround for CentOS system builds
-        dist = system_dist
-        dist_macro = %(%dist #{dist})
-
-        rpmmacros = [dist_macro]
-
+        dist           = ENV['SIMP_RPM_dist'] || system_dist
+        dist_macro     = %(%dist #{dist})
+        rpmmacros      = [dist_macro]
         rpmmacros_file = File.join(ENV['HOME'], '.rpmmacros')
 
         if File.exist?(rpmmacros_file)
@@ -344,11 +348,14 @@ module Simp
     def self.get_info(rpm_source)
       raise "Error: unable to read '#{rpm_source}'" unless File.readable?(rpm_source)
 
+      if ENV['SIMP_RPM_dist']
+        target_dist = (ENV['SIMP_RPM_dist'] =~ /^\./) ? ENV['SIMP_RPM_dist'] : ('.' + ENV['SIMP_RPM_dist'])
+      else
+        target_dist = system_dist
+      end
+
       info_array = []
-      common_info = {
-        :has_dist_tag => false,
-        :dist => system_dist
-      }
+      common_info = {}
 
       rpm_version_query = %Q(#{rpm_cmd} -q --queryformat '%{NAME} %{VERSION} %{RELEASE} %{ARCH}\\n')
 
@@ -361,12 +368,29 @@ module Simp
         unless dist_info.empty?
           common_info[:has_dist_tag] = true
           common_info[:dist] = '.' + dist_info.first
+        else
+          common_info[:has_dist_tag] = false
+          common_info[:dist] = target_dist
         end
-
       elsif File.read(rpm_source).include?('%{?dist}')
+        common_info[:dist] =target_dist
         common_info[:has_dist_tag] = true
+      else
+        common_info[:has_dist_tag] = false
+        common_info[:dist]     = target_dist
+      end
+
+      unless source_is_rpm
+        macros = {
+          'dist' => target_dist
+        }
+        macros.each do |k,v|
+          rpm_version_query += %Q[ -D '#{k} #{v}']
+        end
+
       end
 
+
       if source_is_rpm
         query_source = "-p #{rpm_source}"
         version_results = execute("#{rpm_version_query} #{query_source}")

data/spec/acceptance/10_pkg_rpm_spec.rb

@@ -8,7 +8,7 @@ end
 
 shared_examples_for "an RPM generator with edge cases" do
   it 'should use specified release number for the RPM' do
-    on host, %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_with_release; rake pkg:rpm")
+    on host, %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_with_release; #{rake_cmd} pkg:rpm")
     release_test_rpm = File.join(pkg_root_dir, 'testpackage_with_release',
       'dist', 'pupmod-simp-testpackage-0.0.1-42.noarch.rpm')
     on host, %(test -f #{release_test_rpm})

data/spec/acceptance/30_pkg_misc_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper_acceptance'
+require_relative 'support/pkg_rpm_helpers'
+
+RSpec.configure do |c|
+  c.include Simp::BeakerHelpers::SimpRakeHelpers::PkgRpmHelpers
+  c.extend  Simp::BeakerHelpers::SimpRakeHelpers::PkgRpmHelpers
+end
+
+
+shared_examples_for 'a valid RPM changelog processor' do |project|
+  it 'should validate the RPM changelog' do
+    on host, %(#{run_cmd} "cd #{pkg_root_dir}/#{project}; #{rake_cmd} pkg:check_rpm_changelog")
+  end
+
+  it 'should generate the tag changelog' do
+    on host, %(#{run_cmd} "cd #{pkg_root_dir}/#{project}; #{rake_cmd} pkg:create_tag_changelog")
+  end
+end
+
+shared_examples_for 'an invalid RPM changelog processor' do |project|
+  it 'should reject the RPM changelog' do
+    on host,
+      %(#{run_cmd} "cd #{pkg_root_dir}/#{project}; #{rake_cmd} pkg:check_rpm_changelog"),
+      :acceptable_exit_codes => [1]
+  end
+
+  it 'should not generate the tag changelog' do
+    on host,
+      %(#{run_cmd} "cd #{pkg_root_dir}/#{project}; #{rake_cmd} pkg:create_tag_changelog"),
+      :acceptable_exit_codes => [1]
+  end
+end
+
+describe 'rake pkg:check_rpm_changelog' do
+  before :all do
+    copy_host_files_into_build_user_homedir(hosts)
+  end
+
+
+  hosts.each do |_host|
+    context "on #{_host}" do
+      let!(:host){ _host }
+      let(:pkg_root_dir) { '/home/build_user/host_files/spec/acceptance/files' }
+
+      it 'can prep the package directories' do
+        testpackages = [
+          'asset',
+          'asset_with_misordered_entries',
+          'module',
+          'module_with_misordered_entries'
+        ]
+
+        testpackages.each do |package|
+          on hosts, %Q(#{run_cmd} "cd #{pkg_root_dir}/#{package}; ) +
+                    %Q(rvm use default; bundle update --local || bundle update")
+        end
+      end
+
+      context 'with no project changelog errors' do
+        it_should_behave_like('a valid RPM changelog processor', 'asset')
+        it_should_behave_like('a valid RPM changelog processor', 'module')
+      end
+
+
+      context 'with project changelog errors' do
+        it_should_behave_like('an invalid RPM changelog processor', 'asset_with_misordered_entries')
+        it_should_behave_like('an invalid RPM changelog processor', 'module_with_misordered_entries')
+      end
+    end
+  end
+end

data/spec/acceptance/files/asset/Rakefile

@@ -0,0 +1,3 @@
+require 'simp/rake/pkg'
+
+Simp::Rake::Pkg.new( File.dirname( __FILE__ ) )

data/spec/acceptance/files/asset/build/asset.spec

@@ -0,0 +1,35 @@
+Summary: SIMP Utils
+Name: asset
+Version: 1.0.0
+Release: 0
+License: Apache License, Version 2.0
+Group: Applications/System
+Source: %{name}-%{version}-%{release}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+
+%description
+Asset with single entry
+
+%prep
+
+%build
+
+%install
+
+%clean
+
+%files
+
+%post
+
+%postun
+
+%changelog
+
+* Wed Oct 18 2017 Jane Doe <jane.doe@simp.com> - 1.0.0-0
+- Single package
+
+* Wed Nov 04 2009 Maintenance
+0.1-0
+- Added the man page

data/spec/acceptance/files/asset_with_misordered_entries/Rakefile

@@ -0,0 +1,3 @@
+require 'simp/rake/pkg'
+
+Simp::Rake::Pkg.new( File.dirname( __FILE__ ) )

data/spec/acceptance/files/asset_with_misordered_entries/build/asset_with_misordered_entries.spec

@@ -0,0 +1,37 @@
+Summary: SIMP Utils
+Name: asset_with_misordered_entries
+Version: 1.0.0
+Release: 0
+License: Apache License, Version 2.0
+Group: Applications/System
+Source: %{name}-%{version}-%{release}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+
+%description
+Asset with single entry
+
+%prep
+
+%build
+
+%install
+
+%clean
+
+%files
+
+%post
+
+%postun
+
+%changelog
+* Tue Oct 17 2017 Jane Doe <jane.doe@simp.com> - 1.0.0-0
+- Misordered changelog entry
+
+* Wed Oct 18 2017 Jane Doe <jane.doe@simp.com> - 1.0.0-0
+- Single package
+
+* Wed Nov 04 2009 Maintenance
+0.1-0
+- Added the man page

data/spec/acceptance/files/module/CHANGELOG

@@ -0,0 +1,5 @@
+* Wed Nov 15 2017 Mary Jones <mary.jones@simp.com> - 1.1.0-0
+- Disable deprecation warnings by default
+
+* Tue Sep 26 2017 Joe Brown <joe.brown@simp.com> - 1.0.0-0
+- Add Puppet function `mod::assert_metadata_os()`

data/spec/acceptance/files/module/Rakefile

@@ -0,0 +1,3 @@
+require 'simp/rake/pkg'
+
+Simp::Rake::Pkg.new( File.dirname( __FILE__ ) )

data/spec/acceptance/files/module/metadata.json

@@ -0,0 +1,44 @@
+{
+  "name": "simp-module",
+  "version": "1.1.0",
+  "author": "SIMP Team",
+  "summary": "A collection of common SIMP functions, facts, and types",
+  "license": "Apache-2.0",
+  "source": "https://github.com/simp/pupmod-simp-simplib",
+  "project_page": "https://github.com/simp/pupmod-simp-simplib",
+  "issues_url": "https://simp-project.atlassian.net",
+  "tags": [
+    "simp",
+    "functions",
+    "facts",
+    "types",
+    "alias",
+    "library"
+  ],
+  "dependencies": [
+
+  ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "puppet",
+      "version_requirement": ">= 4.7.0 < 6.0.0"
+    }
+  ],
+  "package_release_version": "0"
+}

data/spec/acceptance/files/module_with_misordered_entries/CHANGELOG

@@ -0,0 +1,8 @@
+* Tue Nov 14 2017 Mary Jones <mary.jones@simp.com> - 1.1.0-0
+- Oops, misordered changelog entry
+
+* Wed Nov 15 2017 Mary Jones <mary.jones@simp.com> - 1.1.0-0
+- Disable deprecation warnings by default
+
+* Tue Sep 26 2017 Joe Brown <joe.brown@simp.com> - 1.0.0-0
+- Add Puppet function `mod::assert_metadata_os()`

data/spec/acceptance/files/module_with_misordered_entries/Rakefile

@@ -0,0 +1,3 @@
+require 'simp/rake/pkg'
+
+Simp::Rake::Pkg.new( File.dirname( __FILE__ ) )

data/spec/acceptance/files/module_with_misordered_entries/metadata.json

@@ -0,0 +1,44 @@
+{
+  "name": "simp-module",
+  "version": "1.1.0",
+  "author": "SIMP Team",
+  "summary": "A collection of common SIMP functions, facts, and types",
+  "license": "Apache-2.0",
+  "source": "https://github.com/simp/pupmod-simp-simplib",
+  "project_page": "https://github.com/simp/pupmod-simp-simplib",
+  "issues_url": "https://simp-project.atlassian.net",
+  "tags": [
+    "simp",
+    "functions",
+    "facts",
+    "types",
+    "alias",
+    "library"
+  ],
+  "dependencies": [
+
+  ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "puppet",
+      "version_requirement": ">= 4.7.0 < 6.0.0"
+    }
+  ],
+  "package_release_version": "0"
+}

data/spec/acceptance/nodesets/default.yml

@@ -18,19 +18,13 @@ HOSTS:
       - 'yum install -y rpm-build augeas-devel createrepo genisoimage git gnupg2 libicu-devel libxml2 libxml2-devel libxslt libxslt-devel rpmdevtools which'
       # rvm build-deps
       - 'yum install -y libyaml-devel glibc-headers autoconf gcc-c++ glibc-devel readline-devel libffi-devel openssl-devel automake libtool bison sqlite-devel'
-      - 'runuser build_user -l -c "gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3"'
-      - 'runuser build_user -l -c "curl -sSL https://get.rvm.io | bash -s stable --ruby=2.1"'
+      - 'runuser build_user -l -c "gpg2 --keyserver hkp://pgp.mit.edu --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB || gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"'
+      - 'runuser build_user -l -c "curl -sSL https://get.rvm.io | bash -s stable"'
+      - 'runuser build_user -l -c "rvm install 2.1"'
       - 'runuser build_user -l -c "rvm use --default 2.1"'
       - 'runuser build_user -l -c "rvm all do gem install bundler"'
-      - 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc simp-rake-helpers"'
-      - 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc rake"'
-      - 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc json"'
-      - 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc charlock_holmes"'
-      - 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc posix-spawn"'
-    # NOTE: the './' syntax requires BKR-704
     mount_folders:
       folder1:
-        # must be an absolute path, seemingly
         host_path: ./
         container_path: /host_files
     docker_preserve_image: true
@@ -53,18 +47,14 @@ HOSTS:
       - 'yum install -y rpm-build augeas-devel createrepo genisoimage git gnupg2 libicu-devel libxml2 libxml2-devel libxslt libxslt-devel rpmdevtools clamav-update which'
       # rvm build-deps
       - 'yum install -y libyaml-devel glibc-headers autoconf gcc-c++ glibc-devel readline-devel libffi-devel openssl-devel automake libtool bison sqlite-devel'
+      - 'runuser build_user -l -c "gpg2 --keyserver hkp://pgp.mit.edu --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB || gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"'
       - 'runuser build_user -l -c "gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3"'
-      - 'runuser build_user -l -c "curl -sSL https://get.rvm.io | bash -s stable --ruby=2.1"'
+      - 'runuser build_user -l -c "curl -sSL https://get.rvm.io | bash -s stable"'
+      - 'runuser build_user -l -c "rvm install 2.1"'
       - 'runuser build_user -l -c "rvm use --default 2.1"'
       - 'runuser build_user -l -c "rvm all do gem install bundler"'
-      - 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc simp-rake-helpers"'
-      - 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc json"'
-      - 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc charlock_holmes"'
-      - 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc posix-spawn"'
-    # NOTE: the './' syntax requires BKR-704
     mount_folders:
       folder1:
-        # must be an absolute path, seemingly
         host_path: ./
         container_path: /host_files
     docker_preserve_image: true

data/spec/lib/simp/files/relchecks_check_rpm_changelog_spec/asset/build/asset.spec

@@ -0,0 +1,35 @@
+Summary: SIMP Utils
+Name: asset
+Version: 1.0.0
+Release: 0
+License: Apache License, Version 2.0
+Group: Applications/System
+Source: %{name}-%{version}-%{release}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+
+%description
+Asset with single entry
+
+%prep
+
+%build
+
+%install
+
+%clean
+
+%files
+
+%post
+
+%postun
+
+%changelog
+
+* Wed Oct 18 2017 Jane Doe <jane.doe@simp.com> - 1.0.0-0
+- Single package
+
+* Wed Nov 04 2009 Maintenance
+0.1-0
+- Added the man page

data/spec/lib/simp/files/relchecks_check_rpm_changelog_spec/asset_with_misordered_entries/build/asset_with_misordered_entries.spec

@@ -0,0 +1,37 @@
+Summary: SIMP Utils
+Name: asset_with_misordered_entries
+Version: 1.0.0
+Release: 0
+License: Apache License, Version 2.0
+Group: Applications/System
+Source: %{name}-%{version}-%{release}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+
+%description
+Asset with single entry
+
+%prep
+
+%build
+
+%install
+
+%clean
+
+%files
+
+%post
+
+%postun
+
+%changelog
+* Tue Oct 17 2017 Jane Doe <jane.doe@simp.com> - 1.0.0-0
+- Misordered changelog entry
+
+* Wed Oct 18 2017 Jane Doe <jane.doe@simp.com> - 1.0.0-0
+- Single package
+
+* Wed Nov 04 2009 Maintenance
+0.1-0
+- Added the man page

data/spec/lib/simp/files/relchecks_check_rpm_changelog_spec/module/CHANGELOG

@@ -0,0 +1,5 @@
+* Wed Nov 15 2017 Mary Jones <mary.jones@simp.com> - 1.1.0-0
+- Disable deprecation warnings by default
+
+* Tue Sep 26 2017 Joe Brown <joe.brown@simp.com> - 1.0.0-0
+- Add Puppet function `mod::assert_metadata_os()`

data/spec/lib/simp/files/relchecks_check_rpm_changelog_spec/module/metadata.json

@@ -0,0 +1,44 @@
+{
+  "name": "simp-module",
+  "version": "1.1.0",
+  "author": "SIMP Team",
+  "summary": "A collection of common SIMP functions, facts, and types",
+  "license": "Apache-2.0",
+  "source": "https://github.com/simp/pupmod-simp-simplib",
+  "project_page": "https://github.com/simp/pupmod-simp-simplib",
+  "issues_url": "https://simp-project.atlassian.net",
+  "tags": [
+    "simp",
+    "functions",
+    "facts",
+    "types",
+    "alias",
+    "library"
+  ],
+  "dependencies": [
+
+  ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "puppet",
+      "version_requirement": ">= 4.7.0 < 6.0.0"
+    }
+  ],
+  "package_release_version": "0"
+}

data/spec/lib/simp/files/relchecks_check_rpm_changelog_spec/module_with_misordered_entries/CHANGELOG

@@ -0,0 +1,8 @@
+* Tue Nov 14 2017 Mary Jones <mary.jones@simp.com> - 1.1.0-0
+- Oops, misordered changelog entry
+
+* Wed Nov 15 2017 Mary Jones <mary.jones@simp.com> - 1.1.0-0
+- Disable deprecation warnings by default
+
+* Tue Sep 26 2017 Joe Brown <joe.brown@simp.com> - 1.0.0-0
+- Add Puppet function `mod::assert_metadata_os()`

data/spec/lib/simp/files/relchecks_check_rpm_changelog_spec/module_with_misordered_entries/metadata.json

@@ -0,0 +1,44 @@
+{
+  "name": "simp-module",
+  "version": "1.1.0",
+  "author": "SIMP Team",
+  "summary": "A collection of common SIMP functions, facts, and types",
+  "license": "Apache-2.0",
+  "source": "https://github.com/simp/pupmod-simp-simplib",
+  "project_page": "https://github.com/simp/pupmod-simp-simplib",
+  "issues_url": "https://simp-project.atlassian.net",
+  "tags": [
+    "simp",
+    "functions",
+    "facts",
+    "types",
+    "alias",
+    "library"
+  ],
+  "dependencies": [
+
+  ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "puppet",
+      "version_requirement": ">= 4.7.0 < 6.0.0"
+    }
+  ],
+  "package_release_version": "0"
+}

data/spec/lib/simp/relchecks_check_rpm_changelog_spec.rb

@@ -0,0 +1,49 @@
+require 'simp/relchecks'
+require 'spec_helper'
+
+describe 'Simp::RelChecks.check_rpm_changelog' do
+  let(:files_dir) {
+    File.join( File.dirname(__FILE__), 'files', File.basename(__FILE__, '.rb'))
+  }
+
+  let(:templates_dir) {
+    File.join( File.dirname(__FILE__), '..', '..', '..', 'lib', 'simp', 'rake',
+      'helpers', 'assets', 'rpm_spec' )
+  }
+
+  context 'with no project changelog errors' do
+    it 'succeeds for a Puppet module' do
+      component_dir = File.join(files_dir, 'module')
+      component_spec = File.join(templates_dir, 'simpdefault.spec')
+
+      expect{ Simp::RelChecks.check_rpm_changelog(component_dir, component_spec) }.
+        to_not raise_error
+    end
+
+    it 'succeeds for a non-Puppet asset' do
+      component_dir = File.join(files_dir, 'asset')
+      component_spec = File.join(component_dir, 'build', 'asset.spec')
+
+      expect{ Simp::RelChecks.check_rpm_changelog(component_dir, component_spec) }.
+        to_not raise_error
+    end
+  end
+
+  context 'with changelog errors' do
+    it 'fails for a Puppet module' do
+      component_dir = File.join(files_dir, 'module_with_misordered_entries')
+      component_spec = File.join(templates_dir, 'simpdefault.spec')
+
+      expect{ Simp::RelChecks.check_rpm_changelog(component_dir, component_spec) }.
+        to raise_error(/ERROR: Invalid changelog for module_with_misordered_entries/)
+    end
+
+    it 'fails for a non-Puppet asset' do
+      component_dir = File.join(files_dir, 'asset_with_misordered_entries')
+      component_spec = File.join(component_dir, 'build', 'asset_with_misordered_entries.spec')
+
+      expect{ Simp::RelChecks.check_rpm_changelog(component_dir, component_spec) }.
+        to raise_error(/ERROR: Invalid changelog for asset_with_misordered_entries/)
+    end
+  end
+end

data/spec/lib/simp/rpm_spec.rb

@@ -223,6 +223,14 @@ describe Simp::RPM do
     end
 
     context '#dist' do
+      before :each do
+        @pre_env = ENV['SIMP_RPM_dist']
+        ENV['SIMP_RPM_dist'] = nil
+      end
+
+      after :each do
+        ENV['SIMP_RPM_dist'] = @pre_env
+      end
       it 'returns dist' do
         Simp::RPM.stubs(:system_dist).returns('.testdist')
         rpm_obj    = Simp::RPM.new( @rpm_file )
@@ -236,6 +244,39 @@ describe Simp::RPM do
         expect( d_spec_obj.dist ).to eq '.testdist'
       end
 
+      context 'when ENV[SIMP_RPM_dist] is set' do
+        before :each do
+          @_pre_env = ENV['SIMP_RPM_dist']
+          ENV['SIMP_RPM_dist'] = 'foo'
+        end
+
+        after :each do
+          ENV['SIMP_RPM_dist'] = @_pre_env
+        end
+
+        it 'returns target dist for spec files when SIMP_RPM_dist is set' do
+          rpm_obj    = Simp::RPM.new(@rpm_file)
+          spec_obj   = Simp::RPM.new(@spec_file)
+          d_spec_obj = Simp::RPM.new(@d_spec_file)
+          m_spec_obj = Simp::RPM.new(@m_spec_file)
+          d_rpm_obj  = Simp::RPM.new(@d_rpm_file)
+
+          expect( rpm_obj.has_dist_tag?).to eq false
+          expect( spec_obj.has_dist_tag?).to eq false
+          expect( d_rpm_obj.has_dist_tag?).to eq true
+          expect( d_spec_obj.has_dist_tag?).to eq true
+
+          expect( d_spec_obj.dist ).to eq '.foo'
+          expect( d_spec_obj.full_version ).to match /\.foo$/
+          expect( d_spec_obj.name ).to match /\.foo$/
+          expect( d_spec_obj.release ).to match /\.foo$/
+
+          # The RPMs are already created as .el7; no env vars or hinting
+          # should affect them
+          expect( d_rpm_obj.dist ).to eq '.el7'
+        end
+      end
+
       it 'fails when invalid package specified' do
         expect { @rpm_obj.dist('oops') }.to raise_error(ArgumentError)
 #        expect { @signed_rpm_obj.dist('oops') }.to raise_error(ArgumentError)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.5.2
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-22 00:00:00.000000000 Z
+date: 2018-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -315,9 +315,8 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: 1.6.1
-description: '    "simp-rake-helpers provides common methods for SIMP Rake Tasks"
-
-'
+description: |2
+      "simp-rake-helpers provides common methods for SIMP Rake Tasks"
 email: simp@simp-project.org
 executables: []
 extensions: []
@@ -329,7 +328,6 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -369,9 +367,14 @@ files:
 - spec/acceptance/00_pkg_rpm_custom_scriptlets_spec.rb
 - spec/acceptance/10_pkg_rpm_spec.rb
 - spec/acceptance/20_pkg_rpm_safely_upgrading_obsolete_modules_spec.rb
+- spec/acceptance/30_pkg_misc_spec.rb
 - spec/acceptance/development/docker_env.sh
 - spec/acceptance/development/rerun_acceptance_tests.sh
 - spec/acceptance/development/vagrant_rsync.sh
+- spec/acceptance/files/asset/Rakefile
+- spec/acceptance/files/asset/build/asset.spec
+- spec/acceptance/files/asset_with_misordered_entries/Rakefile
+- spec/acceptance/files/asset_with_misordered_entries/build/asset_with_misordered_entries.spec
 - spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-2.1/CHANGELOG
 - spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-2.1/Rakefile
 - spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-2.1/build/rpm_metadata/custom/overrides
@@ -402,6 +405,12 @@ files:
 - spec/acceptance/files/mock_packages/simp-adapter.spec
 - spec/acceptance/files/mock_packages/simp-adapter/etc/simp/adapter_config.yaml
 - spec/acceptance/files/mock_packages/simp-adapter/usr/local/sbin/simp_rpm_helper
+- spec/acceptance/files/module/CHANGELOG
+- spec/acceptance/files/module/Rakefile
+- spec/acceptance/files/module/metadata.json
+- spec/acceptance/files/module_with_misordered_entries/CHANGELOG
+- spec/acceptance/files/module_with_misordered_entries/Rakefile
+- spec/acceptance/files/module_with_misordered_entries/metadata.json
 - spec/acceptance/files/simplib/CHANGELOG
 - spec/acceptance/files/simplib/Rakefile
 - spec/acceptance/files/simplib/build/rpm_metadata/requires
@@ -478,6 +487,12 @@ files:
 - spec/lib/simp/files/componentinfo_spec/module_with_version_misordered_entries/CHANGELOG
 - spec/lib/simp/files/componentinfo_spec/module_with_version_misordered_entries/metadata.json
 - spec/lib/simp/files/componentinfo_spec/module_without_changelog/metadata.json
+- spec/lib/simp/files/relchecks_check_rpm_changelog_spec/asset/build/asset.spec
+- spec/lib/simp/files/relchecks_check_rpm_changelog_spec/asset_with_misordered_entries/build/asset_with_misordered_entries.spec
+- spec/lib/simp/files/relchecks_check_rpm_changelog_spec/module/CHANGELOG
+- spec/lib/simp/files/relchecks_check_rpm_changelog_spec/module/metadata.json
+- spec/lib/simp/files/relchecks_check_rpm_changelog_spec/module_with_misordered_entries/CHANGELOG
+- spec/lib/simp/files/relchecks_check_rpm_changelog_spec/module_with_misordered_entries/metadata.json
 - spec/lib/simp/files/relchecks_compare_latest_tag_spec/module/CHANGELOG
 - spec/lib/simp/files/relchecks_compare_latest_tag_spec/module/metadata.json
 - spec/lib/simp/files/relchecks_compare_latest_tag_spec/module_without_changelog/metadata.json
@@ -554,6 +569,7 @@ files:
 - spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper_acceptance.rb
 - spec/lib/simp/rake/pupmod/helpers_spec.rb
 - spec/lib/simp/rake_spec.rb
+- spec/lib/simp/relchecks_check_rpm_changelog_spec.rb
 - spec/lib/simp/relchecks_compare_latest_tag_spec.rb
 - spec/lib/simp/relchecks_create_tag_changelog_spec.rb
 - spec/lib/simp/rpm_spec.rb
@@ -580,7 +596,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: SIMP rake helpers

data/Guardfile

@@ -1,24 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard :rspec, cmd: "bundle exec rspec" do
-  require "guard/rspec/dsl"
-  dsl = Guard::RSpec::Dsl.new(self)
-
-  # RSpec files
-  rspec = dsl.rspec
-  watch(rspec.spec_helper) { rspec.spec_dir }
-  watch(rspec.spec_support) { rspec.spec_dir }
-  watch(rspec.spec_files)
-
-  # Ruby files
-  ruby = dsl.ruby
-  dsl.watch_spec_files_for(ruby.lib_files)
-end
-
-# Add files and commands to this file, like the example:
-#   watch(%r{file/path}) { `command(s)` }
-#
-guard :shell do
-  watch(/(.*).md/) {|m| `tail #{m[0]}` }
-end