omnibus 5.6.8 → 6.0.1

data/lib/omnibus/packagers/base.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/packagers/bff.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/packagers/deb.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/packagers/ips.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2016 Chef Software, Inc.
+# Copyright 2016-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/packagers/makeself.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/packagers/msi.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/packagers/pkg.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/packagers/pkgsrc.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2016 Chef Software, Inc.
+# Copyright 2016-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/packagers/rpm.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/packagers/solaris.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/packagers/windows_base.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2016 Chef Software, Inc.
+# Copyright 2016-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/project.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2014 Chef Software, Inc.
+# Copyright 2012-2018 Chef Software, Inc.
 # Copyright 2014 Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -794,7 +794,7 @@ module Omnibus
     #
     def text_manifest_path(path = NULL)
       if null?(path)
-        @test_manifest_path || File.join(install_dir, "version-manifest.txt")
+        @text_manifest_path || File.join(install_dir, "version-manifest.txt")
       else
         @text_manifest_path = path
       end

data/lib/omnibus/publisher.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/publishers/artifactory_publisher.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/publishers/null_publisher.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/publishers/s3_publisher.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2014 Chef Software, Inc.
+# Copyright 2012-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/reports.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2014 Chef Software, Inc.
+# Copyright 2012-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/s3_cache.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2014 Chef Software, Inc.
+# Copyright 2012-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/s3_helpers.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015 Chef Software, Inc.
+# Copyright 2015-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/semantic_version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015 Chef Software, Inc.
+# Copyright 2015-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/software.rb

@@ -292,7 +292,7 @@ module Omnibus
         val = canonicalize_source(val)
 
         extra_keys = val.keys - [
-          :git, :path, :url, # fetcher types
+          :git, :file, :path, :url, # fetcher types
           :md5, :sha1, :sha256, :sha512, # hash type - common to all fetchers
           :cookie, :warning, :unsafe, :extract, # used by net_fetcher
           :options, # used by path_fetcher
@@ -303,7 +303,7 @@ module Omnibus
             "only include valid keys. Invalid keys: #{extra_keys.inspect}")
         end
 
-        duplicate_keys = val.keys & [:git, :path, :url]
+        duplicate_keys = val.keys & [:git, :file, :path, :url]
         unless duplicate_keys.size < 2
           raise InvalidValue.new(:source,
             "not include duplicate keys. Duplicate keys: #{duplicate_keys.inspect}")
@@ -688,21 +688,12 @@ module Omnibus
           end
           solaris_flags
         when "freebsd"
-          freebsd_flags = {
+          {
+            "CC" => "clang",
+            "CXX" => "clang++",
             "LDFLAGS" => "-L#{install_dir}/embedded/lib",
             "CFLAGS" => "-I#{install_dir}/embedded/include -O2",
           }
-          # Enable gcc version 4.9 if it is available
-          if (Ohai["os_version"].to_i <= 903000) && which("gcc49")
-            freebsd_flags["CC"] = "gcc49"
-            freebsd_flags["CXX"] = "g++49"
-          end
-          # Clang became the default compiler in FreeBSD 10+
-          if Ohai["os_version"].to_i >= 1000024
-            freebsd_flags["CC"] = "clang"
-            freebsd_flags["CXX"] = "clang++"
-          end
-          freebsd_flags
         when "suse"
           suse_flags = {
             "LDFLAGS" => "-Wl,-rpath,#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib",
@@ -1053,6 +1044,8 @@ module Omnibus
           :url
         elsif source[:git]
           :git
+        elsif source[:file]
+          :file
         elsif source[:path]
           :path
         end

data/lib/omnibus/sugarable.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/templating.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/thread_pool.rb

@@ -1,6 +1,6 @@
 #
 # Copyright 2014 Mike Heijmans
-# Copyright 2014 Chef Software, Inc.
+# Copyright 2014-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/omnibus/version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2014 Chef Software, Inc.
+# Copyright 2012-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = "5.6.8"
+  VERSION = "6.0.1"
 end

data/lib/omnibus/whitelist.rb

@@ -1,5 +1,5 @@
 
-# Copyright 2012-2014 Chef Software, Inc.
+# Copyright 2012-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/omnibus.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.description    = gem.summary
   gem.homepage       = "https://github.com/chef/omnibus"
 
-  gem.required_ruby_version = ">= 2.2"
+  gem.required_ruby_version = ">= 2.4"
 
   gem.files = %w{ LICENSE README.md Rakefile Gemfile } + Dir.glob("*.gemspec") + Dir.glob("{bin,lib,resources,spec}/**/*")
   gem.bindir = "bin"
@@ -22,11 +22,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "aws-sdk",          "~> 2"
-  gem.add_dependency "chef-sugar",       "~> 3.3"
+  gem.add_dependency "chef-sugar",       ">= 3.3"
   gem.add_dependency "cleanroom",        "~> 1.0"
   gem.add_dependency "ffi-yajl",         "~> 2.2"
   gem.add_dependency "mixlib-shellout",  "~> 2.0"
-  gem.add_dependency "ohai",             "~> 8.0"
+  gem.add_dependency "ohai",             ">= 13", "< 15"
   gem.add_dependency "ruby-progressbar", "~> 1.7"
   gem.add_dependency "thor",             "~> 0.18"
   gem.add_dependency "license_scout",    "~> 1.0"
@@ -37,13 +37,12 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "artifactory", "~> 2.0"
   gem.add_development_dependency "aruba",       "~> 0.5"
-  gem.add_development_dependency "chefstyle"
-  gem.add_development_dependency "fauxhai",     "~> 5.2"
+  gem.add_development_dependency "chefstyle",   "= 0.6"
+  gem.add_development_dependency "fauxhai",     ">= 5.2"
   gem.add_development_dependency "rspec",       "~> 3.0"
   gem.add_development_dependency "rspec-json_expectations"
   gem.add_development_dependency "rspec-its"
   gem.add_development_dependency "webmock"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "appbundler"
-  gem.add_development_dependency "pry"
 end

data/spec/unit/compressors/dmg_spec.rb

@@ -253,11 +253,11 @@ module Omnibus
     end
 
     describe "#package_name" do
-      it 'reflects the packager\'s unmodified package_name' do
+      it "reflects the packager's unmodified package_name" do
         expect(subject.package_name).to eq("project-1.2.3-2.dmg")
       end
 
-      it 'reflects the packager\'s modified package_name' do
+      it "reflects the packager's modified package_name" do
         package_basename = "projectsub-1.2.3-3"
         allow(project.packagers_for_system[0]).to receive(:package_name)
           .and_return("#{package_basename}.pkg")

data/spec/unit/metadata_spec.rb

@@ -210,6 +210,7 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
       end
 
       it_behaves_like "a version manipulator", "aix", "7.1", "7.1"
+      it_behaves_like "a version manipulator", "amazon", "2018.03", "2018.03"
       it_behaves_like "a version manipulator", "arch", "rolling", "rolling"
       it_behaves_like "a version manipulator", "centos", "5.9.6", "5"
       it_behaves_like "a version manipulator", "debian", "7.1", "7"
@@ -217,12 +218,13 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
       it_behaves_like "a version manipulator", "el", "6.5", "6"
       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", "2004.3", "2004.3"
+      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"
       it_behaves_like "a version manipulator", "opensuse", "5.9", "5.9"
       it_behaves_like "a version manipulator", "pidora", "11.5", "11"
       it_behaves_like "a version manipulator", "raspbian", "7.1", "7"

data/spec/unit/packager_spec.rb

@@ -4,7 +4,7 @@ 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.12") }
+        before { stub_ohai(platform: "mac_os_x", version: "10.13") }
         it "prefers PKG" do
           expect(described_class.for_current_system).to eq([Packager::PKG])
         end
@@ -46,21 +46,21 @@ module Omnibus
       end
 
       context "on Fedora" do
-        before { stub_ohai(platform: "fedora", version: "25") }
+        before { stub_ohai(platform: "fedora", version: "28") }
         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: "8.8") }
+        before { stub_ohai(platform: "debian", version: "8.11") }
         it "prefers RPM" do
           expect(described_class.for_current_system).to eq([Packager::DEB])
         end
       end
 
       context "on SLES" do
-        before { stub_ohai(platform: "suse", version: "12.2") }
+        before { stub_ohai(platform: "suse", version: "12.3") }
         it "prefers RPM" do
           expect(described_class.for_current_system).to eq([Packager::RPM])
         end

data/spec/unit/packagers/bff_spec.rb

@@ -167,13 +167,13 @@ module Omnibus
         end
 
         context "creates a config script" do
-          it 'when there wasn\'t one provided' do
+          it "when there wasn't one provided" do
             FileUtils.rm_f("#{subject.scripts_staging_dir}/config")
             subject.write_gen_template
             expect(File).to exist("#{subject.scripts_staging_dir}/config")
           end
 
-          it 'when one is provided in the project\'s def' do
+          it "when one is provided in the project's def" do
             create_file("#{project_root}/package-scripts/project/config")
             subject.write_gen_template
             contents = File.read("#{subject.scripts_staging_dir}/config")

data/spec/unit/packagers/rpm_spec.rb

@@ -557,9 +557,9 @@ module Omnibus
       context "on Pidora" do
         before do
           # There's no Pidora in Fauxhai :(
-          stub_ohai(platform: "fedora", version: "25") do |data|
+          stub_ohai(platform: "fedora", version: "27") do |data|
             data["platform"] = "pidora"
-            data["platform_version"] = "25"
+            data["platform_version"] = "27"
             data["kernel"]["machine"] = "armv6l"
           end
         end

data/spec/unit/project_spec.rb

@@ -214,14 +214,14 @@ module Omnibus
       end
 
       context "when on Debian" do
-        let(:fauxhai_options) { { platform: "debian", version: "8.8" } }
+        let(:fauxhai_options) { { platform: "debian", version: "8.11" } }
         it "returns a Debian iteration" do
           expect(subject.build_iteration).to eq(1)
         end
       end
 
       context "when on FreeBSD" do
-        let(:fauxhai_options) { { platform: "freebsd", version: "9.3" } }
+        let(:fauxhai_options) { { platform: "freebsd", version: "10.4" } }
         it "returns a FreeBSD iteration" do
           expect(subject.build_iteration).to eq(1)
         end
@@ -236,7 +236,7 @@ module Omnibus
       end
 
       context "when on OS X" do
-        let(:fauxhai_options) { { platform: "mac_os_x", version: "10.12" } }
+        let(:fauxhai_options) { { platform: "mac_os_x", version: "10.13" } }
         it "returns a generic iteration" do
           expect(subject.build_iteration).to eq(1)
         end

data/spec/unit/publisher_spec.rb

@@ -111,7 +111,7 @@ module Omnibus
                 },
                 ohai: {
                   locked_source: {
-                    git: "https://github.com/opscode/ohai.git",
+                    git: "https://github.com/chef/ohai.git",
                   },
                   locked_version: "fec0959aa5da5ce7ba0e07740dbc08546a8f53f0",
                   source_type: "git",

data/spec/unit/publishers/artifactory_publisher_spec.rb

@@ -68,7 +68,7 @@ module Omnibus
             },
             ohai: {
               locked_source: {
-                git: "https://github.com/opscode/ohai.git",
+                git: "https://github.com/chef/ohai.git",
               },
               locked_version: "fec0959aa5da5ce7ba0e07740dbc08546a8f53f0",
               source_type: "git",