omnibus 5.6.1 → 5.6.6

data/spec/unit/packagers/rpm_spec.rb

@@ -35,7 +35,7 @@ module Omnibus
       create_directory("#{staging_dir}/SOURCES")
       create_directory("#{staging_dir}/SPECS")
 
-      stub_ohai(platform: "redhat", version: "6.5") do |data|
+      stub_ohai(platform: "redhat", version: "6.9") do |data|
         data["kernel"]["machine"] = architecture
       end
     end
@@ -533,7 +533,7 @@ module Omnibus
 
     describe "#safe_architecture" do
       before do
-        stub_ohai(platform: "redhat", version: "6.5") do |data|
+        stub_ohai(platform: "redhat", version: "6.9") do |data|
           data["kernel"]["machine"] = "i386"
         end
       end
@@ -544,7 +544,7 @@ module Omnibus
 
       context "when i686" do
         before do
-          stub_ohai(platform: "redhat", version: "6.5") do |data|
+          stub_ohai(platform: "redhat", version: "6.9") do |data|
             data["kernel"]["machine"] = "i686"
           end
         end
@@ -557,9 +557,9 @@ module Omnibus
       context "on Pidora" do
         before do
           # There's no Pidora in Fauxhai :(
-          stub_ohai(platform: "fedora", version: "20") do |data|
+          stub_ohai(platform: "fedora", version: "25") do |data|
             data["platform"] = "pidora"
-            data["platform_version"] = "20"
+            data["platform_version"] = "25"
             data["kernel"]["machine"] = "armv6l"
           end
         end

data/spec/unit/project_spec.rb

@@ -110,7 +110,7 @@ module Omnibus
 
     describe "#default_root" do
       context "on Windows" do
-        before { stub_ohai(platform: "windows", version: "2012") }
+        before { stub_ohai(platform: "windows", version: "2012R2") }
 
         it "returns C:/" do
           expect(subject.default_root).to eq("C:")
@@ -118,7 +118,7 @@ module Omnibus
       end
 
       context "on non-Windows" do
-        before { stub_ohai(platform: "ubuntu", version: "12.04") }
+        before { stub_ohai(platform: "ubuntu", version: "16.04") }
 
         it "returns /opt" do
           expect(subject.default_root).to eq("/opt")
@@ -207,21 +207,21 @@ module Omnibus
       before { stub_ohai(fauxhai_options) }
 
       context "when on RHEL" do
-        let(:fauxhai_options) { { platform: "redhat", version: "6.4" } }
+        let(:fauxhai_options) { { platform: "redhat", version: "6.9" } }
         it "returns a RHEL iteration" do
           expect(subject.build_iteration).to eq(1)
         end
       end
 
       context "when on Debian" do
-        let(:fauxhai_options) { { platform: "debian", version: "7.2" } }
+        let(:fauxhai_options) { { platform: "debian", version: "8.8" } }
         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.1" } }
+        let(:fauxhai_options) { { platform: "freebsd", version: "9.3" } }
         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.8.2" } }
+        let(:fauxhai_options) { { platform: "mac_os_x", version: "10.12" } }
         it "returns a generic iteration" do
           expect(subject.build_iteration).to eq(1)
         end
@@ -266,7 +266,7 @@ module Omnibus
     end
 
     describe "#ohai" do
-      before { stub_ohai(platform: "ubuntu", version: "12.04") }
+      before { stub_ohai(platform: "ubuntu", version: "16.04") }
 
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:ohai)

data/spec/unit/publishers/artifactory_publisher_spec.rb

@@ -248,6 +248,22 @@ module Omnibus
           subject.publish
         end
       end
+
+      context "custom artifactory_publish_pattern is set" do
+        before do
+          Config.artifactory_publish_pattern("%{platform}/%{platform_version}/%{arch}/%{basename}")
+        end
+
+        it "uploads the package to the provided path" do
+          expect(artifact).to receive(:upload).with(
+            repository,
+            "com/getchef/ubuntu/14.04/x86_64/chef.deb",
+            hash_including(metadata_json_properites)
+          ).once
+
+          subject.publish
+        end
+      end
     end
 
     describe "#metadata_properties_for" do

data/spec/unit/publishers/s3_publisher_spec.rb

@@ -100,6 +100,23 @@ module Omnibus
         end
       end
 
+      context "when the custom s3_publish_pattern is set" do
+        before do
+          Config.s3_publish_pattern("custom_prefix/%{name}/%{version}/%{platform}/%{platform_version}")
+        end
+
+        it "uploads the package to the provided path" do
+          expect(subject).to receive(:store_object).with(
+            "custom_prefix/chef/11.0.6/ubuntu/14.04/chef.deb.metadata.json",
+            FFI_Yajl::Encoder.encode(package.metadata.to_hash, pretty: true),
+            nil,
+            "private"
+          ).once
+
+          subject.publish
+        end
+      end
+
       context "when a block is given" do
         it "yields the package to the block" do
           block = ->(package) { package.do_something! }

data/spec/unit/software_spec.rb

@@ -68,7 +68,7 @@ module Omnibus
 
     describe "with_standard_compiler_flags helper" do
       context "on ubuntu" do
-        before { stub_ohai(platform: "ubuntu", version: "12.04") }
+        before { stub_ohai(platform: "ubuntu", version: "16.04") }
 
         it "sets the defaults" do
           expect(subject.with_standard_compiler_flags).to eq(
@@ -242,7 +242,7 @@ module Omnibus
       end
 
       context "on mac_os_x" do
-        before { stub_ohai(platform: "mac_os_x", version: "10.9.2") }
+        before { stub_ohai(platform: "mac_os_x", version: "10.12") }
 
         it "sets the defaults" do
           expect(subject.with_standard_compiler_flags).to eq(
@@ -285,7 +285,7 @@ module Omnibus
 
       context "on freebsd 9" do
         before do
-          stub_ohai(platform: "freebsd", version: "9.2")
+          stub_ohai(platform: "freebsd", version: "9.3")
         end
 
         it "sets the defaults" do
@@ -323,7 +323,7 @@ module Omnibus
 
       context "on freebsd 10" do
         before do
-          stub_ohai(platform: "freebsd", version: "10.0")
+          stub_ohai(platform: "freebsd", version: "10.3")
         end
 
         it "Clang as the default compiler" do
@@ -345,6 +345,7 @@ module Omnibus
         before do
           # sles identifies as suse
           stub_ohai(platform: "suse", version: "11.4")
+          allow(subject).to receive(:which).with("gcc-4.8").and_return(false)
         end
         it "sets the defaults" do
           expect(subject.with_standard_compiler_flags).to eq(
@@ -383,7 +384,8 @@ module Omnibus
       context "on sles 12" do
         before do
           # sles identifies as suse
-          stub_ohai(platform: "suse", version: "12.1")
+          stub_ohai(platform: "suse", version: "12.2")
+          allow(subject).to receive(:which).with("gcc-4.8").and_return(false)
         end
 
         it "sets the defaults" do
@@ -403,7 +405,7 @@ module Omnibus
         let(:win_arch_i386) { true }
 
         before do
-          stub_ohai(platform: "windows", version: "2012")
+          stub_ohai(platform: "windows", version: "2012R2")
           allow(subject).to receive(:windows_arch_i386?).and_return(win_arch_i386)
         end
 
@@ -485,7 +487,7 @@ module Omnibus
 
       context "on Windows" do
         before do
-          stub_ohai(platform: "windows", version: "2012")
+          stub_ohai(platform: "windows", version: "2012R2")
         end
 
         let(:separator) { ";" }
@@ -525,7 +527,7 @@ module Omnibus
     end
 
     describe "#ohai" do
-      before { stub_ohai(platform: "ubuntu", version: "12.04") }
+      before { stub_ohai(platform: "ubuntu", version: "16.04") }
 
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:ohai)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 5.6.1
+  version: 5.6.6
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -334,12 +334,15 @@ dependencies:
         version: '0'
 description: Omnibus is a framework for building self-installing, full-stack software
   builds.
-email: releng@getchef.com
+email: releng@chef.io
 executables:
 - omnibus
 extensions: []
 extra_rdoc_files: []
 files:
+- ".expeditor/config.yml"
+- ".expeditor/update_version.sh"
+- ".github/CODEOWNERS"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
@@ -351,6 +354,7 @@ files:
 - MAINTAINERS.md
 - README.md
 - Rakefile
+- VERSION
 - appveyor.yml
 - bin/omnibus
 - docs/Build Cache.md
@@ -393,6 +397,7 @@ files:
 - lib/omnibus/download_helpers.rb
 - lib/omnibus/exceptions.rb
 - lib/omnibus/fetcher.rb
+- lib/omnibus/fetchers/file_fetcher.rb
 - lib/omnibus/fetchers/git_fetcher.rb
 - lib/omnibus/fetchers/net_fetcher.rb
 - lib/omnibus/fetchers/null_fetcher.rb
@@ -500,6 +505,7 @@ files:
 - spec/fixtures/licensing/license_scout/zlib/zlib-dependency-licenses.json
 - spec/fixtures/sample/package-scripts/sample/postinstall
 - spec/functional/builder_spec.rb
+- spec/functional/fetchers/file_fetcher_spec.rb
 - spec/functional/fetchers/git_fetcher_spec.rb
 - spec/functional/fetchers/net_fetcher_spec.rb
 - spec/functional/fetchers/path_fetcher_spec.rb
@@ -531,6 +537,7 @@ files:
 - spec/unit/config_spec.rb
 - spec/unit/digestable_spec.rb
 - spec/unit/fetcher_spec.rb
+- spec/unit/fetchers/file_fetcher_spec.rb
 - spec/unit/fetchers/git_fetcher_spec.rb
 - spec/unit/fetchers/net_fetcher_spec.rb
 - spec/unit/fetchers/path_fetcher_spec.rb
@@ -568,7 +575,7 @@ files:
 - spec/unit/software_spec.rb
 - spec/unit/sugarable_spec.rb
 - spec/unit/util_spec.rb
-homepage: https://github.com/opscode/omnibus
+homepage: https://github.com/chef/omnibus
 licenses:
 - Apache 2.0
 metadata: {}
@@ -588,7 +595,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Omnibus is a framework for building self-installing, full-stack software
@@ -612,6 +619,7 @@ test_files:
 - spec/fixtures/licensing/license_scout/zlib/zlib-dependency-licenses.json
 - spec/fixtures/sample/package-scripts/sample/postinstall
 - spec/functional/builder_spec.rb
+- spec/functional/fetchers/file_fetcher_spec.rb
 - spec/functional/fetchers/git_fetcher_spec.rb
 - spec/functional/fetchers/net_fetcher_spec.rb
 - spec/functional/fetchers/path_fetcher_spec.rb
@@ -643,6 +651,7 @@ test_files:
 - spec/unit/config_spec.rb
 - spec/unit/digestable_spec.rb
 - spec/unit/fetcher_spec.rb
+- spec/unit/fetchers/file_fetcher_spec.rb
 - spec/unit/fetchers/git_fetcher_spec.rb
 - spec/unit/fetchers/net_fetcher_spec.rb
 - spec/unit/fetchers/path_fetcher_spec.rb