omnibus 3.2.0.rc.1 → 3.2.0.rc.2

data/spec/unit/build_version_spec.rb

@@ -9,7 +9,7 @@ module Omnibus
     subject(:build_version) { described_class.new }
 
     before do
-      described_class.any_instance.stub(:shellout)
+      allow_any_instance_of(described_class).to receive(:shellout)
         .and_return(double('ouput', stdout: git_describe, exitstatus: 0))
     end
 
@@ -144,7 +144,7 @@ module Omnibus
         end
 
         context 'when Config.append_timestamp is true' do
-          before { Config.stub(:append_timestamp).and_return(true) }
+          before { Config.append_timestamp(true) }
 
           it 'appends a timestamp' do
             expect(build_version.semver).to match(/11.0.0-alpha.3\+#{today_string}[0-9]+.git.207.694b062/)
@@ -152,7 +152,7 @@ module Omnibus
         end
 
         context 'when Config.append_timestamp is false' do
-          before { Config.stub(:append_timestamp).and_return(false) }
+          before { Config.append_timestamp(false) }
 
           it 'does not append a timestamp' do
             expect(build_version.semver).to match(/11.0.0-alpha.3\+git.207.694b062/)
@@ -188,7 +188,7 @@ module Omnibus
   fatal: No tags can describe '809ea1afcce67e1148c1bf0822d40a7ef12c380e'.
   Try --always, or create some tags.
         STDERR
-        build_version.stub(:shellout)
+        allow(build_version).to receive(:shellout)
           .and_return(double('ouput', stderr: stderr, exitstatus: 128))
       end
       it 'sets the version to 0.0.0' do

data/spec/unit/builder_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+module Omnibus
+  describe Builder do
+    let(:software) do
+      double(Software,
+        name: 'chefdk',
+        install_dir: '/opt/chefdk',
+        project_dir: '/opt/chefdk',
+      )
+    end
+
+    subject { described_class.new(software) }
+
+    context 'DSL methods' do
+      before do
+        allow(subject).to receive(:find_file).and_return([nil, '/path'])
+      end
+
+      it_behaves_like 'a cleanroom setter', :command, %|command 'echo "hello"'|
+      it_behaves_like 'a cleanroom setter', :patch, %|patch source: 'diff.patch'|
+      it_behaves_like 'a cleanroom getter', :max_build_jobs
+      it_behaves_like 'a cleanroom setter', :ruby, %|ruby '-e "puts"'|
+      it_behaves_like 'a cleanroom setter', :gem, %|gem 'install bacon'|
+      it_behaves_like 'a cleanroom setter', :bundle, %|bundle 'install'|
+      it_behaves_like 'a cleanroom setter', :block, <<-EOH.gsub(/^ {8}/, '')
+        block 'A named block' do
+          # Complex operation
+        end
+      EOH
+      it_behaves_like 'a cleanroom setter', :erb,  <<-EOH.gsub(/^ {8}/, '')
+        erb source: 'template.erb',
+            dest: '/path/to/file',
+            vars: { a: 'b', c: 'd' }
+      EOH
+      it_behaves_like 'a cleanroom setter', :mkdir, %|mkdir 'path'|
+      it_behaves_like 'a cleanroom setter', :touch, %|touch 'file'|
+      it_behaves_like 'a cleanroom setter', :delete, %|delete 'file'|
+      it_behaves_like 'a cleanroom setter', :copy, %|copy 'file', 'file2'|
+      it_behaves_like 'a cleanroom setter', :move, %|move 'file', 'file2'|
+      it_behaves_like 'a cleanroom setter', :link, %|link 'file', 'file2'|
+      it_behaves_like 'a cleanroom getter', :project_root, %|puts project_root|
+
+      # From software
+      it_behaves_like 'a cleanroom getter', :project_dir
+      it_behaves_like 'a cleanroom getter', :install_dir
+    end
+  end
+end

data/spec/unit/config_spec.rb

@@ -25,7 +25,7 @@ module Omnibus
       end
 
       it_behaves_like 'a cleanroom getter', id, default
-      it_behaves_like 'a cleanroom setter', id, default
+      it_behaves_like 'a cleanroom setter', id, %|#{id}(#{default.inspect})|
     end
 
     include_examples 'a configurable', :base_dir, '/var/cache/omnibus'

data/spec/unit/fetchers/git_fetcher_spec.rb

@@ -16,12 +16,12 @@ module Omnibus
     describe '#fetch' do
       context 'when the project is cloned' do
         before do
-          subject.stub(:existing_git_clone?).and_return(true)
-          subject.stub(:fetch_updates)
+          allow(subject).to receive(:existing_git_clone?).and_return(true)
+          allow(subject).to receive(:fetch_updates)
         end
 
         context 'when the rev matches' do
-          before { subject.stub(:current_rev_matches_target_rev?).and_return(true) }
+          before { allow(subject).to receive(:current_rev_matches_target_rev?).and_return(true) }
 
           it 'does not fetch updates' do
             expect(subject).to_not receive(:fetch_updates)
@@ -30,7 +30,7 @@ module Omnibus
         end
 
         context 'when the rev does not match' do
-          before { subject.stub(:current_rev_matches_target_rev?).and_return(false) }
+          before { allow(subject).to receive(:current_rev_matches_target_rev?).and_return(false) }
 
           it 'fetches the updates' do
             expect(subject).to receive(:fetch_updates).once
@@ -41,9 +41,9 @@ module Omnibus
 
       context 'when the project is not cloned' do
         before do
-          subject.stub(:existing_git_clone?).and_return(false)
-          subject.stub(:clone)
-          subject.stub(:checkout)
+          allow(subject).to receive(:existing_git_clone?).and_return(false)
+          allow(subject).to receive(:clone)
+          allow(subject).to receive(:checkout)
         end
 
         it 'clones the project' do
@@ -61,14 +61,14 @@ module Omnibus
         let(:error_reporter) { double(Fetcher::ErrorReporter, explain: nil) }
 
         before do
-          subject.stub(:existing_git_clone?).and_return(false)
-          subject.stub(:clone).and_raise(RuntimeError)
+          allow(subject).to receive(:existing_git_clone?).and_return(false)
+          allow(subject).to receive(:clone).and_raise(RuntimeError)
 
-          Fetcher::ErrorReporter.stub(:new).and_return(error_reporter)
+          allow(Fetcher::ErrorReporter).to receive(:new).and_return(error_reporter)
         end
 
         it 'retries 4 times' do
-          subject.stub(:sleep)
+          allow(subject).to receive(:sleep)
           expect(subject).to receive(:clone).exactly(4).times
           expect { subject.fetch }.to raise_error(RuntimeError)
         end

data/spec/unit/fetchers/net_fetcher_spec.rb

@@ -20,13 +20,11 @@ module Omnibus
     shared_examples 'an extractor' do |extension, command|
       context "when the file is a .#{extension}" do
         before do
-          software_mock.stub(
-            project_file: "file.#{extension}",
-            source_uri: "http://example.com/file.#{extension}",
-          )
+          allow(software_mock).to receive(:project_file).and_return("file.#{extension}")
+          allow(software_mock).to receive(:source_uri).and_return("http://example.com/file.#{extension}")
         end
 
-        it 'downloads and decompresses the archive' do
+        it 'has the correct extract command' do
           expect(subject.extract_cmd).to eq(command)
         end
       end

data/spec/unit/git_cache_spec.rb

@@ -68,7 +68,7 @@ module Omnibus
 
     describe '#tag' do
       it 'returns the correct tag' do
-        expect(ipc.tag).to eql('zlib-329d861e3928a74938f1ff9ff2672ea4e1c0b6ac3b7f32e66fd61064f516f751')
+        expect(ipc.tag).to eql('zlib-25a09c83aca0f38a6e9d0d555358e772cde7ae7c40214edf108f1d1fded96bc7')
       end
 
       describe 'with no deps' do
@@ -77,7 +77,7 @@ module Omnibus
         end
 
         it 'returns the correct tag' do
-          expect(ipc.tag).to eql('zlib-4093b06ca5b22654b650a207736136964a1e8a362548a058702adbf501955189')
+          expect(ipc.tag).to eql('zlib-4315c8f2f9a0850b6fabeeaffe1f2dde4a3b52a234cc5e9bfaaf37f2280c6829')
         end
       end
     end

data/spec/unit/package_spec.rb

@@ -25,31 +25,138 @@ module Omnibus
 
     describe '.generate' do
       it 'writes out the file' do
-        described_class.stub(:new).and_return(instance)
+        allow(described_class).to receive(:new).and_return(instance)
         expect(instance).to receive(:save).once
 
         described_class.generate(package, data)
       end
+
+      describe '#arch' do
+        it 'returns the architecture' do
+          stub_ohai(platform: 'ubuntu', version: '12.04') do |data|
+            data['kernel']['machine'] = 'x86_64'
+          end
+          expect(described_class.arch).to eq('x86_64')
+        end
+      end
+
+      describe '#platform_shortname' do
+        it 'returns el on rhel' do
+          stub_ohai(platform: 'redhat', version: '6.4')
+          expect(described_class.platform_shortname).to eq('el')
+        end
+
+        it 'returns #platform on non-rhel systems' do
+          stub_ohai(platform: 'ubuntu', version: '12.04')
+          expect(described_class.platform_shortname).to eq('ubuntu')
+        end
+      end
+
+      describe '#platform_version' do
+        shared_examples 'a version manipulator' do |platform_shortname, version, expected|
+          context "on #{platform_shortname}-#{version}" do
+            it 'returns the correct value' do
+              stub_ohai(platform: 'ubuntu', version: '12.04') do |data|
+                data['platform'] = platform_shortname
+                data['platform_version'] = version
+              end
+
+              expect(described_class.platform_version).to eq(expected)
+            end
+          end
+        end
+
+        it_behaves_like 'a version manipulator', 'arch', '2009.02', '2009.02'
+        it_behaves_like 'a version manipulator', 'arch', '2014.06.01', '2014.06'
+        it_behaves_like 'a version manipulator', 'debian', '7.1', '7'
+        it_behaves_like 'a version manipulator', 'debian', '6.9', '6'
+        it_behaves_like 'a version manipulator', 'ubuntu', '10.04', '10.04'
+        it_behaves_like 'a version manipulator', 'ubuntu', '10.04.04', '10.04'
+        it_behaves_like 'a version manipulator', 'fedora', '11.5', '11'
+        it_behaves_like 'a version manipulator', 'freebsd', '10.0', '10'
+        it_behaves_like 'a version manipulator', 'rhel', '6.5', '6'
+        it_behaves_like 'a version manipulator', 'el', '6.5', '6'
+        it_behaves_like 'a version manipulator', 'centos', '5.9.6', '5'
+        it_behaves_like 'a version manipulator', 'aix', '7.1', '7.1'
+        it_behaves_like 'a version manipulator', 'gentoo', '2004.3', '2004.3'
+        it_behaves_like 'a version manipulator', 'mac_os_x', '10.9.1', '10.9'
+        it_behaves_like 'a version manipulator', 'openbsd', '5.4.4', '5.4'
+        it_behaves_like 'a version manipulator', 'slackware', '12.0.1', '12.0'
+        it_behaves_like 'a version manipulator', 'solaris2', '5.9', '5.9'
+        it_behaves_like 'a version manipulator', 'suse', '5.9', '5.9'
+        it_behaves_like 'a version manipulator', 'omnios', 'r151010', 'r151010'
+        it_behaves_like 'a version manipulator', 'smartos', '20120809T221258Z', '20120809T221258Z'
+        it_behaves_like 'a version manipulator', 'windows', '5.0.2195', '2000'
+        it_behaves_like 'a version manipulator', 'windows', '5.1.2600', 'xp'
+        it_behaves_like 'a version manipulator', 'windows', '5.2.3790', '2003r2'
+        it_behaves_like 'a version manipulator', 'windows', '6.0.6001', '2008'
+        it_behaves_like 'a version manipulator', 'windows', '6.1.7600', '7'
+        it_behaves_like 'a version manipulator', 'windows', '6.1.7601', '2008r2'
+        it_behaves_like 'a version manipulator', 'windows', '6.2.9200', '8'
+        it_behaves_like 'a version manipulator', 'windows', '6.3.9200', '8.1'
+
+        context 'given an unknown platform' do
+          before do
+            stub_ohai(platform: 'ubuntu', version: '12.04') do |data|
+              data['platform'] = 'bacon'
+              data['platform_version'] = '1.crispy'
+            end
+          end
+
+          it 'raises an exception' do
+            expect { described_class.platform_version }
+              .to raise_error(UnknownPlatform)
+          end
+        end
+
+        context 'given an unknown windows platform version' do
+          before do
+            stub_ohai(platform: 'ubuntu', version: '12.04') do |data|
+              data['platform'] = 'windows'
+              data['platform_version'] = '1.2.3'
+            end
+          end
+
+          it 'raises an exception' do
+            expect { described_class.platform_version }
+              .to raise_error(UnknownPlatformVersion)
+          end
+        end
+      end
     end
 
     describe '.for_package' do
       it 'raises an exception when the file does not exist' do
-        File.stub(:read).and_raise(Errno::ENOENT)
+        allow(File).to receive(:read).and_raise(Errno::ENOENT)
         expect { described_class.for_package(package) }
           .to raise_error(NoPackageMetadataFile)
       end
 
       it 'returns a metadata object' do
-        File.stub(:read).and_return('{ "platform": "ubuntu" }')
+        allow(File).to receive(:read).and_return('{ "platform": "ubuntu" }')
         expect(described_class.for_package(package)).to be_a(described_class)
       end
 
       it 'loads the metadata from disk' do
-        File.stub(:read).and_return('{ "platform": "ubuntu" }')
+        allow(File).to receive(:read).and_return('{ "platform": "ubuntu" }')
         instance = described_class.for_package(package)
 
         expect(instance[:platform]).to eq('ubuntu')
       end
+
+      it 'ensures an iteration exists' do
+        allow(File).to receive(:read).and_return('{}')
+        instance = described_class.for_package(package)
+
+        expect(instance[:iteration]).to eq(1)
+      end
+
+      it 'does not change existing iterations' do
+        allow(File).to receive(:read).and_return('{ "iteration": 4 }')
+        instance = described_class.for_package(package)
+
+        expect(instance[:iteration]).to eq(4)
+      end
     end
 
     describe '.path_for' do
@@ -75,7 +182,7 @@ module Omnibus
     describe '#save' do
       let(:file) { double(File) }
 
-      before { File.stub(:open).and_yield(file) }
+      before { allow(File).to receive(:open).and_yield(file) }
 
       it 'saves the file to disk' do
         expect(file).to receive(:write).once
@@ -114,7 +221,7 @@ module Omnibus
     describe '#md5' do
       let(:md5) { 'abcdef123456' }
 
-      before { subject.stub(:digest).with(path, :md5).and_return(md5) }
+      before { allow(subject).to receive(:digest).with(path, :md5).and_return(md5) }
 
       it 'returns the md5 of the package at the path' do
         expect(subject.md5).to eq(md5)
@@ -124,7 +231,7 @@ module Omnibus
     describe '#sha256' do
       let(:sha256) { 'abcdef123456' }
 
-      before { subject.stub(:digest).with(path, :sha256).and_return(sha256) }
+      before { allow(subject).to receive(:digest).with(path, :sha256).and_return(sha256) }
 
       it 'returns the sha256 of the package at the path' do
         expect(subject.sha256).to eq(sha256)
@@ -134,7 +241,7 @@ module Omnibus
     describe '#sha512' do
       let(:sha512) { 'abcdef123456' }
 
-      before { subject.stub(:digest).with(path, :sha512).and_return(sha512) }
+      before { allow(subject).to receive(:digest).with(path, :sha512).and_return(sha512) }
 
       it 'returns the sha512 of the package at the path' do
         expect(subject.sha512).to eq(sha512)
@@ -145,7 +252,7 @@ module Omnibus
       context 'when the file exists' do
         let(:content) { 'BINARY' }
 
-        before { IO.stub(:read).with(path).and_return(content) }
+        before { allow(IO).to receive(:read).with(path).and_return(content) }
 
         it 'reads the file' do
           expect(subject.content).to eq(content)
@@ -153,7 +260,7 @@ module Omnibus
       end
 
       context 'when the file does not exist' do
-        before { IO.stub(:read).and_raise(Errno::ENOENT) }
+        before { allow(IO).to receive(:read).and_raise(Errno::ENOENT) }
 
         it 'raises an exception' do
           expect { subject.content }.to raise_error(NoPackageFile)
@@ -164,7 +271,7 @@ module Omnibus
     describe '#metadata' do
       let(:content) { '{ "platform": "ubuntu" }' }
 
-      before { IO.stub(:read).and_return(content) }
+      before { allow(IO).to receive(:read).and_return(content) }
 
       it 'returns a Metadata object' do
         expect(subject.metadata).to be_a(Package::Metadata)

data/spec/unit/packagers/base_spec.rb

@@ -68,7 +68,7 @@ module Omnibus
     end
 
     describe '#create_directory' do
-      before { FileUtils.stub(:mkdir_p) }
+      before { allow(FileUtils).to receive(:mkdir_p) }
 
       it 'creates the directory' do
         expect(FileUtils).to receive(:mkdir_p).with('/foo/bar')
@@ -81,7 +81,7 @@ module Omnibus
     end
 
     describe '#remove_directory' do
-      before { FileUtils.stub(:rm_rf) }
+      before { allow(FileUtils).to receive(:rm_rf) }
 
       it 'remove the directory' do
         expect(FileUtils).to receive(:rm_rf).with('/foo/bar')
@@ -91,8 +91,8 @@ module Omnibus
 
     describe '#purge_directory' do
       before do
-        subject.stub(:remove_directory)
-        subject.stub(:create_directory)
+        allow(subject).to receive(:remove_directory)
+        allow(subject).to receive(:create_directory)
       end
 
       it 'removes and creates the directory' do
@@ -103,7 +103,7 @@ module Omnibus
     end
 
     describe '#copy_file' do
-      before { FileUtils.stub(:cp) }
+      before { allow(FileUtils).to receive(:cp) }
 
       it 'copies the file' do
         expect(FileUtils).to receive(:cp).with('foo', 'bar')
@@ -117,8 +117,8 @@ module Omnibus
 
     describe '#copy_directory' do
       before do
-        FileUtils.stub(:cp_r)
-        Dir.stub(:[]).and_return(['baz/file'])
+        allow(FileUtils).to receive(:cp_r)
+        allow(Dir).to receive(:[]).and_return(['baz/file'])
       end
 
       it 'copies the directory' do
@@ -141,8 +141,8 @@ module Omnibus
           input.write('<%= project.friendly_name %>')
           input.rewind
 
-          File.stub(:open).with(source_path).and_yield(input)
-          File.stub(:open).with(expected_destination_path, 'w').and_yield(output)
+          allow(File).to receive(:open).with(source_path).and_yield(input)
+          allow(File).to receive(:open).with(expected_destination_path, 'w').and_yield(output)
 
           expect(subject).to receive(:remove_file).with(source_path)
         end
@@ -171,7 +171,7 @@ module Omnibus
     end
 
     describe '#remove_file' do
-      before { FileUtils.stub(:rm_f) }
+      before { allow(FileUtils).to receive(:rm_f) }
 
       it 'removes the file' do
         expect(FileUtils).to receive(:rm_f).with('/foo/bar')
@@ -180,7 +180,7 @@ module Omnibus
     end
 
     describe '#execute' do
-      before { subject.stub(:shellout!) }
+      before { allow(subject).to receive(:shellout!) }
 
       it 'shellsout' do
         expect(subject).to receive(:shellout!)
@@ -191,17 +191,17 @@ module Omnibus
 
     describe '#assert_presence!' do
       it 'raises a MissingAsset exception when the file does not exist' do
-        File.stub(:exist?).and_return(false)
+        allow(File).to receive(:exist?).and_return(false)
         expect { subject.assert_presence!('foo') }.to raise_error(MissingAsset)
       end
     end
 
     describe '#run!' do
       before do
-        described_class.stub(:validate).and_return(proc {})
-        described_class.stub(:setup).and_return(proc {})
-        described_class.stub(:build).and_return(proc {})
-        described_class.stub(:clean).and_return(proc {})
+        allow(described_class).to receive(:validate).and_return(proc {})
+        allow(described_class).to receive(:setup).and_return(proc {})
+        allow(described_class).to receive(:build).and_return(proc {})
+        allow(described_class).to receive(:clean).and_return(proc {})
       end
 
       it 'calls the methods in order' do
@@ -243,7 +243,7 @@ module Omnibus
       end
 
       context 'when project defines resources_path' do
-        before { project.stub(:resources_path).and_return('project/specific') }
+        before { allow(project).to receive(:resources_path).and_return('project/specific') }
         it 'is the project resources_path, underscored_name, and Resources' do
           path = 'project/specific/base/Resources'
           expect(subject.send(:resources_path)).to eq(File.expand_path(path))