omnibus 5.5.0 → 5.6.0

data/spec/unit/sugarable_spec.rb

@@ -12,7 +12,7 @@ module Omnibus
       expect(described_class.singleton_class.included_modules).to include(Sugarable)
     end
 
-    it "includes Sugarable" do
+    it "is a sugarable" do
       expect(described_class.ancestors).to include(Sugarable)
     end
   end
@@ -47,13 +47,33 @@ module Omnibus
       end
 
       it "makes the DSL methods available in the cleanroom" do
-        expect {
+        expect do
           instance.evaluate <<-EOH.gsub(/^ {12}/, "")
             windows?
             vagrant?
           EOH
-        }.to_not raise_error
+        end.to_not raise_error
+      end
+    end
+  end
+
+  describe Sugar do
+    let(:klass) do
+      Class.new do
+        include Sugar
       end
     end
+
+    let(:instance) { klass.new }
+
+    it "returns the windows architecture being built" do
+      expect(Omnibus::Config).to receive(:windows_arch).and_return(:x86_64)
+      expect(instance.windows_arch_i386?).to eq(false)
+    end
+
+    it "returns whether fips_mode is enabled" do
+      expect(Omnibus::Config).to receive(:fips_mode).and_return(false)
+      expect(instance.fips_mode?).to eq(false)
+    end
   end
 end

data/spec/unit/util_spec.rb

@@ -4,7 +4,38 @@ module Omnibus
   describe Util do
     subject { Class.new { include Util }.new }
 
-    describe '#shellout!' do
+    describe "#retry_block" do
+      class OurTestException < StandardError; end
+      let(:expected_retries) { 3 }
+      let(:expected_calls) { expected_retries + 1 }
+      let(:sentinel) { double }
+
+      it "retries the block if the passed exception is raised" do
+        expect(sentinel).to receive(:call_me).and_raise(OurTestException)
+        expect(sentinel).to receive(:call_me).and_return(:test_return)
+        block_return = nil
+        expect do
+          block_return = subject.retry_block("test", [OurTestException], expected_retries) { sentinel.call_me }
+        end.to_not raise_error
+        expect(block_return).to eq(:test_return)
+      end
+
+      it "raises the last exception if the number of retries is exceeded" do
+        expect(sentinel).to receive(:call_me).exactly(expected_calls).times.and_raise(OurTestException)
+        expect do
+          subject.retry_block("test", [OurTestException], expected_retries) { sentinel.call_me }
+        end.to raise_error(OurTestException)
+      end
+
+      it "doesn't retry exceptions not listed by the user" do
+        expect(sentinel).to receive(:call_me).exactly(1).times.and_raise(StandardError)
+        expect do
+          subject.retry_block("test", [OurTestException], expected_retries) { sentinel.call_me }
+        end.to raise_error(StandardError)
+      end
+    end
+
+    describe "#shellout!" do
       let(:shellout) do
         double(Mixlib::ShellOut,
           command:     "evil command",
@@ -28,9 +59,9 @@ module Omnibus
         end
 
         it "raises an CommandFailed exception" do
-          expect {
+          expect do
             subject.shellout!
-          }.to raise_error(CommandFailed) { |error|
+          end.to raise_error(CommandFailed) { |error|
             message = error.message
 
             expect(message).to include("$ I_LOVE_YOU=barney TICKLE_ME=elmo evil command")
@@ -49,9 +80,9 @@ module Omnibus
         end
 
         it "raises an CommandFailed exception" do
-          expect {
+          expect do
             subject.shellout!
-          }.to raise_error(CommandTimeout) { |error|
+          end.to raise_error(CommandTimeout) { |error|
             message = error.message
 
             expect(message).to include("shell command timed out at 7,200 seconds")
@@ -62,7 +93,7 @@ module Omnibus
       end
     end
 
-    describe '#create_directory' do
+    describe "#create_directory" do
       before { allow(FileUtils).to receive(:mkdir_p) }
 
       it "creates the directory" do
@@ -80,7 +111,7 @@ module Omnibus
       end
     end
 
-    describe '#remove_directory' do
+    describe "#remove_directory" do
       before { allow(FileUtils).to receive(:rm_rf) }
 
       it "remove the directory" do
@@ -99,7 +130,7 @@ module Omnibus
       end
     end
 
-    describe '#copy_file' do
+    describe "#copy_file" do
       before { allow(FileUtils).to receive(:cp) }
 
       it "copies the file" do
@@ -117,7 +148,7 @@ module Omnibus
       end
     end
 
-    describe '#remove_file' do
+    describe "#remove_file" do
       before { allow(FileUtils).to receive(:rm_f) }
 
       it "removes the file" do
@@ -136,7 +167,7 @@ module Omnibus
       end
     end
 
-    describe '#create_file' do
+    describe "#create_file" do
       before do
         allow(FileUtils).to receive(:mkdir_p)
         allow(FileUtils).to receive(:touch)
@@ -171,7 +202,7 @@ module Omnibus
       end
     end
 
-    describe '#create_link' do
+    describe "#create_link" do
       before { allow(FileUtils).to receive(:ln_s) }
 
       it "creates the directory" do

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.6.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: chef-sugar
   requirement: !ruby/object:Gem::Requirement
@@ -39,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: mixlib-shellout
+  name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: mixlib-versioning
+  name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
@@ -95,47 +109,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: mixlib-versioning
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: ffi-yajl
+  name: pedump
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: license_scout
   requirement: !ruby/object:Gem::Requirement
@@ -196,16 +210,16 @@ dependencies:
   name: chefstyle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fauxhai
   requirement: !ruby/object:Gem::Requirement
@@ -422,6 +436,7 @@ files:
 - lib/omnibus/packagers/makeself.rb
 - lib/omnibus/packagers/msi.rb
 - lib/omnibus/packagers/pkg.rb
+- lib/omnibus/packagers/pkgsrc.rb
 - lib/omnibus/packagers/rpm.rb
 - lib/omnibus/packagers/solaris.rb
 - lib/omnibus/packagers/windows_base.rb
@@ -440,6 +455,7 @@ files:
 - lib/omnibus/thread_pool.rb
 - lib/omnibus/util.rb
 - lib/omnibus/version.rb
+- lib/omnibus/whitelist.rb
 - omnibus.gemspec
 - resources/appx/AppxManifest.xml.erb
 - resources/appx/assets/clear.png
@@ -518,6 +534,7 @@ files:
 - spec/unit/fetchers/git_fetcher_spec.rb
 - spec/unit/fetchers/net_fetcher_spec.rb
 - spec/unit/fetchers/path_fetcher_spec.rb
+- spec/unit/file_syncer_spec.rb
 - spec/unit/generator_spec.rb
 - spec/unit/git_cache_spec.rb
 - spec/unit/git_repository_spec.rb
@@ -538,6 +555,7 @@ files:
 - spec/unit/packagers/makeself_spec.rb
 - spec/unit/packagers/msi_spec.rb
 - spec/unit/packagers/pkg_spec.rb
+- spec/unit/packagers/pkgsrc_spec.rb
 - spec/unit/packagers/rpm_spec.rb
 - spec/unit/packagers/solaris_spec.rb
 - spec/unit/project_spec.rb
@@ -562,7 +580,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -570,7 +588,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Omnibus is a framework for building self-installing, full-stack software
@@ -628,6 +646,7 @@ test_files:
 - spec/unit/fetchers/git_fetcher_spec.rb
 - spec/unit/fetchers/net_fetcher_spec.rb
 - spec/unit/fetchers/path_fetcher_spec.rb
+- spec/unit/file_syncer_spec.rb
 - spec/unit/generator_spec.rb
 - spec/unit/git_cache_spec.rb
 - spec/unit/git_repository_spec.rb
@@ -648,6 +667,7 @@ test_files:
 - spec/unit/packagers/makeself_spec.rb
 - spec/unit/packagers/msi_spec.rb
 - spec/unit/packagers/pkg_spec.rb
+- spec/unit/packagers/pkgsrc_spec.rb
 - spec/unit/packagers/rpm_spec.rb
 - spec/unit/packagers/solaris_spec.rb
 - spec/unit/project_spec.rb