omnibus 5.6.1 → 5.6.6

data/spec/spec_helper.rb

@@ -72,7 +72,7 @@ RSpec.configure do |config|
     FileUtils.mkdir_p(tmp_path)
 
     # Don't run Ohai - tests can still override this
-    stub_ohai(platform: "ubuntu", version: "12.04")
+    stub_ohai(platform: "ubuntu", version: "16.04")
 
     # Default to real HTTP requests
     WebMock.allow_net_connect!

data/spec/unit/build_version_spec.rb

@@ -112,7 +112,17 @@ module Omnibus
         expect(build_version.semver).to match(/11.0.0-alpha1\+#{today_string}[0-9]+.git.207.694b062/)
       end
 
-      it "uses ENV['BUILD_ID'] to generate timestamp if set" do
+      it "uses ENV['BUILD_TIMESTAMP'] to generate timestamp if set" do
+        stub_env("BUILD_TIMESTAMP", "2012-12-25_16-41-40")
+        expect(build_version.semver).to eq("11.0.0-alpha1+20121225164140.git.207.694b062")
+      end
+
+      it "fails on invalid ENV['BUILD_TIMESTAMP'] values" do
+        stub_env("BUILD_TIMESTAMP", "AAAA")
+        expect { build_version.semver }.to raise_error(ArgumentError)
+      end
+
+      it "uses ENV['BUILD_ID'] to generate timestamp if set and BUILD_TIMESTAMP is not set" do
         stub_env("BUILD_ID", "2012-12-25_16-41-40")
         expect(build_version.semver).to eq("11.0.0-alpha1+20121225164140.git.207.694b062")
       end

data/spec/unit/compressor_spec.rb

@@ -4,7 +4,7 @@ module Omnibus
   describe Compressor do
     describe ".for_current_system" do
       context "on Mac OS X" do
-        before { stub_ohai(platform: "mac_os_x", version: "10.9.2") }
+        before { stub_ohai(platform: "mac_os_x", version: "10.12") }
 
         context "when :dmg is activated" do
           it "prefers dmg" do
@@ -26,7 +26,7 @@ module Omnibus
       end
 
       context "on Ubuntu" do
-        before { stub_ohai(platform: "ubuntu", version: "14.04") }
+        before { stub_ohai(platform: "ubuntu", version: "16.04") }
 
         context "when :tgz activated" do
           it "prefers tgz" do

data/spec/unit/config_spec.rb

@@ -50,7 +50,7 @@ module Omnibus
     describe "#workers" do
       context "when the Ohai data is not present" do
         before do
-          stub_ohai(platform: "ubuntu", version: "12.04") do |data|
+          stub_ohai(platform: "ubuntu", version: "16.04") do |data|
             data["cpu"] = nil
           end
         end
@@ -62,7 +62,7 @@ module Omnibus
 
       context "when the Ohai data is present" do
         before do
-          stub_ohai(platform: "ubuntu", version: "12.04") do |data|
+          stub_ohai(platform: "ubuntu", version: "16.04") do |data|
             data["cpu"] = { "total" => "5" }
           end
         end
@@ -74,7 +74,7 @@ module Omnibus
     end
 
     context "on Windows" do
-      before { stub_ohai(platform: "windows", version: "2012") }
+      before { stub_ohai(platform: "windows", version: "2012R2") }
 
       include_examples "a configurable", :base_dir, "C:/omnibus-ruby"
       include_examples "a configurable", :cache_dir, "C:/omnibus-ruby/cache"
@@ -93,5 +93,15 @@ module Omnibus
       include_examples "a configurable", :build_dir, "/foo/bar/build"
       include_examples "a configurable", :package_dir, "/foo/bar/pkg"
     end
+
+    context "when cache_suffix is specified" do
+      before { described_class.cache_suffix("projecto") }
+
+      include_examples "a configurable", :cache_dir, "/var/cache/omnibus/projecto/cache"
+      include_examples "a configurable", :git_cache_dir, "/var/cache/omnibus/projecto/cache/git_cache"
+      include_examples "a configurable", :source_dir, "/var/cache/omnibus/projecto/src"
+      include_examples "a configurable", :build_dir, "/var/cache/omnibus/projecto/build"
+      include_examples "a configurable", :package_dir, "/var/cache/omnibus/projecto/pkg"
+    end
   end
 end

data/spec/unit/fetchers/file_fetcher_spec.rb

@@ -0,0 +1,81 @@
+require "spec_helper"
+
+module Omnibus
+  describe FileFetcher do
+    let(:source_file) { "/local/file" }
+    let(:target_file) { "/project/dir/file" }
+    let(:project_dir) { "/project/dir" }
+    let(:build_dir) { "/build/dir" }
+
+    let(:manifest_entry) do
+      double(ManifestEntry,
+        name: "software",
+        locked_version: nil,
+        described_version: nil,
+        locked_source: { file: source_file })
+    end
+
+    subject { described_class.new(manifest_entry, project_dir, build_dir) }
+
+    describe "#fetch_required?" do
+      context "when the SHAs match" do
+        before do
+          allow(subject).to receive(:target_shasum).and_return("abcd1234")
+          allow(subject).to receive(:destination_shasum).and_return("abcd1234")
+        end
+
+        it "returns false" do
+          expect(subject.fetch_required?).to be(false)
+        end
+      end
+
+      context "when the SHAs do not match" do
+        before do
+          allow(subject).to receive(:target_shasum).and_return("abcd1234")
+          allow(subject).to receive(:destination_shasum).and_return("efgh5678")
+        end
+
+        it "returns true" do
+          expect(subject.fetch_required?).to be_truthy
+        end
+      end
+    end
+
+    describe "#version_guid" do
+      it "returns the path" do
+        expect(subject.version_guid).to eq("file:#{source_file}")
+      end
+    end
+
+    describe "#clean" do
+      it "returns true" do
+        expect(subject.clean).to be_truthy
+      end
+    end
+
+    describe "#fetch" do
+      before do
+        allow(subject).to receive(:create_required_directories)
+      end
+
+      it "copies the new files over" do
+        expect(FileUtils).to receive(:cp).with(source_file, target_file)
+        subject.fetch
+      end
+    end
+
+    describe "#version_for_cache" do
+      let(:shasum) { "abcd1234" }
+
+      before do
+        allow(subject).to receive(:digest)
+          .with(source_file, :sha256)
+          .and_return(shasum)
+      end
+
+      it "returns the shasum of the source file" do
+        expect(subject.version_for_cache).to eq("file:#{source_file}|shasum:#{shasum}")
+      end
+    end
+  end
+end

data/spec/unit/fetchers/net_fetcher_spec.rb

@@ -200,6 +200,17 @@ module Omnibus
           end
         end
 
+        context "custom endpoint with path style urls" do
+          before do
+            Config.s3_force_path_style(true)
+            Config.s3_endpoint("http://example.com")
+          end
+
+          it "returns the url using path style" do
+            expect(subject.send(:download_url)).to eq("http://example.com/mybucket/file-1.2.3-abcd1234")
+          end
+        end
+
         context "s3 transfer acceleration" do
           before { Config.s3_accelerate(true) }
 
@@ -369,7 +380,7 @@ module Omnibus
 
         before do
           Config.cache_dir("C:/")
-          stub_ohai(platform: "windows", version: "2012")
+          stub_ohai(platform: "windows", version: "2012R2")
           allow(Dir).to receive(:mktmpdir).and_yield("C:/tmp_dir")
         end
 
@@ -446,7 +457,7 @@ module Omnibus
       context "on Linux" do
         before do
           Config.cache_dir("/")
-          stub_ohai(platform: "ubuntu", version: "12.04")
+          stub_ohai(platform: "ubuntu", version: "16.04")
           stub_const("File::ALT_SEPARATOR", nil)
 
           allow(Omnibus).to receive(:which)
@@ -479,7 +490,7 @@ module Omnibus
           before do
             Config.cache_dir("/")
 
-            stub_ohai(platform: "ubuntu", version: "12.04")
+            stub_ohai(platform: "ubuntu", version: "16.04")
             stub_const("File::ALT_SEPARATOR", nil)
 
             allow(Omnibus).to receive(:which)

data/spec/unit/health_check_spec.rb

@@ -30,11 +30,11 @@ module Omnibus
 
     context "on windows" do
       before do
-        stub_ohai(platform: "windows", version: "2012")
+        stub_ohai(platform: "windows", version: "2012R2")
       end
 
       it "will perform dll base relocation checks" do
-        stub_ohai(platform: "windows", version: "2012")
+        stub_ohai(platform: "windows", version: "2012R2")
         expect(subject.relocation_checkable?).to be true
       end
 
@@ -101,7 +101,7 @@ module Omnibus
     end
 
     context "on linux" do
-      before { stub_ohai(platform: "ubuntu", version: "12.04") }
+      before { stub_ohai(platform: "ubuntu", version: "16.04") }
 
       let(:bad_healthcheck) do
         double("Mixlib::Shellout",

data/spec/unit/metadata_spec.rb

@@ -85,7 +85,7 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
           sha256:   "abcd1234",
           sha512:   "abcdef123456",
           platform: "ubuntu",
-          platform_version: "12.04",
+          platform_version: "16.04",
           arch: "x86_64",
           name: "some-project",
           friendly_name: "Some Project",
@@ -130,7 +130,7 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
       let(:architecture) { "x86_64" }
 
       before do
-        stub_ohai(platform: "ubuntu", version: "12.04") do |data|
+        stub_ohai(platform: "ubuntu", version: "16.04") do |data|
           data["kernel"]["machine"] = architecture
         end
       end
@@ -180,17 +180,17 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
     describe ".platform_shortname" do
       it "returns el on rhel" do
-        stub_ohai(platform: "redhat", version: "6.4")
+        stub_ohai(platform: "redhat", version: "6.9")
         expect(described_class.platform_shortname).to eq("el")
       end
 
       it "returns sles on suse" do
-        stub_ohai(platform: "suse", version: "12.0")
+        stub_ohai(platform: "suse", version: "12.2")
         expect(described_class.platform_shortname).to eq("sles")
       end
 
       it "returns .platform on all other systems" do
-        stub_ohai(platform: "ubuntu", version: "12.04")
+        stub_ohai(platform: "ubuntu", version: "16.04")
         expect(described_class.platform_shortname).to eq("ubuntu")
       end
     end
@@ -199,7 +199,7 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
       shared_examples "a version manipulator" do |platform_shortname, version, expected|
         context "on #{platform_shortname}-#{version}" do
           it "returns the correct value" do
-            stub_ohai(platform: "ubuntu", version: "12.04") do |data|
+            stub_ohai(platform: "ubuntu", version: "16.04") do |data|
               data["platform"] = platform_shortname
               data["platform_version"] = version
             end
@@ -247,7 +247,7 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
       context "given an unknown platform" do
         before do
-          stub_ohai(platform: "ubuntu", version: "12.04") do |data|
+          stub_ohai(platform: "ubuntu", version: "16.04") do |data|
             data["platform"] = "bacon"
             data["platform_version"] = "1.crispy"
           end
@@ -261,7 +261,7 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
       context "given an unknown windows platform version" do
         before do
-          stub_ohai(platform: "ubuntu", version: "12.04") do |data|
+          stub_ohai(platform: "ubuntu", version: "16.04") do |data|
             data["platform"] = "windows"
             data["platform_version"] = "1.2.3"
           end

data/spec/unit/packager_spec.rb

@@ -4,14 +4,14 @@ module Omnibus
   describe Packager do
     describe ".for_current_system" do
       context "on Mac OS X" do
-        before { stub_ohai(platform: "mac_os_x", version: "10.9.2") }
+        before { stub_ohai(platform: "mac_os_x", version: "10.12") }
         it "prefers PKG" do
           expect(described_class.for_current_system).to eq([Packager::PKG])
         end
       end
 
-      context "on Windows 2012" do
-        before { stub_ohai(platform: "windows", version: "2012") }
+      context "on Windows 2012 R2" do
+        before { stub_ohai(platform: "windows", version: "2012R2") }
         it "prefers MSI and APPX" do
           expect(described_class.for_current_system).to eq([Packager::MSI, Packager::APPX])
         end
@@ -38,29 +38,29 @@ module Omnibus
         end
       end
 
-      context "on aix" do
+      context "on AIX" do
         before { stub_ohai(platform: "aix", version: "7.1") }
         it "prefers BFF" do
           expect(described_class.for_current_system).to eq([Packager::BFF])
         end
       end
 
-      context "on fedora" do
-        before { stub_ohai(platform: "fedora", version: "20") }
+      context "on Fedora" do
+        before { stub_ohai(platform: "fedora", version: "25") }
         it "prefers RPM" do
           expect(described_class.for_current_system).to eq([Packager::RPM])
         end
       end
 
-      context "on debian" do
-        before { stub_ohai(platform: "debian", version: "7.2") }
+      context "on Debian" do
+        before { stub_ohai(platform: "debian", version: "8.8") }
         it "prefers RPM" do
           expect(described_class.for_current_system).to eq([Packager::DEB])
         end
       end
 
-      context "on suse" do
-        before { stub_ohai(platform: "suse", version: "12.0") }
+      context "on SLES" do
+        before { stub_ohai(platform: "suse", version: "12.2") }
         it "prefers RPM" do
           expect(described_class.for_current_system).to eq([Packager::RPM])
         end

data/spec/unit/packagers/bff_spec.rb

@@ -373,7 +373,7 @@ module Omnibus
 
     describe "#safe_architecture" do
       before do
-        stub_ohai(platform: "ubuntu", version: "12.04") do |data|
+        stub_ohai(platform: "ubuntu", version: "16.04") do |data|
           data["kernel"]["machine"] = "i386"
         end
       end

data/spec/unit/packagers/deb_spec.rb

@@ -337,6 +337,46 @@ module Omnibus
       end
     end
 
+    describe "#sign_deb_file", :not_supported_on_windows do
+      context "when DEB signing is not enabled" do
+        before do
+          subject.signing_passphrase(nil)
+        end
+
+        it "logs a message" do
+          output = capture_logging { subject.sign_deb_file }
+          expect(output).to include("Signing not enabled for .deb file")
+        end
+      end
+
+      context "when DEB signing is enabled" do
+        before do
+          allow(subject).to receive(:shellout!)
+          allow(subject).to receive(:package_name).and_return("safe")
+          subject.signing_passphrase("foobar")
+        end
+
+        it "logs a message" do
+          output = capture_logging { subject.sign_deb_file }
+          expect(output).to include("Signing enabled for .deb file")
+        end
+
+        it "finds gpg and ar commands" do
+          output = capture_logging { subject.sign_deb_file }
+          expect(output).not_to include("Signing not possible.")
+        end
+
+        it "runs correct commands" do
+          expect(subject).to receive(:shellout!)
+            .at_least(:once).with(/ar x/)
+            .at_least(:once).with(/cat debian-binary control\.tar/)
+            .at_least(:once).with(/fakeroot gpg/)
+            .at_least(:once).with(/fakeroot ar rc/)
+          subject.sign_deb_file
+        end
+      end
+    end
+
     describe "#package_size" do
       before do
         project.install_dir(staging_dir)

data/spec/unit/packagers/ips_spec.rb

@@ -1,5 +1,4 @@
 require "spec_helper"
-require "pry"
 
 module Omnibus
   describe Packager::IPS do
@@ -171,18 +170,23 @@ module Omnibus
         expect(manifest_file_contents).to include("set name=variant.arch value=i386")
       end
 
-      context "when symlinks.erb exists" do
+      context "when both symlinks.erb and project-symlinks.erb exists" do
         before do
           FileUtils.mkdir_p(resources_path)
           allow(subject).to receive(:resources_path).and_return(resources_path)
-          File.open(File.join(resources_path, "symlinks.erb"), "w+") do |f|
+          File.open(File.join(resources_path, "project-symlinks.erb"), "w+") do |f|
             f.puts("link path=usr/bin/ohai target=<%= projectdir %>/bin/ohai")
             f.puts("link path=<%= projectdir %>/bin/gmake target=<%= projectdir %>/embedded/bin/make")
           end
+          File.open(File.join(resources_path, "symlinks.erb"), "w+") do |f|
+            f.puts("link path=usr/bin/knife target=<%= projectdir %>/bin/knife")
+            f.puts("link path=<%= projectdir %>/bin/berks target=<%= projectdir %>/embedded/bin/berks")
+          end
         end
 
-        it "should append symlinks to metadata contents" do
+        it "should render project-symlinks.erb and append to metadata contents" do
           subject.write_pkg_metadata
+          expect(subject.symlinks_file).to eq("project-symlinks.erb")
           expect(File.exist?(manifest_file)).to be(true)
           manifest_file_contents = File.read(manifest_file)
           expect(manifest_file_contents).to include("link path=usr/bin/ohai target=/opt/project/bin/ohai")
@@ -190,12 +194,34 @@ module Omnibus
         end
       end
 
-      context "when symlinks.erb does not exist" do
+      context "when only symlinks.erb exists" do
+        before do
+          FileUtils.mkdir_p(resources_path)
+          allow(subject).to receive(:resources_path).and_return(resources_path)
+          File.open(File.join(resources_path, "symlinks.erb"), "w+") do |f|
+            f.puts("link path=usr/bin/knife target=<%= projectdir %>/bin/knife")
+            f.puts("link path=<%= projectdir %>/bin/berks target=<%= projectdir %>/embedded/bin/berks")
+          end
+        end
+
+        it "should render symlinks.erb and append to metadata contents" do
+          subject.write_pkg_metadata
+          expect(subject.symlinks_file).to eq("symlinks.erb")
+          expect(File.exist?(manifest_file)).to be(true)
+          manifest_file_contents = File.read(manifest_file)
+          expect(manifest_file_contents).to include("link path=usr/bin/knife target=/opt/project/bin/knife")
+          expect(manifest_file_contents).to include("link path=/opt/project/bin/berks target=/opt/project/embedded/bin/berks")
+        end
+      end
+
+      context "when symlinks_file does not exist" do
         it "#write_pkg_metadata does not include symlinks" do
           subject.write_pkg_metadata
           manifest_file = File.join(staging_dir, "gen.manifestfile")
           manifest_file_contents = File.read(manifest_file)
+          expect(subject.symlinks_file).to be_nil
           expect(manifest_file_contents).not_to include("link path=usr/bin/ohai target=/opt/project/bin/ohai")
+          expect(manifest_file_contents).not_to include("link path=usr/bin/knife target=/opt/project/bin/knife")
         end
       end
     end