omnibus 4.0.0 → 4.1.0

data/spec/unit/project_spec.rb

@@ -41,7 +41,9 @@ module Omnibus
     it_behaves_like 'a cleanroom setter', :exclude, %|exclude 'hamlet'|
     it_behaves_like 'a cleanroom setter', :config_file, %|config_file '/path/to/config.rb'|
     it_behaves_like 'a cleanroom setter', :extra_package_file, %|extra_package_file '/path/to/asset'|
-
+    it_behaves_like 'a cleanroom setter', :text_manifest_path, %|text_manifest_path '/path/to/manifest.txt'|
+    it_behaves_like 'a cleanroom setter', :json_manifest_path, %|json_manifest_path '/path/to/manifest.txt'|
+    it_behaves_like 'a cleanroom setter', :build_git_revision, %|build_git_revision 'wombats'|
     it_behaves_like 'a cleanroom getter', :files_path
 
     describe 'basics' do
@@ -125,6 +127,21 @@ module Omnibus
       end
     end
 
+    describe "build_git_revision" do
+      let(:git_repo_subdir_path) do
+        path = local_git_repo("foobar", annotated_tags: ["1.0", "2.0", "3.0"])
+        subdir_path = File.join(path, "asubdir")
+        Dir.mkdir(subdir_path)
+        subdir_path
+      end
+
+      it "returns a revision even when running in a subdir" do
+        Dir.chdir(git_repo_subdir_path) do
+          expect(subject.build_git_revision).to eq("632501dde2c41f3bdd988b818b4c008e2ff398dc")
+        end
+      end
+    end
+
     describe '#dirty!' do
       let(:software) { double(Omnibus::Software) }
 

data/spec/unit/publisher_spec.rb

@@ -42,6 +42,71 @@ module Omnibus
       it 'returns an array of Package objects' do
         expect(subject.packages.first).to be_a(Package)
       end
+
+      context 'a platform mappings matrix is provided' do
+        let(:options) do
+          {
+            platform_mappings: {
+              'ubuntu-12.04' => [
+                'ubuntu-12.04',
+                'ubuntu-14.04',
+              ],
+            },
+          }
+        end
+
+        let(:package) do
+          Package.new('/path/to/files/chef.deb')
+        end
+
+        let(:metadata) do
+          Metadata.new(package,
+            name: 'chef',
+            friendly_name: 'Chef',
+            homepage: 'https://www.getchef.com',
+            version: '11.0.6',
+            iteration: 1,
+            basename: 'chef.deb',
+            platform: 'ubuntu',
+            platform_version: '12.04',
+            arch: 'x86_64',
+            sha1: 'SHA1',
+            md5: 'ABCDEF123456',
+          )
+        end
+
+        before do
+          allow(package).to receive(:metadata).and_return(metadata)
+          allow(FileSyncer).to receive_message_chain(:glob, :map).and_return([package])
+        end
+
+        it 'creates a package for each publish platform' do
+          expect(subject.packages.size).to eq(2)
+          expect(
+            subject.packages.map do |p|
+              p.metadata[:platform_version]
+            end
+          ).to include('12.04', '14.04')
+        end
+
+        context 'the build platform does not exist' do
+          let(:options) do
+            {
+              platform_mappings: {
+                'ubuntu-10.04' => [
+                  'ubuntu-12.04',
+                  'ubuntu-14.04',
+                ],
+              },
+            }
+          end
+
+          it 'prints a warning' do
+            output = capture_logging { subject.packages }
+            expect(output).to include('Could not locate a package for build platform ubuntu-10.04. Publishing will be skipped for: ubuntu-12.04, ubuntu-14.04')
+          end
+        end
+      end
     end
 
     describe '#publish' do

data/spec/unit/publishers/artifactory_publisher_spec.rb

@@ -34,11 +34,14 @@ module Omnibus
     let(:packages) { [package] }
     let(:client)   { double('Artifactory::Client') }
     let(:artifact) { double('Artifactory::Resource::Artifact', upload: nil) }
+    let(:build)    { double('Artifactory::Resource::Build') }
 
     before do
       allow(subject).to receive(:client).and_return(client)
       allow(subject).to receive(:artifact_for).and_return(artifact)
+      allow(subject).to receive(:build_for).and_return(build)
       allow(package).to receive(:metadata).and_return(metadata)
+      allow(build).to   receive(:save)
     end
 
     subject { described_class.new(path, repository: repository) }
@@ -65,6 +68,20 @@ module Omnibus
         subject.publish
       end
 
+      it 'it creates a build record for all packages' do
+        expect(build).to receive(:save).once
+        subject.publish
+      end
+
+      context 'when no packages exist' do
+        let(:packages) { [] }
+
+        it 'does nothing' do
+          expect(artifact).to_not receive(:upload)
+          expect(build).to_not    receive(:save)
+        end
+      end
+
       context 'when upload fails' do
         before do
           Config.publish_retries(3)
@@ -85,26 +102,6 @@ module Omnibus
 
       end
 
-      context 'when an alternate platform and platform version are provided' do
-        subject do
-          described_class.new(path,
-            repository: repository,
-            platform: 'debian',
-            platform_version: '7',
-          )
-        end
-
-        it 'overrides the platform and platform version used for publishing' do
-          expect(artifact).to receive(:upload).with(
-            repository,
-            'com/getchef/chef/11.0.6/debian/7/chef.deb',
-            an_instance_of(Hash),
-          ).once
-
-          subject.publish
-        end
-      end
-
       context 'when a block is given' do
         it 'yields the package to the block' do
           block = ->(package) { package.do_something! }
@@ -112,6 +109,15 @@ module Omnibus
           subject.publish(&block)
         end
       end
+
+      context 'when the :build_record option is false' do
+        subject { described_class.new(path, repository: repository, build_record: false) }
+
+        it 'does not create a build record at the end of publishing' do
+          expect(build).to_not receive(:save)
+          subject.publish
+        end
+      end
     end
   end
 end

data/spec/unit/publishers/s3_publisher_spec.rb

@@ -30,11 +30,12 @@ module Omnibus
 
     let(:packages) { [package] }
 
-    let(:client) { double('UberS3', store: nil) }
+    let(:client) { double('Aws::S3::Resource') }
 
     before do
       allow(package).to receive(:metadata).and_return(metadata)
       allow(subject).to receive(:client).and_return(client)
+      allow(subject).to receive(:store_object)
     end
 
     subject { described_class.new(path) }
@@ -48,21 +49,22 @@ module Omnibus
       end
 
       it 'uploads the metadata' do
-        expect(client).to receive(:store).with(
+        expect(subject).to receive(:store_object).with(
           'ubuntu/14.04/x86_64/chef.deb/chef.deb.metadata.json',
           package.metadata.to_json,
-          access: :private,
+          nil,
+          'private',
         ).once
 
         subject.publish
       end
 
       it 'uploads the package' do
-        expect(client).to receive(:store).with(
+        expect(subject).to receive(:store_object).with(
           'ubuntu/14.04/x86_64/chef.deb/chef.deb',
           package.content,
-          access: :private,
-          content_md5: package.metadata[:md5],
+          package.metadata[:md5],
+          'private'
         ).once
 
         subject.publish
@@ -72,10 +74,11 @@ module Omnibus
         subject { described_class.new(path, acl: 'public') }
 
         it 'sets the access control to public_read' do
-          expect(client).to receive(:store).with(
+          expect(subject).to receive(:store_object).with(
             'ubuntu/14.04/x86_64/chef.deb/chef.deb.metadata.json',
             package.metadata.to_json,
-            access: :public_read,
+            nil,
+            'public-read',
           ).once
 
           subject.publish
@@ -86,30 +89,11 @@ module Omnibus
         subject { described_class.new(path, acl: 'baconbits') }
 
         it 'sets the access control to private' do
-          expect(client).to receive(:store).with(
+          expect(subject).to receive(:store_object).with(
             'ubuntu/14.04/x86_64/chef.deb/chef.deb.metadata.json',
             package.metadata.to_json,
-            access: :private,
-          ).once
-
-          subject.publish
-        end
-      end
-
-      context 'when an alternate platform and platform version are provided' do
-        subject do
-          described_class.new(path,
-            platform: 'debian',
-            platform_version: '7',
-          )
-        end
-
-        it 'overrides the platform and platform version used for publishing' do
-          expect(client).to receive(:store).with(
-            'debian/7/x86_64/chef.deb/chef.deb',
-            package.content,
-            access: :private,
-            content_md5: package.metadata[:md5],
+            nil,
+            'private',
           ).once
 
           subject.publish

data/spec/unit/s3_cacher_spec.rb

@@ -43,7 +43,7 @@ module Omnibus
       before { allow(S3Cache).to receive(:bucket).and_return(bucket) }
 
       it 'lists the keys on the S3 bucket' do
-        expect(bucket).to receive(:objects).with('/').once
+        expect(bucket).to receive(:objects).once
         S3Cache.keys
       end
     end

data/spec/unit/s3_helpers_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+require 'omnibus/s3_helpers'
+
+module Omnibus
+  describe S3Helpers do
+    include Omnibus::S3Helpers
+
+    context 'when #s3_configuration is not defined' do
+      describe '#client' do
+        it 'raises an error if it is not overridden' do
+          expect { s3_configuration }.to raise_error(RuntimeError,
+                                                     "You must override s3_configuration")
+        end
+
+        it 'raises an error stating that s3_configuration must be overriden' do
+          expect { client }.to raise_error(RuntimeError,
+                                           "You must override s3_configuration")
+        end
+      end
+    end
+
+    describe '#to_base64_digest' do
+      it 'turns "c3b5247592ce694f7097873aa07d66fe" into "w7UkdZLOaU9wl4c6oH1m/g=="' do
+        expect(to_base64_digest("c3b5247592ce694f7097873aa07d66fe")).to eql('w7UkdZLOaU9wl4c6oH1m/g==')
+      end
+
+      it 'allows a nil input without error' do
+        expect(to_base64_digest(nil)).to be_nil
+      end
+    end
+  end
+end

data/spec/unit/semantic_version_spec.rb

@@ -0,0 +1,55 @@
+#
+# Copyright 2015 Chef Software, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require 'spec_helper'
+
+module Omnibus
+  describe SemanticVersion do
+
+    it "raises an InvalidVersion error if it doesn't understand the format" do
+      expect {Omnibus::SemanticVersion.new("wut")}.to raise_error(Omnibus::InvalidVersion)
+    end
+
+    it "preserves leading the leading v when printing the string" do
+      v = Omnibus::SemanticVersion.new("v1.0.0")
+      expect(v.to_s).to eq("v1.0.0")
+    end
+
+    it "can bump the patch version" do
+      v = Omnibus::SemanticVersion.new("1.0.0")
+      expect(v.next_patch.to_s).to eq("1.0.1")
+    end
+
+    it "can bump the minor version" do
+      v = Omnibus::SemanticVersion.new("1.1.0")
+      expect(v.next_minor.to_s).to eq("1.2.0")
+    end
+
+    it "can bump the major version" do
+      v = Omnibus::SemanticVersion.new("1.0.0")
+      expect(v.next_major.to_s).to eq("2.0.0")
+    end
+
+    it "resets the patch version when bumping minor versions" do
+      v = Omnibus::SemanticVersion.new("1.1.1")
+      expect(v.next_minor.to_s).to eq("1.2.0")
+    end
+
+    it "resets the patch and minor version when bumping major versions" do
+      v = Omnibus::SemanticVersion.new("1.1.1")
+      expect(v.next_major.to_s).to eq("2.0.0")
+    end
+  end
+end

data/spec/unit/software_spec.rb

@@ -52,43 +52,58 @@ module Omnibus
             'LDFLAGS'         => '-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib',
             'CFLAGS'          => '-I/opt/project/embedded/include',
             'CXXFLAGS'        => '-I/opt/project/embedded/include',
+            'CPPFLAGS'        => '-I/opt/project/embedded/include',
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
           )
         end
-        it 'ovesrride LDFLAGS' do
+        it 'overrides LDFLAGS' do
           expect(subject.with_standard_compiler_flags('LDFLAGS'        => 'foo')).to eq(
             'LDFLAGS'         => '-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib',
             'CFLAGS'          => '-I/opt/project/embedded/include',
             'CXXFLAGS'        => '-I/opt/project/embedded/include',
+            'CPPFLAGS'        => '-I/opt/project/embedded/include',
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
           )
         end
-        it 'ovesrride CFLAGS' do
+        it 'overrides CFLAGS' do
           expect(subject.with_standard_compiler_flags('CFLAGS'=>'foo')).to eq(
             'LDFLAGS'         => '-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib',
             'CFLAGS'          => '-I/opt/project/embedded/include',
             'CXXFLAGS'        => '-I/opt/project/embedded/include',
+            'CPPFLAGS'        => '-I/opt/project/embedded/include',
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
           )
         end
-        it 'ovesrride CXXFLAGS' do
+        it 'overrides CXXFLAGS' do
           expect(subject.with_standard_compiler_flags('CXXFLAGS'=>'foo')).to eq(
             'LDFLAGS'         => '-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib',
             'CFLAGS'          => '-I/opt/project/embedded/include',
             'CXXFLAGS'        => '-I/opt/project/embedded/include',
+            'CPPFLAGS'        => '-I/opt/project/embedded/include',
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
           )
         end
-        it 'presserve anything else' do
+        it 'overrides CPPFLAGS' do
+          expect(subject.with_standard_compiler_flags('CPPFLAGS'=>'foo')).to eq(
+            'LDFLAGS'         => '-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib',
+            'CFLAGS'          => '-I/opt/project/embedded/include',
+            'CXXFLAGS'        => '-I/opt/project/embedded/include',
+            'CPPFLAGS'        => '-I/opt/project/embedded/include',
+            'LD_RUN_PATH'     => '/opt/project/embedded/lib',
+            'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
+          )
+        end
+        it 'preserves anything else' do
           expect(subject.with_standard_compiler_flags('numberwang'=>4)).to eq(
             'numberwang'      => 4,
             'LDFLAGS'         => '-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib',
             'CFLAGS'          => '-I/opt/project/embedded/include',
             'CXXFLAGS'        => '-I/opt/project/embedded/include',
+            'CPPFLAGS'        => '-I/opt/project/embedded/include',
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
           )
@@ -109,11 +124,39 @@ module Omnibus
             'LDFLAGS'         => '-R/opt/project/embedded/lib -L/opt/project/embedded/lib -static-libgcc',
             'CFLAGS'          => '-I/opt/project/embedded/include',
             "CXXFLAGS"        => "-I/opt/project/embedded/include",
+            "CPPFLAGS"        => "-I/opt/project/embedded/include",
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'LD_OPTIONS'      => '-R/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
           )
         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.11') 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',
+              "CXXFLAGS"        => "-I/opt/project/embedded/include",
+              "CPPFLAGS"        => "-I/opt/project/embedded/include",
+              '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'
+            )
+          end
+        end
       end
 
       context 'on mac_os_x' do
@@ -124,6 +167,7 @@ module Omnibus
             'LDFLAGS'         => '-L/opt/project/embedded/lib',
             'CFLAGS'          => '-I/opt/project/embedded/include',
             "CXXFLAGS"        => "-I/opt/project/embedded/include",
+            "CPPFLAGS"        => "-I/opt/project/embedded/include",
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
           )
@@ -144,6 +188,7 @@ module Omnibus
             'CXX'             => 'xlC_r -q64',
             'CFLAGS'          => '-q64 -I/opt/project/embedded/include -D_LARGE_FILES -O',
             "CXXFLAGS"        => "-q64 -I/opt/project/embedded/include -D_LARGE_FILES -O",
+            "CPPFLAGS"        => "-q64 -I/opt/project/embedded/include -D_LARGE_FILES -O",
             'LDFLAGS'         => '-q64 -L/opt/project/embedded/lib -Wl,-blibpath:/opt/project/embedded/lib:/usr/lib:/lib',
             'LD'              => 'ld -b64',
             'OBJECT_MODE'     => '64',
@@ -163,6 +208,7 @@ module Omnibus
           expect(subject.with_standard_compiler_flags).to eq(
             'CFLAGS'  => '-I/opt/project/embedded/include',
             'CXXFLAGS'  => '-I/opt/project/embedded/include',
+            'CPPFLAGS'  => '-I/opt/project/embedded/include',
             'LDFLAGS' => '-L/opt/project/embedded/lib',
             'LD_RUN_PATH' => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig',
@@ -180,6 +226,7 @@ module Omnibus
               'CXX'             => 'clang++',
               'CFLAGS'          => '-I/opt/project/embedded/include',
               'CXXFLAGS'        => '-I/opt/project/embedded/include',
+              'CPPFLAGS'        => '-I/opt/project/embedded/include',
               'LDFLAGS'         => '-L/opt/project/embedded/lib',
               'LD_RUN_PATH'     => '/opt/project/embedded/lib',
               'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig',
@@ -256,6 +303,9 @@ module Omnibus
         end
 
         context '`Path` does not exist in the environment' do
+          before do
+            allow(ENV).to receive(:keys).and_return(['PATH'])
+          end
           it 'returns a path key of `PATH`' do
             expect(subject.with_embedded_path).to eq(
               'PATH' => prepended_path
@@ -277,6 +327,64 @@ module Omnibus
       end
     end
 
+    describe "#manifest_entry" do
+      let(:a_source) do
+        { url: 'http://example.com/',
+          md5: 'abcd1234' }
+      end
+
+      let(:manifest_entry) {Omnibus::ManifestEntry.new("software", {locked_version: "1.2.8", locked_source: a_source})}
+      let(:manifest) do
+        m = Omnibus::Manifest.new
+        m.add("software", manifest_entry)
+      end
+
+      let(:project_with_manifest) do
+        described_class.new(project, nil, manifest).evaluate do
+          name 'software'
+          default_version '1.2.3'
+          source url: 'http://example.com/',
+          md5: 'abcd1234'
+        end
+      end
+
+      let(:project_without_manifest) do
+        described_class.new(project, nil, nil).evaluate do
+          name 'software'
+          default_version '1.2.3'
+          source url: 'http://example.com/',
+          md5: 'abcd1234'
+        end
+      end
+
+      let(:another_project) do
+        described_class.new(project, nil, manifest).evaluate do
+          name 'ruroh'
+        end
+      end
+
+      it "constructs a manifest entry if no manifest was provided" do
+        expect(project_without_manifest.manifest_entry).to be_a Omnibus::ManifestEntry
+        expect(project_without_manifest.manifest_entry.locked_version).to eq("1.2.3")
+        expect(project_without_manifest.manifest_entry.locked_source).to eq(a_source)
+      end
+
+      it "constructs a manifest entry with a fully resolved version" do
+        expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", a_source).and_return("1.2.8")
+        expect(project_without_manifest.manifest_entry.locked_version).to eq("1.2.8")
+      end
+
+      it "returns the entry from the user-provided manifest if it was given one" do
+        expect(project_with_manifest.manifest_entry).to eq(manifest_entry)
+        expect(project_with_manifest.manifest_entry.locked_version).to eq("1.2.8")
+        expect(project_with_manifest.manifest_entry.locked_source).to eq(a_source)
+      end
+
+      it "raises an error if it was given a manifest but can't find it's entry" do
+        expect{another_project.manifest_entry}.to raise_error(Manifest::MissingManifestEntry)
+      end
+    end
+
     describe '#<=>' do
       let(:zlib)   { described_class.new(project).tap { |s| s.name('zlib') } }
       let(:erchef) { described_class.new(project).tap { |s| s.name('erchef') } }