omnibus 5.0.0 → 5.1.0

data/spec/functional/fetchers/git_fetcher_spec.rb

@@ -21,6 +21,8 @@ module Omnibus
     end
 
     subject { described_class.new(manifest_entry, project_dir, build_dir) }
+    
+    let(:revision) { shellout!('git rev-parse HEAD', cwd: project_dir).stdout.strip }
 
     describe '#fetch_required?' do
       context 'when the repo is not cloned' do
@@ -32,15 +34,16 @@ module Omnibus
       context 'when the repo is cloned' do
         before { subject.fetch }
 
-        context 'when the revisions are different' do
-          it 'return true' do
-            # Dirty the project_dir to differ the revisions
-            Dir.chdir(project_dir) do
-              FileUtils.touch("file-#{Time.now.to_i}")
-              git %|add .|
-              git %|commit -am "Add new file"|
-            end
+        context 'when the revision is not available' do
+          let(:manifest_entry) do
+            double(ManifestEntry,
+              name: 'software',
+              locked_version: 'abcdefabcdef5d66ed866b2c3eb418426e6382b0',
+              described_version: version,
+              locked_source: source)
+          end
 
+          it 'return true' do
             expect(subject.fetch_required?).to be_truthy
           end
         end
@@ -60,37 +63,49 @@ module Omnibus
     end
 
     describe '#clean' do
-      context 'when the project directory exists' do
-        before do
-          subject.fetch
-          create_file("#{project_dir}/file_a")
-          create_file("#{project_dir}/.file_b")
-        end
+      before do
+        subject.fetch
+      end
+
+      it 'returns true' do
+        expect(subject.clean).to be_truthy
+      end
 
+      context 'when the project directory has extra files in it' do
         it 'cleans the git repo' do
+          create_file("#{project_dir}/file_a")
+          create_file("#{project_dir}/.file_b")
           subject.clean
           expect("#{project_dir}/file_a").to_not be_a_file
           expect("#{project_dir}/.file_b").to_not be_a_file
         end
-
-        it 'returns true' do
-          expect(subject.clean).to be_truthy
-        end
       end
 
-      context 'when the project directory does not exist' do
+      context 'when the project directory is at a different version' do
         before do
-          remove_directory(project_dir)
+          # Dirty the project_dir by giving it a conflicting commit.
+          create_file("#{project_dir}/file_a") { 'some new file' }
+          create_file("#{project_dir}/configure") { 'LALALALA' }
+          shellout!('git add .', cwd: project_dir)
+          shellout!('git commit -am "Some commit"', cwd: project_dir)
+          create_file("#{project_dir}/.file_b")
         end
 
-        it 'returns false' do
-          expect(subject.clean).to be(false)
+        it 'checks out the right version' do
+          subject.clean
+          expect(revision).to eq(manifest_entry.locked_version)
+        end
+
+        it 'resets the working tree' do
+          subject.clean
+          expect("#{project_dir}/file_a").to_not be_a_file
+          expect("#{project_dir}/.file_b").to_not be_a_file
+          expect(File.read("#{project_dir}/configure")).to_not match('LA')
         end
       end
     end
 
     describe '#fetch'  do
-      let(:revision) { shellout!('git rev-parse HEAD', cwd: project_dir).stdout.strip }
       let(:version)  { 'v1.2.4' }
       let(:remote)   { remote_git_repo('zlib', annotated_tags: [version]) }
       let(:manifest_entry) do
@@ -108,11 +123,6 @@ module Omnibus
         subject.fetch
         expect("#{project_dir}/.git").to be_a_directory
       end
-
-      it 'fetches the locked_version from the manifest' do
-        subject.fetch
-        expect(revision).to eq(manifest_entry.locked_version)
-      end
     end
 
 
@@ -173,18 +183,15 @@ module Omnibus
     end
 
     describe '#version_for_cache' do
-      let(:revision) { shellout!('git rev-parse HEAD', cwd: project_dir).stdout.strip }
-
-      it 'includes the revision' do
-        expect(subject.version_for_cache).to eq("revision:#{revision}")
+      it 'includes the resolved revision' do
+        expect(subject.version_for_cache).to eq('revision:45ded6d3b1a35d66ed866b2c3eb418426e6382b0')
       end
 
-      it 'does not returned cached revision after fetching' do
-        before_fetch = subject.version_for_cache
+      it 'not use the current version on disk after fetching' do
+        expect(subject.version_for_cache).to eq('revision:45ded6d3b1a35d66ed866b2c3eb418426e6382b0')
         subject.fetch
-        after_fetch = revision
-        expect(subject.version_for_cache).to eq("revision:#{after_fetch}")
-        expect(subject.version_for_cache).not_to eq("revision:#{before_fetch}")
+        expect(subject.version_for_cache).to eq('revision:45ded6d3b1a35d66ed866b2c3eb418426e6382b0')
+        expect(revision).to_not eq('revision:45ded6d3b1a35d66ed866b2c3eb418426e6382b0')
       end
     end
   end

data/spec/functional/fetchers/net_fetcher_spec.rb

@@ -1,6 +1,14 @@
 require 'spec_helper'
 
 module Omnibus
+  module RSpec
+    module OhaiHelpers
+      # Turn off the mandatory Ohai helper.
+      def stub_ohai(options = {}, &block)
+      end
+    end
+  end
+
   describe NetFetcher do
     include_examples 'a software', 'zlib'
 
@@ -119,6 +127,34 @@ module Omnibus
           expect(subject.clean).to be(false)
         end
       end
+
+      context 'when the source has read-only files' do
+        let(:source_url) { 'http://dl.bintray.com/oneclick/OpenKnapsack/x86/openssl-1.0.0q-x86-windows.tar.lzma' }
+        let(:source_md5) { '577dbe528415c6f178a9431fd0554df4' }
+        
+        it 'extracts the asset without crashing' do
+          subject.clean
+          expect(extracted).to_not be_a_file
+          subject.clean
+          expect(extracted).to_not be_a_file
+        end
+      end
+
+      context 'when the source has broken symlinks' do
+        let(:source_url) { 'http://www.openssl.org/source/openssl-1.0.1q.tar.gz' }
+        let(:source_md5) { '54538d0cdcb912f9bc2b36268388205e' }
+
+        let(:source) do
+          { url: source_url, md5: source_md5, extract: :lax_tar }
+        end
+
+        it 'extracts the asset without crashing' do
+          subject.clean
+          expect(extracted).to_not be_a_file
+          subject.clean
+          expect(extracted).to_not be_a_file
+        end
+      end
     end
 
     describe '#fetch' do
@@ -218,11 +254,6 @@ module Omnibus
         expect(retry_count).to eq(Omnibus::Config.fetcher_retries)
       end
 
-      it 'extracts the file' do
-        fetch!
-        expect(extracted).to be_a_directory
-      end
-
       context 'when the file is less than 10240 bytes' do
         let(:source_url) { 'https://downloads.chef.io/packages-chef-io-public.key' }
         let(:source_md5) { '369efc3a19b9118cdf51c7e87a34f266' }

data/spec/functional/fetchers/path_fetcher_spec.rb

@@ -55,45 +55,45 @@ module Omnibus
       end
     end
 
-    describe '#clean' do
-      context 'when the project directory exists' do
-        before do
-          create_file("#{source_path}/file_a")
-          create_file("#{source_path}/file_b")
-          create_file("#{source_path}/.file_c")
-
-          create_file("#{project_dir}/file_a")
-        end
+    describe "#fetch" do
+      before do
+        create_file("#{source_path}/file_a")
+        create_file("#{source_path}/file_b")
+        create_file("#{source_path}/.file_c")
+        remove_file("#{source_path}/file_d")
 
-        it 'fetches new files' do
-          subject.clean
+        create_file("#{project_dir}/file_a")
+        remove_file("#{project_dir}/file_b")
+        remove_file("#{project_dir}/.file_c")
+        create_file("#{project_dir}/file_d")
+      end
 
-          expect("#{project_dir}/file_a").to be_a_file
-          expect("#{project_dir}/file_b").to be_a_file
-          expect("#{project_dir}/.file_c").to be_a_file
-        end
+      it 'fetches new files' do
+        subject.fetch
 
-        it 'returns true' do
-          expect(subject.clean).to be_truthy
-        end
+        expect("#{project_dir}/file_a").to be_a_file
+        expect("#{project_dir}/file_b").to be_a_file
+        expect("#{project_dir}/.file_c").to be_a_file
       end
 
-      context 'when the project directory does not exist' do
-        before do
-          remove_directory(project_dir)
-        end
+      it 'removes extraneous files' do
+        subject.fetch
 
-        it 'returns false' do
-          expect(subject.clean).to be(false)
-        end
+        expect("#{project_dir}/file_d").to_not be_a_file
+      end
+    end
+
+    describe '#clean' do
+      it 'returns true' do
+        expect(subject.clean).to be_truthy
       end
     end
 
     describe '#version_for_cache' do
       before do
-        create_file("#{project_dir}/file_a")
-        create_file("#{project_dir}/file_b")
-        create_file("#{project_dir}/.file_c")
+        create_file("#{source_path}/file_a")
+        create_file("#{source_path}/file_b")
+        create_file("#{source_path}/.file_c")
       end
 
       let(:sha) { '69553b23b84e69e095b4a231877b38022b1ffb41ae0ecbba6bb2625410c49f7e' }

data/spec/unit/builder_spec.rb

@@ -5,22 +5,32 @@ module Omnibus
     let(:software) do
       double(Software,
         name: 'chefdk',
-        install_dir: '/opt/chefdk',
-        project_dir: '/opt/chefdk',
+        install_dir: project_dir,
+        project_dir: project_dir,
       )
     end
 
+    let(:project_dir) { on_windows ? 'C:/opscode/chefdk' : '/opt/chefdk' }
+    let(:on_windows) { false }
+    let(:msys_bash) { "C:\\opscode\\chefdk\\embedded\\msys\\1.0\\bin\\bash.exe" }
+
+    def run_build_command
+      subject.send(:build_commands)[0].run(subject)
+    end
+
     subject { described_class.new(software) }
 
-    describe '#command' do
-      it 'is a DSL method' do
-        expect(subject).to have_exposed_method(:command)
+    before do
+      allow(subject).to receive(:windows?).and_return(on_windows)
+      allow(subject).to receive(:windows_safe_path) do |*args|
+        path = File.join(*args)
+        path.gsub!(File::SEPARATOR, '\\') if on_windows
       end
     end
 
-    describe '#patch' do
+    describe '#command' do
       it 'is a DSL method' do
-        expect(subject).to have_exposed_method(:patch)
+        expect(subject).to have_exposed_method(:command)
       end
     end
 
@@ -108,6 +118,12 @@ module Omnibus
       end
     end
 
+    describe '#update_config_guess' do
+      it 'is a DSL method' do
+        expect(subject).to have_exposed_method(:update_config_guess)
+      end
+    end
+
     describe '#windows_safe_path' do
       it 'is a DSL method' do
         expect(subject).to have_exposed_method(:windows_safe_path)
@@ -131,10 +147,14 @@ module Omnibus
         allow(subject).to receive(:command)
       end
 
+      it 'is a DSL method' do
+        expect(subject).to have_exposed_method(:make)
+      end
+
       context 'when :bin is present' do
         it 'uses the custom bin' do
           expect(subject).to receive(:command)
-            .with('/path/to/make', {})
+            .with('/path/to/make', in_msys_bash: true)
           subject.make(bin: '/path/to/make')
         end
       end
@@ -148,7 +168,7 @@ module Omnibus
 
         it 'uses gmake and sets MAKE=gmake' do
           expect(subject).to receive(:command)
-            .with('gmake', env: { 'MAKE' => 'gmake' })
+            .with('gmake', env: { 'MAKE' => 'gmake' }, in_msys_bash: true)
           subject.make
         end
       end
@@ -161,26 +181,138 @@ module Omnibus
 
         it 'uses make' do
           expect(subject).to receive(:command)
-            .with('make', {})
+            .with('make', in_msys_bash: true)
           subject.make
         end
       end
 
       it 'accepts 0 options' do
+        expect(subject).to receive(:command)
+          .with('make', in_msys_bash: true)
         expect { subject.make }.to_not raise_error
       end
 
       it 'accepts an additional command string' do
+        expect(subject).to receive(:command)
+          .with('make install', in_msys_bash: true)
         expect { subject.make('install') }.to_not raise_error
       end
 
       it 'persists given options' do
         expect(subject).to receive(:command)
-          .with(anything(), timeout: 3600)
+          .with('make', timeout: 3600, in_msys_bash: true)
         subject.make(timeout: 3600)
       end
     end
 
+    describe '#configure' do
+      before do
+        allow(subject).to receive(:command)
+      end
+
+      it 'is a DSL method' do
+        expect(subject).to have_exposed_method(:configure)
+      end
+
+      context 'on 64-bit windows' do
+        let(:on_windows) { true }
+        let(:windows_i386) { false }
+
+        before do
+          allow(subject).to receive(:windows_arch_i386?)
+            .and_return(windows_i386)
+        end
+
+        it 'invokes appends platform host to the options' do
+          expect(subject).to receive(:command)
+            .with("./configure --host=x86_64-w64-mingw32 --prefix=#{project_dir}/embedded", in_msys_bash: true)
+          subject.configure()
+        end
+      end
+
+      context 'when :bin is present' do
+        it 'uses the custom bin' do
+          expect(subject).to receive(:command)
+            .with("/path/to/configure --prefix=#{project_dir}/embedded", in_msys_bash: true)
+          subject.configure(bin: '/path/to/configure')
+        end
+      end
+
+      context 'when :prefix is present' do
+        it 'emits non-empty prefix' do
+          expect(subject).to receive(:command)
+            .with("./configure --prefix=/some/prefix", in_msys_bash: true)
+          subject.configure(prefix: '/some/prefix')
+        end
+
+        it 'omits prefix if empty' do
+          expect(subject).to receive(:command)
+            .with("./configure", in_msys_bash: true)
+          subject.configure(prefix: '')
+        end
+      end
+
+      it 'accepts 0 options' do
+        expect(subject).to receive(:command)
+          .with("./configure --prefix=#{project_dir}/embedded", in_msys_bash: true)
+        expect { subject.configure }.to_not raise_error
+      end
+
+      it 'accepts an additional command string' do
+        expect(subject).to receive(:command)
+          .with("./configure --prefix=#{project_dir}/embedded --myopt", in_msys_bash: true)
+        expect { subject.configure('--myopt') }.to_not raise_error
+      end
+
+      it 'persists given options' do
+        expect(subject).to receive(:command)
+          .with("./configure --prefix=#{project_dir}/embedded", timeout: 3600, in_msys_bash: true)
+        subject.configure(timeout: 3600)
+      end
+    end
+
+    describe '#patch' do
+      before do
+        allow(subject).to receive(:find_file)
+          .with('config/patches', 'good_patch')
+          .and_return(
+            [ ["#{project_dir}/patch_location1/good_patch", "#{project_dir}/patch_location2/good_patch"],
+              "#{project_dir}/patch_location2/good_patch" ])
+      end
+
+      it 'is a DSL method' do
+        expect(subject).to have_exposed_method(:patch)
+      end
+
+      it 'invokes patch with patch level 1 unless specified' do
+        expect { subject.patch(source: 'good_patch') }.to_not raise_error
+        expect(subject).to receive(:shellout!)
+          .with("patch -p1 -i #{project_dir}/patch_location2/good_patch", in_msys_bash: true)
+        run_build_command
+      end
+
+      it 'invokes patch with patch level provided' do
+        expect { subject.patch(source: 'good_patch', plevel: 0) }.to_not raise_error
+        expect(subject).to receive(:shellout!)
+          .with("patch -p0 -i #{project_dir}/patch_location2/good_patch", in_msys_bash: true)
+        run_build_command
+      end
+
+      it 'invokes patch differently if target is provided' do
+        expect { subject.patch(source: 'good_patch', target: 'target/path') }.to_not raise_error
+        expect(subject).to receive(:shellout!)
+          .with("cat #{project_dir}/patch_location2/good_patch | patch -p1 target/path", in_msys_bash: true)
+        run_build_command
+      end
+
+      it 'persists other options' do
+        expect { subject.patch(source: 'good_patch', timeout:3600) }.to_not raise_error
+        expect(subject).to receive(:shellout!)
+          .with("patch -p1 -i #{project_dir}/patch_location2/good_patch", timeout: 3600, in_msys_bash: true)
+        run_build_command
+      end
+    end
+
     describe "#shasum" do
       let(:build_step) do
         Proc.new {