simp-beaker-helpers 1.34.3 → 1.35.1

data/lib/simp/rake/beaker.rb

@@ -6,50 +6,53 @@ require 'beaker/tasks/rake_task'
 require 'beaker-rspec/rake_task'
 require 'puppetlabs_spec_helper/tasks/fixtures'
 
+# Simp namespace
 module Simp; end
-module Simp::Rake
-  class Beaker < ::Rake::TaskLib
-    def initialize(base_dir)
+# Simp::Rake namespace
+module Simp::Rake; end
 
-      @base_dir   = base_dir
-      @clean_list = []
+# Rake tasks for SIMP Beaker testing
+class Simp::Rake::Beaker < ::Rake::TaskLib
+  def initialize(base_dir) # rubocop:disable Lint/MissingSuper
+    @base_dir   = base_dir
+    @clean_list = []
 
-      ::CLEAN.include( %{#{@base_dir}/log} )
-      ::CLEAN.include( %{#{@base_dir}/junit} )
-      ::CLEAN.include( %{#{@base_dir}/sec_results} )
-      ::CLEAN.include( %{#{@base_dir}/spec/fixtures/inspec_deps} )
+    ::CLEAN.include(%(#{@base_dir}/log))
+    ::CLEAN.include(%(#{@base_dir}/junit))
+    ::CLEAN.include(%(#{@base_dir}/sec_results))
+    ::CLEAN.include(%(#{@base_dir}/spec/fixtures/inspec_deps))
 
-      yield self if block_given?
+    yield self if block_given?
 
-      ::CLEAN.include( @clean_list )
+    ::CLEAN.include(@clean_list)
 
-      namespace :beaker do
-        desc <<-EOM
+    namespace :beaker do
+      desc <<-EOM
           Run a Beaker test against a specific Nodeset
             * :nodeset - The nodeset against which you wish to run
         EOM
-        task :run, [:nodeset] do |t,args|
-          fail "You must pass :nodeset to #{t}" unless args[:nodeset]
-          nodeset = args[:nodeset].strip
+      task :run, [:nodeset] do |t, args|
+        raise "You must pass :nodeset to #{t}" unless args[:nodeset]
+        nodeset = args[:nodeset].strip
 
-          old_stdout = $stdout
-          nodesets = StringIO.new
-          $stdout = nodesets
+        old_stdout = $stdout
+        nodesets = StringIO.new
+        $stdout = nodesets
 
-          Rake::Task['beaker_nodes'].invoke
+        Rake::Task['beaker_nodes'].invoke
 
-          $stdout = old_stdout
+        $stdout = old_stdout
 
-          nodesets = nodesets.string.split("\n")
+        nodesets = nodesets.string.split("\n")
 
-          fail "Nodeset '#{nodeset}' not found. Valid Nodesets:\n#{nodesets.map{|x| x = %(  * #{x})}.join(%(\n))}" unless nodesets.include?(nodeset)
+        raise "Nodeset '#{nodeset}' not found. Valid Nodesets:\n#{nodesets.map { |x| %(  * #{x}) }.join(%(\n))}" unless nodesets.include?(nodeset)
 
-          ENV['BEAKER_set'] = nodeset
+        ENV['BEAKER_set'] = nodeset
 
-          Rake::Task['beaker'].invoke
-        end
+        Rake::Task['beaker'].invoke
+      end
 
-        desc <<-EOM
+      desc <<-EOM
           Run Beaker test suites.
             * :suite - A specific suite to run
               * If you set this to `ALL`, all suites will be run
@@ -108,211 +111,206 @@ module Simp::Rake
               'default_run' : <true|false> => Default: false
               ```
         EOM
-        task :suites, [:suite, :nodeset] => ['spec_prep'] do |t,args|
-          suite = args[:suite]
-          nodeset = args[:nodeset]
+      task :suites, [:suite, :nodeset] => ['spec_prep'] do |_t, args|
+        suite = args[:suite]
+        nodeset = args[:nodeset]
 
-          # Record Tasks That Fail
-          # Need to figure out how to capture the errors
-          failures = Hash.new
+        # Record Tasks That Fail
+        # Need to figure out how to capture the errors
+        failures = {}
 
-          suite_basedir = File.join(@base_dir, 'spec/acceptance/suites')
+        suite_basedir = File.join(@base_dir, 'spec/acceptance/suites')
 
-          if ENV['BEAKER_suite_basedir']
-            suite_basedir = ENV['BEAKER_suite_basedir']
-          end
+        if ENV['BEAKER_suite_basedir']
+          suite_basedir = ENV['BEAKER_suite_basedir']
+        end
 
-          raise("Error: Suites Directory at '#{suite_basedir}'!") unless File.directory?(suite_basedir)
-
-          if suite && (suite != 'ALL')
-            unless File.directory?(File.join(suite_basedir, suite))
-              STDERR.puts("Error: Could not find suite '#{suite}'")
-              STDERR.puts("Available Suites:")
-              STDERR.puts('  * ' + Dir.glob(
-                File.join(suite_basedir, '*')).sort.map{ |x|
-                  File.basename(x)
-                }.join("\n  * ")
-              )
-              exit(1)
-            end
+        raise("Error: Suites Directory at '#{suite_basedir}'!") unless File.directory?(suite_basedir)
+
+        if suite && (suite != 'ALL')
+          unless File.directory?(File.join(suite_basedir, suite))
+            STDERR.puts("Error: Could not find suite '#{suite}'")
+            STDERR.puts('Available Suites:')
+            STDERR.puts('  * ' + Dir.glob(
+              File.join(suite_basedir, '*'),
+            ).sort.map { |x|
+              File.basename(x)
+            }.join("\n  * "))
+            exit(1)
           end
+        end
 
-          suite_config = {
-            'fail_fast' => true
-          }
-          suite_config_metadata_path = File.join(suite_basedir, 'config.yml')
-          if File.file?(suite_config_metadata_path)
-            suite_config.merge!(YAML.load_file(suite_config_metadata_path))
-          end
+        suite_config = {
+          'fail_fast' => true
+        }
+        suite_config_metadata_path = File.join(suite_basedir, 'config.yml')
+        if File.file?(suite_config_metadata_path)
+          suite_config.merge!(YAML.load_file(suite_config_metadata_path))
+        end
 
-          suites = Hash.new
+        suites = {}
 
-          if suite && (suite != 'ALL')
-            suites[suite] = Hash.new
-            # If a suite was set, make sure it runs.
-            suites[suite]['default_run'] = true
-          else
-            Dir.glob(File.join(suite_basedir,'*')) do |file|
-              if File.directory?(file)
-                suites[File.basename(file)] = Hash.new
+        if suite && (suite != 'ALL')
+          suites[suite] = {}
+          # If a suite was set, make sure it runs.
+          suites[suite]['default_run'] = true
+        else
+          Dir.glob(File.join(suite_basedir, '*')) do |file|
+            if File.directory?(file)
+              suites[File.basename(file)] = {}
 
-                if suite == 'ALL'
-                  suites[File.basename(file)]['default_run'] = true
-                end
+              if suite == 'ALL'
+                suites[File.basename(file)]['default_run'] = true
               end
             end
           end
+        end
 
-          suites.keys.each do |ste|
-            suites[ste]['name']  = ste
-            suites[ste]['path']  = File.join(suite_basedir, ste)
+        suites.each_key do |ste|
+          suites[ste]['name']  = ste
+          suites[ste]['path']  = File.join(suite_basedir, ste)
 
-            metadata_path = File.join(suites[ste]['path'], 'metadata.yml')
-            if File.file?(metadata_path)
-              suites[ste]['metadata'] = YAML.load_file(metadata_path)
-            end
+          metadata_path = File.join(suites[ste]['path'], 'metadata.yml')
+          if File.file?(metadata_path)
+            suites[ste]['metadata'] = YAML.load_file(metadata_path)
+          end
 
-            unless File.directory?(File.join(suites[ste]['path'],'nodesets'))
-              Dir.chdir(suites[ste]['path']) do
-                if File.directory?('../../nodesets')
-                  FileUtils.ln_s('../../nodesets', 'nodesets')
-                end
+          unless File.directory?(File.join(suites[ste]['path'], 'nodesets'))
+            Dir.chdir(suites[ste]['path']) do
+              if File.directory?('../../nodesets')
+                FileUtils.ln_s('../../nodesets', 'nodesets')
               end
             end
+          end
 
-            suites[ste].merge!(suites[ste]['metadata']) if suites[ste]['metadata']
+          suites[ste].merge!(suites[ste]['metadata']) if suites[ste]['metadata']
 
-            # Ensure that the 'default' suite runs unless explicitly disabled.
-            if suites['default']
-              if ( suites['default']['default_run'].nil? ) || ( suites['default']['default_run'] == true )
-                suites['default']['default_run'] = true
-              end
-            end
+          # Ensure that the 'default' suite runs unless explicitly disabled.
+          next unless suites['default']
+          if suites['default']['default_run'].nil? || (suites['default']['default_run'] == true)
+            suites['default']['default_run'] = true
           end
+        end
 
-          raise("Error: No Suites Found in '#{suite_basedir}'!") if suites.empty?
-
-          # Need to ensure that 'default' is first
-          ordered_suites = suites.keys.sort
-          default_suite = ordered_suites.delete('default')
-          ordered_suites.unshift(default_suite) if default_suite
+        raise("Error: No Suites Found in '#{suite_basedir}'!") if suites.empty?
 
-          suite_start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-          ordered_suites.each do |ste|
+        # Need to ensure that 'default' is first
+        ordered_suites = suites.keys.sort
+        default_suite = ordered_suites.delete('default')
+        ordered_suites.unshift(default_suite) if default_suite
 
-            next unless (suites[ste]['default_run'] == true)
+        suite_start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        ordered_suites.each do |ste|
+          next unless suites[ste]['default_run'] == true
 
-            name = suites[ste]['name']
+          name = suites[ste]['name']
 
-            $stdout.puts("\n\n=== Suite '#{name}' Starting ===\n\n")
+          $stdout.puts("\n\n=== Suite '#{name}' Starting ===\n\n")
 
-            nodesets = Array.new
-            nodeset_path = File.join(suites[ste]['path'],'nodesets')
+          nodesets = []
+          nodeset_path = File.join(suites[ste]['path'], 'nodesets')
 
-            if nodeset
-              if nodeset == 'ALL'
-                nodesets = Dir.glob(File.join(nodeset_path, '*.yml'))
+          if nodeset
+            if nodeset == 'ALL'
+              nodesets = Dir.glob(File.join(nodeset_path, '*.yml'))
 
-                # Make sure we run the default set first
-                default_set = nodesets.delete(File.join(nodeset_path, 'default.yml'))
-                nodesets.unshift(default_set) if default_set
-              else
-                nodeset.split(':').each do |tgt_nodeset|
-                  nodesets << File.join(nodeset_path, "#{tgt_nodeset.strip}.yml")
-                end
-              end
+              # Make sure we run the default set first
+              default_set = nodesets.delete(File.join(nodeset_path, 'default.yml'))
+              nodesets.unshift(default_set) if default_set
             else
-              nodesets << File.join(nodeset_path, 'default.yml')
+              nodeset.split(':').each do |tgt_nodeset|
+                nodesets << File.join(nodeset_path, "#{tgt_nodeset.strip}.yml")
+              end
             end
+          else
+            nodesets << File.join(nodeset_path, 'default.yml')
+          end
 
-            refined_nodesets = []
-
-            nodesets.each do |nodeset_yml|
-              parsed_nodeset = ::Beaker::Options::HostsFileParser.parse_hosts_file(nodeset_yml)
+          refined_nodesets = []
 
-              # Default to multi-node testing for backwards compatibility
-              multi_node = (parsed_nodeset[:multi_node] == false ? false: true)
+          nodesets.each do |nodeset_yml|
+            parsed_nodeset = ::Beaker::Options::HostsFileParser.parse_hosts_file(nodeset_yml)
 
-              if multi_node
-                refined_nodesets.push(nodeset_yml)
-              else
-                parsed_nodeset_hosts = parsed_nodeset.delete(:HOSTS)
+            # Default to multi-node testing for backwards compatibility
+            multi_node = ((parsed_nodeset[:multi_node] == false) ? false : true)
 
-                parsed_nodeset_hosts.each do |k,v|
+            if multi_node
+              refined_nodesets.push(nodeset_yml)
+            else
+              parsed_nodeset_hosts = parsed_nodeset.delete(:HOSTS)
 
-                  v[:roles] ||= []
-                  v[:roles] |= ['default']
+              parsed_nodeset_hosts.each do |k, v|
+                v[:roles] ||= []
+                v[:roles] |= ['default']
 
-                  tmp_nodeset = {
-                    :HOSTS  => { k => v },
-                    :CONFIG => parsed_nodeset
-                  }
+                tmp_nodeset = {
+                  HOSTS: { k => v },
+                  CONFIG: parsed_nodeset
+                }
 
-                  tmp_nodeset_file = Tempfile.new("nodeset_#{k}-")
-                  tmp_nodeset_file.write(tmp_nodeset.to_yaml)
-                  tmp_nodeset_file.close
+                tmp_nodeset_file = Tempfile.new("nodeset_#{k}-")
+                tmp_nodeset_file.write(tmp_nodeset.to_yaml)
+                tmp_nodeset_file.close
 
-                  refined_nodesets.push(tmp_nodeset_file.path)
+                refined_nodesets.push(tmp_nodeset_file.path)
 
-                  at_exit do
-                    if tmp_nodeset_file && File.exist?(tmp_nodeset_file.path)
-                      tmp_nodeset_file.close
-                      tmp_nodeset_file.unlink
-                    end
+                at_exit do
+                  if tmp_nodeset_file && File.exist?(tmp_nodeset_file.path)
+                    tmp_nodeset_file.close
+                    tmp_nodeset_file.unlink
                   end
                 end
               end
             end
+          end
 
-            refined_nodesets.sort.each do |nodeset_yml|
-              unless File.file?(nodeset_yml)
-                # Get here if user has specified a non-existent nodeset or the
-                # implied `default` nodeset does not exist.
-                if suite_config['fail_fast']
-                  fail("*** Suite #{name} Nodeset '#{File.basename(nodeset_yml, '.yml')}' Not Found ***")
-                else
-                  $stdout.puts("=== Suite #{name} Nodeset '#{File.basename(nodeset_yml, '.yml')}' Not Found, Skipping ===")
-                  next
-                end
-              end
+          refined_nodesets.sort.each do |nodeset_yml|
+            unless File.file?(nodeset_yml)
+              # Get here if user has specified a non-existent nodeset or the
+              # implied `default` nodeset does not exist.
+              raise("*** Suite #{name} Nodeset '#{File.basename(nodeset_yml, '.yml')}' Not Found ***") if suite_config['fail_fast']
 
-              ENV['BEAKER_setfile'] = nodeset_yml
+              $stdout.puts("=== Suite #{name} Nodeset '#{File.basename(nodeset_yml, '.yml')}' Not Found, Skipping ===")
+              next
 
-              Rake::Task[:beaker].clear
-              RSpec::Core::RakeTask.new(:beaker) do |tsk|
-                tsk.rspec_opts = ['--color']
-                tsk.pattern = File.join(suites[ste]['path'])
-              end
+            end
+
+            ENV['BEAKER_setfile'] = nodeset_yml
 
-              current_suite_task = Rake::Task[:beaker]
+            Rake::Task[:beaker].clear
+            RSpec::Core::RakeTask.new(:beaker) do |tsk|
+              tsk.rspec_opts = ['--color']
+              tsk.pattern = File.join(suites[ste]['path'])
+            end
 
-              if suite_config['fail_fast'] == true
+            current_suite_task = Rake::Task[:beaker]
+
+            if suite_config['fail_fast'] == true
+              current_suite_task.execute
+            else
+              begin
                 current_suite_task.execute
-              else
-                begin
-                  current_suite_task.execute
-                rescue SystemExit
-                  failures[suites[ste]['name']] = {
-                    'path'    => suites[ste]['path'],
-                    'nodeset' => File.basename(nodeset_yml, '.yml')
-                  }
-                end
+              rescue SystemExit
+                failures[suites[ste]['name']] = {
+                  'path'    => suites[ste]['path'],
+                  'nodeset' => File.basename(nodeset_yml, '.yml')
+                }
               end
-
-              $stdout.puts("\n\n=== Suite '#{name}' Complete ===\n\n")
             end
+
+            $stdout.puts("\n\n=== Suite '#{name}' Complete ===\n\n")
           end
-          suite_end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        end
+        suite_end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
-          suite_run_time = ((suite_end_time - suite_start_time)/60).round(2)
+        suite_run_time = ((suite_end_time - suite_start_time) / 60).round(2)
 
-          $stdout.puts("== Total Runtime: #{suite_run_time} minutes ==\n\n")
+        $stdout.puts("== Total Runtime: #{suite_run_time} minutes ==\n\n")
 
-          unless failures.keys.empty?
-            $stdout.puts("The following tests had failures:")
-            failures.keys.sort.each do |ste|
-              $stdout.puts("  * #{ste} => #{failures[ste]['path']} on #{failures[ste]['nodeset']}")
-            end
+        unless failures.keys.empty?
+          $stdout.puts('The following tests had failures:')
+          failures.keys.sort.each do |ste|
+            $stdout.puts("  * #{ste} => #{failures[ste]['path']} on #{failures[ste]['nodeset']}")
           end
         end
       end

data/spec/acceptance/suites/default/check_puppet_version_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper_acceptance'
 
 unless ENV['PUPPET_VERSION'] || ENV['BEAKER_PUPPET_COLLECTION']
-  fail('You must set either PUPPET_VERSION or BEAKER_PUPPET_COLLECTION as an environment variable')
+  raise('You must set either PUPPET_VERSION or BEAKER_PUPPET_COLLECTION as an environment variable')
 end
 
 if ENV['BEAKER_PUPPET_COLLECTION']
-  target_version = ENV['BEAKER_PUPPET_COLLECTION'][/(\d+)$/,1]
+  target_version = ENV['BEAKER_PUPPET_COLLECTION'][%r{(\d+)$}, 1]
 elsif ENV['PUPPET_VERSION']
   target_version = ENV['PUPPET_VERSION'].split('.').first
 end
@@ -15,7 +15,7 @@ hosts.each do |host|
     context "on #{host}" do
       client_puppet_version = on(host, 'puppet --version').output.lines.last.strip
 
-      it "should be running puppet version #{target_version}" do
+      it "is running puppet version #{target_version}" do
         expect(Gem::Version.new(client_puppet_version)).to be >= Gem::Version.new(target_version)
       end
     end

data/spec/acceptance/suites/default/fixture_modules_spec.rb

@@ -3,29 +3,29 @@ require 'spec_helper_acceptance'
 context 'after copy_fixture_modules_to( hosts )' do
   before(:all) do
     # This should automatically run pluginsync_on hosts
-    copy_fixture_modules_to( hosts )
+    copy_fixture_modules_to(hosts)
   end
 
   describe "fact_on(default,'root_home')" do
-    it 'should not return value of `root_home`' do
+    it 'does not return value of `root_home`' do
       expect(fact_on(default, 'root_home').to_s).to eq ''
     end
   end
 
   describe "pfact_on(default,'root_home')" do
-    it 'should return value of `root_home`' do
+    it 'returns value of `root_home`' do
       expect(pfact_on(default, 'root_home')).to eq '/root'
     end
   end
 
   describe "pfact_on(default,'os.release.major')" do
-    it 'should return the value of `os.release.major`' do
-      expect(pfact_on(default, 'os.release.major')).to match(/.+/)
+    it 'returns the value of `os.release.major`' do
+      expect(pfact_on(default, 'os.release.major')).to match(%r{.+})
     end
   end
 
   describe "pfact_on(default,'os.release.foo')" do
-    it 'should not return the value of `os.release.foo`' do
+    it 'does not return the value of `os.release.foo`' do
       expect(pfact_on(default, 'os.release.foo').to_s).to eq ''
     end
   end
@@ -33,13 +33,13 @@ context 'after copy_fixture_modules_to( hosts )' do
   describe "pfact_on(default,'fips_enabled')" do
     expected = (ENV['BEAKER_fips'] == 'yes')
 
-    it 'should return false' do
+    it 'returns false' do
       expect(pfact_on(default, 'fips_enabled')).to eq expected
     end
   end
 
-  describe "pfact_on returns a hash" do
-    it 'should return a Hash' do
+  describe 'pfact_on returns a hash' do
+    it 'returns a Hash' do
       expect(pfact_on(default, 'os')).to be_a(Hash)
     end
   end

data/spec/acceptance/suites/default/install_simp_deps_repo_spec.rb

@@ -7,7 +7,7 @@ hosts.each do |host|
   end
 
   describe '#install_simp_repos' do
-    it 'should install yum utils' do
+    it 'installs yum utils' do
       host.install_package('yum-utils')
     end
 
@@ -15,11 +15,8 @@ hosts.each do |host|
       before(:all) do
         install_simp_repos(host)
       rescue => e
-        if expect_failures
-          warn e.message
-        else
-          raise e
-        end
+        raise e unless expect_failures
+        warn e.message
       end
 
       it 'enables the correct repos' do
@@ -43,13 +40,10 @@ hosts.each do |host|
 
     context 'when passed a disabled list ' do
       before(:all) do
-        install_simp_repos(host, ['simp-community-simp'] )
+        install_simp_repos(host, ['simp-community-simp'])
       rescue => e
-        if expect_failures
-          warn e.message
-        else
-          raise e
-        end
+        raise e unless expect_failures
+        warn e.message
       end
 
       it 'enables the correct repos' do
@@ -58,7 +52,7 @@ hosts.each do |host|
       end
 
       it 'disables the correct repos' do
-        on(host, 'yum -y list simp', :acceptable_exit_codes => [1])
+        on(host, 'yum -y list simp', acceptable_exit_codes: [1])
       end
     end
   end

data/spec/acceptance/suites/default/pki_tests_spec.rb

@@ -1,42 +1,37 @@
 require 'spec_helper_acceptance'
 require 'tmpdir'
 
-
 context 'PKI operations' do
-
   context 'after run_fake_pki_ca_on(default,hosts)' do
     before(:all) do
-      copy_fixture_modules_to( hosts )
+      copy_fixture_modules_to(hosts)
     end
 
     shared_examples_for 'a correctly copied keydist/ tree' do |test_dir|
       it 'correctly copies keydist/ tree' do
-        on(default, "ls -d #{test_dir}" +
-                   " #{test_dir}/cacerts" +
-                   " #{test_dir}/cacerts/cacert_*.pem"
-          )
+        on(default, "ls -d #{test_dir}" \
+                   " #{test_dir}/cacerts" \
+                   " #{test_dir}/cacerts/cacert_*.pem")
 
         hosts.each do |host|
           name = host.node_name
-          on(default, "ls -d #{test_dir}/#{name}/cacerts" +
-                     " #{test_dir}/#{name}/#{name}.pem"  +
-                     " #{test_dir}/#{name}/#{name}.pub"  +
-                     " #{test_dir}/cacerts/cacert_*.pem"
-            )
+          on(default, "ls -d #{test_dir}/#{name}/cacerts" \
+                     " #{test_dir}/#{name}/#{name}.pem"  \
+                     " #{test_dir}/#{name}/#{name}.pub"  \
+                     " #{test_dir}/cacerts/cacert_*.pem")
         end
       end
     end
 
     describe 'a Fake CA under /root' do
       tmp_keydist_dir = Dir.mktmpdir 'simp-beaker-helpers__pki-tests'
-      run_fake_pki_ca_on( default, hosts, tmp_keydist_dir  )
+      run_fake_pki_ca_on(default, hosts, tmp_keydist_dir)
 
-      it 'should create /root/pki' do
+      it 'creates /root/pki' do
         on(default, 'test -d /root/pki')
       end
 
       it_behaves_like 'a correctly copied keydist/ tree', '/root/pki/keydist'
-
     end
 
     describe 'after copy_keydist_to' do
@@ -50,6 +45,5 @@ context 'PKI operations' do
       copy_keydist_to(default, test_dir)
       it_behaves_like 'a correctly copied keydist/ tree', test_dir
     end
-
   end
 end

data/spec/acceptance/suites/fips_from_fixtures/00_default_spec.rb

@@ -25,7 +25,7 @@ new_fixtures['fixtures']['repositories']['augeasproviders_grub'] = 'https://gith
 new_fixtures['fixtures']['repositories']['simplib'] = 'https://github.com/simp/pupmod-simp-simplib'
 new_fixtures['fixtures']['repositories']['stdlib'] = 'https://github.com/simp/puppetlabs-stdlib'
 
-File.open(alt_fixtures, 'w'){ |fh| fh.puts(new_fixtures.to_yaml) }
+File.open(alt_fixtures, 'w') { |fh| fh.puts(new_fixtures.to_yaml) }
 
 ScrubFixtures.new
 
@@ -34,12 +34,12 @@ ENV['FIXTURES_YML'] = alt_fixtures
 
 beaker_gem_options = ENV['BEAKER_GEM_OPTIONS']
 
-Bundler.with_clean_env{
+Bundler.with_clean_env do
   ENV['BEAKER_GEM_OPTIONS'] = beaker_gem_options
   ENV['FIXTURES_YML'] = alt_fixtures
 
-  %x{bundle exec rake spec_prep}
-}
+  `bundle exec rake spec_prep`
+end
 
 require 'spec_helper_acceptance'