omnibus 6.1.7 → 8.0.9

data/spec/unit/packagers/pkgsrc_spec.rb

@@ -70,7 +70,7 @@ module Omnibus
         expect(subject).to receive(:shellout!)
           .with "cd #{project.install_dir} && find . -type l -or -type f | sort >> #{staging_dir}/packlist"
         subject.write_packlist
-        expect(File.read("#{staging_dir}/packlist")).to match(/@pkgdir \/opt\/project/)
+        expect(File.read("#{staging_dir}/packlist")).to match(%r{@pkgdir /opt/project})
       end
     end
   end

data/spec/unit/packagers/rpm_spec.rb

@@ -35,7 +35,7 @@ module Omnibus
       create_directory("#{staging_dir}/SOURCES")
       create_directory("#{staging_dir}/SPECS")
 
-      stub_ohai(platform: "redhat", version: "6.9") do |data|
+      stub_ohai(platform: "redhat", version: "6") do |data|
         data["kernel"]["machine"] = architecture
       end
     end
@@ -488,7 +488,7 @@ module Omnibus
 
     describe "#safe_architecture" do
       before do
-        stub_ohai(platform: "redhat", version: "6.9") do |data|
+        stub_ohai(platform: "redhat", version: "6") do |data|
           data["kernel"]["machine"] = "i386"
         end
       end
@@ -499,7 +499,7 @@ module Omnibus
 
       context "when i686" do
         before do
-          stub_ohai(platform: "redhat", version: "6.9") do |data|
+          stub_ohai(platform: "redhat", version: "6") do |data|
             data["kernel"]["machine"] = "i686"
           end
         end
@@ -512,9 +512,9 @@ module Omnibus
       context "on Pidora" do
         before do
           # There's no Pidora in Fauxhai :(
-          stub_ohai(platform: "fedora", version: "27") do |data|
+          stub_ohai(platform: "fedora", version: "32") do |data|
             data["platform"] = "pidora"
-            data["platform_version"] = "27"
+            data["platform_version"] = "32"
             data["kernel"]["machine"] = "armv6l"
           end
         end

data/spec/unit/packagers/solaris_spec.rb

@@ -139,11 +139,11 @@ module Omnibus
 
       it "uses the correct commands" do
         expect(subject).to receive(:shellout!)
-          .with("cd /opt && find project -print > #{File.join(staging_dir, 'files')}")
+          .with("cd /opt && find project -print > #{File.join(staging_dir, "files")}")
         expect(subject).to receive(:shellout!)
-          .with("cd /opt && pkgproto < #{File.join(staging_dir, 'files.clean')} > #{File.join(staging_dir, 'Prototype.files')}")
+          .with("cd /opt && pkgproto < #{File.join(staging_dir, "files.clean")} > #{File.join(staging_dir, "Prototype.files")}")
         expect(subject).to receive(:shellout!)
-          .with("awk '{ $5 = \"root\"; $6 = \"root\"; print }' < #{File.join(staging_dir, 'Prototype.files')} >> #{File.join(staging_dir, 'Prototype')}")
+          .with("awk '{ $5 = \"root\"; $6 = \"root\"; print }' < #{File.join(staging_dir, "Prototype.files")} >> #{File.join(staging_dir, "Prototype")}")
         subject.write_prototype_file
       end
 
@@ -158,11 +158,11 @@ module Omnibus
     describe "#create_solaris_file" do
       it "uses the correct commands" do
         expect(subject).to receive(:shellout!)
-          .with("pkgmk -o -r /opt -d #{staging_dir} -f #{File.join(staging_dir, 'Prototype')}")
+          .with("pkgmk -o -r /opt -d #{staging_dir} -f #{File.join(staging_dir, "Prototype")}")
         expect(subject).to receive(:shellout!)
           .with("pkgchk -vd #{staging_dir} project")
         expect(subject).to receive(:shellout!)
-          .with("pkgtrans #{staging_dir} #{File.join(package_dir, 'project-1.2.3-1.i386.solaris')} project")
+          .with("pkgtrans #{staging_dir} #{File.join(package_dir, "project-1.2.3-1.i386.solaris")} project")
 
         subject.create_solaris_file
       end
@@ -207,11 +207,11 @@ module Omnibus
 
       it "uses the correct commands" do
         expect(subject).to receive(:shellout!)
-          .with("pkgmk -o -r /opt -d #{staging_dir} -f #{File.join(staging_dir, 'Prototype')}")
+          .with("pkgmk -o -r /opt -d #{staging_dir} -f #{File.join(staging_dir, "Prototype")}")
         expect(subject).to receive(:shellout!)
           .with("pkgchk -vd #{staging_dir} project")
         expect(subject).to receive(:shellout!)
-          .with("pkgtrans #{staging_dir} #{File.join(package_dir, 'project-1.2.3-1.i386.solaris')} project")
+          .with("pkgtrans #{staging_dir} #{File.join(package_dir, "project-1.2.3-1.i386.solaris")} project")
 
         subject.create_solaris_file
       end

data/spec/unit/project_spec.rb

@@ -202,33 +202,33 @@ module Omnibus
     end
 
     describe "#build_iteration" do
-      let(:fauxhai_options) { Hash.new }
+      let(:fauxhai_options) { {} }
 
       before { stub_ohai(fauxhai_options) }
 
       context "when on RHEL" do
-        let(:fauxhai_options) { { platform: "redhat", version: "6.9" } }
+        let(:fauxhai_options) { { platform: "redhat", version: "8" } }
         it "returns a RHEL iteration" do
           expect(subject.build_iteration).to eq(1)
         end
       end
 
       context "when on Debian" do
-        let(:fauxhai_options) { { platform: "debian", version: "8.11" } }
+        let(:fauxhai_options) { { platform: "debian", version: "10" } }
         it "returns a Debian iteration" do
           expect(subject.build_iteration).to eq(1)
         end
       end
 
       context "when on FreeBSD" do
-        let(:fauxhai_options) { { platform: "freebsd", version: "10.4" } }
+        let(:fauxhai_options) { { platform: "freebsd", version: "12" } }
         it "returns a FreeBSD iteration" do
           expect(subject.build_iteration).to eq(1)
         end
       end
 
       context "when on Windows" do
-        before { stub_ohai(platform: "windows", version: "2008R2") }
+        before { stub_ohai(platform: "windows", version: "2019") }
         before { stub_const("File::ALT_SEPARATOR", '\\') }
         it "returns a Windows iteration" do
           expect(subject.build_iteration).to eq(1)
@@ -236,7 +236,7 @@ module Omnibus
       end
 
       context "when on OS X" do
-        let(:fauxhai_options) { { platform: "mac_os_x", version: "10.13" } }
+        let(:fauxhai_options) { { platform: "mac_os_x", version: "10.15" } }
         it "returns a generic iteration" do
           expect(subject.build_iteration).to eq(1)
         end
@@ -340,7 +340,7 @@ module Omnibus
         subject.compress(:tgz)
 
         expect(Compressor).to receive(:for_current_system)
-          .with([:dmg, :tgz])
+          .with(%i{dmg tgz})
           .and_call_original
 
         subject.compressor

data/spec/unit/publisher_spec.rb

@@ -133,8 +133,7 @@ module Omnibus
                   license: "Apache-2.0",
                 },
               },
-            }
-          )
+            })
         end
 
         before do

data/spec/unit/publishers/artifactory_publisher_spec.rb

@@ -10,8 +10,7 @@ module Omnibus
         path: "/path/to/files/chef.deb",
         name: "chef.deb",
         content: "BINARY",
-        validate!: true
-      )
+        validate!: true)
     end
 
     let(:metadata) do
@@ -90,8 +89,7 @@ module Omnibus
               license: "Apache-2.0",
             },
           },
-        }
-      )
+        })
     end
 
     let(:packages) { [package] }

data/spec/unit/publishers/s3_publisher_spec.rb

@@ -9,8 +9,7 @@ module Omnibus
         path: "/path/to/files/chef.deb",
         name: "chef.deb",
         content: "BINARY",
-        validate!: true
-      )
+        validate!: true)
     end
 
     let(:metadata) do
@@ -24,8 +23,7 @@ module Omnibus
         platform_version: "14.04",
         arch: "x86_64",
         sha1: "SHA1",
-        md5: "ABCDEF123456"
-      )
+        md5: "ABCDEF123456")
     end
 
     let(:packages) { [package] }

data/spec/unit/s3_cacher_spec.rb

@@ -7,9 +7,7 @@ module Omnibus
         name: "ruby",
         version: "1.9.3",
         fetcher: double(Fetcher,
-          checksum: "abcd1234"
-        )
-      )
+          checksum: "abcd1234"))
     end
 
     let(:python_27) do
@@ -17,9 +15,7 @@ module Omnibus
         name: "python",
         version: "2.7",
         fetcher: double(Fetcher,
-          checksum: "defg5678"
-        )
-      )
+          checksum: "defg5678"))
     end
 
     describe ".list" do
@@ -113,10 +109,12 @@ module Omnibus
       let (:s3_access_key) { nil }
       let (:s3_secret_key) { nil }
       let (:s3_profile) { nil }
+      let (:s3_iam_role_arn) { nil }
 
       before do
         Config.s3_bucket s3_bucket
         Config.s3_region s3_region
+        Config.s3_iam_role_arn s3_iam_role_arn
         Config.s3_profile s3_profile
         Config.s3_access_key s3_access_key
         Config.s3_secret_key s3_secret_key
@@ -152,6 +150,21 @@ module Omnibus
           expect(config[:secret_access_key]).to eq(nil)
         end
       end
+
+      context "s3_iam_role_arn is configured" do
+        let(:s3_iam_role_arn) { "S3_IAM_ROLE_ARN" }
+        let(:s3_profile) { "SHAREDPROFILE" }
+        let(:s3_access_key) { "ACCESS_KEY_ID" }
+        let(:s3_secret_key) { "SECRET_ACCESS_KEY" }
+
+        it "sets s3_iam_role_arn only" do
+          config = S3Cache.send(:s3_configuration)
+          expect(config[:iam_role_arn]).to eq(s3_iam_role_arn)
+          expect(config[:profile]).to eq(nil)
+          expect(config[:access_key_id]).to eq(nil)
+          expect(config[:secret_access_key]).to eq(nil)
+        end
+      end
     end
   end
 end

data/spec/unit/s3_helpers_spec.rb

@@ -9,12 +9,12 @@ module Omnibus
       describe "#client" do
         it "raises an error if it is not overridden" do
           expect { s3_configuration }.to raise_error(RuntimeError,
-                                                     "You must override s3_configuration")
+            "You must override s3_configuration")
         end
 
         it "raises an error stating that s3_configuration must be overriden" do
           expect { client }.to raise_error(RuntimeError,
-                                           "You must override s3_configuration")
+            "You must override s3_configuration")
         end
       end
     end
@@ -40,6 +40,8 @@ module Omnibus
       let(:instance) { klass.new }
       let(:key_pair) { { access_key_id: "key_id", secret_access_key: "access_key" } }
       let(:profile) { "my-profile" }
+      let(:iam_role_arn) { "my-iam-role-arn" }
+      let(:role_session_name) { "omnibus-assume-role-s3-access" }
       let(:config) { { bucket_name: "foo", region: "us-east-1" } }
 
       it "uses configured key pairs" do
@@ -52,19 +54,36 @@ module Omnibus
         instance.send(:get_credentials)
       end
 
-      it "preferrs shared credentials profiles over key pairs" do
+      it "prefers shared credentials profiles over key pairs" do
         allow_any_instance_of(klass).to receive(:s3_configuration).and_return(
           {
             **config,
             **key_pair,
+            iam_role_arn: nil,
             profile: profile,
           }
         )
         expect(Aws::Credentials).to_not receive(:new)
+        expect(Aws::AssumeRoleCredentials).to_not receive(:new)
         allow(Aws::SharedCredentials).to receive(:new).with(profile_name: profile)
         instance.send(:get_credentials)
       end
 
+      it "prefers AWS IAM role arn over profiles and key pairs" do
+        allow_any_instance_of(klass).to receive(:s3_configuration).and_return(
+          {
+            **config,
+            **key_pair,
+            profile: profile,
+            iam_role_arn: iam_role_arn,
+          }
+        )
+        expect(Aws::Credentials).to_not receive(:new)
+        expect(Aws::SharedCredentials).to_not receive(:new)
+        allow(Aws::AssumeRoleCredentials).to receive(:new).with(role_arn: iam_role_arn, role_session_name: role_session_name)
+        instance.send(:get_credentials)
+      end
+
     end
   end
 end

data/spec/unit/software_spec.rb

@@ -73,9 +73,9 @@ module Omnibus
         it "sets the defaults" do
           expect(subject.with_standard_compiler_flags).to eq(
             "LDFLAGS"         => "-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib",
-            "CFLAGS"          => "-I/opt/project/embedded/include -O2",
-            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2",
-            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2",
+            "CFLAGS"          => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
+            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
+            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
             "LD_RUN_PATH"     => "/opt/project/embedded/lib",
             "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
             "OMNIBUS_INSTALL_DIR" => "/opt/project"
@@ -84,9 +84,9 @@ module Omnibus
         it "overrides LDFLAGS" do
           expect(subject.with_standard_compiler_flags("LDFLAGS" => "foo")).to eq(
             "LDFLAGS"         => "-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib",
-            "CFLAGS"          => "-I/opt/project/embedded/include -O2",
-            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2",
-            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2",
+            "CFLAGS"          => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
+            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
+            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
             "LD_RUN_PATH"     => "/opt/project/embedded/lib",
             "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
             "OMNIBUS_INSTALL_DIR" => "/opt/project"
@@ -95,9 +95,9 @@ module Omnibus
         it "overrides CFLAGS" do
           expect(subject.with_standard_compiler_flags("CFLAGS" => "foo")).to eq(
             "LDFLAGS"         => "-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib",
-            "CFLAGS"          => "-I/opt/project/embedded/include -O2",
-            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2",
-            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2",
+            "CFLAGS"          => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
+            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
+            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
             "LD_RUN_PATH"     => "/opt/project/embedded/lib",
             "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
             "OMNIBUS_INSTALL_DIR" => "/opt/project"
@@ -106,9 +106,9 @@ module Omnibus
         it "overrides CXXFLAGS" do
           expect(subject.with_standard_compiler_flags("CXXFLAGS" => "foo")).to eq(
             "LDFLAGS"         => "-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib",
-            "CFLAGS"          => "-I/opt/project/embedded/include -O2",
-            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2",
-            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2",
+            "CFLAGS"          => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
+            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
+            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
             "LD_RUN_PATH"     => "/opt/project/embedded/lib",
             "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
             "OMNIBUS_INSTALL_DIR" => "/opt/project"
@@ -117,9 +117,9 @@ module Omnibus
         it "overrides CPPFLAGS" do
           expect(subject.with_standard_compiler_flags("CPPFLAGS" => "foo")).to eq(
             "LDFLAGS"         => "-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib",
-            "CFLAGS"          => "-I/opt/project/embedded/include -O2",
-            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2",
-            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2",
+            "CFLAGS"          => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
+            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
+            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
             "LD_RUN_PATH"     => "/opt/project/embedded/lib",
             "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
             "OMNIBUS_INSTALL_DIR" => "/opt/project"
@@ -129,9 +129,9 @@ module Omnibus
           expect(subject.with_standard_compiler_flags("numberwang" => 4)).to eq(
             "numberwang"      => 4,
             "LDFLAGS"         => "-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib",
-            "CFLAGS"          => "-I/opt/project/embedded/include -O2",
-            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2",
-            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2",
+            "CFLAGS"          => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
+            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
+            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
             "LD_RUN_PATH"     => "/opt/project/embedded/lib",
             "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
             "OMNIBUS_INSTALL_DIR" => "/opt/project"
@@ -196,9 +196,9 @@ module Omnibus
         it "sets the defaults" do
           expect(subject.with_standard_compiler_flags).to eq(
             "LDFLAGS"         => "-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib",
-            "CFLAGS"          => "-I/opt/project/embedded/include -O2",
-            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2",
-            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2",
+            "CFLAGS"          => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
+            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
+            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
             "LD_RUN_PATH"     => "/opt/project/embedded/lib",
             "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
             "OMNIBUS_INSTALL_DIR" => "/opt/project"
@@ -207,12 +207,7 @@ module Omnibus
       end
 
       context "on aix" do
-        before do
-          # There's no AIX in Fauxhai :(
-          stub_ohai(platform: "solaris2", version: "5.11") do |data|
-            data["platform"] = "aix"
-          end
-        end
+        before { stub_ohai(platform: "aix") }
 
         it "sets the defaults" do
           expect(subject.with_standard_compiler_flags).to eq(
@@ -232,17 +227,17 @@ module Omnibus
         end
       end
 
-      context "on freebsd 10" do
+      context "on freebsd" do
         before do
-          stub_ohai(platform: "freebsd", version: "10.4")
+          stub_ohai(platform: "freebsd", version: "12.1")
         end
 
         it "sets the defaults" do
           expect(subject.with_standard_compiler_flags).to eq(
             "CC" => "clang",
-            "CFLAGS" => "-I/opt/project/embedded/include -O2",
-            "CXXFLAGS"  => "-I/opt/project/embedded/include -O2",
-            "CPPFLAGS"  => "-I/opt/project/embedded/include -O2",
+            "CFLAGS" => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
+            "CXXFLAGS"  => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
+            "CPPFLAGS"  => "-I/opt/project/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
             "CXX" => "clang++",
             "LDFLAGS" => "-L/opt/project/embedded/lib",
             "LD_RUN_PATH" => "/opt/project/embedded/lib",
@@ -250,95 +245,9 @@ module Omnibus
             "OMNIBUS_INSTALL_DIR" => "/opt/project"
           )
         end
-
-        context "with gcc 4.9 installed" do
-          before do
-            allow(subject).to receive(:which).and_return("/usr/local/bin/gcc49")
-          end
-        end
-      end
-
-      context "on freebsd 10" do
-        before do
-          stub_ohai(platform: "freebsd", version: "10.4")
-        end
-
-        it "Clang as the default compiler" do
-          expect(subject.with_standard_compiler_flags).to eq(
-            "CC"              => "clang",
-            "CXX"             => "clang++",
-            "CFLAGS"          => "-I/opt/project/embedded/include -O2",
-            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2",
-            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2",
-            "LDFLAGS"         => "-L/opt/project/embedded/lib",
-            "LD_RUN_PATH"     => "/opt/project/embedded/lib",
-            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
-            "OMNIBUS_INSTALL_DIR" => "/opt/project"
-          )
-        end
-      end
-
-      context "on sles 11" do
-        before do
-          # sles identifies as suse
-          stub_ohai(platform: "suse", version: "11.4")
-          allow(subject).to receive(:which).with("gcc-4.8").and_return(false)
-        end
-        it "sets the defaults" do
-          expect(subject.with_standard_compiler_flags).to eq(
-          "LDFLAGS"         => "-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib",
-          "CFLAGS"          => "-I/opt/project/embedded/include -O2",
-          "CXXFLAGS"        => "-I/opt/project/embedded/include -O2",
-          "CPPFLAGS"        => "-I/opt/project/embedded/include -O2",
-          "LD_RUN_PATH"     => "/opt/project/embedded/lib",
-          "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
-          "OMNIBUS_INSTALL_DIR" => "/opt/project"
-          )
-        end
-
-        context "with gcc 4.8 installed" do
-
-          before do
-            allow(subject).to receive(:which).and_return("/usr/bin/gcc-4.8")
-          end
-
-          it "sets the compiler args" do
-            expect(subject.with_standard_compiler_flags).to eq(
-              "CC"              => "gcc-4.8",
-              "CXX"             => "g++-4.8",
-              "LDFLAGS"         => "-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib",
-              "CFLAGS"          => "-I/opt/project/embedded/include -O2",
-              "CXXFLAGS"        => "-I/opt/project/embedded/include -O2",
-              "CPPFLAGS"        => "-I/opt/project/embedded/include -O2",
-              "LD_RUN_PATH"     => "/opt/project/embedded/lib",
-              "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
-              "OMNIBUS_INSTALL_DIR" => "/opt/project"
-              )
-          end
-        end
-      end
-
-      context "on sles 12" do
-        before do
-          # sles identifies as suse
-          stub_ohai(platform: "suse", version: "12.2")
-          allow(subject).to receive(:which).with("gcc-4.8").and_return(true)
-        end
-
-        it "sets the defaults" do
-          expect(subject.with_standard_compiler_flags).to eq(
-            "LDFLAGS"         => "-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib",
-            "CFLAGS"          => "-I/opt/project/embedded/include -O2",
-            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2",
-            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2",
-            "LD_RUN_PATH"     => "/opt/project/embedded/lib",
-            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
-            "OMNIBUS_INSTALL_DIR" => "/opt/project"
-          )
-        end
       end
 
-      context "on Windows" do
+      context "on windows" do
         let(:win_arch_i386) { true }
 
         before do
@@ -547,7 +456,7 @@ module Omnibus
     describe "#whitelist_file" do
       it "appends to the whitelist_files array" do
         expect(subject.whitelist_files.size).to eq(0)
-        subject.whitelist_file(/foo\/bar/)
+        subject.whitelist_file(%r{foo/bar})
         expect(subject.whitelist_files.size).to eq(1)
       end
 
@@ -558,6 +467,36 @@ module Omnibus
       end
     end
 
+    describe "#bin_dirs" do
+      it "sets bin_dirs" do
+        subject.bin_dirs ["my_bin_dir"]
+        expect(subject.bin_dirs).to eq(["my_bin_dir"])
+        expect(subject.bin_dirs).to be_kind_of(Array)
+      end
+
+      context "bin_dirs is not set" do
+        it "returns default values" do
+          expect(subject.bin_dirs).to eq(["/opt/project/bin", "/opt/project/embedded/bin"])
+          expect(subject.bin_dirs).to be_kind_of(Array)
+        end
+      end
+    end
+
+    describe "#lib_dirs" do
+      it "sets lib_dirs" do
+        subject.lib_dirs ["my_lib_dir"]
+        expect(subject.lib_dirs).to eq(["my_lib_dir"])
+        expect(subject.lib_dirs).to be_kind_of(Array)
+      end
+
+      context "lib_dirs is not set" do
+        it "returns default values" do
+          expect(subject.lib_dirs).to eq(["/opt/project/embedded/lib"])
+          expect(subject.lib_dirs).to be_kind_of(Array)
+        end
+      end
+    end
+
     context "testing repo-level version overrides" do
       context "without overrides" do
         it "returns the original values" do