omnibus 5.5.0 → 5.6.0

data/spec/unit/project_spec.rb

@@ -87,7 +87,7 @@ module Omnibus
       end
     end
 
-    describe '#install_dir' do
+    describe "#install_dir" do
       it "removes duplicate slashes" do
         subject.install_dir("///opt//chef")
         expect(subject.install_dir).to eq("/opt/chef")
@@ -108,7 +108,7 @@ module Omnibus
       end
     end
 
-    describe '#default_root' do
+    describe "#default_root" do
       context "on Windows" do
         before { stub_ohai(platform: "windows", version: "2012") }
 
@@ -145,19 +145,19 @@ module Omnibus
       end
     end
 
-    describe '#license' do
+    describe "#license" do
       it "sets the default to Unspecified" do
         expect(subject.license).to eq ("Unspecified")
       end
     end
 
-    describe '#license_file_path' do
+    describe "#license_file_path" do
       it "sets the default to LICENSE" do
         expect(subject.license_file_path).to eq ("/sample/LICENSE")
       end
     end
 
-    describe '#dirty!' do
+    describe "#dirty!" do
       let(:software) { double(Omnibus::Software) }
 
       it "dirties the cache" do
@@ -173,7 +173,7 @@ module Omnibus
       end
     end
 
-    describe '#dirty?' do
+    describe "#dirty?" do
       it "returns true by default" do
         subject.instance_variable_set(:@culprit, nil)
         expect(subject).to_not be_dirty
@@ -190,7 +190,7 @@ module Omnibus
       end
     end
 
-    describe '#<=>' do
+    describe "#<=>" do
       let(:chefdk) { described_class.new.tap { |p| p.name("chefdk") } }
       let(:chef)   { described_class.new.tap { |p| p.name("chef") } }
       let(:ruby)   { described_class.new.tap { |p| p.name("ruby") } }
@@ -201,7 +201,7 @@ module Omnibus
       end
     end
 
-    describe '#build_iteration' do
+    describe "#build_iteration" do
       let(:fauxhai_options) { Hash.new }
 
       before { stub_ohai(fauxhai_options) }
@@ -243,20 +243,20 @@ module Omnibus
       end
     end
 
-    describe '#overrides' do
+    describe "#overrides" do
       before { subject.overrides.clear }
 
-      it 'sets all the things through #overrides' do
+      it "sets all the things through #overrides" do
         subject.override(:thing, version: "6.6.6")
         expect(subject.override(:zlib)).to be_nil
       end
 
-      it 'retrieves the things set through #overrides' do
+      it "retrieves the things set through #overrides" do
         subject.override(:thing, version: "6.6.6")
         expect(subject.override(:thing)[:version]).to eq("6.6.6")
       end
 
-      it 'symbolizes #overrides' do
+      it "symbolizes #overrides" do
         subject.override("thing", version: "6.6.6")
         [:thing, "thing"].each do |thing|
           expect(subject.override(thing)).not_to be_nil
@@ -265,7 +265,7 @@ module Omnibus
       end
     end
 
-    describe '#ohai' do
+    describe "#ohai" do
       before { stub_ohai(platform: "ubuntu", version: "12.04") }
 
       it "is a DSL method" do
@@ -277,21 +277,21 @@ module Omnibus
       end
     end
 
-    describe '#packagers_for_system' do
+    describe "#packagers_for_system" do
       it "returns array of packager objects" do
         subject.packagers_for_system.each do |packager|
           expect(packager).to be_a(Packager::Base)
         end
       end
 
-      it 'calls Packager#for_current_system' do
+      it "calls Packager#for_current_system" do
         expect(Packager).to receive(:for_current_system)
           .and_call_original
         subject.packagers_for_system
       end
     end
 
-    describe '#package' do
+    describe "#package" do
       it "raises an exception when a block is not given" do
         expect { subject.package(:foo) }.to raise_error(InvalidValue)
       end
@@ -312,7 +312,7 @@ module Omnibus
       end
     end
 
-    describe '#packagers' do
+    describe "#packagers" do
       it "returns a Hash" do
         expect(subject.packagers).to be_a(Hash)
       end
@@ -323,12 +323,12 @@ module Omnibus
       end
     end
 
-    describe '#compressor' do
+    describe "#compressor" do
       it "returns a compressor object" do
         expect(subject.compressor).to be_a(Compressor::Base)
       end
 
-      it 'calls Compressor#for_current_system' do
+      it "calls Compressor#for_current_system" do
         expect(Compressor).to receive(:for_current_system)
           .and_call_original
 
@@ -347,7 +347,7 @@ module Omnibus
       end
     end
 
-    describe '#compress' do
+    describe "#compress" do
       it "does not raises an exception when a block is not given" do
         expect { subject.compress(:foo) }.to_not raise_error
       end
@@ -373,7 +373,7 @@ module Omnibus
       end
     end
 
-    describe '#compressors' do
+    describe "#compressors" do
       it "returns a Hash" do
         expect(subject.compressors).to be_a(Hash)
       end
@@ -384,7 +384,7 @@ module Omnibus
       end
     end
 
-    describe '#shasum' do
+    describe "#shasum" do
       context "when a filepath is given" do
         let(:path) { "/project.rb" }
         let(:file) { double(File) }
@@ -413,5 +413,36 @@ module Omnibus
         end
       end
     end
+
+    describe "#restore_complete_build" do
+      let(:cached_build) { double(GitCache) }
+      let(:first_software) { double(Omnibus::Software) }
+      let(:last_software) { double(Omnibus::Software) }
+
+      before do
+        allow(Config).to receive(:use_git_caching).and_return(git_caching)
+      end
+
+      context "when git caching is enabled" do
+        let(:git_caching) { true }
+
+        it "restores the last software built" do
+          expect(subject).to receive(:softwares).and_return([first_software, last_software])
+          expect(GitCache).to receive(:new).with(last_software).and_return(cached_build)
+          expect(cached_build).to receive(:restore_from_cache)
+          subject.restore_complete_build
+        end
+      end
+
+      context "when git caching is disabled" do
+        let(:git_caching) { false }
+
+        it "does nothing" do
+          expect(subject).not_to receive(:softwares)
+          expect(GitCache).not_to receive(:new)
+          subject.restore_complete_build
+        end
+      end
+    end
   end
 end

data/spec/unit/publisher_spec.rb

@@ -24,7 +24,7 @@ module Omnibus
 
     subject { described_class.new(pattern, options) }
 
-    describe '#packages' do
+    describe "#packages" do
       let(:a) { "/path/to/files/a.deb" }
       let(:b) { "/path/to/files/b.deb" }
       let(:glob) { [a, b] }
@@ -185,7 +185,7 @@ module Omnibus
 
     end
 
-    describe '#publish' do
+    describe "#publish" do
       it "is an abstract method" do
         expect { subject.publish }.to raise_error(NotImplementedError)
       end

data/spec/unit/publishers/artifactory_publisher_spec.rb

@@ -112,6 +112,10 @@ module Omnibus
         "omnibus.sha512" => "SHA512",
         "omnibus.version" => "11.0.6",
         "omnibus.license" => "Apache-2.0",
+        "md5" => "ABCDEF123456",
+        "sha1" => "SHA1",
+        "sha256" => "SHA256",
+        "sha512" => "SHA512",
       }
     end
     let(:metadata_json_properites) do
@@ -137,7 +141,7 @@ module Omnibus
 
     subject { described_class.new(path, options) }
 
-    describe '#publish' do
+    describe "#publish" do
       before do
         allow(subject).to receive(:packages).and_return(packages)
         Config.artifactory_base_path("com/getchef")
@@ -191,7 +195,7 @@ module Omnibus
           # raise an exception a set number of times.
           @times = 0
           allow(artifact).to receive(:upload) do
-            @times += 1;
+            @times += 1
             raise Artifactory::Error::HTTPError.new("status" => "409", "message" => "CONFLICT") unless @times > 1
           end
         end
@@ -246,7 +250,7 @@ module Omnibus
       end
     end
 
-    describe '#metadata_properties_for' do
+    describe "#metadata_properties_for" do
       it "returns the transformed package metadata values" do
         expect(subject.send(:metadata_properties_for, package)).to include(package_properties.merge(build_values))
       end

data/spec/unit/publishers/s3_publisher_spec.rb

@@ -40,7 +40,7 @@ module Omnibus
 
     subject { described_class.new(path) }
 
-    describe '#publish' do
+    describe "#publish" do
       before { allow(subject).to receive(:packages).and_return(packages) }
 
       it "validates the package" do

data/spec/unit/s3_helpers_spec.rb

@@ -5,8 +5,8 @@ module Omnibus
   describe S3Helpers do
     include Omnibus::S3Helpers
 
-    context 'when #s3_configuration is not defined' do
-      describe '#client' do
+    context "when #s3_configuration is not defined" do
+      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")
@@ -19,7 +19,7 @@ module Omnibus
       end
     end
 
-    describe '#to_base64_digest' do
+    describe "#to_base64_digest" do
       it 'turns "c3b5247592ce694f7097873aa07d66fe" into "w7UkdZLOaU9wl4c6oH1m/g=="' do
         expect(to_base64_digest("c3b5247592ce694f7097873aa07d66fe")).to eql("w7UkdZLOaU9wl4c6oH1m/g==")
       end
@@ -29,4 +29,42 @@ module Omnibus
       end
     end
   end
+
+  context "when #s3_configuration is defined" do
+    describe "#get_credentials" do
+      let(:klass) do
+        Class.new do
+          include Omnibus::S3Helpers
+        end
+      end
+      let(:instance) { klass.new }
+      let(:key_pair) { { access_key_id: "key_id", secret_access_key: "access_key" } }
+      let(:profile) { "my-profile" }
+      let(:config) { { bucket_name: "foo", region: "us-east-1" } }
+
+      it "uses configured key pairs" do
+        allow_any_instance_of(klass).to receive(:s3_configuration).and_return(config.merge!(key_pair))
+        expect(Aws::Credentials).to receive(:new).with(
+          config[:access_key_id],
+          config[:secret_access_key]
+        )
+        expect(Aws::SharedCredentials).to_not receive(:new)
+        instance.send(:get_credentials)
+      end
+
+      it "preferrs shared credentials profiles over key pairs" do
+        allow_any_instance_of(klass).to receive(:s3_configuration).and_return(
+          {
+            **config,
+            **key_pair,
+            profile: profile,
+          }
+        )
+        expect(Aws::Credentials).to_not receive(:new)
+        allow(Aws::SharedCredentials).to receive(:new).with(profile_name: profile)
+        instance.send(:get_credentials)
+      end
+
+    end
+  end
 end

data/spec/unit/software_spec.rb

@@ -42,6 +42,7 @@ module Omnibus
     it_behaves_like "a cleanroom setter", :license, %{license 'Apache 2.0'}
     it_behaves_like "a cleanroom setter", :license_file, %{license_file 'LICENSES/artistic.txt'}
     it_behaves_like "a cleanroom setter", :skip_transitive_dependency_licensing, %{skip_transitive_dependency_licensing true}
+    it_behaves_like "a cleanroom setter", :dependency_licenses, %{dependency_licenses [{license: "MIT"}]}
     it_behaves_like "a cleanroom setter", :whitelist_file, %{whitelist_file '/opt/whatever'}
     it_behaves_like "a cleanroom setter", :relative_path, %{relative_path '/path/to/extracted'}
     it_behaves_like "a cleanroom setter", :build, %|build {}|
@@ -76,7 +77,8 @@ module Omnibus
             "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"
+            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
+            "OMNIBUS_INSTALL_DIR" => "/opt/project"
           )
         end
         it "overrides LDFLAGS" do
@@ -86,7 +88,8 @@ module Omnibus
             "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"
+            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
+            "OMNIBUS_INSTALL_DIR" => "/opt/project"
           )
         end
         it "overrides CFLAGS" do
@@ -96,7 +99,8 @@ module Omnibus
             "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"
+            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
+            "OMNIBUS_INSTALL_DIR" => "/opt/project"
           )
         end
         it "overrides CXXFLAGS" do
@@ -106,7 +110,8 @@ module Omnibus
             "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"
+            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
+            "OMNIBUS_INSTALL_DIR" => "/opt/project"
           )
         end
         it "overrides CPPFLAGS" do
@@ -116,7 +121,8 @@ module Omnibus
             "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"
+            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
+            "OMNIBUS_INSTALL_DIR" => "/opt/project"
           )
         end
         it "preserves anything else" do
@@ -127,7 +133,8 @@ module Omnibus
             "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"
+            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
+            "OMNIBUS_INSTALL_DIR" => "/opt/project"
           )
         end
       end
@@ -149,7 +156,8 @@ module Omnibus
             "LDFLAGS"         => "-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib -static-libgcc",
             "LD_OPTIONS"      => "-R/opt/project/embedded/lib",
             "LD_RUN_PATH"     => "/opt/project/embedded/lib",
-            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig"
+            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
+            "OMNIBUS_INSTALL_DIR" => "/opt/project"
           )
         end
 
@@ -175,7 +183,8 @@ module Omnibus
               "LDFLAGS"         => "-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib -static-libgcc",
               "LD_OPTIONS"      => "-R/opt/project/embedded/lib",
               "LD_RUN_PATH"     => "/opt/project/embedded/lib",
-              "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig"
+              "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
+              "OMNIBUS_INSTALL_DIR" => "/opt/project"
             )
           end
         end
@@ -193,12 +202,13 @@ module Omnibus
           expect(subject.with_standard_compiler_flags).to eq(
             "CC"              => "gcc -static-libgcc",
             "LDFLAGS"         => "-R/opt/project/embedded/lib -L/opt/project/embedded/lib -static-libgcc",
-            "CFLAGS"          => "-I/opt/project/embedded/include",
-            "CXXFLAGS"        => "-I/opt/project/embedded/include",
-            "CPPFLAGS"        => "-I/opt/project/embedded/include",
+            "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",
             "LD_OPTIONS"      => "-R/opt/project/embedded/lib",
-            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig"
+            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
+            "OMNIBUS_INSTALL_DIR" => "/opt/project"
           )
         end
 
@@ -219,12 +229,13 @@ module Omnibus
             expect(subject.with_standard_compiler_flags).to eq(
               "CC"              => "gcc -static-libgcc",
               "LDFLAGS"         => "-R/opt/project/embedded/lib -L/opt/project/embedded/lib -static-libgcc",
-              "CFLAGS"          => "-I/opt/project/embedded/include",
-              "CXXFLAGS"        => "-I/opt/project/embedded/include",
-              "CPPFLAGS"        => "-I/opt/project/embedded/include",
+              "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",
               "LD_OPTIONS"      => "-R/opt/project/embedded/lib -M #{project_root}/files/mapfile/solaris",
-              "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig"
+              "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
+              "OMNIBUS_INSTALL_DIR" => "/opt/project"
             )
           end
         end
@@ -240,7 +251,8 @@ module Omnibus
             "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"
+            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
+            "OMNIBUS_INSTALL_DIR" => "/opt/project"
           )
         end
       end
@@ -265,7 +277,8 @@ module Omnibus
             "OBJECT_MODE"     => "64",
             "ARFLAGS"         => "-X64 cru",
             "LD_RUN_PATH"     => "/opt/project/embedded/lib",
-            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig"
+            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
+            "OMNIBUS_INSTALL_DIR" => "/opt/project"
           )
         end
       end
@@ -282,7 +295,8 @@ module Omnibus
             "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"
+            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
+            "OMNIBUS_INSTALL_DIR" => "/opt/project"
           )
         end
 
@@ -300,7 +314,9 @@ module Omnibus
               "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" )
+              "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
+              "OMNIBUS_INSTALL_DIR" => "/opt/project"
+            )
           end
         end
       end
@@ -319,7 +335,66 @@ module Omnibus
             "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"
+            "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")
+        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.1")
+        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
@@ -335,12 +410,13 @@ module Omnibus
         context "in 32-bit mode" do
           it "sets the default" do
             expect(subject.with_standard_compiler_flags).to eq(
-              "CFLAGS"          => "-I/opt/project/embedded/include -m32 -O2 -fno-lto -march=i686",
-              "CXXFLAGS"        => "-I/opt/project/embedded/include -m32 -O2 -fno-lto -march=i686",
-              "CPPFLAGS"        => "-I/opt/project/embedded/include -m32 -O2 -fno-lto -march=i686",
+              "CFLAGS"          => "-I/opt/project/embedded/include -m32 -O3 -march=i686",
+              "CXXFLAGS"        => "-I/opt/project/embedded/include -m32 -O3 -march=i686",
+              "CPPFLAGS"        => "-I/opt/project/embedded/include -m32 -O3 -march=i686",
               "LDFLAGS"         => "-L/opt/project/embedded/lib -m32 -fno-lto",
               "LD_RUN_PATH"     => "/opt/project/embedded/lib",
-              "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig"
+              "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
+              "OMNIBUS_INSTALL_DIR" => "/opt/project"
             )
           end
         end
@@ -350,12 +426,13 @@ module Omnibus
 
           it "sets the default" do
             expect(subject.with_standard_compiler_flags).to eq(
-              "CFLAGS"          => "-I/opt/project/embedded/include -m64 -O2 -fno-lto -march=x86-64",
-              "CXXFLAGS"        => "-I/opt/project/embedded/include -m64 -O2 -fno-lto -march=x86-64",
-              "CPPFLAGS"        => "-I/opt/project/embedded/include -m64 -O2 -fno-lto -march=x86-64",
+              "CFLAGS"          => "-I/opt/project/embedded/include -m64 -O3 -march=x86-64",
+              "CXXFLAGS"        => "-I/opt/project/embedded/include -m64 -O3 -march=x86-64",
+              "CPPFLAGS"        => "-I/opt/project/embedded/include -m64 -O3 -march=x86-64",
               "LDFLAGS"         => "-L/opt/project/embedded/lib -m64 -fno-lto",
               "LD_RUN_PATH"     => "/opt/project/embedded/lib",
-              "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig"
+              "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
+              "OMNIBUS_INSTALL_DIR" => "/opt/project"
             )
           end
         end
@@ -425,9 +502,10 @@ module Omnibus
             allow(ENV).to receive(:keys).and_return(%w{ Path PATH })
           end
 
-          it "returns a path key of `Path`" do
-            expect(subject.with_embedded_path).to eq(
-              "Path" => prepended_path
+          it "and raises an error when PATH is also set" do
+            expect { subject.with_embedded_path }.to raise_error(
+              RuntimeError,
+              "The current omnibus environment has multiple PATH/Path variables."
             )
           end
         end
@@ -446,7 +524,7 @@ module Omnibus
       end
     end
 
-    describe '#ohai' do
+    describe "#ohai" do
       before { stub_ohai(platform: "ubuntu", version: "12.04") }
 
       it "is a DSL method" do
@@ -516,7 +594,7 @@ module Omnibus
       end
     end
 
-    describe '#<=>' do
+    describe "#<=>" do
       let(:zlib)   { described_class.new(project).tap { |s| s.name("zlib") } }
       let(:erchef) { described_class.new(project).tap { |s| s.name("erchef") } }
       let(:bacon)  { described_class.new(project).tap { |s| s.name("bacon") } }
@@ -527,7 +605,7 @@ module Omnibus
       end
     end
 
-    describe '#whitelist_file' do
+    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/)
@@ -636,7 +714,7 @@ module Omnibus
       end
     end
 
-    describe '#fetcher' do
+    describe "#fetcher" do
       before do
         expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", source).and_return("1.2.8")
       end
@@ -760,7 +838,7 @@ module Omnibus
       end
     end
 
-    describe '#shasum' do
+    describe "#shasum" do
       context "when a filepath is given" do
         let(:path) { "/software.rb" }
         let(:file) { double(File) }