simp-rake-helpers 5.11.4 → 5.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bde11b6e154b94ae99c983cc5efbc50ee72bfd5e4fff43752f3bde5a1fe9383
-  data.tar.gz: 1f20976af7376822f6d4ab663b2d5f4b01bab9c85cc71a3f86035d586771e443
+  metadata.gz: 9b882eab26bdb4e92d2cddac0a080fabc1fb517f4741c61c960553201c71f649
+  data.tar.gz: edb33965a9af173e8e0dd9a65eb016689754b560b1c5d4c986ccb084df1c8627
 SHA512:
-  metadata.gz: bc56ab90f4e83059108725f9750793ba060bac5af618d72e819f095319233ae1229a7f8a153feb4ecd50de46808792fd9c3c2559f02ec632c606a9fdeb3a8659
-  data.tar.gz: 8cdf8f62c251be9bbc3388adaae57516fde2eb0478adf6ec4fd66c09bf411cf1902546ac309a455f87dcef1d30db3f5cd498dcc6838e2a80c0102f1448bc5c1e
+  metadata.gz: 7aead3d0b88b982510a872293c77a81d848189b4e4b96ec16fe3d698d7870fa86136a244f98700d1afb2340d7084a8226c7953804eae6eccfcfe4c13d85d8d91
+  data.tar.gz: 319182e049295afa57e8da953980bb33b08c8b1987a7362b4d42a5d10a35c53fe0d969bc548d49719fff7ccb3635845a908e71544116a3fd840305b586f2a353

data/.travis.yml

@@ -3,35 +3,16 @@ language: ruby
 cache: bundler
 sudo: false
 
-bundler_args: --without development system_tests
-
 notifications:
   email: false
 
-addons:
-  apt:
-    packages:
-      - rpm
-      # provides unbuffer
-      - expect-dev
-
-before_install:
-  - rm -f Gemfile.lock
-
 jobs:
   include:
-    - stage: spec
-      rvm: 2.5.1
-      script:
-        - bundle exec rake spec
-
-    - stage: acceptance
-      sudo: required
-      rvm: 2.5.1
-      services:
-        - docker
-      script:
-        - travis_wait 90 unbuffer bundle exec rake acceptance
+  ###  Testing on Travis CI is indefinitely disabled
+  ###
+  ###  See:
+  ###    * https://blog.travis-ci.com/2020-11-02-travis-ci-new-billing
+  ###    * https://simp-project.atlassian.net/browse/SIMP-8703
 
     - stage: deploy
       rvm: 2.5.1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 5.11.5 / 2020-12-02
+* Add support for Puppet 7
+* Work around issues with querying RPM spec file changelogs using RPM version 4.15.0+
+* Switch between 'with_unbundled_env' and 'with_clean_env' based on which one
+  Bundler supports.
+
 ### 5.11.4 / 2020-08-03
 * Permit *.md files in `rake pkg:compare_latest_tag`
 

data/Gemfile

@@ -2,7 +2,7 @@
 #
 # SIMP_GEM_SERVERS | a space/comma delimited list of rubygem servers
 # PUPPET_VERSION   | specifies the version of the puppet gem to load
-puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : '~> 5'
+puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : '~> 6'
 gem_sources   = ENV.key?('SIMP_GEM_SERVERS') ? ENV['SIMP_GEM_SERVERS'].split(/[, ]+/) : ['https://rubygems.org']
 
 gem_sources.each { |gem_source| source gem_source }

data/lib/simp/componentinfo.rb

@@ -139,6 +139,23 @@ class Simp::ComponentInfo
     if $?.exitstatus != 0
       fail("Could not extract changelog from #{rpm_spec_files[0]}." +
         " To debug, execute:\n   #{changelog_query}")
+    elsif raw_changelog.strip.empty?
+      changelog_lines = []
+
+      in_changelog = false
+      File.read(rpm_spec_files[0]).lines.each do |line|
+        changelog_lines << line if in_changelog
+
+        if line.start_with?('%')
+          if line.start_with?('%changelog')
+            in_changelog = true
+          else
+            in_changelog = false
+          end
+        end
+      end
+
+      raw_changelog = changelog_lines.join
     end
     @changelog = parse_changelog(raw_changelog, latest_version_only, verbose)
   end

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

@@ -76,7 +76,8 @@ module Simp::Rake::Build
               #
               # Clean env will give bundler the environment present before
               # Bundler is activated.
-              ::Bundler.with_clean_env do
+              clean_env_method = Bundler.respond_to?(:with_unbundled_env) ? :with_unbundled_env : :with_clean_env
+              ::Bundler.send(clean_env_method) do
                 out = %x(bundle #{args[:action]} 2>&1)
                 status = $?.success?
                 puts out if verbose
@@ -94,6 +95,7 @@ module Simp::Rake::Build
         namespace :yum do
           task :prep do
             if $simp6
+              # `$simp6_build_dir` is set by the build:auto task
               @build_dir = $simp6_build_dir
 
               unless @build_dir
@@ -469,10 +471,10 @@ module Simp::Rake::Build
           ##############################################################################
 
           desc <<-EOM
-          Create a workspace for a new distribution.
+          Create a new yum directory tree for a new distribution.
 
-          Creates a YUM scaffold under
-          #{@build_dir}/yum_data/SIMP{:simp_version}_{:os}{:os_version}_{:arch}.
+          Creates a YUM directory tree under
+          {dist_build_dir}/yum_data/SIMP{:simp_version}_{:os}{:os_version}_{:arch}.
 
           * :os           - The Operating System that you wish to use.
                             Supported OSs: #{@target_dists}.join(', ')
@@ -482,31 +484,45 @@ module Simp::Rake::Build
                             Default: Auto
 
           * :arch         - The architecture that you support. Default: x86_64
+
+          Set ENV['SIMP_BUILD_yum_dir'] to override the path of {dist_build_dir}
+
+          Will not overwrite existing directories or package.yaml files
           EOM
-          task :scaffold,[:os,:os_version,:simp_version,:arch] => [:prep] do |t,args|
+          task :scaffold,[:os,:os_version,:simp_version,:arch] do |t,args|
             # @simp_version is set in the main Rakefile
             args.with_defaults(:simp_version => @simp_version.split('-').first)
             args.with_defaults(:arch => @build_arch)
 
-            target_dir = get_target_dir(args)
-
-            unless File.exist?(target_dir)
-              mkdir_p(target_dir)
-              puts("Created #{target_dir}")
-            end
-
-            # Put together the rest of the scaffold directories
-            Dir.chdir(@build_base_dir) do
-              if $simp6
-                mkdir('../my_repos') unless File.exist?('../my_repos')
-              else
-                mkdir('my_repos') unless File.exist?('my_repos')
-              end
-            end
-
-            Dir.chdir(target_dir) do
-              mkdir('repos') unless File.exist?('repos')
-              mkdir('packages') unless File.exist?('packages')
+            major_os_ver = args[:os_version].split('.').first
+            build_dir = distro_build_dir(
+              File.join(@base_dir,'build'), args[:os], major_os_ver, args[:arch]
+            )
+            build_dir = ENV['SIMP_BUILD_yum_dir'] if File.directory?(ENV['SIMP_BUILD_yum_dir'].to_s)
+            ENV['SIMP_BUILD_yum_dir'] ||= build_dir  # <-- for hacky :prep task
+
+            target_dir = File.join(build_dir,'yum_data')
+
+            # Create directories
+            my_repos = $simp6 ? '../my_repos' : 'my_repos'
+            [
+              target_dir,
+              File.join(target_dir,'repos'),
+              File.join(target_dir,'packages'),
+              File.expand_path(my_repos,target_dir)
+            ].each { |dir| mkdir_p(dir, verbose: false) }
+
+            # Create example packages.yaml
+            packages_yaml_path = File.join(target_dir, 'packages.yaml')
+            unless File.exists? packages_yaml_path
+              pkg = 'example-package-name'
+              pkg_file = "#{pkg}-1.0.0-1.el#{major_os_ver}.#{args[:arch]}.rpm"
+              yum_url = "https://yum.server/#{args[:os]}/#{major_os_ver}/#{args[:arch]}"
+              pkg_url = "#{yum_url}/#{pkg_file}"
+              yaml = { pkg => { rpm_name: pkg_file, source: pkg_url } }.to_yaml
+              File.open(packages_yaml_path,'w'){|f| f.puts yaml.gsub(/^/,'# ') }
+              puts "Created #{target_dir}"
+              puts "Created example file at #{packages_yaml_path}"
             end
           end
 
@@ -525,7 +541,7 @@ module Simp::Rake::Build
 
           * :arch         - The architecture that you support. Default: x86_64
           EOM
-          task :sync,[:os,:os_version,:simp_version,:arch] => [:prep, :scaffold] do |t,args|
+          task :sync,[:os,:os_version,:simp_version,:arch] => [:scaffold, :prep] do |t,args|
             # @simp_version is set in the main Rakefile
             args.with_defaults(:simp_version => @simp_version.split('-').first)
             args.with_defaults(:arch => @build_arch)
@@ -550,7 +566,7 @@ module Simp::Rake::Build
 
           * :arch         - The architecture that you support. Default: x86_64
           EOM
-          task :diff,[:os,:os_version,:simp_version,:arch] => [:prep, :scaffold] do |t,args|
+          task :diff,[:os,:os_version,:simp_version,:arch] => [:scaffold, :prep] do |t,args|
             args.with_defaults(:simp_version => @simp_version.split('-').first)
             args.with_defaults(:arch => @build_arch)
 
@@ -616,7 +632,7 @@ module Simp::Rake::Build
 
           * :arch         - The architecture that you support. Default: x86_64
           EOM
-          task :fetch,[:pkg,:os,:os_version,:simp_version,:arch] => [:prep, :scaffold] do |t,args|
+          task :fetch,[:pkg,:os,:os_version,:simp_version,:arch] => [:scaffold, :prep] do |t,args|
             args.with_defaults(:simp_version => @simp_version.split('-').first)
             args.with_defaults(:arch => @build_arch)
 

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

@@ -3,6 +3,10 @@ require 'rake/tasklib'
 module Simp::Rake; end
 module Simp::Rake::Build; end
 module Simp::Rake::Build::Constants
+  def distro_build_dir(build_dir, build_distro, build_version, build_arch)
+    File.join(build_dir, 'distributions', build_distro, build_version, build_arch)
+  end
+
   def init_member_vars( base_dir )
     return if @member_vars_initialized
 
@@ -36,7 +40,7 @@ module Simp::Rake::Build::Constants
     @simp_dvd_dirs     = ["SIMP","ks","Config"]
     @member_vars_initialized = true
 
-    @distro_build_dir = File.join(@build_dir, 'distributions', @build_distro, @build_version, @build_arch)
+    @distro_build_dir  = distro_build_dir(@build_dir, @build_distro, @build_version, @build_arch)
     @dvd_src           = File.join(@distro_build_dir, 'DVD')
     @dvd_dir           = File.join(@distro_build_dir, 'DVD_Overlay')
 

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

@@ -69,6 +69,7 @@ module Simp::Rake::Build
               :in_processes => get_cpu_limit,
               :progress => t.name
             ) do |dir|
+              next unless File.directory?(dir)
               Dir.chdir(dir) do
                 begin
                   rake_flags = Rake.application.options.trace ? '--trace' : ''
@@ -98,6 +99,7 @@ module Simp::Rake::Build
               :in_processes => get_cpu_limit,
               :progress => t.name
             ) do |dir|
+              next unless File.directory?(dir)
               Dir.chdir(dir) do
                 rake_flags = Rake.application.options.trace ? '--trace' : ''
                 sh %{rake clobber #{rake_flags}}
@@ -867,8 +869,18 @@ protect=1
                       $stderr.puts("First 'rake pkg:rpm' attempt for #{dir} failed, running bundle and trying again.")
                     end
 
-                    ::Bundler.with_clean_env do
-                      %x{bundle install --with development}
+                    if Bundler.respond_to?(:with_unbundled_env)
+                      # Bundler 2.1+
+                      clean_env_method = :with_unbundled_env
+                      bundle_install_cmd = %{bundle config set with 'development' && bundle install}
+                    else
+                      # Old Bundler
+                      clean_env_method = :with_clean_env
+                      bundle_install_cmd = %{bundle install --with development}
+                    end
+
+                    ::Bundler.send(clean_env_method) do
+                      %x{#{bundle_install_cmd}}
                       output = %x{#{cmd} 2>&1}
 
                       unless $?.success?

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

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

data/lib/simp/rpm.rb

@@ -613,5 +613,10 @@ EOE
         end
       end
     end
+
+    # Returns the version of RPM installed on the system
+    def self.version
+      %x{rpm --version}.strip.split.last
+    end
   end
 end

data/spec/lib/simp/ci/gitlab_spec.rb

@@ -35,8 +35,7 @@ describe Simp::Ci::Gitlab do
   describe '#validate_config' do
     it 'succeeds when no .gitlab-ci.yml file exists and no tests exist' do
       proj_dir = File.join(files_dir, 'no_gitlab_config_without_tests')
-      expect{ Simp::Ci::Gitlab.new(proj_dir).validate_config }.
-        to_not raise_error
+      expect{ Simp::Ci::Gitlab.new(proj_dir).validate_config }.to_not raise_error
     end
 
     it 'succeeds but warns when no .gitlab-ci.yml file exists but tests exist' do
@@ -56,9 +55,9 @@ describe Simp::Ci::Gitlab do
       proj_dir = File.join(files_dir, 'valid_job_suite_nodeset')
       validator = Simp::Ci::Gitlab.new(proj_dir)
 
-      validator.stubs(:`).with('which curl').returns('/usr/bin/curl')
+      expect(validator).to receive(:`).with('which curl').and_return('/usr/bin/curl')
       gitlab_response = '{"status":"valid","errors":[]}'
-      validator.stubs(:`).with(Not(equals('which curl'))).returns(gitlab_response)
+      expect(validator).to receive(:`).with(/(?!which curl).*/).and_return(gitlab_response)
 
       expect{ validator.validate_config }.
         to_not raise_error
@@ -68,9 +67,9 @@ describe Simp::Ci::Gitlab do
       proj_dir = File.join(files_dir, 'valid_job_suite_nodeset')
       validator = Simp::Ci::Gitlab.new(proj_dir)
 
-      validator.stubs(:`).with('which curl').returns('/usr/bin/curl')
+      expect(validator).to receive(:`).with('which curl').and_return('/usr/bin/curl')
       gitlab_response = '{"status":"invalid","errors":["root config contains unknown keys: pup5.5-unit"]}'
-      validator.stubs(:`).with(Not(equals('which curl'))).returns(gitlab_response)
+      expect(validator).to receive(:`).with(/(?!which curl).*/).and_return(gitlab_response)
 
       expect{ validator.validate_config }.
         to raise_error(Simp::Ci::Gitlab::LintError,
@@ -97,7 +96,7 @@ describe Simp::Ci::Gitlab do
       proj_dir = File.join(files_dir, 'valid_job_suite_nodeset')
       validator = Simp::Ci::Gitlab.new(proj_dir)
 
-      validator.stubs(:`).returns('')
+      expect(validator).to receive(:`).and_return('')
 
       expect{ validator.validate_yaml }.
         to output(/Could not find 'curl'/).to_stdout
@@ -107,8 +106,8 @@ describe Simp::Ci::Gitlab do
       proj_dir = File.join(files_dir, 'valid_job_suite_nodeset')
       validator = Simp::Ci::Gitlab.new(proj_dir)
 
-      validator.stubs(:`).with('which curl').returns('/usr/bin/curl')
-      validator.stubs(:`).with(Not(equals('which curl'))).returns('{}')
+      expect(validator).to receive(:`).with('which curl').and_return('/usr/bin/curl')
+      expect(validator).to receive(:`).with(/(?!which curl).*/).and_return('{}')
 
       expect{ validator.validate_yaml }.
         to output(/Unable to lint check/).to_stdout
@@ -118,9 +117,9 @@ describe Simp::Ci::Gitlab do
       proj_dir = File.join(files_dir, 'valid_job_suite_nodeset')
       validator = Simp::Ci::Gitlab.new(proj_dir)
 
-      validator.stubs(:`).with('which curl').returns('/usr/bin/curl')
+      expect(validator).to receive(:`).with('which curl').and_return('/usr/bin/curl')
       gitlab_response = '{"status":"valid","errors":[]}'
-      validator.stubs(:`).with(Not(equals('which curl'))).returns(gitlab_response)
+      expect(validator).to receive(:`).with(/(?!which curl).*/).and_return(gitlab_response)
 
       expect{ validator.validate_yaml }.
         to_not raise_error
@@ -132,9 +131,9 @@ describe Simp::Ci::Gitlab do
       proj_dir = File.join(files_dir, 'valid_job_suite_nodeset')
       validator = Simp::Ci::Gitlab.new(proj_dir)
 
-      validator.stubs(:`).with('which curl').returns('/usr/bin/curl')
+      expect(validator).to receive(:`).with('which curl').and_return('/usr/bin/curl')
       gitlab_response = '{"status":"invalid","errors":["root config contains unknown keys: pup5.5-unit"]}'
-      validator.stubs(:`).with(Not(equals('which curl'))).returns(gitlab_response)
+      expect(validator).to receive(:`).with(/(?!which curl).*/).and_return(gitlab_response)
 
       expect{ validator.validate_yaml }.
         to raise_error(Simp::Ci::Gitlab::LintError,

data/spec/lib/simp/componentinfo_spec.rb

@@ -257,10 +257,16 @@ describe Simp::ComponentInfo do
        /Could not extract version and release from /)
    end
 
-   # This has to be a case in which version and release can be read
-   # from spec file but the changelog (which is optional) can't.  Could
-   # be mocked, but would like a real-world test case.
-   xit 'fails when changelog cannot be read from asset RPM spec file'
+   it 'fails when changelog cannot be read from asset RPM spec file' do
+     skip(
+       <<~SKIP.strip.split("\n").join(' ')
+         This has to be a case in which version and release can be read from
+         spec file but the changelog (which is optional) can't.
 
+         It *could* be mocked, but is probably not worth the LOE unless we
+         encounter a real-world test case."
+       SKIP
+     )
+   end
   end
 end

data/spec/lib/simp/rake/build/helpers_spec.rb

@@ -4,7 +4,10 @@ require 'spec_helper'
 describe Simp::Rake::Build::Helpers do
   before :each do
     dir        = File.expand_path( '../../files/simp_build', File.dirname( __FILE__ ) )
+    env = ENV['SIMP_RPM_dist'].dup
+    ENV['SIMP_RPM_dist'] = '.el7'
     @obj = Simp::Rake::Build::Helpers.new( dir )
+    ENV['SIMP_RPM_dist'] = env
   end
 
   describe "#initialize" do

data/spec/lib/simp/rake/build/rpmdeps_spec.rb

@@ -32,8 +32,7 @@ describe 'Simp::Rake::Build::RpmDeps#get_version_requires' do
       }.to raise_error(SIMPRpmDepVersionException)
     end
 
-    # FIXME regex doesn't catch this
-    pending do
+    it( nil, :pending => "FIXME regex doesn't catch this" )  do
       expect{
         Simp::Rake::Build::RpmDeps::get_version_requires(pkg, '<= 3.0.0')
       }.to raise_error(SIMPRpmDepVersionException)

data/spec/lib/simp/rake/pupmod/fixtures/othermod/Gemfile

@@ -1,18 +1,9 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
-puppetversion = ENV.key?('PUPPET_VERSION') ? ENV['PUPPET_VERSION'] : ['>= 3.3']
+puppetversion = ENV.key?('PUPPET_VERSION') ? ENV['PUPPET_VERSION'] : ['>= 5.5']
 gem 'metadata-json-lint'
 gem 'puppet', puppetversion
 gem 'puppetlabs_spec_helper', '>= 1.0.0'
 gem 'puppet-lint', '>= 1.0.0'
 gem 'facter', '>= 1.7.0'
 gem 'rspec-puppet'
-
-# rspec must be v2 for ruby 1.8.7
-if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
-  gem 'rspec', '~> 2.0'
-  gem 'rake', '~> 10.0'
-else
-  # rubocop requires ruby >= 1.9
-  gem 'rubocop'
-end

data/spec/lib/simp/rake_spec.rb

@@ -8,7 +8,8 @@ describe Simp::Rake do
 
   describe ".get_cpu_limit" do
     it "detects number of CPUs" do
-      expect( get_cpu_limit ).to be > 0
+      expect(Parallel).to receive(:processor_count).and_return(3)
+      expect( get_cpu_limit ).to eq 2
     end
   end
 

data/spec/lib/simp/relchecks_check_rpm_changelog_spec.rb

@@ -1,6 +1,8 @@
 require 'simp/relchecks'
 require 'spec_helper'
 
+rpm_version = Simp::RPM.version
+
 describe 'Simp::RelChecks.check_rpm_changelog' do
   let(:files_dir) {
     File.join( File.dirname(__FILE__), 'files', File.basename(__FILE__, '.rb'))
@@ -31,19 +33,27 @@ describe 'Simp::RelChecks.check_rpm_changelog' do
 
   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/)
+      if Gem::Version.new(rpm_version) > Gem::Version.new('4.15.0')
+        skip("RPM #{rpm_version} does not properly process changelog entries")
+      else
+        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
     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/)
+      if Gem::Version.new(rpm_version) > Gem::Version.new('4.15.0')
+        skip("RPM #{rpm_version} does not properly process changelog entries")
+      else
+        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
 end

data/spec/lib/simp/relchecks_compare_latest_tag_spec.rb

@@ -10,17 +10,17 @@ describe 'Simp::RelChecks.compare_latest_tag' do
 
   context 'with no project errors' do
     it 'reports no tags for a project with no tags' do
-      Simp::RelChecks.expects(:`).with('git fetch -t origin 2>/dev/null').returns("\n")
-      Simp::RelChecks.expects(:`).with('git tag -l').returns("\n")
+      expect(Simp::RelChecks).to receive(:`).with('git fetch -t origin 2>/dev/null').and_return("\n")
+      expect(Simp::RelChecks).to receive(:`).with('git tag -l').and_return("\n")
 
       expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.
         to output("  No tags exist from origin\n").to_stdout
     end
 
     it 'reports no new tag required when no files have changed' do
-      Simp::RelChecks.expects(:`).with('git fetch -t origin 2>/dev/null').returns("\n")
-      Simp::RelChecks.expects(:`).with('git tag -l').returns("1.0.0-pre\n1.0.0\n1.1.0\n")
-      Simp::RelChecks.expects(:`).with('git diff tags/1.1.0 --name-only').returns("\n")
+      expect(Simp::RelChecks).to receive(:`).with('git fetch -t origin 2>/dev/null').and_return("\n")
+      expect(Simp::RelChecks).to receive(:`).with('git tag -l').and_return("1.0.0-pre\n1.0.0\n1.1.0\n")
+      expect(Simp::RelChecks).to receive(:`).with('git diff tags/1.1.0 --name-only').and_return("\n")
 
       msg = "  No new tag required: No significant files have changed since '1.1.0' tag\n"
       expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.
@@ -28,9 +28,9 @@ describe 'Simp::RelChecks.compare_latest_tag' do
     end
 
     it 'reports no new tag required when no significant files have changed' do
-      Simp::RelChecks.expects(:`).with('git fetch -t origin 2>/dev/null').returns("\n")
-      Simp::RelChecks.expects(:`).with('git tag -l').returns("1.0.0\nv1.0.1\n1.1.0\n")
-      Simp::RelChecks.expects(:`).with('git diff tags/1.1.0 --name-only').returns(
+      expect(Simp::RelChecks).to receive(:`).with('git fetch -t origin 2>/dev/null').and_return("\n")
+      expect(Simp::RelChecks).to receive(:`).with('git tag -l').and_return("1.0.0\nv1.0.1\n1.1.0\n")
+      expect(Simp::RelChecks).to receive(:`).with('git diff tags/1.1.0 --name-only').and_return(
         ".travis.yml\nRakefile\nREFERENCE.md\nGemfile.lock\nspec/some_spec.rb\ndoc/index.html\nrakelib/mytasks.rake\n")
 
       msg = "  No new tag required: No significant files have changed since '1.1.0' tag\n"
@@ -39,9 +39,9 @@ describe 'Simp::RelChecks.compare_latest_tag' do
     end
 
     it 'reports a new tag is required for significant changes with bumped version' do
-      Simp::RelChecks.expects(:`).with('git fetch -t origin 2>/dev/null').returns("\n")
-      Simp::RelChecks.expects(:`).with('git tag -l').returns("1.0.0\n1.1.0-RC01\n")
-      Simp::RelChecks.expects(:`).with('git diff tags/1.0.0 --name-only').returns(
+      expect(Simp::RelChecks).to receive(:`).with('git fetch -t origin 2>/dev/null').and_return("\n")
+      expect(Simp::RelChecks).to receive(:`).with('git tag -l').and_return("1.0.0\n1.1.0-RC01\n")
+      expect(Simp::RelChecks).to receive(:`).with('git diff tags/1.0.0 --name-only').and_return(
          "CHANGELOG\nmetadata.json\nmanifest/init.pp\n")
 
       msg = <<-EOM
@@ -58,9 +58,9 @@ NOTICE: New tag of version '1.1.0' is required for 3 changed files:
 
   context 'with project errors' do
     it 'fails when latest version < latest tag' do
-      Simp::RelChecks.expects(:`).with('git fetch -t origin 2>/dev/null').returns("\n")
-      Simp::RelChecks.expects(:`).with('git tag -l').returns("1.0.0\n1.2.0\n")
-      Simp::RelChecks.expects(:`).with('git diff tags/1.2.0 --name-only').returns(
+      expect(Simp::RelChecks).to receive(:`).with('git fetch -t origin 2>/dev/null').and_return("\n")
+      expect(Simp::RelChecks).to receive(:`).with('git tag -l').and_return("1.0.0\n1.2.0\n")
+      expect(Simp::RelChecks).to receive(:`).with('git diff tags/1.2.0 --name-only').and_return(
          "CHANGELOG\nmetadata.json\nmanifest/init.pp\n")
 
       expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.
@@ -68,9 +68,9 @@ NOTICE: New tag of version '1.1.0' is required for 3 changed files:
     end
 
     it 'fails when significant file changes need a version bump' do
-      Simp::RelChecks.expects(:`).with('git fetch -t origin 2>/dev/null').returns("\n")
-      Simp::RelChecks.expects(:`).with('git tag -l').returns("1.0.0\n1.1.0\n")
-      Simp::RelChecks.expects(:`).with('git diff tags/1.1.0 --name-only').returns(
+      expect(Simp::RelChecks).to receive(:`).with('git fetch -t origin 2>/dev/null').and_return("\n")
+      expect(Simp::RelChecks).to receive(:`).with('git tag -l').and_return("1.0.0\n1.1.0\n")
+      expect(Simp::RelChecks).to receive(:`).with('git diff tags/1.1.0 --name-only').and_return(
          "manifest/init.pp\n")
 
       expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.

data/spec/lib/simp/rpm_spec.rb

@@ -237,7 +237,7 @@ describe Simp::RPM do
         ENV['SIMP_RPM_dist'] = @pre_env
       end
       it 'returns dist' do
-        Simp::RPM.stubs(:system_dist).returns('.testdist')
+        allow(Simp::RPM).to receive(:system_dist).and_return('.testdist')
         rpm_obj    = Simp::RPM.new( @rpm_file )
         d_rpm_obj  = Simp::RPM.new( @d_rpm_file )
         spec_obj   = Simp::RPM.new( @spec_file )

data/spec/spec_helper.rb

@@ -10,5 +10,5 @@ RSpec.configure do |config|
   config.filter_run :focus
 
   config.mock_framework = :rspec
-  config.mock_with :mocha
+  #config.mock_with :rspec
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.11.4
+  version: 5.11.5
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-03 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers
@@ -74,7 +74,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: puppet-lint
   requirement: !ruby/object:Gem::Requirement