simp-rake-helpers 5.25.0 → 6.0.0

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'simp/rake/build/rpmdeps'
 require 'spec_helper'
 require 'tmpdir'
@@ -8,33 +10,33 @@ describe 'Simp::Rake::Build::RpmDeps#get_version_requires' do
 
   context 'with valid version specifications' do
     {
-      "1.0.0"            => ['Requires: pupmod-foo-bar = 1.0.0'],
-      "> 2.0.0"          => ['Requires: pupmod-foo-bar > 2.0.0'],
-      "< 3.0.0"          => ['Requires: pupmod-foo-bar < 3.0.0'],
-      ">= 4.0.0 < 5.0.0" => ['Requires: pupmod-foo-bar >= 4.0.0',
+      '1.0.0' => ['Requires: pupmod-foo-bar = 1.0.0'],
+      '> 2.0.0' => ['Requires: pupmod-foo-bar > 2.0.0'],
+      '< 3.0.0' => ['Requires: pupmod-foo-bar < 3.0.0'],
+      '>= 4.0.0 < 5.0.0' => ['Requires: pupmod-foo-bar >= 4.0.0',
                              'Requires: pupmod-foo-bar < 5.0.0'],
-      "5.x"              => ['Requires: pupmod-foo-bar >= 5.0.0',
-                             'Requires: pupmod-foo-bar < 6.0.0'],
-      "6.4.x"            => ['Requires: pupmod-foo-bar >= 6.4.0',
-                             'Requires: pupmod-foo-bar < 7.0.0'],
-      nil                => ['Requires: pupmod-foo-bar']
+      '5.x' => ['Requires: pupmod-foo-bar >= 5.0.0',
+                'Requires: pupmod-foo-bar < 6.0.0'],
+      '6.4.x' => ['Requires: pupmod-foo-bar >= 6.4.0',
+                  'Requires: pupmod-foo-bar < 7.0.0'],
+      nil => ['Requires: pupmod-foo-bar']
     }.each do |input, output|
       it do
-        expect(Simp::Rake::Build::RpmDeps::get_version_requires(pkg, input)).to eq output
+        expect(Simp::Rake::Build::RpmDeps.get_version_requires(pkg, input)).to eq output
       end
     end
   end
 
   context 'with invalid version specifications' do
     it do
-      expect{
-        Simp::Rake::Build::RpmDeps::get_version_requires(pkg, '1.0.0.1')
+      expect {
+        Simp::Rake::Build::RpmDeps.get_version_requires(pkg, '1.0.0.1')
       }.to raise_error(SIMPRpmDepVersionException)
     end
 
-    it( nil, :pending => "FIXME regex doesn't catch this" )  do
-      expect{
-        Simp::Rake::Build::RpmDeps::get_version_requires(pkg, '<= 3.0.0')
+    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)
     end
   end
@@ -50,12 +52,12 @@ end
 #
 describe 'Simp::Rake::Build::RpmDeps#generate_rpm_meta_files' do
   let(:files_dir) { File.join(File.dirname(__FILE__), 'files') }
-  let(:rpm_metadata) {
-   YAML.load(File.read(File.join(files_dir, 'dependencies.yaml')))
-  }
+  let(:rpm_metadata) do
+    YAML.load_file(File.join(files_dir, 'dependencies.yaml'))
+  end
 
   before :each do
-    @tmp_dir = Dir.mktmpdir( File.basename( __FILE__ ) )
+    @tmp_dir = Dir.mktmpdir(File.basename(__FILE__))
     FileUtils.cp_r(files_dir, @tmp_dir)
   end
 
@@ -64,9 +66,9 @@ describe 'Simp::Rake::Build::RpmDeps#generate_rpm_meta_files' do
   end
 
   context 'managed component with a name change (obsoletes)' do
-    it 'should generate requires file with obsoletes' do
+    it 'generates requires file with obsoletes' do
       mod_dir = File.join(@tmp_dir, 'files', 'changed_name_mod')
-      Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_metadata)
+      Simp::Rake::Build::RpmDeps.generate_rpm_meta_files(mod_dir, rpm_metadata)
 
       requires_file = File.join(mod_dir, 'build', 'rpm_metadata', 'requires')
       expect(File.exist?(requires_file)).to be true
@@ -83,7 +85,7 @@ Requires: pupmod-foo5-bar5 < 6.0.0
 Requires: pupmod-foo6-bar6 >= 6.4.0
 Requires: pupmod-foo6-bar6 < 7.0.0
 EOM
-      actual = IO.read(requires_file)
+      actual = File.read(requires_file)
       expect(actual).to eq expected
 
       release_file = File.join(mod_dir, 'build', 'rpm_metadata', 'release')
@@ -92,9 +94,9 @@ EOM
   end
 
   context 'managed component with a subset of metadata.json deps, external deps and a release' do
-    it 'should generate both a requires file and a release file from dependencies.yaml' do
+    it 'generates both a requires file and a release file from dependencies.yaml' do
       mod_dir = File.join(@tmp_dir, 'files', 'managed_mod')
-      Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_metadata)
+      Simp::Rake::Build::RpmDeps.generate_rpm_meta_files(mod_dir, rpm_metadata)
 
       requires_file = File.join(mod_dir, 'build', 'rpm_metadata', 'requires')
       expect(File.exist?(requires_file)).to be true
@@ -111,19 +113,19 @@ Requires: rubygem-puppetserver-toml >= 0.1.2
 Requires: rubygem-puppetserver-blackslate >= 2.1.2.4-1
 Requires: rubygem-puppetserver-blackslate < 2.2.0.0
 EOM
-      actual = IO.read(requires_file)
+      actual = File.read(requires_file)
       expect(actual).to eq expected
 
       release_file = File.join(mod_dir, 'build', 'rpm_metadata', 'release')
       expect(File.exist?(release_file)).to be true
-      expect(IO.read(release_file)).to match(/^2017.0$/)
+      expect(File.read(release_file)).to match(%r{^2017.0$})
     end
   end
 
   context 'managed component with only a release' do
-    it 'should generate a release file from dependencies.yaml' do
+    it 'generates a release file from dependencies.yaml' do
       mod_dir = File.join(@tmp_dir, 'files', 'release_only_mod')
-      Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_metadata)
+      Simp::Rake::Build::RpmDeps.generate_rpm_meta_files(mod_dir, rpm_metadata)
 
       requires_file = File.join(mod_dir, 'build', 'rpm_metadata', 'requires')
       expect(File.exist?(requires_file)).to be true
@@ -132,19 +134,19 @@ EOM
 Requires: pupmod-puppetlabs-stdlib >= 3.2.0
 Requires: pupmod-puppetlabs-stdlib < 5.0.0
 EOM
-      actual = IO.read(requires_file)
+      actual = File.read(requires_file)
       expect(actual).to eq expected
 
       release_file = File.join(mod_dir, 'build', 'rpm_metadata', 'release')
       expect(File.exist?(release_file)).to be true
-      expect(IO.read(release_file)).to match(/^2017.2$/)
+      expect(File.read(release_file)).to match(%r{^2017.2$})
     end
   end
 
   context 'unmanaged component' do
-    it 'should replace requires file with metadata.json dependencies' do
+    it 'replaces requires file with metadata.json dependencies' do
       mod_dir = File.join(@tmp_dir, 'files', 'unmanaged_mod')
-      Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_metadata)
+      Simp::Rake::Build::RpmDeps.generate_rpm_meta_files(mod_dir, rpm_metadata)
 
       # expected should overwritten with simply dependencies in order
       # they were listed in metadata.json
@@ -161,12 +163,12 @@ EOM
       requires_file = File.join(mod_dir, 'build', 'rpm_metadata', 'requires')
       expect(File.exist?(requires_file)).to be true
 
-      actual = IO.read(requires_file)
+      actual = File.read(requires_file)
       expect(actual).to eq expected
 
-      original = IO.readlines(File.join(files_dir, 'unmanaged_mod',
-        'build', 'rpm_metadata', 'requires'))
-      expect(actual).to_not eq original
+      original = File.readlines(File.join(files_dir, 'unmanaged_mod',
+                                          'build', 'rpm_metadata', 'requires'))
+      expect(actual).not_to eq original
 
       release_file = File.join(mod_dir, 'build', 'rpm_metadata', 'release')
       expect(File.exist?(release_file)).to be false
@@ -174,9 +176,9 @@ EOM
   end
 
   context 'ignores obsoletes when version obsoleted is newer than this version' do
-    it 'should generate requires file with no obsoletes' do
+    it 'generates requires file with no obsoletes' do
       mod_dir = File.join(@tmp_dir, 'files', 'obsoletes_too_new_mod')
-      Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_metadata)
+      Simp::Rake::Build::RpmDeps.generate_rpm_meta_files(mod_dir, rpm_metadata)
 
       requires_file = File.join(mod_dir, 'build', 'rpm_metadata', 'requires')
       expect(File.exist?(requires_file)).to be true
@@ -186,37 +188,37 @@ EOM
 Requires: pupmod-foo1-bar1 = 1.0.0
 Requires: pupmod-foo2-bar2 > 2.0.0
 EOM
-      actual = IO.read(requires_file)
+      actual = File.read(requires_file)
       expect(actual).to eq expected
     end
   end
 
   context 'dependency from dependencies.yaml not found in metadata.json' do
-    it 'should fail when dep in depedencies.yaml is not found in metadata.json' do
+    it 'fails when dep in depedencies.yaml is not found in metadata.json' do
       mod_dir = File.join(@tmp_dir, 'files', 'unknown_dep_mod')
       err_msg = "Could not find 'oops/unknown' dependency in #{mod_dir}/metadata.json"
       expect {
-        Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_metadata)
+        Simp::Rake::Build::RpmDeps.generate_rpm_meta_files(mod_dir, rpm_metadata)
       }.to raise_error(err_msg)
     end
   end
 
   context 'malformed dependency version' do
-    it 'should fail for managed component with invalid dep version in metadata.json' do
+    it 'fails for managed component with invalid dep version in metadata.json' do
       mod_dir = File.join(@tmp_dir, 'files', 'malformed_dep_meta_mod')
       err_msg = "Unable to parse 'foo1/bar1' dependency version '1.0.0.1' in #{mod_dir}/metadata.json"
       expect {
-        Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_metadata)
+        Simp::Rake::Build::RpmDeps.generate_rpm_meta_files(mod_dir, rpm_metadata)
       }.to raise_error(err_msg)
     end
 
-    it 'should fail for unmanaged component with invalid dep version in metadata.json' do
+    it 'fails for unmanaged component with invalid dep version in metadata.json' do
       rpm_meta = rpm_metadata.dup
-      rpm_meta ['malformed_dep_meta_mod'] = nil
+      rpm_meta['malformed_dep_meta_mod'] = nil
       mod_dir = File.join(@tmp_dir, 'files', 'malformed_dep_meta_mod')
       err_msg = "Unable to parse 'foo1/bar1' dependency version '1.0.0.1' in #{mod_dir}/metadata.json"
       expect {
-        Simp::Rake::Build::RpmDeps::generate_rpm_meta_files(mod_dir, rpm_meta)
+        Simp::Rake::Build::RpmDeps.generate_rpm_meta_files(mod_dir, rpm_meta)
       }.to raise_error(err_msg)
     end
   end

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

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
+
 require 'simp/rake/helpers'
 require 'spec_helper'
 
 describe Simp::Rake::Helpers do
   before :each do
-    @obj = Simp::Rake::Helpers.new
+    @obj = described_class.new
   end
 
-  describe "#initialize" do
-    it "initialized (smoke test)" do
-      expect( @obj.class ).to eq Simp::Rake::Helpers
+  describe '#initialize' do
+    it 'initialized (smoke test)' do
+      expect(@obj.class).to eq described_class
     end
   end
 end
-

data/spec/lib/simp/rake/pkg_spec.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 require 'simp/rake/pkg'
 require 'spec_helper'
 
 describe Simp::Rake::Pkg do
   before :all do
-    dir        = File.expand_path( '../files', File.dirname( __FILE__ ) )
-    @obj = Simp::Rake::Pkg.new( dir )
+    dir = File.expand_path('../files', File.dirname(__FILE__))
+    @obj = described_class.new(dir)
   end
 
-  describe "#initialize" do
-    it "initializes (smoke test)" do
-      expect( @obj.class ).to eq Simp::Rake::Pkg
+  describe '#initialize' do
+    it 'initializes (smoke test)' do
+      expect(@obj.class).to eq described_class
     end
   end
 end

data/spec/lib/simp/rake/pupmod/fixtures/othermod/spec/classes/init_spec.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 describe 'othermod' do
   context 'with default values for all parameters' do
-    it { should contain_class('othermod') }
+    it { is_expected.to contain_class('othermod') }
   end
 end

data/spec/lib/simp/rake/pupmod/fixtures/othermod/spec/spec_helper.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'puppetlabs_spec_helper/module_spec_helper'

data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/suites/default/class_spec.rb

@@ -1,25 +1,26 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 
 test_name 'simpmod class'
 
 describe 'simpmod class' do
-  let(:manifest) {
+  let(:manifest) do
     <<-EOS
       class { 'simpmod': }
     EOS
-  }
+  end
 
   context 'default parameters' do
     # Using puppet_apply as a helper
-    it 'should work with no errors' do
+    it 'works with no errors' do
       apply_manifest(manifest, :catch_failures => true)
     end
 
-    it 'should be idempotent' do
+    it 'is idempotent' do
       apply_manifest(manifest, :catch_changes => true)
     end
 
-
     describe package('simpmod') do
       it { is_expected.to be_installed }
     end

data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/classes/init_spec.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'simpmod' do
-  shared_examples_for "a structured module" do
+  shared_examples_for 'a structured module' do
     it { is_expected.to compile.with_all_deps }
     it { is_expected.to create_class('simpmod') }
     it { is_expected.to contain_class('simpmod') }
@@ -13,7 +15,6 @@ describe 'simpmod' do
     it { is_expected.to contain_package('simpmod').with_ensure('present') }
   end
 
-
   context 'supported operating systems' do
     on_supported_os.each do |os, facts|
       context "on #{os}" do
@@ -21,51 +22,66 @@ describe 'simpmod' do
           facts
         end
 
-        context "simpmod class without any parameters" do
-          let(:params) {{ }}
-          it_behaves_like "a structured module"
+        context 'simpmod class without any parameters' do
+          let(:params) { {} }
+
+          it_behaves_like 'a structured module'
           it { is_expected.to contain_class('simpmod').with_trusted_nets(['127.0.0.1/32']) }
         end
 
-        context "simpmod class with firewall enabled" do
-          let(:params) {{
-            :trusted_nets     => ['10.0.2.0/24'],
-            :tcp_listen_port => 1234,
-            :enable_firewall => true,
-          }}
-          ###it_behaves_like "a structured module"
+        context 'simpmod class with firewall enabled' do
+          let(:params) do
+            {
+              :trusted_nets => ['10.0.2.0/24'],
+              :tcp_listen_port => 1234,
+              :enable_firewall => true
+            }
+          end
+
+          # ##it_behaves_like "a structured module"
           it { is_expected.to contain_class('simpmod::config::firewall') }
 
           it { is_expected.to contain_class('simpmod::config::firewall').that_comes_before('Class[simpmod::service]') }
-          it { is_expected.to create_iptables__listen__tcp_stateful('allow_simpmod_tcp_connections').with_dports(1234)
+
+          it {
+            expect(subject).to create_iptables__listen__tcp_stateful('allow_simpmod_tcp_connections').with_dports(1234)
           }
         end
 
-        context "simpmod class with selinux enabled" do
-          let(:params) {{
-            :enable_selinux => true,
-          }}
-          ###it_behaves_like "a structured module"
+        context 'simpmod class with selinux enabled' do
+          let(:params) do
+            {
+              :enable_selinux => true
+            }
+          end
+
+          # ##it_behaves_like "a structured module"
           it { is_expected.to contain_class('simpmod::config::selinux') }
           it { is_expected.to contain_class('simpmod::config::selinux').that_comes_before('Class[simpmod::service]') }
           it { is_expected.to create_notify('FIXME: selinux') }
         end
 
-        context "simpmod class with auditing enabled" do
-          let(:params) {{
-            :enable_auditing => true,
-          }}
-          ###it_behaves_like "a structured module"
+        context 'simpmod class with auditing enabled' do
+          let(:params) do
+            {
+              :enable_auditing => true
+            }
+          end
+
+          # ##it_behaves_like "a structured module"
           it { is_expected.to contain_class('simpmod::config::auditing') }
           it { is_expected.to contain_class('simpmod::config::auditing').that_comes_before('Class[simpmod::service]') }
           it { is_expected.to create_notify('FIXME: auditing') }
         end
 
-        context "simpmod class with logging enabled" do
-          let(:params) {{
-            :enable_logging => true,
-          }}
-          ###it_behaves_like "a structured module"
+        context 'simpmod class with logging enabled' do
+          let(:params) do
+            {
+              :enable_logging => true
+            }
+          end
+
+          # ##it_behaves_like "a structured module"
           it { is_expected.to contain_class('simpmod::config::logging') }
           it { is_expected.to contain_class('simpmod::config::logging').that_comes_before('Class[simpmod::service]') }
           it { is_expected.to create_notify('FIXME: logging') }
@@ -76,12 +92,14 @@ describe 'simpmod' do
 
   context 'unsupported operating system' do
     describe 'simpmod class without any parameters on Solaris/Nexenta' do
-      let(:facts) {{
-        :osfamily        => 'Solaris',
-        :operatingsystem => 'Nexenta',
-      }}
+      let(:facts) do
+        {
+          :osfamily => 'Solaris',
+          :operatingsystem => 'Nexenta'
+        }
+      end
 
-      it { expect { is_expected.to contain_package('simpmod') }.to raise_error(Puppet::Error, /Nexenta not supported/) }
+      it { expect { is_expected.to contain_package('simpmod') }.to raise_error(Puppet::Error, %r{Nexenta not supported}) }
     end
   end
 end

data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet'
 require 'simp/rspec-puppet-facts'
@@ -7,9 +9,9 @@ require 'pathname'
 
 # RSpec Material
 fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
-module_name = File.basename(File.expand_path(File.join(__FILE__,'../..')))
+File.basename(File.expand_path(File.join(__FILE__, '../..')))
 
-default_hiera_config =<<-EOM
+default_hiera_config = <<-EOM
 ---
 :backends:
   - "rspec"
@@ -23,9 +25,8 @@ default_hiera_config =<<-EOM
   - "default"
 EOM
 
-
-['hieradata','modules'].each do |dir|
-  _dir = File.join(fixture_path,dir)
+['hieradata', 'modules'].each do |dir|
+  _dir = File.join(fixture_path, dir)
   FileUtils.mkdir_p(_dir) unless File.directory?(_dir)
 end
 
@@ -33,8 +34,8 @@ RSpec.configure do |c|
   # If nothing else...
   c.default_facts = {
     :production => {
-      #:fqdn           => 'production.rspec.test.localdomain',
-      :path           => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
+      # :fqdn           => 'production.rspec.test.localdomain',
+      :path => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin',
       :concat_basedir => '/tmp'
     }
   }
@@ -44,10 +45,10 @@ RSpec.configure do |c|
 
   c.module_path = File.join(fixture_path, 'modules')
   c.manifest_dir = File.join(fixture_path, 'manifests')
-  c.hiera_config = File.join(fixture_path,'hieradata','hiera.yaml')
+  c.hiera_config = File.join(fixture_path, 'hieradata', 'hiera.yaml')
 
   # Useless backtrace noise
-  backtrace_exclusion_patterns = [ /spec_helper/, /gems/ ]
+  backtrace_exclusion_patterns = [%r{spec_helper}, %r{gems}]
 
   if c.respond_to?(:backtrace_exclusion_patterns)
     c.backtrace_exclusion_patterns = backtrace_exclusion_patterns
@@ -56,19 +57,17 @@ RSpec.configure do |c|
   end
 
   c.before(:all) do
-    data = YAML.load(default_hiera_config)
+    data = YAML.safe_load(default_hiera_config)
     data[:yaml][:datadir] = File.join(fixture_path, 'hieradata')
 
-    File.open(c.hiera_config, 'w') do |f|
-      f.write data.to_yaml
-    end
+    File.write(c.hiera_config, data.to_yaml)
   end
 
   c.before(:each) do
     @spec_global_env_temp = Dir.mktmpdir('simpspec')
 
     if defined?(environment)
-      FileUtils.mkdir_p(File.join(@spec_global_env_temp,environment.to_s))
+      FileUtils.mkdir_p(File.join(@spec_global_env_temp, environment.to_s))
     end
 
     # ensure the user running these tests has an accessible environmentpath
@@ -86,7 +85,7 @@ end
 Dir.glob("#{RSpec.configuration.module_path}/*").each do |dir|
   begin
     Pathname.new(dir).realpath
-  rescue
-    fail "ERROR: The module '#{dir}' is not installed. Tests cannot continue."
+  rescue StandardError
+    raise "ERROR: The module '#{dir}' is not installed. Tests cannot continue."
   end
 end

data/spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper_acceptance.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'beaker-rspec'
 require 'tmpdir'
 require 'yaml'
@@ -15,7 +17,6 @@ unless ENV['BEAKER_provision'] == 'no'
   end
 end
 
-
 RSpec.configure do |c|
   # ensure that environment OS is ready on each host
   fix_errata_on hosts
@@ -27,19 +28,18 @@ RSpec.configure do |c|
   c.before :suite do
     begin
       # Install modules and dependencies from spec/fixtures/modules
-      copy_fixture_modules_to( hosts )
+      copy_fixture_modules_to(hosts)
 
       # Generate and install PKI certificates on each SUT
       Dir.mktmpdir do |cert_dir|
-        run_fake_pki_ca_on( default, hosts, cert_dir )
-        hosts.each{ |sut| copy_pki_to( sut, cert_dir, '/etc/pki/simp-testing' )}
+        run_fake_pki_ca_on(default, hosts, cert_dir)
+        hosts.each { |sut| copy_pki_to(sut, cert_dir, '/etc/pki/simp-testing') }
       end
     rescue StandardError, ScriptError => e
-      if ENV['PRY']
-        require 'pry'; binding.pry
-      else
-        raise e
-      end
+      raise e unless ENV['PRY']
+
+      require 'pry'
+      binding.pry # rubocop:disable Lint/Debugger
     end
   end
 end

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

@@ -1,23 +1,25 @@
+# frozen_string_literal: true
+
 require 'simp/rake/pupmod/helpers'
 require 'spec_helper'
 
 describe Simp::Rake::Pupmod::Helpers do
   before :each do
-    fixtures_dir = File.expand_path( '../fixtures', __FILE__ )
-    @simpmod = Simp::Rake::Pupmod::Helpers.new(File.join(fixtures_dir, 'simpmod'))
-    @othermod = Simp::Rake::Pupmod::Helpers.new(File.join(fixtures_dir, 'othermod'))
+    fixtures_dir = File.expand_path('fixtures', __dir__)
+    @simpmod = described_class.new(File.join(fixtures_dir, 'simpmod'))
+    @othermod = described_class.new(File.join(fixtures_dir, 'othermod'))
   end
 
   describe '#initialize' do
     it 'initialized (smoke test)' do
-      expect( @simpmod.class ).to eq Simp::Rake::Pupmod::Helpers
+      expect(@simpmod.class).to eq described_class
     end
   end
 
   describe '#metadata' do
     it 'reads a valid metadata.json (simp)' do
-      expect( @simpmod.send( :metadata )['name'] ).to eq 'simp-simpmod'
-      expect( @othermod.send( :metadata )['name'] ).to eq 'other-othermod'
+      expect(@simpmod.send(:metadata)['name']).to eq 'simp-simpmod'
+      expect(@othermod.send(:metadata)['name']).to eq 'other-othermod'
     end
   end
 
@@ -36,32 +38,31 @@ describe Simp::Rake::Pupmod::Helpers do
     end
 
     it "doesn't match invalid one-line CHANGELOG entries" do
-      expect("* Foo Jan 1 1970 First Last <email@domain.com> - 0.0.1\n").to_not match @rgx
-      expect("* Mon Xxn 1 1970 First Last <email@domain.com> - 0.0.1\n").to_not match @rgx
-      expect("* Mon Jan 111 1970 First Last <email@domain.com> - 0.0.1\n").to_not match @rgx
-      expect("* Mon Jan 1 1970 <email@domain.com> - 0.0.1\n").to_not match @rgx
+      expect("* Foo Jan 1 1970 First Last <email@domain.com> - 0.0.1\n").not_to match @rgx
+      expect("* Mon Xxn 1 1970 First Last <email@domain.com> - 0.0.1\n").not_to match @rgx
+      expect("* Mon Jan 111 1970 First Last <email@domain.com> - 0.0.1\n").not_to match @rgx
+      expect("* Mon Jan 1 1970 <email@domain.com> - 0.0.1\n").not_to match @rgx
     end
 
     it 'matches valid two-line CHANGELOG entries' do
-      skip "Not worth implementing right now"
+      skip 'Not worth implementing right now'
     end
   end
 
-  describe "#changelog_annotation" do
+  describe '#changelog_annotation' do
     it "generates a tag annotation from a valid SIMP module's CHANGELOG" do
-      _log = @simpmod.send( :changelog_annotation )
-      expect( _log.class ).to be String
-      expect( _log.size ).to be > 0
-      expect( _log.scan( /^Release of/ ).size ).to eq 1
+      _log = @simpmod.send(:changelog_annotation)
+      expect(_log.class).to be String
+      expect(_log.size).to be > 0
+      expect(_log.scan(%r{^Release of}).size).to eq 1
     end
 
     it 'handles multiple CHANGELOG entries for the same release' do
-      _log = @simpmod.send( :changelog_annotation )
-      expect( _log.scan(/^\*.*\d+\.\d+\.\d+$/) ).to eq [
+      _log = @simpmod.send(:changelog_annotation)
+      expect(_log.scan(%r{^\*.*\d+\.\d+\.\d+$})).to eq [
         '* Tue Jan 2 1970 Second Author <email1@domain.com> - 0.1.0',
         '* Mon Jan 1 1970 First Author <email2@domain.com> - 0.1.0',
       ]
     end
   end
 end
-