omnibus 4.0.0 → 4.1.0

data/spec/unit/packagers/bff_spec.rb

@@ -15,11 +15,15 @@ module Omnibus
 
     subject { described_class.new(project) }
 
-    let(:project_root) { "#{tmp_path}/project/root" }
-    let(:package_dir)  { "#{tmp_path}/package/dir" }
-    let(:staging_dir)  { "#{tmp_path}/staging/dir" }
+    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') }
 
     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)
 
@@ -46,13 +50,13 @@ module Omnibus
 
     describe '#scripts_install_dir' do
       it 'is nested inside the project install_dir' do
-        expect(subject.scripts_install_dir).to eq("#{project.install_dir}/embedded/share/installp")
+        expect(subject.scripts_install_dir).to start_with(project.install_dir)
       end
     end
 
     describe '#scripts_staging_dir' do
       it 'is nested inside the staging_dir' do
-        expect(subject.scripts_staging_dir).to eq("#{staging_dir}#{subject.scripts_install_dir}")
+        expect(subject.scripts_staging_dir).to start_with(staging_dir)
       end
     end
 

data/spec/unit/packagers/deb_spec.rb

@@ -15,9 +15,9 @@ module Omnibus
 
     subject { described_class.new(project) }
 
-    let(:project_root) { "#{tmp_path}/project/root" }
-    let(:package_dir)  { "#{tmp_path}/package/dir" }
-    let(:staging_dir)  { "#{tmp_path}/staging/dir" }
+    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') }
 
     before do
       Config.project_root(project_root)
@@ -167,13 +167,18 @@ module Omnibus
         create_file("#{project_root}/package-scripts/project/postrm") { "postrm" }
       end
 
-      it 'copies the scripts into the DEBIAN dir' do
+      it 'copies the scripts into the DEBIAN dir with permissions = 100755', :not_supported_on_windows do
         subject.write_scripts
 
         expect("#{staging_dir}/DEBIAN/preinst").to be_a_file
         expect("#{staging_dir}/DEBIAN/postinst").to be_a_file
         expect("#{staging_dir}/DEBIAN/prerm").to be_a_file
         expect("#{staging_dir}/DEBIAN/postrm").to be_a_file
+
+        expect("#{staging_dir}/DEBIAN/preinst").to have_permissions '100755'
+        expect("#{staging_dir}/DEBIAN/postinst").to have_permissions '100755'
+        expect("#{staging_dir}/DEBIAN/prerm").to have_permissions '100755'
+        expect("#{staging_dir}/DEBIAN/postrm").to have_permissions '100755'
       end
 
       it 'logs a message' do
@@ -344,18 +349,45 @@ module Omnibus
         end
       end
 
-      context 'on Raspbian' do
+      context 'when ppc64le' do
         before do
-          # There's no Raspbian in Fauxhai :(
-          stub_ohai(platform: 'debian', version: '7.6') do |data|
-            data['platform'] = 'raspbian'
-            data['platform_version'] = '7.6'
-            data['kernel']['machine'] = 'armv6l'
+          stub_ohai(platform: 'ubuntu', version: '14.04') do |data|
+            data['kernel']['machine'] = 'ppc64le'
+          end
+        end
+
+        it 'returns ppc64el' do
+          expect(subject.safe_architecture).to eq('ppc64el')
+        end
+      end
+
+      context 'Raspberry Pi' do
+        context 'Raspbian on Pi v1' do
+          before do
+            # There's no Raspbian in Fauxhai :(
+            stub_ohai(platform: 'debian', version: '7.6') do |data|
+              data['platform'] = 'raspbian'
+              data['platform_version'] = '7.6'
+              data['kernel']['machine'] = 'armv6l'
+            end
+          end
+
+          it 'returns armhf' do
+            expect(subject.safe_architecture).to eq('armhf')
           end
         end
 
-        it 'returns armhf' do
-          expect(subject.safe_architecture).to eq('armhf')
+        context 'Ubuntu on Pi v2' do
+          before do
+            # There's no Raspbian in Fauxhai :(
+            stub_ohai(platform: 'ubuntu', version: '14.04') do |data|
+              data['kernel']['machine'] = 'armv7l'
+            end
+          end
+
+          it 'returns armhf' do
+            expect(subject.safe_architecture).to eq('armhf')
+          end
         end
       end
     end

data/spec/unit/packagers/makeself_spec.rb

@@ -15,9 +15,9 @@ module Omnibus
 
     subject { described_class.new(project) }
 
-    let(:project_root) { "#{tmp_path}/project/root" }
-    let(:package_dir)  { "#{tmp_path}/package/dir" }
-    let(:staging_dir)  { "#{tmp_path}/staging/dir" }
+    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') }
 
     before do
       Config.project_root(project_root)
@@ -44,7 +44,7 @@ module Omnibus
     end
 
     describe '#write_makeselfinst' do
-      it 'generates the executable file' do
+      it 'generates the executable file', :not_supported_on_windows do
         subject.write_makeselfinst
         expect("#{staging_dir}/makeselfinst").to be_an_executable
       end

data/spec/unit/packagers/msi_spec.rb

@@ -9,15 +9,15 @@ module Omnibus
         project.install_dir('C:/project')
         project.build_version('1.2.3')
         project.build_iteration('2')
-        project.maintainer('Chef Software')
+        project.maintainer('Chef Software <maintainers@chef.io>')
       end
     end
 
     subject { described_class.new(project) }
 
-    let(:project_root) { "#{tmp_path}/project/root" }
-    let(:package_dir)  { "#{tmp_path}/package/dir" }
-    let(:staging_dir)  { "#{tmp_path}/staging/dir" }
+    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') }
 
     before do
       Config.project_root(project_root)
@@ -31,6 +31,10 @@ module Omnibus
       it 'exposes :parameters' do
         expect(subject).to have_exposed_method(:parameters)
       end
+
+      it 'exposes :signing_identity' do
+        expect(subject).to have_exposed_method(:signing_identity)
+      end
     end
 
     describe '#id' do
@@ -86,8 +90,17 @@ module Omnibus
     end
 
     describe '#package_name' do
+      before do
+        allow(Config).to receive(:windows_arch).and_return(:foo_arch)
+      end
+
       it 'includes the name, version, and build iteration' do
-        expect(subject.package_name).to eq('project-1.2.3-2.msi')
+        expect(subject.package_name).to eq('project-1.2.3-2-foo_arch.msi')
+      end
+
+      it 'returns the bundle name when building a bundle' do
+        subject.bundle_msi(true)
+        expect(subject.package_name).to eq('project-1.2.3-2-foo_arch.exe')
       end
     end
 
@@ -108,7 +121,7 @@ module Omnibus
         contents = File.read("#{staging_dir}/localization-en-us.wxl")
 
         expect(contents).to include('<String Id="ProductName">Project</String>')
-        expect(contents).to include('<String Id="ManufacturerName">Chef Software</String>')
+        expect(contents).to include('<String Id="ManufacturerName">"Chef Software &lt;maintainers@chef.io&gt;"</String>')
         expect(contents).to include('<String Id="FeatureMainName">Project</String>')
       end
     end
@@ -168,6 +181,27 @@ module Omnibus
       end
     end
 
+    describe '#write_bundle_file' do
+      before do
+        subject.bundle_msi(true)
+        subject.upgrade_code('ABCD-1234')
+        allow(Config).to receive(:windows_arch).and_return(:x86)
+      end
+
+      it 'generates the file' do
+        subject.write_bundle_file
+        expect("#{staging_dir}/bundle.wxs").to be_a_file
+      end
+
+      it 'has the correct content' do
+        outpath = "#{tmp_path}/package/dir/project-1.2.3-2-x86.msi"
+        outpath = outpath.gsub(File::SEPARATOR, File::ALT_SEPARATOR) if windows?
+        subject.write_bundle_file
+        contents = File.read("#{staging_dir}/bundle.wxs")
+        expect(contents).to include("<MsiPackage SourceFile=\"#{outpath}\" EnableFeatureSelection=\"no\" />")
+      end
+    end
+
     describe '#msi_version' do
       context 'when the project build_version semver' do
         it 'returns the right value' do
@@ -263,5 +297,87 @@ module Omnibus
         expect(subject.wix_extension_switches(['a', 'b'])).to eq("-ext 'a' -ext 'b'")
       end
     end
+
+    describe "#bundle_msi" do
+      it 'is a DSL method' do
+        expect(subject).to have_exposed_method(:bundle_msi)
+      end
+
+      it 'requires the value to be a TrueClass or a FalseClass' do
+        expect {
+          subject.bundle_msi(Object.new)
+        }.to raise_error(InvalidValue)
+      end
+
+      it 'returns the given value' do
+        subject.bundle_msi(true)
+        expect(subject.bundle_msi).to be_truthy
+      end
+    end
+
+    context 'when signing parameters are provided' do
+      let(:msi) { 'somemsi.msi' }
+
+      context 'when invalid parameters' do
+        it 'should raise an InvalidValue error when the certificate name is not a String' do
+          expect{subject.signing_identity(Object.new)}.to raise_error(InvalidValue)
+        end
+
+        it 'should raise an InvalidValue error when params is not a Hash' do
+          expect{subject.signing_identity("foo", Object.new)}.to raise_error(InvalidValue)
+        end
+
+        it 'should raise an InvalidValue error when params contains an invalid key' do
+          expect{subject.signing_identity("foo", bar: 'baz')}.to raise_error(InvalidValue)
+        end
+      end
+
+      context 'when valid parameters' do
+        before do
+          allow(subject).to receive(:shellout!)
+        end
+
+        it 'should sign the file and then add the timestamp' do
+          subject.signing_identity('foo')
+          expect(subject).to receive(:add_timestamp)
+          subject.sign_package(msi)
+        end
+
+        describe "#timestamp_servers" do
+          it "defaults to using ['http://timestamp.digicert.com','http://timestamp.verisign.com/scripts/timestamp.dll']" do
+            subject.signing_identity('foo')
+            expect(subject).to receive(:try_timestamp).with(msi, 'http://timestamp.digicert.com').and_return(false)
+            expect(subject).to receive(:try_timestamp).with(msi, 'http://timestamp.verisign.com/scripts/timestamp.dll').and_return(true)
+            subject.sign_package(msi)
+          end
+
+          it 'uses the timestamp server if provided through the #timestamp_server dsl' do
+            subject.signing_identity('foo', timestamp_servers: 'http://fooserver')
+            expect(subject).to receive(:try_timestamp).with(msi, 'http://fooserver').and_return(true)
+            subject.sign_package(msi)
+          end
+
+          it 'tries all timestamp server if provided through the #timestamp_server dsl' do
+            subject.signing_identity('foo', timestamp_servers: ['http://fooserver', 'http://barserver'])
+            expect(subject).to receive(:try_timestamp).with(msi, 'http://fooserver').and_return(false)
+            expect(subject).to receive(:try_timestamp).with(msi, 'http://barserver').and_return(true)
+            subject.sign_package(msi)
+          end
+
+          it 'tries all timestamp server if provided through the #timestamp_servers dsl and stops at the first available' do
+            subject.signing_identity('foo', timestamp_servers: ['http://fooserver', 'http://barserver'])
+            expect(subject).to receive(:try_timestamp).with(msi, 'http://fooserver').and_return(true)
+            expect(subject).not_to receive(:try_timestamp).with(msi, 'http://barserver')
+            subject.sign_package(msi)
+          end
+
+          it 'raises an exception if there are no available timestamp servers' do
+            subject.signing_identity('foo', timestamp_servers: 'http://fooserver')
+            expect(subject).to receive(:try_timestamp).with(msi, 'http://fooserver').and_return(false)
+            expect {subject.sign_package(msi)}.to raise_error(FailedToTimestampMSI)
+          end
+        end
+      end
+    end
   end
 end

data/spec/unit/packagers/pkg_spec.rb

@@ -15,9 +15,9 @@ module Omnibus
 
     subject { described_class.new(project) }
 
-    let(:project_root) { "#{tmp_path}/project/root" }
-    let(:package_dir)  { "#{tmp_path}/package/dir" }
-    let(:staging_dir)  { "#{tmp_path}/staging/dir" }
+    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') }
 
     before do
       subject.identifier('com.getchef.project')

data/spec/unit/packagers/rpm_spec.rb

@@ -16,9 +16,9 @@ module Omnibus
 
     subject { described_class.new(project) }
 
-    let(:project_root) { "#{tmp_path}/project/root" }
-    let(:package_dir)  { "#{tmp_path}/package/dir" }
-    let(:staging_dir)  { "#{tmp_path}/staging/dir" }
+    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') }
 
     before do
       Config.project_root(project_root)
@@ -31,6 +31,8 @@ module Omnibus
       create_directory("#{staging_dir}/SRPMS")
       create_directory("#{staging_dir}/SOURCES")
       create_directory("#{staging_dir}/SPECS")
+
+      stub_ohai(platform: 'redhat', version: '6.5')
     end
 
     describe '#signing_passphrase' do
@@ -112,7 +114,7 @@ module Omnibus
       end
 
       it 'includes the name, version, and build iteration' do
-        expect(subject.package_name).to eq('project-1.2.3-2.x86_64.rpm')
+        expect(subject.package_name).to eq('project-1.2.3-2.el6.x86_64.rpm')
       end
     end
 
@@ -127,7 +129,7 @@ module Omnibus
         allow(subject).to receive(:safe_architecture).and_return('x86_64')
       end
 
-      let(:spec_file) { "#{staging_dir}/SPECS/project-1.2.3-2.x86_64.rpm.spec" }
+      let(:spec_file) { "#{staging_dir}/SPECS/project-1.2.3-2.el6.x86_64.rpm.spec" }
 
       it 'generates the file' do
         subject.write_rpm_spec
@@ -140,7 +142,7 @@ module Omnibus
 
         expect(contents).to include("Name: project")
         expect(contents).to include("Version: 1.2.3")
-        expect(contents).to include("Release: 2")
+        expect(contents).to include("Release: 2.el6")
         expect(contents).to include("Summary:  The full stack of project")
         expect(contents).to include("BuildArch: x86_64")
         expect(contents).to include("AutoReqProv: no")
@@ -205,29 +207,34 @@ module Omnibus
           create_file("#{staging_dir}/BUILD/file2")
           create_directory("#{staging_dir}/BUILD/.dir1")
           create_directory("#{staging_dir}/BUILD/dir2")
+          create_directory("#{staging_dir}/BUILD/dir3 space")
         end
 
         it 'writes them into the spec' do
           subject.write_rpm_spec
           contents = File.read(spec_file)
 
-          expect(contents).to include("/.dir1")
+          expect(contents).to include("%dir /.dir1")
           expect(contents).to include("/.file1")
-          expect(contents).to include("/dir2")
+          expect(contents).to include("%dir /dir2")
           expect(contents).to include("/file2")
+          expect(contents).to include("%dir \"/dir3 space\"")
         end
       end
 
       context 'when leaf directories owned by the filesystem package are present' do
         before do
-          create_file("#{staging_dir}/BUILD/opt")
+          create_directory("#{staging_dir}/BUILD/usr/lib")
+          create_directory("#{staging_dir}/BUILD/opt")
+          create_file("#{staging_dir}/BUILD/opt/thing")
         end
 
-        it 'does not write them into the spec' do
+        it 'is written into the spec with ownership and permissions' do
           subject.write_rpm_spec
           contents = File.read(spec_file)
 
-          expect(contents).to_not include("/opt")
+          expect(contents).to include("%dir %attr(0755,root,root) /opt")
+          expect(contents).to include("%dir %attr(0555,root,root) /usr/lib")
         end
       end
     end
@@ -295,6 +302,12 @@ module Omnibus
       end
     end
 
+    describe '#dist_tag' do
+      it 'returns the Fedora packaging guidelines dist tag for the package' do
+        expect(subject.dist_tag).to eq('.el6')
+      end
+    end
+
     describe '#safe_base_package_name' do
       context 'when the project name is "safe"' do
         it 'returns the value without logging a message' do
@@ -357,7 +370,7 @@ module Omnibus
 
     describe '#safe_architecture' do
       before do
-        stub_ohai(platform: 'ubuntu', version: '12.04') do |data|
+        stub_ohai(platform: 'redhat', version: '6.5') do |data|
           data['kernel']['machine'] = 'i386'
         end
       end
@@ -366,6 +379,18 @@ module Omnibus
         expect(subject.safe_architecture).to eq('i386')
       end
 
+      context 'when i686' do
+        before do
+          stub_ohai(platform: 'redhat', version: '6.5') do |data|
+            data['kernel']['machine'] = 'i686'
+          end
+        end
+
+        it 'returns i386' do
+          expect(subject.safe_architecture).to eq('i386')
+        end
+      end
+
       context 'on Pidora' do
         before do
           # There's no Pidora in Fauxhai :(