omnibus 5.4.0 → 5.5.0

data/spec/unit/compressors/base_spec.rb

@@ -1,25 +1,25 @@
-require 'stringio'
+require "stringio"
 
 module Omnibus
   describe Compressor::Base do
     let(:packager) { double(Packager::Base) }
-    let(:project)  { double(Project, packager: packager) }
+    let(:project)  { double(Project, packagers_for_system: [packager]) }
 
-    describe '.initialize' do
+    describe ".initialize" do
       subject { described_class.new(project) }
 
-      it 'sets the project' do
+      it "sets the project" do
         expect(subject.project).to eq(project)
       end
 
-      it 'sets the packager' do
+      it "sets the packager" do
         expect(subject.packager).to eq(packager)
       end
     end
 
     subject { described_class.new(project) }
 
-    it 'inherits from Packager' do
+    it "inherits from Packager" do
       expect(subject).to be_a(Packager::Base)
     end
   end

data/spec/unit/compressors/dmg_spec.rb

@@ -1,27 +1,27 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Omnibus
   describe Compressor::DMG do
     let(:project) do
       Project.new.tap do |project|
-        project.name('project')
-        project.homepage('https://example.com')
-        project.install_dir('/opt/project')
-        project.build_version('1.2.3')
-        project.build_iteration('2')
-        project.maintainer('Chef Software')
+        project.name("project")
+        project.homepage("https://example.com")
+        project.install_dir("/opt/project")
+        project.build_version("1.2.3")
+        project.build_iteration("2")
+        project.maintainer("Chef Software")
       end
     end
 
     subject { described_class.new(project) }
 
-    let(:project_root) { File.join(tmp_path, 'project/root') }
-    let(:package_dir)  { File.join(tmp_path, 'package/dir') }
-    let(:staging_dir)  { File.join(tmp_path, 'staging/dir') }
+    let(:project_root) { File.join(tmp_path, "project/root") }
+    let(:package_dir)  { File.join(tmp_path, "package/dir") }
+    let(:staging_dir)  { File.join(tmp_path, "staging/dir") }
 
     before do
-      allow(project).to receive(:packager)
-        .and_return(Packager::PKG.new(project))
+      allow(project).to receive(:packagers_for_system)
+        .and_return([Packager::PKG.new(project)])
 
       Config.project_root(project_root)
       Config.package_dir(package_dir)
@@ -34,56 +34,56 @@ module Omnibus
     end
 
     describe '#window_bounds' do
-      it 'is a DSL method' do
+      it "is a DSL method" do
         expect(subject).to have_exposed_method(:window_bounds)
       end
 
-      it 'has a default value' do
-        expect(subject.window_bounds).to eq('100, 100, 750, 600')
+      it "has a default value" do
+        expect(subject.window_bounds).to eq("100, 100, 750, 600")
       end
     end
 
     describe '#pkg_position' do
-      it 'is a DSL method' do
+      it "is a DSL method" do
         expect(subject).to have_exposed_method(:pkg_position)
       end
 
-      it 'has a default value' do
-        expect(subject.pkg_position).to eq('535, 50')
+      it "has a default value" do
+        expect(subject.pkg_position).to eq("535, 50")
       end
     end
 
     describe '#id' do
-      it 'is :dmg' do
+      it "is :dmg" do
         expect(subject.id).to eq(:dmg)
       end
     end
 
     describe '#resources_dir' do
-      it 'is nested inside the staging_dir' do
+      it "is nested inside the staging_dir" do
         expect(subject.resources_dir).to eq("#{staging_dir}/Resources")
       end
     end
 
     describe '#clean_disks' do
-      it 'logs a message' do
+      it "logs a message" do
         allow(subject).to receive(:shellout!)
-          .and_return(double(Mixlib::ShellOut, stdout: ''))
+          .and_return(double(Mixlib::ShellOut, stdout: ""))
 
         output = capture_logging { subject.clean_disks }
-        expect(output).to include('Cleaning previously mounted disks')
+        expect(output).to include("Cleaning previously mounted disks")
       end
     end
 
     describe '#create_writable_dmg' do
-      it 'logs a message' do
+      it "logs a message" do
         output = capture_logging { subject.create_writable_dmg }
-        expect(output).to include('Creating writable dmg')
+        expect(output).to include("Creating writable dmg")
       end
 
-      it 'runs the hdiutil command' do
+      it "runs the hdiutil command" do
         expect(subject).to receive(:shellout!)
-          .with <<-EOH.gsub(/^ {12}/, '')
+          .with <<-EOH.gsub(/^ {12}/, "")
             hdiutil create \\
               -srcfolder "#{staging_dir}/Resources" \\
               -volname "Project" \\
@@ -106,14 +106,14 @@ module Omnibus
 
       let(:shellout) { double(Mixlib::ShellOut, stdout: "hello\n") }
 
-      it 'logs a message' do
+      it "logs a message" do
         output = capture_logging { subject.attach_dmg }
-        expect(output).to include('Attaching dmg as disk')
+        expect(output).to include("Attaching dmg as disk")
       end
 
-      it 'runs the hdiutil command' do
+      it "runs the hdiutil command" do
         expect(subject).to receive(:shellout!)
-          .with <<-EOH.gsub(/^ {12}/, '')
+          .with <<-EOH.gsub(/^ {12}/, "")
             hdiutil attach \\
               -readwrite \\
               -noverify \\
@@ -124,22 +124,22 @@ module Omnibus
         subject.attach_dmg
       end
 
-      it 'returns the stripped stdout' do
-        expect(subject.attach_dmg).to eq('hello')
+      it "returns the stripped stdout" do
+        expect(subject.attach_dmg).to eq("hello")
       end
     end
 
     describe '#set_volume_icon' do
-      it 'logs a message' do
+      it "logs a message" do
         output = capture_logging { subject.set_volume_icon }
-        expect(output).to include('Setting volume icon')
+        expect(output).to include("Setting volume icon")
       end
 
-      it 'runs the sips commands' do
-        icon = subject.resource_path('icon.png')
+      it "runs the sips commands" do
+        icon = subject.resource_path("icon.png")
 
         expect(subject).to receive(:shellout!)
-          .with <<-EOH.gsub(/^ {12}/, '')
+          .with <<-EOH.gsub(/^ {12}/, "")
             # Generate the icns
             mkdir tmp.iconset
             sips -z 16 16     #{icon} --out tmp.iconset/icon_16x16.png
@@ -166,42 +166,42 @@ module Omnibus
     end
 
     describe '#prettify_dmg' do
-      it 'logs a message' do
+      it "logs a message" do
         output = capture_logging { subject.prettify_dmg }
-        expect(output).to include('Making the dmg all pretty and stuff')
+        expect(output).to include("Making the dmg all pretty and stuff")
       end
 
-      it 'renders the apple script template' do
+      it "renders the apple script template" do
         subject.prettify_dmg
         expect("#{staging_dir}/create_dmg.osascript").to be_a_file
       end
 
-      it 'has the correct content' do
+      it "has the correct content" do
         subject.prettify_dmg
         contents = File.read("#{staging_dir}/create_dmg.osascript")
 
         expect(contents).to include('tell application "Finder"')
         expect(contents).to include('  tell disk "Project"')
-        expect(contents).to include('    open')
-        expect(contents).to include('    set current view of container window to icon view')
-        expect(contents).to include('    set toolbar visible of container window to false')
-        expect(contents).to include('    set statusbar visible of container window to false')
-        expect(contents).to include('    set the bounds of container window to {100, 100, 750, 600}')
-        expect(contents).to include('    set theViewOptions to the icon view options of container window')
-        expect(contents).to include('    set arrangement of theViewOptions to not arranged')
-        expect(contents).to include('    set icon size of theViewOptions to 72')
+        expect(contents).to include("    open")
+        expect(contents).to include("    set current view of container window to icon view")
+        expect(contents).to include("    set toolbar visible of container window to false")
+        expect(contents).to include("    set statusbar visible of container window to false")
+        expect(contents).to include("    set the bounds of container window to {100, 100, 750, 600}")
+        expect(contents).to include("    set theViewOptions to the icon view options of container window")
+        expect(contents).to include("    set arrangement of theViewOptions to not arranged")
+        expect(contents).to include("    set icon size of theViewOptions to 72")
         expect(contents).to include('    set background picture of theViewOptions to file ".support:background.png"')
-        expect(contents).to include('    delay 5')
+        expect(contents).to include("    delay 5")
         expect(contents).to include('    set position of item "project-1.2.3-2.pkg" of container window to {535, 50}')
-        expect(contents).to include('    update without registering applications')
-        expect(contents).to include('    delay 5')
-        expect(contents).to include('  end tell')
-        expect(contents).to include('end tell')
+        expect(contents).to include("    update without registering applications")
+        expect(contents).to include("    delay 5")
+        expect(contents).to include("  end tell")
+        expect(contents).to include("end tell")
       end
 
-      it 'runs the apple script' do
+      it "runs the apple script" do
         expect(subject).to receive(:shellout!)
-          .with <<-EOH.gsub(/^ {12}/, '')
+          .with <<-EOH.gsub(/^ {12}/, "")
             osascript "#{staging_dir}/create_dmg.osascript"
           EOH
 
@@ -210,17 +210,17 @@ module Omnibus
     end
 
     describe '#compress_dmg' do
-      it 'logs a message' do
+      it "logs a message" do
         output = capture_logging { subject.compress_dmg }
-        expect(output).to include('Compressing dmg')
+        expect(output).to include("Compressing dmg")
       end
 
-      it 'runs the magical command series' do
-        device = '/dev/sda1'
+      it "runs the magical command series" do
+        device = "/dev/sda1"
         subject.instance_variable_set(:@device, device)
 
         expect(subject).to receive(:shellout!)
-          .with <<-EOH.gsub(/^ {12}/, '')
+          .with <<-EOH.gsub(/^ {12}/, "")
             chmod -Rf go-w /Volumes/Project
             sync
             hdiutil detach "#{device}"
@@ -238,16 +238,16 @@ module Omnibus
     end
 
     describe '#set_dmg_icon' do
-      it 'logs a message' do
+      it "logs a message" do
         output = capture_logging { subject.set_dmg_icon }
-        expect(output).to include('Setting dmg icon')
+        expect(output).to include("Setting dmg icon")
       end
 
-      it 'runs the sips commands' do
-        icon = subject.resource_path('icon.png')
+      it "runs the sips commands" do
+        icon = subject.resource_path("icon.png")
 
         expect(subject).to receive(:shellout!)
-          .with <<-EOH.gsub(/^ {12}/, '')
+          .with <<-EOH.gsub(/^ {12}/, "")
             # Convert the png to an icon
             sips -i "#{icon}"
 
@@ -267,12 +267,12 @@ module Omnibus
 
     describe '#package_name' do
       it 'reflects the packager\'s unmodified package_name' do
-        expect(subject.package_name).to eq('project-1.2.3-2.dmg')
+        expect(subject.package_name).to eq("project-1.2.3-2.dmg")
       end
 
       it 'reflects the packager\'s modified package_name' do
-        package_basename = 'projectsub-1.2.3-3'
-        allow(project.packager).to receive(:package_name)
+        package_basename = "projectsub-1.2.3-3"
+        allow(project.packagers_for_system[0]).to receive(:package_name)
           .and_return("#{package_basename}.pkg")
 
         expect(subject.package_name).to eq("#{package_basename}.dmg")
@@ -280,19 +280,19 @@ module Omnibus
     end
 
     describe '#writable_dmg' do
-      it 'is in the staging_dir' do
+      it "is in the staging_dir" do
         expect(subject.writable_dmg).to include(staging_dir)
       end
 
-      it 'is project-writable' do
-        expect(subject.writable_dmg).to include('project-writable.dmg')
+      it "is project-writable" do
+        expect(subject.writable_dmg).to include("project-writable.dmg")
       end
     end
 
     describe '#volume_name' do
-      it 'is the project friendly_name' do
-        project.friendly_name('Friendly Bacon Bits')
-        expect(subject.volume_name).to eq('Friendly Bacon Bits')
+      it "is the project friendly_name" do
+        project.friendly_name("Friendly Bacon Bits")
+        expect(subject.volume_name).to eq("Friendly Bacon Bits")
       end
     end
   end

data/spec/unit/compressors/null_spec.rb

@@ -1,20 +1,20 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Omnibus
   describe Compressor::Null do
     let(:packager) { double(Packager::Base) }
-    let(:project)  { double(Project, packager: packager) }
+    let(:project)  { double(Project, packagers_for_system: [packager]) }
 
     subject { described_class.new(project) }
 
     describe '#id' do
-      it 'is :dmg' do
+      it "is :dmg" do
         expect(subject.id).to eq(:null)
       end
     end
 
     describe '#run!' do
-      it 'does nothing' do
+      it "does nothing" do
         expect(subject).to_not receive(:instance_eval)
         subject.run!
       end

data/spec/unit/compressors/tgz_spec.rb

@@ -1,31 +1,31 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Omnibus
   describe Compressor::TGZ do
     let(:project) do
       Project.new.tap do |project|
-        project.name('project')
-        project.homepage('https://example.com')
-        project.install_dir('/opt/project')
-        project.build_version('1.2.3')
-        project.build_iteration('2')
-        project.maintainer('Chef Software')
+        project.name("project")
+        project.homepage("https://example.com")
+        project.install_dir("/opt/project")
+        project.build_version("1.2.3")
+        project.build_iteration("2")
+        project.maintainer("Chef Software")
       end
     end
 
     subject { described_class.new(project) }
 
-    let(:project_root) { File.join(tmp_path, 'project/root') }
-    let(:package_dir)  { File.join(tmp_path, 'package/dir') }
-    let(:staging_dir)  { File.join(tmp_path, 'staging/dir') }
+    let(:project_root) { File.join(tmp_path, "project/root") }
+    let(:package_dir)  { File.join(tmp_path, "package/dir") }
+    let(:staging_dir)  { File.join(tmp_path, "staging/dir") }
 
     before do
       create_directory(project_root)
       create_directory(package_dir)
       create_directory(staging_dir)
 
-      allow(project).to receive(:packager)
-        .and_return(Packager::PKG.new(project))
+      allow(project).to receive(:packagers_for_system)
+        .and_return([Packager::PKG.new(project)])
 
       Config.project_root(project_root)
       Config.package_dir(package_dir)
@@ -37,30 +37,30 @@ module Omnibus
     end
 
     describe '#package_name' do
-      it 'returns the name of the packager' do
-        expect(subject.package_name).to eq('project-1.2.3-2.pkg.tar.gz')
+      it "returns the name of the packager" do
+        expect(subject.package_name).to eq("project-1.2.3-2.pkg.tar.gz")
       end
     end
 
     describe '#write_tgz' do
       before do
-        File.open("#{staging_dir}/project-1.2.3-2.pkg", 'wb') do |f|
-          f.write " "*1_000_000
+        File.open("#{staging_dir}/project-1.2.3-2.pkg", "wb") do |f|
+          f.write " " * 1_000_000
         end
       end
 
-      it 'generates the file' do
+      it "generates the file" do
         subject.write_tgz
         expect("#{staging_dir}/project-1.2.3-2.pkg.tar.gz").to be_a_file
       end
 
-      it 'has the correct content' do
+      it "has the correct content" do
         subject.write_tgz
-        file = File.open("#{staging_dir}/project-1.2.3-2.pkg.tar.gz", 'rb')
+        file = File.open("#{staging_dir}/project-1.2.3-2.pkg.tar.gz", "rb")
         contents = file.read
         file.close
 
-        expect(contents).to include("\x1F\x8B\b\x00".force_encoding('ASCII-8BIT'))
+        expect(contents).to include("\x1F\x8B\b\x00".force_encoding("ASCII-8BIT"))
       end
     end
   end

data/spec/unit/config_spec.rb

@@ -1,10 +1,10 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Omnibus
   describe Config do
     subject { described_class.instance }
 
-    it 'extends Util' do
+    it "extends Util" do
       expect(subject).to be_a(Util)
     end
 
@@ -16,7 +16,7 @@ module Omnibus
       allow(File).to receive(:expand_path) { |arg| arg }
     end
 
-    shared_examples 'a configurable' do |id, default|
+    shared_examples "a configurable" do |id, default|
       it "responds to .#{id}" do
         expect(described_class).to respond_to(id)
       end
@@ -25,71 +25,72 @@ module Omnibus
         expect(described_class.send(id)).to eq(default)
       end
 
-      it_behaves_like 'a cleanroom getter', id, default
-      it_behaves_like 'a cleanroom setter', id, %|#{id}(#{default.inspect})|
+      it_behaves_like "a cleanroom getter", id, default
+      it_behaves_like "a cleanroom setter", id, %{#{id}(#{default.inspect})}
     end
 
-    include_examples 'a configurable', :base_dir, '/var/cache/omnibus'
-    include_examples 'a configurable', :cache_dir, '/var/cache/omnibus/cache'
-    include_examples 'a configurable', :git_cache_dir, '/var/cache/omnibus/cache/git_cache'
-    include_examples 'a configurable', :source_dir, '/var/cache/omnibus/src'
-    include_examples 'a configurable', :build_dir, '/var/cache/omnibus/build'
-    include_examples 'a configurable', :package_dir, '/var/cache/omnibus/pkg'
-    include_examples 'a configurable', :project_root, Dir.pwd
-    include_examples 'a configurable', :local_software_dirs, []
-    include_examples 'a configurable', :software_gems, ['omnibus-software']
-    include_examples 'a configurable', :solaris_linker_mapfile, 'files/mapfiles/solaris'
-    include_examples 'a configurable', :append_timestamp, true
-    include_examples 'a configurable', :build_retries, 0
-    include_examples 'a configurable', :use_git_caching, true
-    include_examples 'a configurable', :fetcher_read_timeout, 60
-    include_examples 'a configurable', :fetcher_retries, 5
+    include_examples "a configurable", :base_dir, "/var/cache/omnibus"
+    include_examples "a configurable", :cache_dir, "/var/cache/omnibus/cache"
+    include_examples "a configurable", :git_cache_dir, "/var/cache/omnibus/cache/git_cache"
+    include_examples "a configurable", :source_dir, "/var/cache/omnibus/src"
+    include_examples "a configurable", :build_dir, "/var/cache/omnibus/build"
+    include_examples "a configurable", :package_dir, "/var/cache/omnibus/pkg"
+    include_examples "a configurable", :project_root, Dir.pwd
+    include_examples "a configurable", :local_software_dirs, []
+    include_examples "a configurable", :software_gems, ["omnibus-software"]
+    include_examples "a configurable", :solaris_linker_mapfile, "files/mapfiles/solaris"
+    include_examples "a configurable", :append_timestamp, true
+    include_examples "a configurable", :build_retries, 0
+    include_examples "a configurable", :use_git_caching, true
+    include_examples "a configurable", :fetcher_read_timeout, 60
+    include_examples "a configurable", :fetcher_retries, 5
+    include_examples "a configurable", :fatal_licensing_warnings, false
 
     describe '#workers' do
-      context 'when the Ohai data is not present' do
+      context "when the Ohai data is not present" do
         before do
-          stub_ohai(platform: 'ubuntu', version: '12.04') do |data|
-            data['cpu'] = nil
+          stub_ohai(platform: "ubuntu", version: "12.04") do |data|
+            data["cpu"] = nil
           end
         end
 
-        it 'defaults to 3' do
+        it "defaults to 3" do
           expect(described_class.workers).to eq(3)
         end
       end
 
-      context 'when the Ohai data is present' do
+      context "when the Ohai data is present" do
         before do
-          stub_ohai(platform: 'ubuntu', version: '12.04') do |data|
-            data['cpu'] = { 'total' => '5' }
+          stub_ohai(platform: "ubuntu", version: "12.04") do |data|
+            data["cpu"] = { "total" => "5" }
           end
         end
 
-        it 'defaults to the value + 6' do
+        it "defaults to the value + 6" do
           expect(described_class.workers).to eq(6)
         end
       end
     end
 
-    context 'on Windows' do
-      before { stub_ohai(platform: 'windows', version: '2012') }
+    context "on Windows" do
+      before { stub_ohai(platform: "windows", version: "2012") }
 
-      include_examples 'a configurable', :base_dir, 'C:/omnibus-ruby'
-      include_examples 'a configurable', :cache_dir, 'C:/omnibus-ruby/cache'
-      include_examples 'a configurable', :git_cache_dir, 'C:/omnibus-ruby/cache/git_cache'
-      include_examples 'a configurable', :source_dir, 'C:/omnibus-ruby/src'
-      include_examples 'a configurable', :build_dir, 'C:/omnibus-ruby/build'
-      include_examples 'a configurable', :package_dir, 'C:/omnibus-ruby/pkg'
+      include_examples "a configurable", :base_dir, "C:/omnibus-ruby"
+      include_examples "a configurable", :cache_dir, "C:/omnibus-ruby/cache"
+      include_examples "a configurable", :git_cache_dir, "C:/omnibus-ruby/cache/git_cache"
+      include_examples "a configurable", :source_dir, "C:/omnibus-ruby/src"
+      include_examples "a configurable", :build_dir, "C:/omnibus-ruby/build"
+      include_examples "a configurable", :package_dir, "C:/omnibus-ruby/pkg"
     end
 
-    context 'when base_dir is changed' do
-      before { described_class.base_dir('/foo/bar') }
+    context "when base_dir is changed" do
+      before { described_class.base_dir("/foo/bar") }
 
-      include_examples 'a configurable', :cache_dir, '/foo/bar/cache'
-      include_examples 'a configurable', :git_cache_dir, '/foo/bar/cache/git_cache'
-      include_examples 'a configurable', :source_dir, '/foo/bar/src'
-      include_examples 'a configurable', :build_dir, '/foo/bar/build'
-      include_examples 'a configurable', :package_dir, '/foo/bar/pkg'
+      include_examples "a configurable", :cache_dir, "/foo/bar/cache"
+      include_examples "a configurable", :git_cache_dir, "/foo/bar/cache/git_cache"
+      include_examples "a configurable", :source_dir, "/foo/bar/src"
+      include_examples "a configurable", :build_dir, "/foo/bar/build"
+      include_examples "a configurable", :package_dir, "/foo/bar/pkg"
     end
   end
 end

data/spec/unit/digestable_spec.rb

@@ -1,37 +1,37 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Omnibus
   describe Digestable do
-    let(:path) { '/path/to/file' }
+    let(:path) { "/path/to/file" }
     let(:io)   { StringIO.new }
 
     subject { Class.new { include Digestable }.new }
 
     describe '#digest' do
-      it 'reads the IO in chunks' do
+      it "reads the IO in chunks" do
         expect(File).to receive(:open).with(path).and_yield(io)
-        expect(subject.digest(path)).to eq('d41d8cd98f00b204e9800998ecf8427e')
+        expect(subject.digest(path)).to eq("d41d8cd98f00b204e9800998ecf8427e")
       end
     end
 
     describe '#digest_directory' do
-      let(:path)    { '/path/to/dir' }
+      let(:path)    { "/path/to/dir" }
       let(:glob)    { "#{path}/**/*" }
-      let(:subdir)  { '/path/to/dir/subdir' }
-      let(:subfile) { '/path/to/dir/subfile' }
+      let(:subdir)  { "/path/to/dir/subdir" }
+      let(:subfile) { "/path/to/dir/subfile" }
       let(:io)      { StringIO.new }
 
-      it 'inspects the file types of glob entries' do
+      it "inspects the file types of glob entries" do
         expect(FileSyncer).to receive(:glob).with(glob).and_return([subdir])
-        expect(File).to receive(:ftype).with(subdir).and_return('directory')
-        expect(subject.digest_directory(path)).to eq('8b91792e7917b1152d8494670caaeb85')
+        expect(File).to receive(:ftype).with(subdir).and_return("directory")
+        expect(subject.digest_directory(path)).to eq("8b91792e7917b1152d8494670caaeb85")
       end
 
-      it 'inspects the contents of the files' do
+      it "inspects the contents of the files" do
         expect(FileSyncer).to receive(:glob).with(glob).and_return([subfile])
-        expect(File).to receive(:ftype).with(subfile).and_return('file')
+        expect(File).to receive(:ftype).with(subfile).and_return("file")
         expect(File).to receive(:open).with(subfile).and_yield(io)
-        expect(subject.digest_directory(path)).to eq('c8f023976b95ace2ae3678540fd3b4f1')
+        expect(subject.digest_directory(path)).to eq("c8f023976b95ace2ae3678540fd3b4f1")
       end
     end
   end