omnibus 4.1.0 → 5.0.0

data/spec/unit/packagers/solaris_spec.rb

@@ -0,0 +1,234 @@
+require 'spec_helper'
+
+module Omnibus
+  describe Packager::Solaris do
+    let(:project) do
+      Project.new.tap do |project|
+        project.name('project')
+        project.homepage('https://example.com')
+        project.install_dir('/opt/project')
+        project.build_version('1.2.3')
+        project.build_iteration('1')
+        project.maintainer('Chef Software')
+      end
+    end
+
+    subject { described_class.new(project) }
+
+    let(:project_root) { File.join(tmp_path, 'project/root') }
+    let(:package_dir)  { File.join(tmp_path, 'package/dir') }
+    let(:staging_dir)  { File.join(tmp_path, 'staging/dir') }
+    let(:architecture) { 'i86pc' }
+
+    before do
+      # This is here to allow this unit test to run on windows.
+      allow(File).to receive(:expand_path).and_wrap_original do |m, *args|
+        m.call(*args).sub(/^[A-Za-z]:/, '')
+      end
+      Config.project_root(project_root)
+      Config.package_dir(package_dir)
+
+      allow(subject).to receive(:staging_dir).and_return(staging_dir)
+      create_directory(staging_dir)
+
+      stub_ohai(platform: 'solaris2', version: '5.11') do |data|
+        data['kernel']['machine'] = architecture
+      end
+    end
+
+    describe '#id' do
+      it 'is :solaris' do
+        expect(subject.id).to eq(:solaris)
+      end
+    end
+
+    describe '#package_name' do
+      it 'includes the name, version, iteration and architecture' do
+        expect(subject.package_name).to eq('project-1.2.3-1.i386.solaris')
+      end
+    end
+
+    describe '#pkgmk_version' do
+      it 'includes the version and iteration' do
+        expect(subject.pkgmk_version).to eq('1.2.3-1')
+      end
+    end
+
+    describe '#install_dirname' do
+      it 'returns the parent directory' do
+        expect(subject.install_dirname).to eq('/opt')
+      end
+    end
+
+    describe '#install_basename' do
+      it 'name of the install directory' do
+        expect(subject.install_basename).to eq('project')
+      end
+    end
+
+    describe '#write_scripts' do
+      context 'when scripts are given' do
+        let(:scripts) { %w( postinstall postremove ) }
+        before do
+          scripts.each do |script_name|
+            create_file("#{project_root}/package-scripts/project/#{script_name}") do
+              "Contents of #{script_name}"
+            end
+          end
+        end
+
+        it 'writes the scripts into scripts staging dir' do
+          subject.write_scripts
+
+          scripts.each do |script_name|
+            script_file = "#{staging_dir}/#{script_name}"
+            contents = File.read(script_file)
+            expect(contents).to include("Contents of #{script_name}")
+          end
+        end
+      end
+
+      context 'when scripts with default omnibus naming are given' do
+        let(:default_scripts) { %w( postinst postrm ) }
+        before do
+          default_scripts.each do |script_name|
+            create_file("#{project_root}/package-scripts/project/#{script_name}") do
+              "Contents of #{script_name}"
+            end
+          end
+        end
+
+        it 'writes the scripts into scripts staging dir' do
+          subject.write_scripts
+
+          default_scripts.each do |script_name|
+            mapped_name = Packager::Solaris::SCRIPT_MAP[script_name.to_sym]
+            script_file = "#{staging_dir}/#{mapped_name}"
+            contents = File.read(script_file)
+            expect(contents).to include("Contents of #{script_name}")
+          end
+        end
+      end
+    end
+
+    describe '#write_prototype_file' do
+      let(:prototype_file) { File.join(staging_dir, 'Prototype') }
+
+      before do
+        allow(subject).to receive(:shellout!)
+      end
+
+      it 'creates the prototype file' do
+        subject.write_prototype_file
+        contents = File.read(prototype_file)
+
+        expect(contents).to include(
+          <<-EOH.gsub(/^ {12}/, '')
+            i pkginfo
+            i postinstall
+            i postremove
+          EOH
+        )
+      end
+
+      it 'uses the correct commands' do
+        expect(subject).to receive(:shellout!)
+          .with("cd /opt && find project -print > #{File.join(staging_dir, 'files')}")
+        expect(subject).to receive(:shellout!)
+          .with("cd /opt && pkgproto < #{File.join(staging_dir, 'files')} > #{File.join(staging_dir, 'Prototype.files')}")
+        expect(subject).to receive(:shellout!)
+          .with("awk '{ $5 = \"root\"; $6 = \"root\"; print }' < #{File.join(staging_dir, 'Prototype.files')} >> #{File.join(staging_dir, 'Prototype')}")
+
+        subject.write_prototype_file
+      end
+    end
+
+    describe '#create_solaris_file' do
+      it 'uses the correct commands' do
+        expect(subject).to receive(:shellout!)
+          .with("pkgmk -o -r /opt -d #{staging_dir} -f #{File.join(staging_dir, 'Prototype')}")
+        expect(subject).to receive(:shellout!)
+          .with("pkgchk -vd #{staging_dir} project")
+        expect(subject).to receive(:shellout!)
+          .with("pkgtrans #{staging_dir} #{File.join(package_dir, 'project-1.2.3-1.i386.solaris')} project")
+
+        subject.create_solaris_file
+      end
+    end
+
+    describe '#write_pkginfo_file' do
+      let(:pkginfo_file) { File.join(staging_dir, 'pkginfo') }
+      let(:hostname) { Socket.gethostname }
+      let(:now) { Time.now }
+
+      it 'generates the file' do
+        subject.write_pkginfo_file
+        expect(pkginfo_file).to be_a_file
+      end
+
+      it 'has the correct content' do
+        allow(Time).to receive(:now).and_return(now)
+        subject.write_pkginfo_file
+        contents = File.read(pkginfo_file)
+
+        expect(contents).to include("CLASSES=none")
+        expect(contents).to include("TZ=PST")
+        expect(contents).to include("PATH=/sbin:/usr/sbin:/usr/bin:/usr/sadm/install/bin")
+        expect(contents).to include("BASEDIR=/opt")
+        expect(contents).to include("PKG=project")
+        expect(contents).to include("NAME=project")
+        expect(contents).to include("ARCH=i386")
+        expect(contents).to include("VERSION=1.2.3-1")
+        expect(contents).to include("CATEGORY=application")
+        expect(contents).to include("DESC=")
+        expect(contents).to include("VENDOR=Chef Software")
+        expect(contents).to include("EMAIL=Chef Software")
+        expect(contents).to include("PSTAMP=#{hostname}#{now.utc.iso8601}")
+      end
+    end
+
+    describe '#create_solaris_file' do
+      before do
+        allow(subject).to receive(:shellout!)
+        allow(Dir).to receive(:chdir) { |_, &b| b.call }
+      end
+
+      it 'uses the correct commands' do
+        expect(subject).to receive(:shellout!)
+          .with("pkgmk -o -r /opt -d #{staging_dir} -f #{File.join(staging_dir, 'Prototype')}")
+        expect(subject).to receive(:shellout!)
+          .with("pkgchk -vd #{staging_dir} project")
+        expect(subject).to receive(:shellout!)
+          .with("pkgtrans #{staging_dir} #{File.join(package_dir, 'project-1.2.3-1.i386.solaris')} project")
+
+        subject.create_solaris_file
+      end
+    end
+
+    describe '#safe_architecture' do
+      context 'the architecture is Intel-based' do
+        let(:architecture) { 'i86pc' }
+
+        it 'returns `i386`' do
+          expect(subject.safe_architecture).to eq('i386')
+        end
+      end
+
+      context 'the architecture is SPARC-based' do
+        let(:architecture) { 'sun4v' }
+
+        it 'returns `sparc`' do
+          expect(subject.safe_architecture).to eq('sparc')
+        end
+      end
+
+      context 'anything else' do
+        let(:architecture) { 'FOO' }
+
+        it 'returns the value from Ohai' do
+          expect(subject.safe_architecture).to eq('FOO')
+        end
+      end
+    end
+  end
+end

data/spec/unit/publisher_spec.rb

@@ -107,6 +107,20 @@ module Omnibus
           end
         end
       end
+
+      context 'there are no packages to publish' do
+        before do
+          allow(FileSyncer).to receive(:glob)
+            .with(pattern)
+            .and_return([])
+        end
+
+        it 'prints a warning' do
+          output = capture_logging { subject.packages }
+          expect(output).to include('No packages found, skipping publish')
+        end
+      end
+
     end
 
     describe '#publish' do

data/spec/unit/publishers/artifactory_publisher_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 module Omnibus
   describe ArtifactoryPublisher do
     let(:path) { '/path/to/files/*.deb' }
-
     let(:repository) { 'REPO' }
 
     let(:package) do
@@ -27,6 +26,8 @@ module Omnibus
         platform_version: '14.04',
         arch: 'x86_64',
         sha1: 'SHA1',
+        sha256: 'SHA256',
+        sha512: 'SHA512',
         md5: 'ABCDEF123456',
       )
     end
@@ -36,6 +37,29 @@ module Omnibus
     let(:artifact) { double('Artifactory::Resource::Artifact', upload: nil) }
     let(:build)    { double('Artifactory::Resource::Build') }
 
+    let(:transformed_metadata_values) do
+      {
+        "omnibus.architecture" => "x86_64",
+        "omnibus.iteration" => 1,
+        "omnibus.md5" => "ABCDEF123456",
+        "omnibus.platform" => "ubuntu",
+        "omnibus.platform_version" => "14.04",
+        "omnibus.project" => "chef",
+        "omnibus.sha1" => "SHA1",
+        "omnibus.sha256" => "SHA256",
+        "omnibus.sha512" => "SHA512",
+        "omnibus.version" => "11.0.6",
+      }
+    end
+    let(:build_values) do
+      {
+        "build.name" => "chef",
+        "build.number" => "11.0.6",
+      }
+    end
+
+    let(:options) { {repository: repository} }
+
     before do
       allow(subject).to receive(:client).and_return(client)
       allow(subject).to receive(:artifact_for).and_return(artifact)
@@ -44,7 +68,7 @@ module Omnibus
       allow(build).to   receive(:save)
     end
 
-    subject { described_class.new(path, repository: repository) }
+    subject { described_class.new(path, options) }
 
     describe '#publish' do
       before do
@@ -62,7 +86,7 @@ module Omnibus
         expect(artifact).to receive(:upload).with(
           repository,
           'com/getchef/chef/11.0.6/ubuntu/14.04/chef.deb',
-          an_instance_of(Hash),
+          hash_including(transformed_metadata_values),
         ).once
 
         subject.publish
@@ -118,6 +142,51 @@ module Omnibus
           subject.publish
         end
       end
+
+      context 'additional properties are provided' do
+        let(:delivery_props) do
+          {
+            'delivery.change' => '4dbf38de-3e82-439f-8090-c5f3e11aeba6',
+            'delivery.sha' => 'ec1cb62616350176fc6fd9b1dc4ad3153caa0791',
+          }
+        end
+        let(:options) do
+          {
+            properties: delivery_props,
+            repository: repository,
+          }
+        end
+
+        it 'uploads the package with the provided properties' do
+          expect(artifact).to receive(:upload).with(
+            repository,
+            'com/getchef/chef/11.0.6/ubuntu/14.04/chef.deb',
+            hash_including(transformed_metadata_values.merge(delivery_props)),
+          ).once
+
+          subject.publish
+        end
+      end
+    end
+
+    describe '#metadata_properties_for' do
+      it 'returns the transformed package metadata values' do
+        expect(subject.send(:metadata_properties_for, package)).to include(transformed_metadata_values.merge(build_values))
+      end
+
+      context ':build_record is false' do
+        let(:options) do
+          {
+            build_record: false,
+            repository: repository,
+          }
+        end
+
+        it 'does not include `build.*` values' do
+          expect(subject.send(:metadata_properties_for, package)).to include(transformed_metadata_values)
+          expect(subject.send(:metadata_properties_for, package)).to_not include(build_values)
+        end
+      end
     end
   end
 end

data/spec/unit/sugarable_spec.rb

@@ -7,6 +7,22 @@ module Omnibus
     end
   end
 
+  describe Metadata do
+    it 'extends Sugarable' do
+      expect(described_class.singleton_class.included_modules).to include(Sugarable)
+    end
+
+    it 'includes Sugarable' do
+      expect(described_class.ancestors).to include(Sugarable)
+    end
+  end
+
+  describe Packager::Base do
+    it 'is a sugarable' do
+      expect(described_class.ancestors).to include(Sugarable)
+    end
+  end
+
   describe Project do
     it 'is a sugarable' do
       expect(described_class.ancestors).to include(Sugarable)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-sugar
@@ -374,6 +374,7 @@ files:
 - resources/makeself/makeself-header.sh
 - resources/makeself/makeself.sh
 - resources/makeself/makeselfinst.erb
+- resources/msi/CustomActionFastMsi.CA.dll
 - resources/msi/assets/LICENSE.rtf
 - resources/msi/assets/banner_background.bmp
 - resources/msi/assets/dialog_background.bmp
@@ -444,6 +445,7 @@ files:
 - spec/unit/packagers/msi_spec.rb
 - spec/unit/packagers/pkg_spec.rb
 - spec/unit/packagers/rpm_spec.rb
+- spec/unit/packagers/solaris_spec.rb
 - spec/unit/project_spec.rb
 - spec/unit/publisher_spec.rb
 - spec/unit/publishers/artifactory_publisher_spec.rb
@@ -466,7 +468,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.1
+      version: '2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -474,7 +476,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Omnibus is a framework for building self-installing, full-stack software
@@ -540,6 +542,7 @@ test_files:
 - spec/unit/packagers/msi_spec.rb
 - spec/unit/packagers/pkg_spec.rb
 - spec/unit/packagers/rpm_spec.rb
+- spec/unit/packagers/solaris_spec.rb
 - spec/unit/project_spec.rb
 - spec/unit/publisher_spec.rb
 - spec/unit/publishers/artifactory_publisher_spec.rb