omnibus 6.1.7 → 6.1.9

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = "6.1.7".freeze
+  VERSION = "6.1.9".freeze
 end

data/omnibus.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.files = %w{ LICENSE README.md Rakefile Gemfile } + Dir.glob("*.gemspec") + Dir.glob("{bin,lib,resources,spec}/**/{*,.kitchen*}")
   gem.bindir = "bin"
   gem.executables = %w{omnibus}
-  gem.test_files = gem.files.grep(/^(test|spec|features)\//)
+  gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
   gem.add_dependency "aws-sdk-s3",       "~> 1"
@@ -36,7 +36,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "artifactory", "~> 3.0"
   gem.add_development_dependency "aruba",       "~> 0.5"
-  gem.add_development_dependency "chefstyle",   "= 0.12"
+  gem.add_development_dependency "chefstyle",   "= 0.13.3"
   gem.add_development_dependency "fauxhai",     ">= 5.2"
   gem.add_development_dependency "rspec",       "~> 3.0"
   gem.add_development_dependency "rspec-json_expectations"

data/spec/functional/builder_spec.rb

@@ -22,6 +22,7 @@ module Omnibus
         ext = name == "ruby" ? ".exe" : ".bat"
         source = Bundler.which(name + ext)
         raise "Could not find #{name} in bundler environment" unless source
+
         File.open(File.join(embedded_bin_dir, name + ".bat"), "w") do |f|
           f.write <<-EOH.gsub(/^ {12}/, "")
             @"#{source}" %*
@@ -221,7 +222,7 @@ module Omnibus
         output = capture_logging { subject.build }
 
         appbundler_path = File.join(embedded_bin_dir, "appbundler")
-        appbundler_path.gsub!(/\//, '\\') if windows?
+        appbundler_path.gsub!(%r{/}, '\\') if windows?
         expect(output).to include("#{appbundler_path} '#{project_dir}' '#{bin_dir}'")
       end
     end

data/spec/functional/fetchers/file_fetcher_spec.rb

@@ -13,10 +13,10 @@ module Omnibus
 
     let(:manifest_entry) do
       double(Omnibus::ManifestEntry,
-             name: "pathelogical",
-             locked_version: nil,
-             described_version: nil,
-             locked_source: source)
+        name: "pathelogical",
+        locked_version: nil,
+        described_version: nil,
+        locked_source: source)
     end
 
     subject { described_class.new(manifest_entry, project_dir, build_dir) }

data/spec/functional/fetchers/git_fetcher_spec.rb

@@ -110,10 +110,10 @@ module Omnibus
       let(:remote)   { remote_git_repo("zlib", annotated_tags: [version]) }
       let(:manifest_entry) do
         double(ManifestEntry,
-               name: "software",
-               locked_version: "efde208366abd0f91419d8a54b45e3f6e0540105",
-               described_version: version,
-               locked_source: source)
+          name: "software",
+          locked_version: "efde208366abd0f91419d8a54b45e3f6e0540105",
+          described_version: version,
+          locked_source: source)
       end
 
       subject { described_class.new(manifest_entry, project_dir, build_dir) }

data/spec/functional/fetchers/net_fetcher_spec.rb

@@ -4,8 +4,7 @@ module Omnibus
   module RSpec
     module OhaiHelpers
       # Turn off the mandatory Ohai helper.
-      def stub_ohai(options = {}, &block)
-      end
+      def stub_ohai(options = {}, &block); end
     end
   end
 
@@ -29,10 +28,10 @@ module Omnibus
 
     let(:manifest_entry) do
       double(ManifestEntry,
-             name: "software",
-             locked_version: "1.2.8",
-             described_version: "1.2.8",
-             locked_source: source)
+        name: "software",
+        locked_version: "1.2.8",
+        described_version: "1.2.8",
+        locked_source: source)
     end
 
     subject { described_class.new(manifest_entry, project_dir, build_dir) }

data/spec/functional/fetchers/path_fetcher_spec.rb

@@ -12,10 +12,10 @@ module Omnibus
 
     let(:manifest_entry) do
       double(Omnibus::ManifestEntry,
-             name: "pathelogical",
-             locked_version: nil,
-             described_version: nil,
-             locked_source: source)
+        name: "pathelogical",
+        locked_version: nil,
+        described_version: nil,
+        locked_source: source)
     end
 
     before do

data/spec/functional/licensing_spec.rb

@@ -37,14 +37,14 @@ module Omnibus
         expect(project_license).to match /This product bundles private_code 1.7.2,\nwhich is available under a "Unspecified"/
         expect(project_license).to match /This product bundles snoopy 1.0.0,\nwhich is available under a "GPL v2"/
         expect(project_license).not_to match /preparation/
-        expect(project_license).to match /LICENSES\/snoopy-artistic.html/
-        expect(project_license).to match /LICENSES\/snoopy-NOTICE/
+        expect(project_license).to match %r{LICENSES/snoopy-artistic.html}
+        expect(project_license).to match %r{LICENSES/snoopy-NOTICE}
         if zlib_version_override
           expect(project_license).to match /This product bundles zlib 1.8.0,\nwhich is available under a "Apache-2.0"/
-          expect(project_license).to match /LICENSES\/zlib-APACHE/
+          expect(project_license).to match %r{LICENSES/zlib-APACHE}
         else
           expect(project_license).to match /This product bundles zlib 1.7.2,\nwhich is available under a "Zlib"/
-          expect(project_license).to match /LICENSES\/zlib-LICENSE/
+          expect(project_license).to match %r{LICENSES/zlib-LICENSE}
         end
       end
 
@@ -263,7 +263,7 @@ module Omnibus
       it "should log a warning for the missing file" do
         output = capture_logging { create_licenses }
         expect(output).to match(/Retrying failed download/)
-        expect(output).to match(/Can not download license file 'https:\/\/downloads.chef.io\/LICENSE' for software 'problematic'./)
+        expect(output).to match(%r{Can not download license file 'https://downloads.chef.io/LICENSE' for software 'problematic'.})
       end
     end
 

data/spec/support/examples.rb

@@ -27,8 +27,7 @@ RSpec.shared_examples "a software" do |name = "chefdk"|
       install_dir: install_dir,
       project_dir: project_dir,
       source:      source,
-      overridden?: false
-    )
+      overridden?: false)
   end
 
   before do
@@ -56,12 +55,12 @@ RSpec.shared_examples "a software" do |name = "chefdk"|
     FileUtils.mkdir_p(embedded_bin_dir)
 
     allow(software).to receive(:with_embedded_path).and_return(
-      "PATH" => "#{bin_dir}:#{embedded_bin_dir}:#{ENV['PATH']}"
+      "PATH" => "#{bin_dir}:#{embedded_bin_dir}:#{ENV["PATH"]}"
     )
 
     allow(software).to receive(:embedded_bin) do |binary|
       p = File.join(embedded_bin_dir, binary)
-      p.gsub!(/\//, '\\') if windows?
+      p.gsub!(%r{/}, '\\') if windows?
       p
     end
   end

data/spec/unit/builder_spec.rb

@@ -6,8 +6,7 @@ module Omnibus
       double(Software,
         name: "chefdk",
         install_dir: project_dir,
-        project_dir: project_dir
-      )
+        project_dir: project_dir)
     end
 
     let(:project_dir) { on_windows ? "C:/opscode/chefdk" : "/opt/chefdk" }
@@ -238,7 +237,7 @@ module Omnibus
         it "appends platform host to the options" do
           expect(subject).to receive(:command)
             .with("./configure --build=x86_64-w64-mingw32 --prefix=#{project_dir}/embedded", in_msys_bash: true)
-          subject.configure()
+          subject.configure
         end
       end
 
@@ -254,7 +253,7 @@ module Omnibus
         it "appends platform host to the options" do
           expect(subject).to receive(:command)
             .with("./configure --build=i686-w64-mingw32 --prefix=#{project_dir}/embedded", in_msys_bash: true)
-          subject.configure()
+          subject.configure
         end
       end
 
@@ -305,7 +304,8 @@ module Omnibus
           .with("config/patches", "good_patch")
           .and_return(
             [ ["#{project_dir}/patch_location1/good_patch", "#{project_dir}/patch_location2/good_patch"],
-              "#{project_dir}/patch_location2/good_patch" ])
+              "#{project_dir}/patch_location2/good_patch" ]
+          )
       end
 
       it "is a DSL method" do
@@ -355,10 +355,10 @@ module Omnibus
 
       let(:software) do
         double(Software,
-               name: "chefdk",
-               install_dir: tmp_dir,
-               project_dir: tmp_dir,
-               overridden?: false)
+          name: "chefdk",
+          install_dir: tmp_dir,
+          project_dir: tmp_dir,
+          overridden?: false)
       end
 
       let(:before_build_shasum) do

data/spec/unit/changelogprinter_spec.rb

@@ -16,16 +16,18 @@ module Omnibus
 
       let(:changelog) do
         double(ChangeLog,
-                               changelog_entries: %w{entry1 entry2},
-                               authors: %w{alice bob}) end
+          changelog_entries: %w{entry1 entry2},
+          authors: %w{alice bob})
+      end
       let(:git_changelog) do
         double(ChangeLog,
-                                   changelog_entries:
-                                   %w{sub-entry1 sub-entry2}) end
+          changelog_entries:
+          %w{sub-entry1 sub-entry2})
+      end
       let(:now) { double(Time) }
       let(:emptydiff) { EmptyManifestDiff.new }
       let(:old_manifest) do
-        m = Manifest.new()
+        m = Manifest.new
         m.add("updated-comp", manifest_entry_for("updated-comp", "v9", "v9"))
         m.add("updated-comp-2", manifest_entry_for("updated-comp-2", "someref0", "someref0", :git))
         m.add("removed-comp", manifest_entry_for("removed-comp", "v9", "v9"))
@@ -33,7 +35,7 @@ module Omnibus
         m
       end
       let(:new_manifest) do
-        m = Manifest.new()
+        m = Manifest.new
         m.add("updated-comp", manifest_entry_for("updated-comp", "v10", "v10"))
         m.add("updated-comp-2", manifest_entry_for("updated-comp-2", "someotherref", "someotherref", :git))
         m.add("added-comp", manifest_entry_for("added-comp", "v100", "v100"))

data/spec/unit/compressor_spec.rb

@@ -8,13 +8,13 @@ module Omnibus
 
         context "when :dmg is activated" do
           it "prefers dmg" do
-            expect(described_class.for_current_system([:tgz, :dmg])).to eq(Compressor::DMG)
+            expect(described_class.for_current_system(%i{tgz dmg})).to eq(Compressor::DMG)
           end
         end
 
         context "when :dmg is not activated" do
           it "prefers tgz" do
-            expect(described_class.for_current_system([:tgz, :foo])).to eq(Compressor::TGZ)
+            expect(described_class.for_current_system(%i{tgz foo})).to eq(Compressor::TGZ)
           end
         end
 
@@ -30,7 +30,7 @@ module Omnibus
 
         context "when :tgz activated" do
           it "prefers tgz" do
-            expect(described_class.for_current_system([:tgz, :foo])).to eq(Compressor::TGZ)
+            expect(described_class.for_current_system(%i{tgz foo})).to eq(Compressor::TGZ)
           end
         end
 

data/spec/unit/fetchers/net_fetcher_spec.rb

@@ -11,10 +11,10 @@ module Omnibus
 
     let(:manifest_entry) do
       double(Omnibus::ManifestEntry,
-             name: "file",
-             locked_version: "1.2.3",
-             described_version: "1.2.3",
-             locked_source: source)
+        name: "file",
+        locked_version: "1.2.3",
+        described_version: "1.2.3",
+        locked_source: source)
     end
 
     let(:cache_dir) { "/cache" }
@@ -331,11 +331,10 @@ module Omnibus
       context "when the file is a .#{extension}" do
         let(:manifest_entry) do
           double(Omnibus::ManifestEntry,
-                 name: "file",
-                 locked_version: "1.2.3",
-                 described_version: "1.2.3",
-                 locked_source: { url: "https://get.example.com/file.#{extension}", md5: "abcd1234" }.merge(source_options)
-                )
+            name: "file",
+            locked_version: "1.2.3",
+            described_version: "1.2.3",
+            locked_source: { url: "https://get.example.com/file.#{extension}", md5: "abcd1234" }.merge(source_options))
         end
 
         subject { described_class.new(manifest_entry, project_dir, build_dir) }
@@ -361,10 +360,10 @@ module Omnibus
       context "when the downloaded file is a folder" do
         let(:manifest_entry) do
           double(Omnibus::ManifestEntry,
-                 name: "file",
-                 locked_version: "1.2.3",
-                 described_version: "1.2.3",
-                 locked_source: { url: "https://get.example.com/folder", md5: "abcd1234" })
+            name: "file",
+            locked_version: "1.2.3",
+            described_version: "1.2.3",
+            locked_source: { url: "https://get.example.com/folder", md5: "abcd1234" })
         end
 
         subject { described_class.new(manifest_entry, project_dir, build_dir) }
@@ -382,10 +381,10 @@ module Omnibus
       context "when the downloaded file is a regular file" do
         let(:manifest_entry) do
           double(Omnibus::ManifestEntry,
-                 name: "file",
-                 locked_version: "1.2.3",
-                 described_version: "1.2.3",
-                 locked_source: { url: "https://get.example.com/file", md5: "abcd1234" })
+            name: "file",
+            locked_version: "1.2.3",
+            described_version: "1.2.3",
+            locked_source: { url: "https://get.example.com/file", md5: "abcd1234" })
         end
 
         subject { described_class.new(manifest_entry, project_dir, build_dir) }

data/spec/unit/health_check_spec.rb

@@ -8,9 +8,7 @@ module Omnibus
         name: "chefdk",
         install_dir: "/opt/chefdk",
         library: double(Library,
-          components: []
-        )
-      )
+          components: []))
     end
 
     def mkdump(base, size, x64 = false)
@@ -19,9 +17,7 @@ module Omnibus
         x64?: x64,
         ioh: double(x64 ? PEdump::IMAGE_OPTIONAL_HEADER64 : PEdump::IMAGE_OPTIONAL_HEADER32,
           ImageBase: base,
-          SizeOfImage: size
-        )
-      )
+          SizeOfImage: size))
       expect(dump).to receive(:pe).and_return(pe)
       dump
     end

data/spec/unit/library_spec.rb

@@ -125,7 +125,8 @@ module Omnibus
               erchef, # project dep
               chef, # project dep
               chefdk, # project dep
-           ])
+           ]
+          )
         end
       end
     end

data/spec/unit/manifest_diff_spec.rb

@@ -12,7 +12,7 @@ module Omnibus
     end
 
     let(:manifest_one) do
-      m = Omnibus::Manifest.new()
+      m = Omnibus::Manifest.new
       m.add("foo", manifest_entry_for("foo", "1.2.4", "deadbeef"))
       m.add("bar", manifest_entry_for("bar", "1.2.4", "deadbeef"))
       m.add("baz", manifest_entry_for("baz", "1.2.4", "deadbeef"))
@@ -20,7 +20,7 @@ module Omnibus
     end
 
     let(:manifest_two) do
-      m = Omnibus::Manifest.new()
+      m = Omnibus::Manifest.new
       m.add("foo", manifest_entry_for("foo", "1.2.5", "deadbea0"))
       m.add("baz", manifest_entry_for("baz", "1.2.4", "deadbeef"))
       m.add("quux", manifest_entry_for("quux", "1.2.4", "deadbeef"))

data/spec/unit/manifest_spec.rb

@@ -45,7 +45,7 @@ module Omnibus
         second = ManifestEntry.new("wombat", {})
         subject.add("foobar", first)
         subject.add("wombat", second)
-        expect(subject.entry_names).to eq([:foobar, :wombat])
+        expect(subject.entry_names).to eq(%i{foobar wombat})
       end
     end
 

data/spec/unit/metadata_spec.rb

@@ -16,8 +16,7 @@ module Omnibus
         md5:    "abc123",
         sha1:   "abc123",
         sha256: "abcd1234",
-        sha512: "abcdef123456"
-      )
+        sha512: "abcdef123456")
     end
 
     let(:project) do
@@ -29,15 +28,13 @@ module Omnibus
         build_iteration:  "1",
         license:          "Apache-2.0",
         built_manifest:    double(Manifest,
-                                  to_hash: {
-                                    manifest_format: 2,
-                                    build_version: "1.2.3",
-                                    build_git_revision: "SHA",
-                                    license: "Apache-2.0",
-                                  }
-                                ),
-        license_file_path: license_path
-      )
+          to_hash: {
+            manifest_format: 2,
+            build_version: "1.2.3",
+            build_git_revision: "SHA",
+            license: "Apache-2.0",
+          }),
+        license_file_path: license_path)
     end
 
     let(:data) { { foo: "bar" } }

data/spec/unit/omnibus_spec.rb

@@ -15,7 +15,7 @@ describe Omnibus do
 
     Omnibus::Config.project_root(File.join(tmp_path, "/foo/bar"))
     Omnibus::Config.local_software_dirs([File.join(tmp_path, "/local"), File.join(tmp_path, "/other")])
-    Omnibus::Config.software_gems(["omnibus-software", "custom-omnibus-software"])
+    Omnibus::Config.software_gems(%w{omnibus-software custom-omnibus-software})
   end
 
   describe "#which" do

data/spec/unit/packagers/bff_spec.rb

@@ -301,7 +301,7 @@ module Omnibus
         # A note - the /opt/ here is essentially project.install_dir one level up.
         # There is nothing magical about 'opt' as a directory.
         expect(subject).to receive(:shellout!)
-          .with(/chown -Rh 0:0 #{staging_dir}\/opt$/)
+          .with(%r{chown -Rh 0:0 #{staging_dir}/opt$})
         subject.create_bff_file
       end
 
@@ -312,7 +312,7 @@ module Omnibus
 
       it "uses the correct command" do
         expect(subject).to receive(:shellout!)
-          .with(/\/usr\/sbin\/mkinstallp -d/)
+          .with(%r{/usr/sbin/mkinstallp -d})
         subject.create_bff_file
       end