simp-rake-helpers 5.24.0 → 6.0.0

data/spec/lib/simp/command_utils_spec.rb

@@ -1,29 +1,32 @@
+# frozen_string_literal: true
+
 require 'simp/command_utils'
 require 'spec_helper'
 
 describe Simp::CommandUtils do
   RSpec.configure do |c|
-    c.include Simp::CommandUtils
+    c.include described_class
   end
 
   describe '.which' do
-    it 'should return location of command that exists' do
+    it 'returns location of command that exists' do
       expect(Facter::Core::Execution).to receive(:which).with('ls').and_return('/usr/bin/ls')
-      expect( which('ls') ).to eq('/usr/bin/ls')
+      expect(which('ls')).to eq('/usr/bin/ls')
     end
 
-    it 'should return nil if command does not exist by default' do
-      expect( which('/does/not/exist/command') ).to be nil
+    it 'returns nil if command does not exist by default' do
+      expect(which('/does/not/exist/command')).to be_nil
     end
 
-    it 'should fail if command does not exist if fail=true' do
-      expect{ which('/does/not/exist/command', true) }.to raise_error(
-        RuntimeError, /Warning: Command \/does\/not\/exist\/command not found/)
+    it 'fails if command does not exist if fail=true' do
+      expect { which('/does/not/exist/command', true) }.to raise_error(
+        RuntimeError, %r{Warning: Command /does/not/exist/command not found}
+      )
     end
 
-    it 'should cache commands' do
+    it 'caches commands' do
       allow(Facter::Core::Execution).to receive(:which).with('ls').and_return('/path1/ls', '/path2/ls')
-      expect( which('ls') ).to eq('/path1/ls')
+      expect(which('ls')).to eq('/path1/ls')
     end
   end
 end

data/spec/lib/simp/componentinfo_changelog_regex_spec.rb

@@ -1,120 +1,120 @@
+# frozen_string_literal: true
+
 require 'simp/relchecks'
 require 'spec_helper'
 
 describe 'Simp::ComponentInfo changelog regex' do
-
   context 'valid initial changelog lines' do
     it 'matches a valid line with a hyphen before version' do
       line = '* Mon Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
       result = line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)
-      expect( result ).to_not be nil
-      expect( result[1] ).to eq 'Mon Nov 06 2017'
-      expect( result[2] ).to eq 'Tom Smith <tom.smith@simp.com>'
-      expect( result[3] ).to eq '3.8.0'
-      expect( result[4] ).to eq '0'
+      expect(result).not_to be_nil
+      expect(result[1]).to eq 'Mon Nov 06 2017'
+      expect(result[2]).to eq 'Tom Smith <tom.smith@simp.com>'
+      expect(result[3]).to eq '3.8.0'
+      expect(result[4]).to eq '0'
     end
 
     it 'matches a valid line without a hyphen before version' do
       line = '* Mon Nov 06 2017 Tom Smith <tom.smith@simp.com>  13.28.30-RC1 '
       result = line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)
-      expect( result ).to_not be nil
-      expect( result[1] ).to eq 'Mon Nov 06 2017'
-      expect( result[2] ).to eq 'Tom Smith <tom.smith@simp.com>'
-      expect( result[3] ).to eq '13.28.30'
-      expect( result[4] ).to eq 'RC1'
+      expect(result).not_to be_nil
+      expect(result[1]).to eq 'Mon Nov 06 2017'
+      expect(result[2]).to eq 'Tom Smith <tom.smith@simp.com>'
+      expect(result[3]).to eq '13.28.30'
+      expect(result[4]).to eq 'RC1'
     end
 
     it 'matches a valid line without release qualifier' do
       line = '* Mon Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0'
       result = line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)
-      expect( result ).to_not be nil
-      expect( result[1] ).to eq 'Mon Nov 06 2017'
-      expect( result[2] ).to eq 'Tom Smith <tom.smith@simp.com>'
-      expect( result[3] ).to eq '3.8.0'
-      expect( result[4] ).to be nil
+      expect(result).not_to be_nil
+      expect(result[1]).to eq 'Mon Nov 06 2017'
+      expect(result[2]).to eq 'Tom Smith <tom.smith@simp.com>'
+      expect(result[3]).to eq '3.8.0'
+      expect(result[4]).to be_nil
     end
   end
 
   context 'invalid initial changelog lines' do
     it "does not match line that does not begin with '*'" do
       line = '- Mon Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
-      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+      expect(line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)).to be_nil
     end
 
     it 'does not match line with bad weekday' do
       line = '* Tues Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
-      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+      expect(line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)).to be_nil
     end
 
     it 'does not match line missing weekday' do
       line = '* Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
-      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+      expect(line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)).to be_nil
     end
 
     it 'does not match line with invalid month' do
       line = '* Mon June 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
-      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+      expect(line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)).to be_nil
     end
 
     it 'does not match line missing month' do
       line = '* Mon 06 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
-      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+      expect(line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)).to be_nil
     end
 
     it 'does not match line with single digit day' do
       line = '* Mon Nov 6 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
-      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+      expect(line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)).to be_nil
     end
 
     it 'does not match line with a too-large day' do
       line = '* Mon Nov 46 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
-      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+      expect(line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)).to be_nil
     end
 
     it 'does not match line missing day' do
       line = '* Mon Nov 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
-      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+      expect(line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)).to be_nil
     end
 
     it 'does not match line with a two-digit year' do
       line = '* Mon Nov 01 17 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
-      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+      expect(line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)).to be_nil
     end
 
     it 'does not match line with a too-large year' do
       line = '* Mon Nov 01 20170 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
-      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+      expect(line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)).to be_nil
     end
 
     it 'does not match line missing year' do
       line = '* Mon Nov 01 Tom Smith <tom.smith@simp.com> - 3.8.0-0'
-      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+      expect(line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)).to be_nil
     end
 
     it 'does not match line missing author name' do
       line = '* Mon Nov 01 2017 <tom.smith@simp.com> - 3.8.0-0'
-      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+      expect(line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)).to be_nil
     end
 
     it 'does not match line missing author email address' do
       line = '* Mon Nov 01 20170 Tom Smith - 3.8.0-0'
-      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+      expect(line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)).to be_nil
     end
 
     it 'does not match line missing version' do
       line = '* Mon Nov 06 2017 Tom Smith <tom.smith@simp.com>'
-      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+      expect(line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)).to be_nil
     end
 
     it 'does not match line with a version less than 3 parts' do
       line = '* Mon Nov 01 20170 Tom Smith <tom.smith@simp.com> - 3.8'
-      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+      expect(line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)).to be_nil
     end
 
     it 'does not match a valid line with more than 3 parts in the version' do
       line = '* Mon Nov 06 2017 Tom Smith <tom.smith@simp.com>  3.8.0.0'
-      expect( line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX) ).to be nil
+      expect(line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)).to be_nil
     end
-
   end
 end

data/spec/lib/simp/componentinfo_spec.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require 'simp/componentinfo'
 require 'spec_helper'
 
 describe Simp::ComponentInfo do
-  let(:files_dir) {
-    File.join( File.dirname(__FILE__), 'files', File.basename(__FILE__, '.rb'))
-  }
+  let(:files_dir) do
+    File.join(File.dirname(__FILE__), 'files', File.basename(__FILE__, '.rb'))
+  end
 
   context 'with valid module input' do
-    let(:component_dir){ File.join(files_dir, 'module') }
-    let(:info){ Simp::ComponentInfo.new(component_dir) }
+    let(:component_dir) { File.join(files_dir, 'module') }
+    let(:info) { described_class.new(component_dir) }
     let(:expected_release) { nil }
     let(:expected_changelog) do
       [
@@ -18,7 +20,7 @@ describe Simp::ComponentInfo do
           :release => '0',
           :content => [
             '* Wed Nov 15 2017 Mary Jones <mary.jones@simp.com> - 3.8.0-0',
-            '- Disable deprecation warnings by default'
+            '- Disable deprecation warnings by default',
           ]
         },
         {
@@ -27,17 +29,17 @@ describe Simp::ComponentInfo do
           :release => '0',
           :content => [
             '* Mon Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0',
-            '- Fixes split failure when "findmnt" does not exist on Linux'
+            '- Fixes split failure when "findmnt" does not exist on Linux',
           ]
         },
         {
           :date => 'Thu Oct 26 2017',
           :version => '3.7.0',
           :release => '0',
-          :content => [  # +changelog_date+:: Date string of the form <weekday> <month> <day> <year>
+          :content => [ # +changelog_date+:: Date string of the form <weekday> <month> <day> <year>
 
             '* Thu Oct 26 2017 Mary Jones <mary.jones@simp.com> - 3.7.0-0',
-            '- Add Mod::Macaddress data type'
+            '- Add Mod::Macaddress data type',
           ]
         },
         {
@@ -49,31 +51,33 @@ describe Simp::ComponentInfo do
             "- Convert all 'sysctl' 'kernel.shm*' entries to Strings",
             '  - shmall and shmmax were causing Facter and newer versions of Puppet to crash',
             '  - See FACT-1732 for additional information',
-            '- Add Puppet function `mod::assert_metadata_os()`'
+            '- Add Puppet function `mod::assert_metadata_os()`',
           ]
-        }
+        },
       ]
     end
 
     shared_examples 'an instance with expected module data' do
-      it { expect( info.component_dir ).to eq component_dir }
-      it { expect( info.type ).to eq :module }
-      it { expect( info.version ).to eq '3.8.0' }
-      it { expect( info.release ).to eq expected_release }
+      it { expect(info.component_dir).to eq component_dir }
+      it { expect(info.type).to eq :module }
+      it { expect(info.version).to eq '3.8.0' }
+      it { expect(info.release).to eq expected_release }
       it { expect(info.changelog).to eq expected_changelog }
     end
 
     it_behaves_like 'an instance with expected module data'
 
     context 'with loads version and latest-version-only changelog info' do
-      let(:info){Simp::ComponentInfo.new(component_dir, true)}
-      let(:expected_changelog){ super()[0..1] }
+      let(:info) { described_class.new(component_dir, true) }
+      let(:expected_changelog) { super()[0..1] }
+
       it_behaves_like 'an instance with expected module data'
     end
 
     context 'with a module version containing a prerelease suffix (3.8.0-rc0)' do
-      let(:component_dir){ File.join(files_dir, 'module_with_prerelease_dash_in_version') }
-      let(:expected_release){ 'rc0' }
+      let(:component_dir) { File.join(files_dir, 'module_with_prerelease_dash_in_version') }
+      let(:expected_release) { 'rc0' }
+
       it_behaves_like 'an instance with expected module data'
     end
   end
@@ -81,37 +85,42 @@ describe Simp::ComponentInfo do
   context 'with invalid module input' do
     it 'fails when metadata.json is malformed' do
       component_dir = File.join(files_dir, 'module_with_malformed_metadata')
-      expect{ Simp::ComponentInfo.new(component_dir) }.to raise_error(
-        JSON::ParserError)
+      expect { described_class.new(component_dir) }.to raise_error(
+        JSON::ParserError,
+      )
     end
 
     it 'fails when version is missing from metadata.json' do
       component_dir = File.join(files_dir, 'module_missing_version_metadata')
-      expect{ Simp::ComponentInfo.new(component_dir) }.to raise_error(
-        /Version missing from .*module_missing_version_metadata\/metadata.json/)
+      expect { described_class.new(component_dir) }.to raise_error(
+        %r{Version missing from .*module_missing_version_metadata/metadata.json},
+      )
     end
 
     it 'fails when module CHANGELOG is missing' do
       component_dir = File.join(files_dir, 'module_without_changelog')
-      expect{ Simp::ComponentInfo.new(component_dir) }.to raise_error(
-        /No CHANGELOG file found in .*module_without_changelog/)
+      expect { described_class.new(component_dir) }.to raise_error(
+        %r{No CHANGELOG file found in .*module_without_changelog},
+      )
     end
 
     it 'fails when any changelog entry version is > top-most version' do
       component_dir = File.join(files_dir, 'module_with_version_misordered_entries')
-      expect{ Simp::ComponentInfo.new(component_dir) }.to raise_error(
-        /ERROR:  Changelog entries are not properly version ordered/)
+      expect { described_class.new(component_dir) }.to raise_error(
+        %r{ERROR:  Changelog entries are not properly version ordered},
+      )
     end
 
     it 'fails when changelog entry dates are not ordered newest to oldest' do
       component_dir = File.join(files_dir, 'module_with_date_misordered_entries')
-      expect{ Simp::ComponentInfo.new(component_dir) }.to raise_error(
-        /ERROR:  Changelog entries are not properly date ordered/)
+      expect { described_class.new(component_dir) }.to raise_error(
+        %r{ERROR:  Changelog entries are not properly date ordered},
+      )
     end
 
     it 'stops processing upon first malformed changelog signature' do
       component_dir = File.join(files_dir, 'module_with_invalid_entries')
-      info = Simp::ComponentInfo.new(component_dir)
+      info = described_class.new(component_dir)
       expected_changelog = [
         {
           :date => 'Wed Nov 15 2017',
@@ -119,16 +128,16 @@ describe Simp::ComponentInfo do
           :release => '0',
           :content => [
             '* Wed Nov 15 2017 Mary Jones <mary.jones@simp.com> - 3.8.0-0',
-            '- Disable deprecation warnings by default'
+            '- Disable deprecation warnings by default',
           ]
-        }
+        },
       ]
       expect(info.changelog).to eq expected_changelog
     end
 
     it 'stops processing upon first invalid changelog weekday' do
       component_dir = File.join(files_dir, 'module_with_invalid_weekday_entry')
-      info = Simp::ComponentInfo.new(component_dir)
+      info = described_class.new(component_dir)
       expected_changelog = [
         {
           :date => 'Thu Nov 16 2017',
@@ -136,22 +145,22 @@ describe Simp::ComponentInfo do
           :release => '0',
           :content => [
             '* Thu Nov 16 2017 Mary Jones <mary.jones@simp.com> - 3.8.0-0',
-            '- Disable deprecation warnings by default'
+            '- Disable deprecation warnings by default',
           ]
-        }
+        },
       ]
       expect(info.changelog).to eq expected_changelog
     end
   end
 
   context 'with valid asset input' do
-   it 'loads version, release and changelog info from a single-package spec file' do
+    it 'loads version, release and changelog info from a single-package spec file' do
       component_dir = File.join(files_dir, 'asset_with_single_package')
-      info = Simp::ComponentInfo.new(component_dir, true)
-      expect( info.component_dir ).to eq component_dir
-      expect( info.type ).to eq :asset
-      expect( info.version ).to eq '1.0.0'
-      expect( info.release ).to eq '1'
+      info = described_class.new(component_dir, true)
+      expect(info.component_dir).to eq component_dir
+      expect(info.type).to eq :asset
+      expect(info.version).to eq '1.0.0'
+      expect(info.release).to eq '1'
       expected_changelog = [
         {
           :date => 'Wed Oct 18 2017',
@@ -159,20 +168,20 @@ describe Simp::ComponentInfo do
           :release => '1',
           :content => [
             '* Wed Oct 18 2017 Jane Doe <jane.doe@simp.com> - 1.0.0-1',
-            '- Fix installed file permissions'
+            '- Fix installed file permissions',
           ]
-        }
+        },
       ]
       expect(info.changelog).to eq expected_changelog
     end
 
     it 'loads version, release, and changelog info for primary package from a multi-package spec file' do
       component_dir = File.join(files_dir, 'asset_with_multiple_packages')
-      info = Simp::ComponentInfo.new(component_dir)
-      expect( info.component_dir ).to eq component_dir
-      expect( info.type ).to eq :asset
-      expect( info.version ).to eq '4.0.3'
-      expect( info.release ).to eq '0'
+      info = described_class.new(component_dir)
+      expect(info.component_dir).to eq component_dir
+      expect(info.type).to eq :asset
+      expect(info.version).to eq '4.0.3'
+      expect(info.release).to eq '0'
       expected_changelog = [
         {
           :date => 'Thu Aug 31 2017',
@@ -181,7 +190,7 @@ describe Simp::ComponentInfo do
           :content => [
             '* Thu Aug 31 2017 Jane Doe <jane.doe@simp.com> - 4.0.3',
             '- Fix bug Z',
-            '  - Thanks to Lilia Smith for the PR!'
+            '  - Thanks to Lilia Smith for the PR!',
           ]
         },
         {
@@ -190,7 +199,7 @@ describe Simp::ComponentInfo do
           :release => nil,
           :content => [
             '* Mon Jun 12 2017 Jane Doe <jane.doe@simp.com> - 4.0.3',
-            '- Prompt user for new input'
+            '- Prompt user for new input',
           ]
         },
         {
@@ -200,20 +209,20 @@ describe Simp::ComponentInfo do
           :content => [
             '* Fri Jun 02 2017 Jim Jones <jim.jones@simp.com> - 4.0.2-0',
             '- Expand X',
-            '- Fix Y'
+            '- Fix Y',
           ]
-        }
+        },
       ]
       expect(info.changelog).to eq expected_changelog
     end
 
     it 'loads version, release, and changelog info when release includes distribution' do
       component_dir = File.join(files_dir, 'asset_with_dist_in_release')
-      info = Simp::ComponentInfo.new(component_dir)
-      expect( info.component_dir ).to eq component_dir
-      expect( info.type ).to eq :asset
-      expect( info.version ).to eq '1.0.0'
-      expect( info.release ).to match(/0/)
+      info = described_class.new(component_dir)
+      expect(info.component_dir).to eq component_dir
+      expect(info.type).to eq :asset
+      expect(info.version).to eq '1.0.0'
+      expect(info.release).to include('0')
       expected_changelog = [
         {
           :date => 'Wed Oct 18 2017',
@@ -221,52 +230,56 @@ describe Simp::ComponentInfo do
           :release => '0',
           :content => [
             '* Wed Oct 18 2017 Jane Doe <jane.doe@simp.com> - 1.0.0-0',
-            '- Package with distribution in release tag'
+            '- Package with distribution in release tag',
           ]
-        }
+        },
       ]
       expect(info.changelog).to eq expected_changelog
     end
   end
 
- # Since same changelog parsing code is used for module and
- # RPM changelog content, only focus on the errors not already
- # tested above.
+  # Since same changelog parsing code is used for module and
+  # RPM changelog content, only focus on the errors not already
+  # tested above.
   context 'with invalid asset input' do
     it 'fails when asset RPM spec file is missing' do
       component_dir = File.join(files_dir, 'asset_without_spec_file')
-      expect{ Simp::ComponentInfo.new(component_dir) }.to raise_error(
-        /No RPM spec file found in .*asset_without_spec_file\/build/)
-   end
+      expect { described_class.new(component_dir) }.to raise_error(
+        %r{No RPM spec file found in .*asset_without_spec_file/build},
+      )
+    end
 
-   it 'fails when more than 1 asset RPM spec file is found' do
-     component_dir = File.join(files_dir, 'asset_with_two_spec_files')
-     expect{ Simp::ComponentInfo.new(component_dir) }.to raise_error(
-       /More than 1 RPM spec file found:/)
-   end
+    it 'fails when more than 1 asset RPM spec file is found' do
+      component_dir = File.join(files_dir, 'asset_with_two_spec_files')
+      expect { described_class.new(component_dir) }.to raise_error(
+        %r{More than 1 RPM spec file found:},
+      )
+    end
 
-   it 'fails when version is missing from asset RPM spec file' do
-     component_dir = File.join(files_dir, 'asset_missing_version')
-     expect{ Simp::ComponentInfo.new(component_dir) }.to raise_error(
-       /Could not extract version and release from /)
-   end
+    it 'fails when version is missing from asset RPM spec file' do
+      component_dir = File.join(files_dir, 'asset_missing_version')
+      expect { described_class.new(component_dir) }.to raise_error(
+        %r{Could not extract version and release from },
+      )
+    end
 
-   it 'fails when release is missing from asset RPM spec file' do
-     component_dir = File.join(files_dir, 'asset_missing_release')
-     expect{ Simp::ComponentInfo.new(component_dir) }.to raise_error(
-       /Could not extract version and release from /)
-   end
+    it 'fails when release is missing from asset RPM spec file' do
+      component_dir = File.join(files_dir, 'asset_missing_release')
+      expect { described_class.new(component_dir) }.to raise_error(
+        %r{Could not extract version and release from },
+      )
+    end
 
-   it 'fails when changelog cannot be read from asset RPM spec file' do
-     skip(
-       <<~SKIP.strip.split("\n").join(' ')
+    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
+        SKIP
+      )
+    end
   end
 end

data/spec/lib/simp/packer/iso_vars_json_spec.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 require 'simp/packer/iso_vars_json'
 require 'spec_helper'
 require 'tmpdir'
 require 'json'
 
 describe Simp::Packer::IsoVarsJson do
-  DUMMY_CONTENT = 'Dummy text with known checksum'.freeze
-  DUMMY_CHECKSUM = 'bd6eae40b2b18359f33332dd5b1a3dd5c9e885240c3d4907d6a1208cdafa0003'.freeze
+  DUMMY_CONTENT = 'Dummy text with known checksum'
+  DUMMY_CHECKSUM = 'bd6eae40b2b18359f33332dd5b1a3dd5c9e885240c3d4907d6a1208cdafa0003'
 
-  before do
+  before(:each) do
     @tmp_dir = Dir.mktmpdir(File.basename(__FILE__))
     @iso = File.expand_path('fixture.iso', @tmp_dir)
     File.open(@iso, 'w') { |f| f.puts DUMMY_CONTENT }
@@ -21,7 +23,7 @@ describe Simp::Packer::IsoVarsJson do
     @var_json = described_class.new(@iso, target_release, target_data, :silent => true)
   end
 
-  after do
+  after(:each) do
     FileUtils.remove_entry_secure @tmp_dir
   end
 
@@ -31,22 +33,22 @@ describe Simp::Packer::IsoVarsJson do
     it 'returns expected information for v1.0.0 format' do
       expect(@var_json.data).to include(
         'simp_vars_version' => '1.0.0',
-        'box_distro_release'  => 'SIMP-6.3.0-Beta1-CentOS-6.10',
-        'box_simp_release'    => '6.3.0-Beta1',
-        'iso_checksum'        => DUMMY_CHECKSUM,
-        'iso_checksum_type'   => 'sha256',
-        'dist_os_flavor'      => 'CentOS',
+        'box_distro_release' => 'SIMP-6.3.0-Beta1-CentOS-6.10',
+        'box_simp_release' => '6.3.0-Beta1',
+        'iso_checksum' => DUMMY_CHECKSUM,
+        'iso_checksum_type' => 'sha256',
+        'dist_os_flavor' => 'CentOS',
         'dist_os_maj_version' => '6',
-        'dist_os_version'     => '6.10',
-        'dist_source_isos'    => 'CentOS-6.10-x86_64-bin-DVD1.iso:CentOS-6.10-x86_64-bin-DVD2.iso',
-        'packer_src_type'     => 'simp-iso',
-        'iso_builder'         => 'rubygem-simp-rake-helpers'
+        'dist_os_version' => '6.10',
+        'dist_source_isos' => 'CentOS-6.10-x86_64-bin-DVD1.iso:CentOS-6.10-x86_64-bin-DVD2.iso',
+        'packer_src_type' => 'simp-iso',
+        'iso_builder' => 'rubygem-simp-rake-helpers',
       )
     end
   end
 
   describe '#write' do
-    before (:each) { @var_json.write }
+    before(:each) { @var_json.write }
 
     let(:json_file) { "#{File.basename(@iso, '.iso')}.json" }
 

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

@@ -1,20 +1,20 @@
+# frozen_string_literal: true
+
 require 'simp/rake/build/helpers'
 require 'spec_helper'
 
 describe Simp::Rake::Build::Helpers do
   before :each do
-    dir = File.expand_path( '../../files/simp_build', File.dirname( __FILE__ ) )
+    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 )
+    @obj = described_class.new(dir)
     ENV['SIMP_RPM_dist'] = env
   end
 
-  describe "#initialize" do
-    it "initialized (smoke test)" do
-      expect( @obj.class ).to eq Simp::Rake::Build::Helpers
+  describe '#initialize' do
+    it 'initialized (smoke test)' do
+      expect(@obj.class).to eq described_class
     end
   end
 end
-
-