omnibus 6.0.1 → 6.0.24

data/spec/functional/builder_spec.rb

@@ -32,7 +32,7 @@ module Omnibus
         raise "Could not find #{name} in bundler environment" unless source
 
         target = File.join(embedded_bin_dir, name)
-        create_link(source, target) unless File.exists?(target)
+        create_link(source, target) unless File.exist?(target)
       end
     end
 

data/spec/functional/licensing_spec.rb

@@ -449,27 +449,27 @@ module Omnibus
 
         let(:expected_license_texts) do
           [
-            <<-EOH,
-This product includes inifile 3.0.0
-which is a 'ruby_bundler' dependency of 'zlib',
-and which is available under a 'MIT' License.
-For details, see:
-#{install_dir}/LICENSES/ruby_bundler-inifile-3.0.0-README.md
-EOH
-            <<-EOH,
-This product includes mime-types 3.1
-which is a 'ruby_bundler' dependency of 'zlib',
-and which is available under a 'MIT' License.
-For details, see:
-#{install_dir}/LICENSES/ruby_bundler-mime-types-3.1-Licence.rdoc
-EOH
-            <<-EOH,
-This product includes mini_portile2 2.1.0
-which is a 'ruby_bundler' dependency of 'zlib',
-and which is available under a 'MIT' License.
-For details, see:
-#{install_dir}/LICENSES/ruby_bundler-mini_portile2-2.1.0-LICENSE.txt
-EOH
+            <<~EOH,
+              This product includes inifile 3.0.0
+              which is a 'ruby_bundler' dependency of 'zlib',
+              and which is available under a 'MIT' License.
+              For details, see:
+              #{install_dir}/LICENSES/ruby_bundler-inifile-3.0.0-README.md
+            EOH
+            <<~EOH,
+              This product includes mime-types 3.1
+              which is a 'ruby_bundler' dependency of 'zlib',
+              and which is available under a 'MIT' License.
+              For details, see:
+              #{install_dir}/LICENSES/ruby_bundler-mime-types-3.1-Licence.rdoc
+            EOH
+            <<~EOH,
+              This product includes mini_portile2 2.1.0
+              which is a 'ruby_bundler' dependency of 'zlib',
+              and which is available under a 'MIT' License.
+              For details, see:
+              #{install_dir}/LICENSES/ruby_bundler-mini_portile2-2.1.0-LICENSE.txt
+            EOH
           ]
         end
 
@@ -508,34 +508,34 @@ EOH
 
         let(:expected_license_texts) do
           [
-            <<-EOH,
-This product includes inifile 3.0.0
-which is a 'ruby_bundler' dependency of 'snoopy', 'zlib',
-and which is available under a 'MIT' License.
-For details, see:
-#{install_dir}/LICENSES/ruby_bundler-inifile-3.0.0-README.md
-EOH
-            <<-EOH,
-This product includes mime-types 3.1
-which is a 'ruby_bundler' dependency of 'zlib',
-and which is available under a 'MIT' License.
-For details, see:
-#{install_dir}/LICENSES/ruby_bundler-mime-types-3.1-Licence.rdoc
-EOH
-            <<-EOH,
-This product includes mini_portile2 2.1.0
-which is a 'ruby_bundler' dependency of 'zlib',
-and which is available under a 'MIT' License.
-For details, see:
-#{install_dir}/LICENSES/ruby_bundler-mini_portile2-2.1.0-LICENSE.txt
-EOH
-            <<-EOH,
-This product includes bundler-audit 0.5.0
-which is a 'ruby_bundler' dependency of 'snoopy',
-and which is available under a 'GPLv3' License.
-For details, see:
-#{install_dir}/LICENSES/ruby_bundler-bundler-audit-0.5.0-COPYING.txt
-EOH
+            <<~EOH,
+              This product includes inifile 3.0.0
+              which is a 'ruby_bundler' dependency of 'snoopy', 'zlib',
+              and which is available under a 'MIT' License.
+              For details, see:
+              #{install_dir}/LICENSES/ruby_bundler-inifile-3.0.0-README.md
+            EOH
+            <<~EOH,
+              This product includes mime-types 3.1
+              which is a 'ruby_bundler' dependency of 'zlib',
+              and which is available under a 'MIT' License.
+              For details, see:
+              #{install_dir}/LICENSES/ruby_bundler-mime-types-3.1-Licence.rdoc
+            EOH
+            <<~EOH,
+              This product includes mini_portile2 2.1.0
+              which is a 'ruby_bundler' dependency of 'zlib',
+              and which is available under a 'MIT' License.
+              For details, see:
+              #{install_dir}/LICENSES/ruby_bundler-mini_portile2-2.1.0-LICENSE.txt
+            EOH
+            <<~EOH,
+              This product includes bundler-audit 0.5.0
+              which is a 'ruby_bundler' dependency of 'snoopy',
+              and which is available under a 'GPLv3' License.
+              For details, see:
+              #{install_dir}/LICENSES/ruby_bundler-bundler-audit-0.5.0-COPYING.txt
+            EOH
 
           ]
         end

data/spec/functional/templating_spec.rb

@@ -19,14 +19,14 @@ module Omnibus
           <% if false -%>
             This is magic!
           <% end -%>
-        EOH
+      EOH
     end
 
     let(:options) do
       {
         destination: destination,
-        variables:   variables,
-        mode:        mode,
+        variables: variables,
+        mode: mode,
       }
     end
 

data/spec/support/git_helpers.rb

@@ -111,12 +111,12 @@ module Omnibus
         #
         time = Time.at(680227200).utc.strftime("%c %z")
         env  = {
-          "GIT_AUTHOR_NAME"     => "omnibus",
-          "GIT_AUTHOR_EMAIL"    => "omnibus@getchef.com",
-          "GIT_AUTHOR_DATE"     => time,
-          "GIT_COMMITTER_NAME"  => "omnibus",
+          "GIT_AUTHOR_NAME" => "omnibus",
+          "GIT_AUTHOR_EMAIL" => "omnibus@getchef.com",
+          "GIT_AUTHOR_DATE" => time,
+          "GIT_COMMITTER_NAME" => "omnibus",
           "GIT_COMMITTER_EMAIL" => "omnibus@gechef.com",
-          "GIT_COMMITTER_DATE"  => time,
+          "GIT_COMMITTER_DATE" => time,
         }
 
         shellout!("git #{command}", env: env)

data/spec/unit/changelog_spec.rb

@@ -4,7 +4,7 @@ module Omnibus
   describe ChangeLog do
     describe "#new" do
       it "sets the start_ref to the latest tag if none is set" do
-        repo = double(GitRepository, :latest_tag => "1.0")
+        repo = double(GitRepository, latest_tag: "1.0")
         expect(ChangeLog.new(nil, "2.0", repo).start_ref).to eq("1.0")
       end
 
@@ -15,38 +15,38 @@ module Omnibus
 
     describe "#changelog_entries" do
       it "returns any git log lines with the ChangeLog: tag, removing the tag" do
-        repo = double(GitRepository, :commit_messages => ["ChangeLog-Entry: foobar\n",
+        repo = double(GitRepository, commit_messages: ["ChangeLog-Entry: foobar\n",
                                                           "ChangeLog-Entry: wombat\n"])
         changelog = ChangeLog.new("0.0.1", "0.0.2", repo)
         expect(changelog.changelog_entries).to eq(%W{foobar\n wombat\n})
       end
 
       it "returns an empty array if there were no changelog entries" do
-        repo = double(GitRepository, :commit_messages => [])
+        repo = double(GitRepository, commit_messages: [])
         changelog = ChangeLog.new("0.0.1", "0.0.2", repo)
         expect(changelog.changelog_entries).to eq([])
       end
 
       it "does not return git messages without a ChangeLog: tag" do
-        repo = double(GitRepository, :commit_messages => %W{foobar\n wombat\n})
+        repo = double(GitRepository, commit_messages: %W{foobar\n wombat\n})
         changelog = ChangeLog.new("0.0.1", "0.0.2", repo)
         expect(changelog.changelog_entries).to eq([])
       end
 
       it "does not return blank lines" do
-        repo = double(GitRepository, :commit_messages => %W{\n \n})
+        repo = double(GitRepository, commit_messages: %W{\n \n})
         changelog = ChangeLog.new("0.0.1", "0.0.2", repo)
         expect(changelog.changelog_entries).to eq([])
       end
 
       it "can handle multi-line ChangeLog entries" do
-        repo = double(GitRepository, :commit_messages => ["ChangeLog-Entry: foobar\n", "foobaz\n"])
+        repo = double(GitRepository, commit_messages: ["ChangeLog-Entry: foobar\n", "foobaz\n"])
         changelog = ChangeLog.new("0.0.1", "0.0.2", repo)
         expect(changelog.changelog_entries).to eq(["foobar\nfoobaz\n"])
       end
 
       it "end a ChangeLog entry at the first blank line" do
-        repo = double(GitRepository, :commit_messages => ["ChangeLog-Entry: foobar\n", "\n", "foobaz\n"])
+        repo = double(GitRepository, commit_messages: ["ChangeLog-Entry: foobar\n", "\n", "foobaz\n"])
         changelog = ChangeLog.new("0.0.1", "0.0.2", repo)
         expect(changelog.changelog_entries).to eq(["foobar\n"])
       end

data/spec/unit/changelogprinter_spec.rb

@@ -6,11 +6,11 @@ module Omnibus
   describe ChangeLogPrinter do
     describe "#print" do
       def manifest_entry_for(name, dv, lv, source_type = :local)
-        Omnibus::ManifestEntry.new(name, { :described_version => dv,
-                                           :locked_version => lv,
-                                           :locked_source => {
-                                             :git => "git://#{name}@example.com" },
-                                           :source_type => source_type,
+        Omnibus::ManifestEntry.new(name, { described_version: dv,
+                                           locked_version: lv,
+                                           locked_source: {
+                                             git: "git://#{name}@example.com" },
+                                           source_type: source_type,
         })
       end
 

data/spec/unit/compressors/dmg_spec.rb

@@ -86,11 +86,9 @@ module Omnibus
         expect(subject).to receive(:shellout!)
           .with <<-EOH.gsub(/^ {12}/, "")
             hdiutil create \\
-              -srcfolder "#{staging_dir}/Resources" \\
               -volname "Project One" \\
               -fs HFS+ \\
               -fsargs "-c c=64,a=16,e=16" \\
-              -format UDRW \\
               -size 512000k \\
               "#{staging_dir}/project-writable.dmg"
           EOH
@@ -130,6 +128,13 @@ module Omnibus
       end
     end
 
+    describe "#copy_assets_to_dmg" do
+      it "logs a message" do
+        output = capture_logging { subject.copy_assets_to_dmg }
+        expect(output).to include("Copying assets into dmg")
+      end
+    end
+
     describe "#set_volume_icon" do
       it "logs a message" do
         output = capture_logging { subject.set_volume_icon }

data/spec/unit/generator_spec.rb

@@ -51,9 +51,7 @@ module Omnibus
       it "generates the proper file structure" do
         Generator.new(["name"], path: tmp_path, bff_assets: true).invoke_all
 
-        expect(structure).to include(*%w{
-          omnibus-name/resources/name/bff/gen.template.erb
-        })
+        expect(structure).to include("omnibus-name/resources/name/bff/gen.template.erb")
       end
     end
 
@@ -61,11 +59,7 @@ module Omnibus
       it "generates the proper file structure" do
         Generator.new(["name"], path: tmp_path, deb_assets: true).invoke_all
 
-        expect(structure).to include(*%w{
-          omnibus-name/resources/name/deb/conffiles.erb
-          omnibus-name/resources/name/deb/control.erb
-          omnibus-name/resources/name/deb/md5sums.erb
-        })
+        expect(structure).to include("omnibus-name/resources/name/deb/conffiles.erb", "omnibus-name/resources/name/deb/control.erb", "omnibus-name/resources/name/deb/md5sums.erb")
       end
     end
 
@@ -73,10 +67,7 @@ module Omnibus
       it "generates the proper file structure" do
         Generator.new(["name"], path: tmp_path, dmg_assets: true).invoke_all
 
-        expect(structure).to include(*%w{
-          omnibus-name/resources/name/dmg/background.png
-          omnibus-name/resources/name/dmg/icon.png
-        })
+        expect(structure).to include("omnibus-name/resources/name/dmg/background.png", "omnibus-name/resources/name/dmg/icon.png")
       end
     end
 
@@ -84,17 +75,7 @@ module Omnibus
       it "generates the proper file structure" do
         Generator.new(["name"], path: tmp_path, msi_assets: true).invoke_all
 
-        expect(structure).to include(*%w{
-          omnibus-name/resources/name/msi/assets/LICENSE.rtf
-          omnibus-name/resources/name/msi/assets/banner_background.bmp
-          omnibus-name/resources/name/msi/assets/dialog_background.bmp
-          omnibus-name/resources/name/msi/assets/project.ico
-          omnibus-name/resources/name/msi/assets/project_16x16.ico
-          omnibus-name/resources/name/msi/assets/project_32x32.ico
-          omnibus-name/resources/name/msi/localization-en-us.wxl.erb
-          omnibus-name/resources/name/msi/parameters.wxi.erb
-          omnibus-name/resources/name/msi/source.wxs.erb
-        })
+        expect(structure).to include("omnibus-name/resources/name/msi/assets/LICENSE.rtf", "omnibus-name/resources/name/msi/assets/banner_background.bmp", "omnibus-name/resources/name/msi/assets/dialog_background.bmp", "omnibus-name/resources/name/msi/assets/project.ico", "omnibus-name/resources/name/msi/assets/project_16x16.ico", "omnibus-name/resources/name/msi/assets/project_32x32.ico", "omnibus-name/resources/name/msi/localization-en-us.wxl.erb", "omnibus-name/resources/name/msi/parameters.wxi.erb", "omnibus-name/resources/name/msi/source.wxs.erb")
       end
     end
 
@@ -102,12 +83,7 @@ module Omnibus
       it "generates the proper file structure" do
         Generator.new(["name"], path: tmp_path, pkg_assets: true).invoke_all
 
-        expect(structure).to include(*%w{
-          omnibus-name/resources/name/pkg/background.png
-          omnibus-name/resources/name/pkg/license.html.erb
-          omnibus-name/resources/name/pkg/welcome.html.erb
-          omnibus-name/resources/name/pkg/distribution.xml.erb
-        })
+        expect(structure).to include("omnibus-name/resources/name/pkg/background.png", "omnibus-name/resources/name/pkg/license.html.erb", "omnibus-name/resources/name/pkg/welcome.html.erb", "omnibus-name/resources/name/pkg/distribution.xml.erb")
       end
     end
 
@@ -115,11 +91,7 @@ module Omnibus
       it "generates the proper file structure" do
         Generator.new(["name"], path: tmp_path, rpm_assets: true).invoke_all
 
-        expect(structure).to include(*%w{
-          omnibus-name/resources/name/rpm/rpmmacros.erb
-          omnibus-name/resources/name/rpm/signing.erb
-          omnibus-name/resources/name/rpm/spec.erb
-        })
+        expect(structure).to include("omnibus-name/resources/name/rpm/rpmmacros.erb", "omnibus-name/resources/name/rpm/signing.erb", "omnibus-name/resources/name/rpm/spec.erb")
       end
     end
   end

data/spec/unit/manifest_diff_spec.rb

@@ -3,11 +3,11 @@ require "spec_helper"
 module Omnibus
   describe ManifestDiff do
     def manifest_entry_for(name, dv, lv)
-      Omnibus::ManifestEntry.new(name, { :described_version => dv,
-                                         :locked_version => lv,
-                                         :locked_source => {
-                                     :git => "git://#{name}@example.com" },
-                                         :source_type => :git,
+      Omnibus::ManifestEntry.new(name, { described_version: dv,
+                                         locked_version: lv,
+                                         locked_source: {
+                                     git: "git://#{name}@example.com" },
+                                         source_type: :git,
                                  })
     end
 
@@ -31,30 +31,30 @@ module Omnibus
 
     describe "#updated" do
       it "returns items that existed in the first manifest but have been changed" do
-        expect(subject.updated).to eq([{ :name => "foo",
-                                         :old_version => "deadbeef",
-                                         :new_version => "deadbea0",
-                                         :source_type => :git,
-                                         :source => { :git => "git://foo@example.com" },
+        expect(subject.updated).to eq([{ name: "foo",
+                                         old_version: "deadbeef",
+                                         new_version: "deadbea0",
+                                         source_type: :git,
+                                         source: { git: "git://foo@example.com" },
                                        }])
       end
 
       describe "#removed" do
         it "returns items that existed in the first manfiest but don't exist in the second" do
-          expect(subject.removed).to eq([{ :name => "bar",
-                                           :old_version => "deadbeef",
-                                           :source_type => :git,
-                                           :source => { :git => "git://bar@example.com" },
+          expect(subject.removed).to eq([{ name: "bar",
+                                           old_version: "deadbeef",
+                                           source_type: :git,
+                                           source: { git: "git://bar@example.com" },
                                          }])
         end
       end
 
       describe "#added" do
         it "returns items that did not exist in the first manifest but do exist in the second" do
-          expect(subject.added).to eq([{ :name => "quux",
-                                         :new_version => "deadbeef",
-                                         :source_type => :git,
-                                         :source => { :git => "git://quux@example.com" },
+          expect(subject.added).to eq([{ name: "quux",
+                                         new_version: "deadbeef",
+                                         source_type: :git,
+                                         source: { git: "git://quux@example.com" },
                                        }])
         end
       end

data/spec/unit/metadata_spec.rb

@@ -42,20 +42,20 @@ module Omnibus
 
     let(:data) { { foo: "bar" } }
     let(:license_file_content) do
-      <<-EOH
-some_project 1.2.3 license: "Apache-2.0"
+      <<~EOH
+        some_project 1.2.3 license: "Apache-2.0"
 
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+                                      Apache License
+                                Version 2.0, January 2004
+                             http://www.apache.org/licenses/
+        TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-1. Definitions.
+        1. Definitions.
 
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
+           "License" shall mean the terms and conditions for use, reproduction,
+           and distribution as defined by Sections 1 through 9 of this document.
 
-...
+        ...
       EOH
     end
 
@@ -219,9 +219,7 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
       it_behaves_like "a version manipulator", "fedora", "11.5", "11"
       it_behaves_like "a version manipulator", "freebsd", "10.0", "10"
       it_behaves_like "a version manipulator", "gentoo", "4.9.95-gentoo", "rolling"
-      it_behaves_like "a version manipulator", "ios_xr", "6.0.0.14I", "6"
       it_behaves_like "a version manipulator", "mac_os_x", "10.9.1", "10.9"
-      it_behaves_like "a version manipulator", "nexus", "5.0", "5"
       it_behaves_like "a version manipulator", "omnios", "r151010", "r151010"
       it_behaves_like "a version manipulator", "openbsd", "5.4.4", "5.4"
       it_behaves_like "a version manipulator", "opensuseleap", "42.3", "42.3"
@@ -295,13 +293,6 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
         expect(instance[:platform]).to eq("ubuntu")
       end
 
-      it "ensures platform version is properly truncated" do
-        allow(File).to receive(:read).and_return('{ "platform": "el", "platform_version": "5.10" }')
-        instance = described_class.for_package(package)
-
-        expect(instance[:platform_version]).to eq("5")
-      end
-
       it "correctly truncates sles platform versions" do
         allow(File).to receive(:read).and_return('{ "platform": "sles", "platform_version": "11.2" }')
         instance = described_class.for_package(package)