omnibus 5.5.0 → 5.6.0

data/resources/rpm/spec.erb

@@ -11,8 +11,7 @@
 # Use md5
 %define _binary_filedigest_algorithm 1
 
-# Use gzip payload compression
-%define _binary_payload w9.gzdio
+%define _binary_payload <%= compression %>
 
 # Metadata
 Name: <%= name %>

data/spec/functional/builder_spec.rb

@@ -47,7 +47,7 @@ module Omnibus
       options
     end
 
-    def make_gemspec()
+    def make_gemspec
       gemspec = File.join(project_dir, "#{project_name}.gemspec")
       File.open(gemspec, "w") do |f|
         f.write <<-EOH.gsub(/^ {12}/, "")
@@ -64,7 +64,7 @@ module Omnibus
       gemspec
     end
 
-    def make_gemfile()
+    def make_gemfile
       gemfile = File.join(project_dir, "Gemfile")
       File.open(gemfile, "w") do |f|
         f.write <<-EOH.gsub(/^ {12}/, "")
@@ -74,7 +74,7 @@ module Omnibus
       gemfile
     end
 
-    def make_gemfile_lock()
+    def make_gemfile_lock
       gemfile_lock = File.join(project_dir, "Gemfile.lock")
       File.open(gemfile_lock, "w") do |f|
         f.write <<-EOH.gsub(/^ {12}/, "")
@@ -100,7 +100,7 @@ module Omnibus
     let(:project_name) { "example" }
     let(:project_dir) { File.join(source_dir, project_name) }
 
-    describe '#command' do
+    describe "#command" do
       it "executes the command" do
         subject.command("echo 'Hello World!'")
 
@@ -109,13 +109,13 @@ module Omnibus
       end
     end
 
-    describe '#make' do
+    describe "#make" do
       it "is waiting for a good samaritan to write tests" do
         skip
       end
     end
 
-    describe '#patch' do
+    describe "#patch" do
       it "applies the patch" do
         configure = File.join(project_dir, "configure")
         File.open(configure, "w") do |f|
@@ -149,7 +149,7 @@ module Omnibus
       end
     end
 
-    describe '#ruby' do
+    describe "#ruby" do
       it "executes the command as the embdedded ruby" do
         ruby = File.join(scripts_dir, "setup.rb")
         File.open(ruby, "w") do |f|
@@ -169,7 +169,7 @@ module Omnibus
       end
     end
 
-    describe '#gem' do
+    describe "#gem" do
       it "executes the command as the embedded gem" do
         make_gemspec
         fake_embedded_bin("gem")
@@ -186,7 +186,7 @@ module Omnibus
       end
     end
 
-    describe '#bundler' do
+    describe "#bundler" do
       it "executes the command as the embedded bundler" do
         make_gemspec
         make_gemfile
@@ -200,7 +200,7 @@ module Omnibus
       end
     end
 
-    describe '#appbundle' do
+    describe "#appbundle" do
       let(:project) { double("Project") }
       let(:project_softwares) { [ double("Software", name: project_name, project_dir: project_dir) ] }
       it "executes the command as the embedded appbundler" do
@@ -226,7 +226,7 @@ module Omnibus
       end
     end
 
-    describe '#rake' do
+    describe "#rake" do
       it "executes the command as the embedded rake" do
         rakefile = File.join(project_dir, "Rakefile")
         File.open(rakefile, "w") do |f|
@@ -246,7 +246,7 @@ module Omnibus
       end
     end
 
-    describe '#block' do
+    describe "#block" do
       it "executes the command as a block" do
         subject.block("A complex operation") do
           FileUtils.touch("#{project_dir}/bacon")
@@ -258,7 +258,7 @@ module Omnibus
       end
     end
 
-    describe '#erb' do
+    describe "#erb" do
       it "renders the erb" do
         erb = File.join(templates_dir, "example.erb")
         File.open(erb, "w") do |f|
@@ -282,7 +282,7 @@ module Omnibus
       end
     end
 
-    describe '#mkdir' do
+    describe "#mkdir" do
       it "creates the directory" do
         path = File.join(tmp_path, "scratch")
         remove_directory(path)
@@ -294,7 +294,7 @@ module Omnibus
       end
     end
 
-    describe '#touch' do
+    describe "#touch" do
       it "creates the file" do
         path = File.join(tmp_path, "file")
         remove_file(path)
@@ -316,7 +316,7 @@ module Omnibus
       end
     end
 
-    describe '#delete' do
+    describe "#delete" do
       it "deletes the directory" do
         path = File.join(tmp_path, "scratch")
         create_directory(path)
@@ -351,7 +351,7 @@ module Omnibus
       end
     end
 
-    describe '#copy' do
+    describe "#copy" do
       it "copies the file" do
         path_a = File.join(tmp_path, "file1")
         path_b = File.join(tmp_path, "file2")
@@ -404,7 +404,7 @@ module Omnibus
       end
     end
 
-    describe '#move' do
+    describe "#move" do
       it "moves the file" do
         path_a = File.join(tmp_path, "file1")
         path_b = File.join(tmp_path, "file2")
@@ -461,7 +461,7 @@ module Omnibus
       end
     end
 
-    describe '#link', :not_supported_on_windows do
+    describe "#link", :not_supported_on_windows do
       it "links the file" do
         path_a = File.join(tmp_path, "file1")
         path_b = File.join(tmp_path, "file2")
@@ -504,7 +504,7 @@ module Omnibus
       end
     end
 
-    describe '#sync' do
+    describe "#sync" do
       let(:source) do
         source = File.join(tmp_path, "source")
         FileUtils.mkdir_p(source)
@@ -607,7 +607,7 @@ module Omnibus
       end
     end
 
-    describe '#update_config_guess', :not_supported_on_windows do
+    describe "#update_config_guess", :not_supported_on_windows do
       let(:config_guess_dir) { "#{install_dir}/embedded/lib/config_guess" }
 
       before do

data/spec/functional/fetchers/git_fetcher_spec.rb

@@ -24,7 +24,7 @@ module Omnibus
 
     let(:revision) { shellout!("git rev-parse HEAD", cwd: project_dir).stdout.strip }
 
-    describe '#fetch_required?' do
+    describe "#fetch_required?" do
       context "when the repo is not cloned" do
         it "return true" do
           expect(subject.fetch_required?).to be_truthy
@@ -56,13 +56,13 @@ module Omnibus
       end
     end
 
-    describe '#version_guid' do
+    describe "#version_guid" do
       it "includes the current revision" do
         expect(subject.version_guid).to match(/^git:[0-9a-f]{40}/)
       end
     end
 
-    describe '#clean' do
+    describe "#clean" do
       before do
         subject.fetch
       end
@@ -105,7 +105,7 @@ module Omnibus
       end
     end
 
-    describe '#fetch'  do
+    describe "#fetch"  do
       let(:version)  { "v1.2.4" }
       let(:remote)   { remote_git_repo("zlib", annotated_tags: [version]) }
       let(:manifest_entry) do
@@ -124,7 +124,7 @@ module Omnibus
       end
     end
 
-    describe '#resolve_version' do
+    describe "#resolve_version" do
       context "when the version is a tag" do
         let(:version)  { "v1.2.3" }
         let(:remote)   { remote_git_repo("zlib", tags: [version]) }
@@ -180,7 +180,7 @@ module Omnibus
       end
     end
 
-    describe '#version_for_cache' do
+    describe "#version_for_cache" do
       it "includes the resolved revision" do
         expect(subject.version_for_cache).to eq("revision:45ded6d3b1a35d66ed866b2c3eb418426e6382b0")
       end

data/spec/functional/fetchers/net_fetcher_spec.rb

@@ -12,7 +12,7 @@ module Omnibus
   describe NetFetcher do
     include_examples "a software", "zlib"
 
-    let(:source_url) { "http://downloads.sourceforge.net/project/libpng/zlib/1.2.8/zlib-1.2.8.tar.gz" }
+    let(:source_url) { "http://chef-releng.s3.amazonaws.com/omnibus/integration_test/zlib-1.2.8.tar.gz" }
     let(:source_md5) { "44d667c142d7cda120332623eab69f40" }
     let(:source_sha1) { "a4d316c404ff54ca545ea71a27af7dbc29817088" }
     let(:source_sha256) { "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d" }
@@ -37,7 +37,7 @@ module Omnibus
 
     subject { described_class.new(manifest_entry, project_dir, build_dir) }
 
-    describe '#fetch_required?' do
+    describe "#fetch_required?" do
       context "when the file is not downloaded" do
         it "return true" do
           expect(subject.fetch_required?).to be_truthy
@@ -62,7 +62,7 @@ module Omnibus
       end
     end
 
-    describe '#version_guid' do
+    describe "#version_guid" do
       context "source with md5" do
         it "includes the md5 digest" do
           expect(subject.version_guid).to eq("md5:#{source_md5}")
@@ -100,7 +100,7 @@ module Omnibus
       end
     end
 
-    describe '#clean' do
+    describe "#clean" do
       before { fetch! }
 
       context "when the project directory exists" do
@@ -157,7 +157,7 @@ module Omnibus
       end
     end
 
-    describe '#fetch' do
+    describe "#fetch" do
       context "source with md5" do
         it "downloads the file" do
           fetch!
@@ -243,7 +243,7 @@ module Omnibus
       it "when the download times out" do
         # Mock the Timeout::Error for this particular test only
         WebMock.disable_net_connect!
-        stub_request(:get, "http://downloads.sourceforge.net/project/libpng/zlib/1.2.8/zlib-1.2.8.tar.gz").to_timeout
+        stub_request(:get, "http://chef-releng.s3.amazonaws.com/omnibus/integration_test/zlib-1.2.8.tar.gz").to_timeout
         output = capture_logging do
           expect { subject.send(:download) }.to raise_error(Timeout::Error)
         end
@@ -265,7 +265,7 @@ module Omnibus
       end
     end
 
-    describe '#version_for_cache' do
+    describe "#version_for_cache" do
       before do
         create_file("#{project_dir}/file_a")
         create_file("#{project_dir}/file_b")

data/spec/functional/fetchers/path_fetcher_spec.rb

@@ -24,7 +24,7 @@ module Omnibus
 
     subject { described_class.new(manifest_entry, project_dir, build_dir) }
 
-    describe '#fetch_required?' do
+    describe "#fetch_required?" do
       context "when the directories have different files" do
         before do
           create_file("#{source_path}/directory/file") { "different" }
@@ -48,7 +48,7 @@ module Omnibus
       end
     end
 
-    describe '#version_guid' do
+    describe "#version_guid" do
       it "includes the source path" do
         expect(subject.version_guid).to eq("path:#{source_path}")
       end
@@ -82,13 +82,13 @@ module Omnibus
       end
     end
 
-    describe '#clean' do
+    describe "#clean" do
       it "returns true" do
         expect(subject.clean).to be_truthy
       end
     end
 
-    describe '#version_for_cache' do
+    describe "#version_for_cache" do
       before do
         create_file("#{source_path}/file_a")
         create_file("#{source_path}/file_b")
@@ -102,7 +102,7 @@ module Omnibus
       end
     end
 
-    describe '#resolve_version' do
+    describe "#resolve_version" do
       it "just returns the version" do
         expect(NetFetcher.resolve_version("1.2.3", source)).to eq("1.2.3")
       end

data/spec/functional/file_syncer_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 module Omnibus
   describe FileSyncer do
-    describe '#glob' do
+    describe "#glob" do
       before do
         FileUtils.mkdir_p(File.join(tmp_path, "folder"))
         FileUtils.mkdir_p(File.join(tmp_path, ".hidden_folder"))
@@ -39,7 +39,7 @@ module Omnibus
       end
     end
 
-    describe '#sync' do
+    describe "#sync" do
       let(:source) do
         source = File.join(tmp_path, "source")
         FileUtils.mkdir_p(source)
@@ -77,21 +77,21 @@ module Omnibus
 
       context "when destination file exists" do
 
-        let(:source) {
+        let(:source) do
           s = File.join(tmp_path, "source")
           FileUtils.mkdir_p(s)
           p = create_file(s, "read-only-file") { "new" }
           FileUtils.chmod(0400, p)
           s
-        }
+        end
 
-        let(:destination) {
+        let(:destination) do
           dest = File.join(tmp_path, "destination")
           FileUtils.mkdir_p(dest)
           create_file(dest, "read-only-file") { "old" }
           FileUtils.chmod(0400, File.join(dest, "read-only-file"))
           dest
-        }
+        end
 
         it "copies over a read-only file" do
           described_class.sync(source, destination)

data/spec/functional/licensing_spec.rb

@@ -155,6 +155,8 @@ module Omnibus
       softwares.each { |s| project.library.component_added(s) }
 
       Licensing.create_incrementally(project) do |licensing|
+        yield licensing if block_given?
+
         project.softwares.each do |software|
           licensing.execute_post_build(software)
         end
@@ -313,13 +315,8 @@ module Omnibus
 
       it "does not collect transitive licensing info for any software" do
         softwares.each { |s| project.library.component_added(s) }
-
-        Licensing.create_incrementally(project) do |licensing|
+        create_licenses do |licensing|
           expect(licensing).not_to receive(:collect_transitive_dependency_licenses_for)
-
-          project.softwares.each do |software|
-            licensing.execute_post_build(software)
-          end
         end
       end
     end
@@ -407,14 +404,30 @@ module Omnibus
 
       describe "when there are warnings in the licensing info" do
         before do
-          allow_any_instance_of(LicenseScout::Collector).to receive(:run)
-          allow_any_instance_of(LicenseScout::Collector).to receive(:issue_report).and_return(["This is a licensing warning!!!"])
+          allow_any_instance_of(LicenseScout::Collector).to receive(:run) do
+            FileUtils.cp_r(File.join(license_fixtures_path, "zlib"), File.join(install_dir, "license-cache/"))
+          end
+          allow_any_instance_of(LicenseScout::Reporter).to receive(:report).and_return(["This is a licensing warning!!!"])
         end
 
         it "logs the warnings" do
           output = capture_logging { create_licenses }
           expect(output).to include("This is a licensing warning!!!")
         end
+
+        describe "when :fatal_transitive_dependency_licensing_warnings is set" do
+          before do
+            Omnibus::Config.fatal_transitive_dependency_licensing_warnings(true)
+          end
+
+          it "raises an error after post_build step" do
+            expect do
+              create_licenses do |licensing|
+                expect(licensing).not_to receive(:process_transitive_dependency_licensing_info)
+              end
+            end.to raise_error(Omnibus::LicensingError)
+          end
+        end
       end
 
       describe "when there are no warnings in the licensing info" do
@@ -426,15 +439,15 @@ module Omnibus
           allow_any_instance_of(LicenseScout::Collector).to receive(:issue_report).and_return([])
         end
 
-        let(:expected_license_files) {
+        let(:expected_license_files) do
           %w{
             ruby_bundler-inifile-3.0.0-README.md
             ruby_bundler-mime-types-3.1-Licence.rdoc
             ruby_bundler-mini_portile2-2.1.0-LICENSE.txt
           }
-        }
+        end
 
-        let(:expected_license_texts) {
+        let(:expected_license_texts) do
           [
             <<-EOH,
 This product includes inifile 3.0.0
@@ -458,7 +471,7 @@ For details, see:
 #{install_dir}/LICENSES/ruby_bundler-mini_portile2-2.1.0-LICENSE.txt
 EOH
           ]
-        }
+        end
 
         it "includes transitive dependency license information in the project license information" do
           create_licenses
@@ -485,15 +498,15 @@ EOH
           allow_any_instance_of(LicenseScout::Collector).to receive(:issue_report).and_return([])
         end
 
-        let(:expected_license_files) {
+        let(:expected_license_files) do
           %w{
             ruby_bundler-inifile-3.0.0-README.md
             ruby_bundler-mime-types-3.1-Licence.rdoc
             ruby_bundler-mini_portile2-2.1.0-LICENSE.txt
           }
-        }
+        end
 
-        let(:expected_license_texts) {
+        let(:expected_license_texts) do
           [
             <<-EOH,
 This product includes inifile 3.0.0
@@ -525,7 +538,7 @@ For details, see:
 EOH
 
           ]
-        }
+        end
 
         it "includes merged licensing information from multiple software definitions" do
           create_licenses