omnibus 6.0.1 → 6.0.24

data/spec/unit/packager_spec.rb

@@ -31,13 +31,6 @@ module Omnibus
         end
       end
 
-      context "on Solaris 10" do
-        before { stub_ohai(platform: "solaris2", version: "5.10") }
-        it "prefers Solaris" do
-          expect(described_class.for_current_system).to eq([Packager::Solaris])
-        end
-      end
-
       context "on AIX" do
         before { stub_ohai(platform: "aix", version: "7.1") }
         it "prefers BFF" do
@@ -52,6 +45,13 @@ module Omnibus
         end
       end
 
+      context "on Amazon Linux 2" do
+        before { stub_ohai(platform: "amazon", version: "2") }
+        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.11") }
         it "prefers RPM" do

data/spec/unit/packagers/base_spec.rb

@@ -87,6 +87,23 @@ module Omnibus
       end
     end
 
+    describe "#skip_packager" do
+      it "is a DSL method" do
+        expect(subject).to have_exposed_method(:skip_packager)
+      end
+
+      it "requires the value to be a TrueClass or a FalseClass" do
+        expect do
+          subject.skip_packager(Object.new)
+        end.to raise_error(InvalidValue)
+      end
+
+      it "returns the given value" do
+        subject.skip_packager(true)
+        expect(subject.skip_packager).to be_truthy
+      end
+    end
+
     describe "#run!" do
       before do
         allow(subject).to receive(:remove_directory)

data/spec/unit/packagers/deb_spec.rb

@@ -451,7 +451,7 @@ module Omnibus
     end
 
     describe "#safe_architecture" do
-      let(:shellout) { double("Mixlib::ShellOut", :run_command => true, :error! => nil) }
+      let(:shellout) { double("Mixlib::ShellOut", run_command: true, error!: nil) }
 
       before do
         allow(Mixlib::ShellOut).to receive(:new).and_return(shellout)

data/spec/unit/packagers/ips_spec.rb

@@ -21,7 +21,7 @@ module Omnibus
     let(:source_dir)   { File.join(staging_dir, "proto_install") }
     let(:repo_dir)     { File.join(staging_dir, "publish/repo") }
     let(:architecture) { "i86pc" }
-    let(:shellout) { double("Mixlib::ShellOut", :run_command => true, :error! => nil) }
+    let(:shellout) { double("Mixlib::ShellOut", run_command: true, error!: nil) }
 
     before do
       Config.project_root(project_root)

data/spec/unit/packagers/msi_spec.rb

@@ -90,6 +90,29 @@ module Omnibus
       end
     end
 
+    describe "#localization" do
+      it "is a DSL method" do
+        expect(subject).to have_exposed_method(:localization)
+      end
+
+      it "defaults to String en-us" do
+        expect(subject.localization).to be_a(String)
+        expect(subject.localization).to eq("en-us")
+      end
+
+      it "requires the value to be a String" do
+        expect do
+          subject.localization(Object.new)
+        end.to raise_error(InvalidValue)
+      end
+
+      it "returns the given value" do
+        loc = "te-st"
+        subject.localization(loc)
+        expect(subject.localization).to eq(loc)
+      end
+    end
+
     describe "#package_name" do
       before do
         allow(Config).to receive(:windows_arch).and_return(:foo_arch)
@@ -269,6 +292,28 @@ module Omnibus
       end
     end
 
+    describe "#wix_light_delay_validation" do
+      it "is a DSL method" do
+        expect(subject).to have_exposed_method(:wix_light_delay_validation)
+      end
+
+      it "requires the value to be a TrueClass or a FalseClass" do
+        expect do
+          subject.wix_light_delay_validation(Object.new)
+        end.to raise_error(InvalidValue)
+      end
+
+      it "defaults to an empty String" do
+        expect(subject.wix_light_delay_validation).to be_a(String)
+        expect(subject.wix_light_delay_validation).to be_empty
+      end
+
+      it "returns the string `-sval` when true" do
+        subject.wix_light_delay_validation(true)
+        expect(subject.wix_light_delay_validation).to eq("-sval")
+      end
+    end
+
     describe "#wix_candle_extension" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:wix_candle_extension)

data/spec/unit/packagers/pkg_spec.rb

@@ -167,7 +167,7 @@ module Omnibus
               --resources "#{staging_dir}/Resources" \\
               --sign "My Special Identity" \\
               "#{package_dir}/project-full-name-1.2.3-2.pkg"
-            EOH
+          EOH
           subject.build_product_pkg
         end
       end

data/spec/unit/packagers/rpm_spec.rb

@@ -267,7 +267,7 @@ module Omnibus
       end
 
       context "when scripts are given" do
-        let(:scripts) { %w{ pre post preun postun verifyscript pretans posttrans } }
+        let(:scripts) { %w{ pre post preun postun verifyscript pretrans posttrans } }
 
         before do
           scripts.each do |script_name|
@@ -348,21 +348,6 @@ module Omnibus
         end
       end
 
-      context "when the platform_family is wrlinux" do
-        let(:spec_file) { "#{staging_dir}/SPECS/project-1.2.3-2.nexus5.x86_64.rpm.spec" }
-
-        before do
-          stub_ohai(platform: "nexus", version: "5")
-        end
-
-        it "writes out a spec file with no BuildArch" do
-          subject.write_rpm_spec
-          contents = File.read(spec_file)
-
-          expect(contents).not_to include("BuildArch")
-        end
-      end
-
       context "when dist_tag is disabled" do
         let(:spec_file) { "#{staging_dir}/SPECS/project-1.2.3-2.x86_64.rpm.spec" }
 
@@ -499,36 +484,6 @@ module Omnibus
           expect(output).to include("The `version' component of RPM package names can only include")
         end
       end
-
-      context "when the build is for nexus" do
-        before do
-          project.build_version("1.2-3")
-          stub_ohai(platform: "nexus", version: "5")
-        end
-
-        it "returns the value while logging a message" do
-          output = capture_logging do
-            expect(subject.safe_version).to eq("1.2_3")
-          end
-
-          expect(output).to include("rpmbuild on Wind River Linux does not support this")
-        end
-      end
-
-      context "when the build is for ios_xr" do
-        before do
-          project.build_version("1.2-3")
-          stub_ohai(platform: "ios_xr", version: "6.0.0.14I")
-        end
-
-        it "returns the value while logging a message" do
-          output = capture_logging do
-            expect(subject.safe_version).to eq("1.2_3")
-          end
-
-          expect(output).to include("rpmbuild on Wind River Linux does not support this")
-        end
-      end
     end
 
     describe "#safe_architecture" do

data/spec/unit/packagers/solaris_spec.rb

@@ -117,9 +117,9 @@ module Omnibus
       before do
         allow(subject).to receive(:shellout!)
         File.open("#{staging_dir}/files", "w+") do |f|
-          f.write <<-EOF
-/foo/bar/baz
-/a file with spaces
+          f.write <<~EOF
+            /foo/bar/baz
+            /a file with spaces
           EOF
         end
       end

data/spec/unit/software_spec.rb

@@ -190,63 +190,12 @@ module Omnibus
         end
       end
 
-      context "on solaris_10" do
-        before do
-          stub_ohai(platform: "solaris2", version: "5.10") do |data|
-            # For some reason, this isn't set in Fauxhai
-            data["platform"] = "solaris2"
-          end
-        end
-
-        it "sets the defaults" do
-          expect(subject.with_standard_compiler_flags).to eq(
-            "CC"              => "gcc -static-libgcc",
-            "LDFLAGS"         => "-R/opt/project/embedded/lib -L/opt/project/embedded/lib -static-libgcc",
-            "CFLAGS"          => "-I/opt/project/embedded/include -O2",
-            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2",
-            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2",
-            "LD_RUN_PATH"     => "/opt/project/embedded/lib",
-            "LD_OPTIONS"      => "-R/opt/project/embedded/lib",
-            "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
-            "OMNIBUS_INSTALL_DIR" => "/opt/project"
-          )
-        end
-
-        context "when loader mapping file is specified" do
-          # Let the unit tests run on windows where auto-path translation occurs.
-          let(:project_root) { File.join(tmp_path, "/root/project") }
-          before do
-            stub_ohai(platform: "solaris2", version: "5.10") do |data|
-              # For some reason, this isn't set in Fauxhai
-              data["platform"] = "solaris2"
-            end
-            Config.project_root(project_root)
-            Config.solaris_linker_mapfile("files/mapfile/solaris")
-            allow(File).to receive(:exist?).and_return(true)
-          end
-
-          it "sets LD_OPTIONS correctly" do
-            expect(subject.with_standard_compiler_flags).to eq(
-              "CC"              => "gcc -static-libgcc",
-              "LDFLAGS"         => "-R/opt/project/embedded/lib -L/opt/project/embedded/lib -static-libgcc",
-              "CFLAGS"          => "-I/opt/project/embedded/include -O2",
-              "CXXFLAGS"        => "-I/opt/project/embedded/include -O2",
-              "CPPFLAGS"        => "-I/opt/project/embedded/include -O2",
-              "LD_RUN_PATH"     => "/opt/project/embedded/lib",
-              "LD_OPTIONS"      => "-R/opt/project/embedded/lib -M #{project_root}/files/mapfile/solaris",
-              "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
-              "OMNIBUS_INSTALL_DIR" => "/opt/project"
-            )
-          end
-        end
-      end
-
       context "on mac_os_x" do
         before { stub_ohai(platform: "mac_os_x", version: "10.13") }
 
         it "sets the defaults" do
           expect(subject.with_standard_compiler_flags).to eq(
-            "LDFLAGS"         => "-L/opt/project/embedded/lib",
+            "LDFLAGS"         => "-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib",
             "CFLAGS"          => "-I/opt/project/embedded/include -O2",
             "CXXFLAGS"        => "-I/opt/project/embedded/include -O2",
             "CPPFLAGS"        => "-I/opt/project/embedded/include -O2",
@@ -373,7 +322,7 @@ module Omnibus
         before do
           # sles identifies as suse
           stub_ohai(platform: "suse", version: "12.2")
-          allow(subject).to receive(:which).with("gcc-4.8").and_return(false)
+          allow(subject).to receive(:which).with("gcc-4.8").and_return(true)
         end
 
         it "sets the defaults" do

data/spec/unit/util_spec.rb

@@ -44,7 +44,7 @@ module Omnibus
           timeout:     7_200,
           exitstatus:  32,
           environment: {
-            "TICKLE_ME"  => "elmo",
+            "TICKLE_ME" => "elmo",
             "I_LOVE_YOU" => "barney",
           }
         )

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.24
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: chef-sugar
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,22 @@ dependencies:
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
@@ -89,7 +95,7 @@ dependencies:
         version: '13'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '15'
+        version: '16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -99,7 +105,7 @@ dependencies:
         version: '13'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '15'
+        version: '16'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -170,20 +176,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: artifactory
   requirement: !ruby/object:Gem::Requirement
@@ -218,14 +210,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: fauxhai
   requirement: !ruby/object:Gem::Requirement
@@ -370,6 +362,8 @@ files:
 - lib/omnibus/fetchers/path_fetcher.rb
 - lib/omnibus/file_syncer.rb
 - lib/omnibus/generator.rb
+- lib/omnibus/generator_files/.kitchen.local.yml.erb
+- lib/omnibus/generator_files/.kitchen.yml.erb
 - lib/omnibus/generator_files/Berksfile.erb
 - lib/omnibus/generator_files/Gemfile.erb
 - lib/omnibus/generator_files/README.md.erb
@@ -541,7 +535,7 @@ files:
 - spec/unit/util_spec.rb
 homepage: https://github.com/chef/omnibus
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -558,8 +552,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Omnibus is a framework for building self-installing, full-stack software