omnibus 5.4.0 → 5.5.0

data/spec/support/examples.rb

@@ -1,23 +1,23 @@
-RSpec.shared_examples 'a software' do |name = 'chefdk'|
-  let(:project_root) { File.join(tmp_path, 'software') }
+RSpec.shared_examples "a software" do |name = "chefdk"|
+  let(:project_root) { File.join(tmp_path, "software") }
 
   let(:name)    { name }
   let(:source)  { nil }
-  let(:version) { '1.0.0' }
+  let(:version) { "1.0.0" }
 
-  let(:build_dir)   { File.join(project_root, 'local', 'build') }
-  let(:cache_dir)   { File.join(project_root, 'local', 'cache') }
-  let(:source_dir)  { File.join(project_root, 'local', 'source') }
-  let(:project_dir) { File.join(source_dir, 'project_dir') }
+  let(:build_dir)   { File.join(project_root, "local", "build") }
+  let(:cache_dir)   { File.join(project_root, "local", "cache") }
+  let(:source_dir)  { File.join(project_root, "local", "source") }
+  let(:project_dir) { File.join(source_dir, "project_dir") }
 
-  let(:patches_dir)   { File.join(project_root, 'config', 'patches', name) }
-  let(:scripts_dir)   { File.join(project_root, 'config', 'scripts', name) }
-  let(:softwares_dir) { File.join(project_root, 'config', 'software', name) }
-  let(:templates_dir) { File.join(project_root, 'config', 'templates', name) }
+  let(:patches_dir)   { File.join(project_root, "config", "patches", name) }
+  let(:scripts_dir)   { File.join(project_root, "config", "scripts", name) }
+  let(:softwares_dir) { File.join(project_root, "config", "software", name) }
+  let(:templates_dir) { File.join(project_root, "config", "templates", name) }
 
-  let(:install_dir)      { File.join(project_root, 'opt', name) }
-  let(:bin_dir)          { File.join(install_dir, 'bin') }
-  let(:embedded_bin_dir) { File.join(install_dir, 'embedded', 'bin') }
+  let(:install_dir)      { File.join(project_root, "opt", name) }
+  let(:bin_dir)          { File.join(install_dir, "bin") }
+  let(:embedded_bin_dir) { File.join(install_dir, "embedded", "bin") }
 
   let(:software) do
     double(Omnibus::Software,
@@ -27,7 +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
 
@@ -58,5 +58,11 @@ RSpec.shared_examples 'a software' do |name = 'chefdk'|
     allow(software).to receive(:with_embedded_path).and_return(
       "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
+    end
   end
 end

data/spec/support/file_helpers.rb

@@ -31,7 +31,7 @@ module Omnibus
         FileUtils.rm(path) if File.exist?(path)
 
         if block
-          File.open(path, 'wb') { |f| f.write(block.call) }
+          File.open(path, "wb") { |f| f.write(yield) }
         else
           FileUtils.touch(path)
         end

data/spec/support/git_helpers.rb

@@ -1,4 +1,4 @@
-require_relative 'shell_helpers'
+require_relative "shell_helpers"
 
 module Omnibus
   module RSpec
@@ -9,41 +9,41 @@ module Omnibus
         "file://#{fake_git_remote("git://github.com/omnibus/#{repo}.git", options)}/.git"
       end
 
-      def local_git_repo(name, options={})
+      def local_git_repo(name, options = {})
         path = git_scratch
         Dir.chdir(path) do
           # Create a bogus configure file
-          File.open('configure', 'w') { |f| f.write('echo "Done!"') }
+          File.open("configure", "w") { |f| f.write('echo "Done!"') }
 
-          git %|init .|
-          git %|add .|
-          git %|commit -am "Initial commit for #{name}..."|
-          git %|remote add origin "#{options[:remote]}"| if options[:remote]
-          git %|push origin master|
+          git %{init .}
+          git %{add .}
+          git %{commit -am "Initial commit for #{name}..."}
+          git %{remote add origin "#{options[:remote]}"} if options[:remote]
+          git %{push origin master}
 
           options[:annotated_tags].each do |tag|
-            File.open('tag', 'w') { |f| f.write(tag) }
-            git %|add tag|
-            git %|commit -am "Create tag #{tag}"|
-            git %|tag "#{tag}" -m "#{tag}"|
-            git %|push origin "#{tag}"| if options[:remote]
+            File.open("tag", "w") { |f| f.write(tag) }
+            git %{add tag}
+            git %{commit -am "Create tag #{tag}"}
+            git %{tag "#{tag}" -m "#{tag}"}
+            git %{push origin "#{tag}"} if options[:remote]
           end if options[:annotated_tags]
 
           options[:tags].each do |tag|
-            File.open('tag', 'w') { |f| f.write(tag) }
-            git %|add tag|
-            git %|commit -am "Create tag #{tag}"|
-            git %|tag "#{tag}"|
-            git %|push origin "#{tag}"| if options[:remote]
+            File.open("tag", "w") { |f| f.write(tag) }
+            git %{add tag}
+            git %{commit -am "Create tag #{tag}"}
+            git %{tag "#{tag}"}
+            git %{push origin "#{tag}"} if options[:remote]
           end if options[:tags]
 
           options[:branches].each do |branch|
-            git %|checkout -b #{branch} master|
-            File.open('branch', 'w') { |f| f.write(branch) }
-            git %|add branch|
-            git %|commit -am "Create branch #{branch}"|
-            git %|push origin "#{branch}"| if options[:remote]
-            git %|checkout master|
+            git %{checkout -b #{branch} master}
+            File.open("branch", "w") { |f| f.write(branch) }
+            git %{add branch}
+            git %{commit -am "Create branch #{branch}"}
+            git %{push origin "#{branch}"} if options[:remote]
+            git %{checkout master}
           end if options[:branches]
         end
         path
@@ -57,10 +57,10 @@ module Omnibus
         FileUtils.mkdir_p(path)
 
         Dir.chdir(path) do
-          git %|init --bare|
-          git %|config core.sharedrepository 1|
-          git %|config receive.denyNonFastforwards true|
-          git %|config receive.denyCurrentBranch ignore|
+          git %{init --bare}
+          git %{config core.sharedrepository 1}
+          git %{config receive.denyNonFastforwards true}
+          git %{config receive.denyCurrentBranch ignore}
         end
 
         local_git_repo(name, options)
@@ -87,13 +87,13 @@ module Omnibus
       #
       # @return [Pathname]
       def remotes
-        path = File.join(tmp_path, 'git', 'remotes')
+        path = File.join(tmp_path, "git", "remotes")
         FileUtils.mkdir_p(path) unless File.directory?(path)
         path
       end
 
       def git_scratch
-        path = File.join(tmp_path, 'git', 'scratch')
+        path = File.join(tmp_path, "git", "scratch")
         FileUtils.mkdir_p(path) unless File.directory?(path)
         path
       end
@@ -103,14 +103,14 @@ module Omnibus
         # We need to override some of the variable's git uses for generating
         # the SHASUM for testing purposes
         #
-        time = Time.at(680227200).utc.strftime('%c %z')
+        time = Time.at(680227200).utc.strftime("%c %z")
         env  = {
-          'GIT_AUTHOR_NAME'     => 'omnibus',
-          'GIT_AUTHOR_EMAIL'    => 'omnibus@getchef.com',
-          'GIT_AUTHOR_DATE'     => time,
-          'GIT_COMMITTER_NAME'  => 'omnibus',
-          'GIT_COMMITTER_EMAIL' => 'omnibus@gechef.com',
-          'GIT_COMMITTER_DATE'  => time,
+          "GIT_AUTHOR_NAME"     => "omnibus",
+          "GIT_AUTHOR_EMAIL"    => "omnibus@getchef.com",
+          "GIT_AUTHOR_DATE"     => time,
+          "GIT_COMMITTER_NAME"  => "omnibus",
+          "GIT_COMMITTER_EMAIL" => "omnibus@gechef.com",
+          "GIT_COMMITTER_DATE"  => time,
         }
 
         shellout!("git #{command}", env: env)

data/spec/support/matchers.rb

@@ -1,4 +1,4 @@
-require 'rspec/expectations'
+require "rspec/expectations"
 
 # expect('/path/to/directory').to be_a_directory
 RSpec::Matchers.define :be_a_directory do
@@ -24,8 +24,8 @@ end
 # expect('/path/to/file').to have_permissions
 RSpec::Matchers.define :have_permissions do |perm|
   match do |actual|
-    m = sprintf('%o', File.stat(actual).mode)
-    m == perm 
+    m = sprintf("%o", File.stat(actual).mode)
+    m == perm
   end
 end
 

data/spec/support/ohai_helpers.rb

@@ -1,5 +1,5 @@
-require 'fauxhai'
-require 'omnibus/ohai'
+require "fauxhai"
+require "omnibus/ohai"
 
 module Omnibus
   module RSpec
@@ -13,8 +13,8 @@ module Omnibus
 
         # If we asked for Windows, we should also specify that magical
         # +File::ALT_SEPARATOR+ variable
-        if options[:platform] && options[:platform] == 'windows'
-          stub_const('File::ALT_SEPARATOR', '\\')
+        if options[:platform] && options[:platform] == "windows"
+          stub_const("File::ALT_SEPARATOR", '\\')
         end
       end
     end

data/spec/support/path_helpers.rb

@@ -6,13 +6,13 @@ module Omnibus
       end
 
       def tmp_path
-        File.expand_path('../../tmp', __FILE__)
+        File.expand_path("../../tmp", __FILE__)
       end
 
       private
 
       def fixtures_path
-        File.expand_path('../../fixtures', __FILE__)
+        File.expand_path("../../fixtures", __FILE__)
       end
     end
   end

data/spec/support/shell_helpers.rb

@@ -1,11 +1,11 @@
-require 'mixlib/shellout'
+require "mixlib/shellout"
 
 module Omnibus
   module RSpec
     module ShellHelpers
       def shellout!(command, options = {})
         cmd = Mixlib::ShellOut.new(command, options)
-        cmd.environment['HOME'] = '/tmp' unless ENV['HOME']
+        cmd.environment["HOME"] = "/tmp" unless ENV["HOME"]
         cmd.run_command
         cmd
       end

data/spec/unit/build_version_dsl_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Omnibus
   describe BuildVersionDSL do
@@ -10,7 +10,7 @@ module Omnibus
     let(:today_string) { Time.now.utc.strftime(Omnibus::BuildVersion::TIMESTAMP_FORMAT) }
 
     let(:zoo_version) { double("BuildVersion", semver: "5.5.5", custom: "7.7.7", build_start_time: today_string) }
-    let(:zoo_software) { double("software", name: 'zoo', project_dir: '/etc/zoo', version: "6.6.6") }
+    let(:zoo_software) { double("software", name: "zoo", project_dir: "/etc/zoo", version: "6.6.6") }
 
     describe "when given nil" do
       it "fails" do
@@ -27,7 +27,7 @@ module Omnibus
     describe "when Config.append_timestamp is true" do
       let(:description) do
         proc do
-            source(:git, from_dependency: 'zoo')
+          source(:git, from_dependency: "zoo")
         end
       end
 
@@ -54,7 +54,7 @@ module Omnibus
       describe "when given a software as source" do
         let(:description) do
           proc do
-            source(:git, from_dependency: 'zoo')
+            source(:git, from_dependency: "zoo")
           end
         end
 
@@ -110,7 +110,7 @@ module Omnibus
       describe "when given a software as source" do
         let(:description) do
           proc do
-            source(:version, from_dependency: 'zoo')
+            source(:version, from_dependency: "zoo")
           end
         end
 

data/spec/unit/build_version_spec.rb

@@ -1,8 +1,8 @@
-require 'spec_helper'
+require "spec_helper"
 
 module Omnibus
   describe BuildVersion do
-    let(:git_describe) { '11.0.0-alpha1-207-g694b062' }
+    let(:git_describe) { "11.0.0-alpha1-207-g694b062" }
     let(:valid_semver_regex) { /^\d+\.\d+\.\d+(\-[\dA-Za-z\-\.]+)?(\+[\dA-Za-z\-\.]+)?$/ }
     let(:valid_git_describe_regex) { /^\d+\.\d+\.\d+(\-[A-Za-z0-9\-\.]+)?(\-\d+\-g[0-9a-f]+)?$/ }
 
@@ -11,17 +11,17 @@ module Omnibus
     before do
       Config.append_timestamp(true)
       allow_any_instance_of(described_class).to receive(:shellout)
-        .and_return(double('ouput', stdout: git_describe, exitstatus: 0))
+        .and_return(double("ouput", stdout: git_describe, exitstatus: 0))
     end
 
-    describe 'git describe parsing' do
+    describe "git describe parsing" do
 
       # we prefer our git tags to be SemVer compliant
 
       # release version
-      context '11.0.1' do
-        let(:git_describe) { '11.0.1' }
-        its(:version_tag) { should == '11.0.1' }
+      context "11.0.1" do
+        let(:git_describe) { "11.0.1" }
+        its(:version_tag) { should == "11.0.1" }
         its(:prerelease_tag) { should be_nil }
         its(:git_sha_tag) { should be_nil }
         its(:commits_since_tag) { should == 0 }
@@ -29,21 +29,21 @@ module Omnibus
       end
 
       # SemVer compliant prerelease version
-      context '11.0.0-alpha.2' do
-        let(:git_describe) { '11.0.0-alpha.2' }
-        its(:version_tag) { should == '11.0.0' }
-        its(:prerelease_tag) { should == 'alpha.2' }
+      context "11.0.0-alpha.2" do
+        let(:git_describe) { "11.0.0-alpha.2" }
+        its(:version_tag) { should == "11.0.0" }
+        its(:prerelease_tag) { should == "alpha.2" }
         its(:git_sha_tag) { should be_nil }
         its(:commits_since_tag) { should == 0 }
         its(:prerelease_version?) { should be_truthy }
       end
 
       # full git describe string
-      context '11.0.0-alpha.3-59-gf55b180' do
-        let(:git_describe) { '11.0.0-alpha.3-59-gf55b180' }
-        its(:version_tag) { should == '11.0.0' }
-        its(:prerelease_tag) { should == 'alpha.3' }
-        its(:git_sha_tag) { should == 'f55b180' }
+      context "11.0.0-alpha.3-59-gf55b180" do
+        let(:git_describe) { "11.0.0-alpha.3-59-gf55b180" }
+        its(:version_tag) { should == "11.0.0" }
+        its(:prerelease_tag) { should == "alpha.3" }
+        its(:git_sha_tag) { should == "f55b180" }
         its(:commits_since_tag) { should == 59 }
         its(:prerelease_version?) { should be_truthy }
       end
@@ -51,40 +51,40 @@ module Omnibus
       # Degenerate git tag formats
 
       # RubyGems compliant git tag
-      context '10.16.0.rc.0' do
-        let(:git_describe) { '10.16.0.rc.0' }
-        its(:version_tag) { should == '10.16.0' }
-        its(:prerelease_tag) { should == 'rc.0' }
+      context "10.16.0.rc.0" do
+        let(:git_describe) { "10.16.0.rc.0" }
+        its(:version_tag) { should == "10.16.0" }
+        its(:prerelease_tag) { should == "rc.0" }
         its(:git_sha_tag) { should be_nil }
         its(:commits_since_tag) { should == 0 }
         its(:prerelease_version?) { should be_truthy }
       end
 
       # dash seperated prerelease
-      context '11.0.0-alpha-2' do
-        let(:git_describe) { '11.0.0-alpha-2' }
-        its(:version_tag) { should == '11.0.0' }
-        its(:prerelease_tag) { should == 'alpha-2' }
+      context "11.0.0-alpha-2" do
+        let(:git_describe) { "11.0.0-alpha-2" }
+        its(:version_tag) { should == "11.0.0" }
+        its(:prerelease_tag) { should == "alpha-2" }
         its(:git_sha_tag) { should be_nil }
         its(:commits_since_tag) { should == 0 }
         its(:prerelease_version?) { should be_truthy }
       end
 
       # dash seperated prerelease full git describe string
-      context '11.0.0-alpha-2-59-gf55b180' do
-        let(:git_describe) { '11.0.0-alpha-2-59-gf55b180' }
-        its(:version_tag) { should == '11.0.0' }
-        its(:prerelease_tag) { should == 'alpha-2' }
-        its(:git_sha_tag) { should == 'f55b180' }
+      context "11.0.0-alpha-2-59-gf55b180" do
+        let(:git_describe) { "11.0.0-alpha-2-59-gf55b180" }
+        its(:version_tag) { should == "11.0.0" }
+        its(:prerelease_tag) { should == "alpha-2" }
+        its(:git_sha_tag) { should == "f55b180" }
         its(:commits_since_tag) { should == 59 }
         its(:prerelease_version?) { should be_truthy }
       end
 
       # WTF git tag
-      context '11.0.0-alpha2' do
-        let(:git_describe) { '11.0.0-alpha2' }
-        its(:version_tag) { should == '11.0.0' }
-        its(:prerelease_tag) { should == 'alpha2' }
+      context "11.0.0-alpha2" do
+        let(:git_describe) { "11.0.0-alpha2" }
+        its(:version_tag) { should == "11.0.0" }
+        its(:prerelease_tag) { should == "alpha2" }
         its(:git_sha_tag) { should be_nil }
         its(:commits_since_tag) { should == 0 }
         its(:prerelease_version?) { should be_truthy }
@@ -101,10 +101,10 @@ module Omnibus
       end
     end
 
-    describe 'semver output' do
-      let(:today_string) { Time.now.utc.strftime('%Y%m%d') }
+    describe "semver output" do
+      let(:today_string) { Time.now.utc.strftime("%Y%m%d") }
 
-      it 'generates a valid semver version' do
+      it "generates a valid semver version" do
         expect(build_version.semver).to match(valid_semver_regex)
       end
 
@@ -113,56 +113,56 @@ module Omnibus
       end
 
       it "uses ENV['BUILD_ID'] to generate timestamp if set" do
-        stub_env('BUILD_ID', '2012-12-25_16-41-40')
-        expect(build_version.semver).to eq('11.0.0-alpha1+20121225164140.git.207.694b062')
+        stub_env("BUILD_ID", "2012-12-25_16-41-40")
+        expect(build_version.semver).to eq("11.0.0-alpha1+20121225164140.git.207.694b062")
       end
 
       it "fails on invalid ENV['BUILD_ID'] values" do
-        stub_env('BUILD_ID', 'AAAA')
+        stub_env("BUILD_ID", "AAAA")
         expect { build_version.semver }.to raise_error(ArgumentError)
       end
 
-      context 'prerelease version with dashes' do
-        let(:git_describe) { '11.0.0-alpha-3-207-g694b062' }
+      context "prerelease version with dashes" do
+        let(:git_describe) { "11.0.0-alpha-3-207-g694b062" }
 
-        it 'converts all dashes to dots' do
+        it "converts all dashes to dots" do
           expect(build_version.semver).to match(/11.0.0-alpha.3\+#{today_string}[0-9]+.git.207.694b062/)
         end
       end
 
-      context 'exact version' do
-        let(:git_describe) { '11.0.0-alpha2' }
+      context "exact version" do
+        let(:git_describe) { "11.0.0-alpha2" }
 
-        it 'appends a timestamp with no git info' do
+        it "appends a timestamp with no git info" do
           expect(build_version.semver).to match(/11.0.0-alpha2\+#{today_string}[0-9]+/)
         end
       end
 
-      describe 'appending a timestamp' do
-        let(:git_describe) { '11.0.0-alpha-3-207-g694b062' }
-        context 'by default' do
-          it 'appends a timestamp' do
+      describe "appending a timestamp" do
+        let(:git_describe) { "11.0.0-alpha-3-207-g694b062" }
+        context "by default" do
+          it "appends a timestamp" do
             expect(build_version.semver).to match(/11.0.0-alpha.3\+#{today_string}[0-9]+.git.207.694b062/)
           end
         end
 
-        context 'when Config.append_timestamp is true' do
-          it 'appends a timestamp' do
+        context "when Config.append_timestamp is true" do
+          it "appends a timestamp" do
             expect(build_version.semver).to match(/11.0.0-alpha.3\+#{today_string}[0-9]+.git.207.694b062/)
           end
         end
 
-        context 'when Config.append_timestamp is false' do
+        context "when Config.append_timestamp is false" do
           before { Config.append_timestamp(false) }
-          it 'does not append a timestamp' do
+          it "does not append a timestamp" do
             expect(build_version.semver).to match(/11.0.0-alpha.3\+git.207.694b062/)
           end
         end
       end
     end
 
-    describe 'git describe output' do
-      it 'generates a valid git describe version' do
+    describe "git describe output" do
+      it "generates a valid git describe version" do
         expect(build_version.git_describe).to match(valid_git_describe_regex)
       end
 
@@ -171,28 +171,28 @@ module Omnibus
       end
     end
 
-    describe '`git describe` command failure' do
+    describe "`git describe` command failure" do
       before do
         stderr = <<-STDERR
   fatal: No tags can describe '809ea1afcce67e1148c1bf0822d40a7ef12c380e'.
   Try --always, or create some tags.
         STDERR
         allow(build_version).to receive(:shellout)
-          .and_return(double('ouput', stderr: stderr, exitstatus: 128))
+          .and_return(double("ouput", stderr: stderr, exitstatus: 128))
       end
-      it 'sets the version to 0.0.0' do
-        expect(build_version.git_describe).to eq('0.0.0')
+      it "sets the version to 0.0.0" do
+        expect(build_version.git_describe).to eq("0.0.0")
       end
     end
 
     describe '#initialize `path` parameter' do
-      let(:path) { '/some/fake/path' }
+      let(:path) { "/some/fake/path" }
       subject(:build_version) { BuildVersion.new(path) }
 
-      it 'runs `git describe` at an alternate path' do
+      it "runs `git describe` at an alternate path" do
         expect(build_version).to receive(:shellout)
-          .with('git describe --tags', cwd: path)
-          .and_return(double('ouput', stdout: git_describe, exitstatus: 0))
+          .with("git describe --tags", cwd: path)
+          .and_return(double("ouput", stdout: git_describe, exitstatus: 0))
         build_version.git_describe
       end
     end