omnibus 5.0.0 → 5.1.0

data/spec/unit/git_cache_spec.rb

@@ -83,7 +83,7 @@ module Omnibus
         expect(FileUtils).to receive(:mkdir_p)
           .with(File.dirname(ipc.cache_path))
         expect(ipc).to receive(:shellout!)
-          .with("git --git-dir=#{cache_path} init -q")
+          .with("git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} init -q")
         ipc.create_cache_path
       end
 
@@ -95,7 +95,6 @@ module Omnibus
           .with(File.dirname(ipc.cache_path))
           .and_return(true)
         expect(ipc).to_not receive(:shellout!)
-          .with("git --git-dir=#{cache_path} init -q")
         ipc.create_cache_path
       end
     end
@@ -114,19 +113,19 @@ module Omnibus
       it 'adds all the changes to git removing git directories' do
         expect(ipc).to receive(:remove_git_dirs)
         expect(ipc).to receive(:shellout!)
-          .with("git --git-dir=#{cache_path} --work-tree=#{install_dir} add -A -f")
+          .with("git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} add -A -f")
         ipc.incremental
       end
 
       it 'commits the backup for the software' do
         expect(ipc).to receive(:shellout!)
-          .with(%Q(git --git-dir=#{cache_path} --work-tree=#{install_dir} commit -q -m "Backup of #{ipc.tag}"))
+          .with(%Q(git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} commit -q -m "Backup of #{ipc.tag}"))
         ipc.incremental
       end
 
       it 'tags the software backup' do
         expect(ipc).to receive(:shellout!)
-          .with(%Q(git --git-dir=#{cache_path} --work-tree=#{install_dir} tag -f "#{ipc.tag}"))
+          .with(%Q(git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} tag -f "#{ipc.tag}"))
         ipc.incremental
       end
     end
@@ -165,11 +164,11 @@ module Omnibus
       end
 
       before(:each) do
-        allow(ipc).to receive(:shellout)
-          .with(%Q(git --git-dir=#{cache_path} --work-tree=#{install_dir} tag -l "#{ipc.tag}"))
+        allow(ipc).to receive(:shellout!)
+          .with(%Q(git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} tag -l "#{ipc.tag}"))
           .and_return(tag_cmd)
         allow(ipc).to receive(:shellout!)
-          .with(%Q(git --git-dir=#{cache_path} --work-tree=#{install_dir} checkout -f "#{ipc.tag}"))
+          .with(%Q(git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} checkout -f "#{ipc.tag}"))
         allow(ipc).to receive(:create_cache_path)
       end
 
@@ -179,11 +178,11 @@ module Omnibus
       end
 
       it 'checks for a tag with the software and version, and if it finds it, checks it out' do
-        expect(ipc).to receive(:shellout)
-          .with(%Q(git --git-dir=#{cache_path} --work-tree=#{install_dir} tag -l "#{ipc.tag}"))
+        expect(ipc).to receive(:shellout!)
+          .with(%Q(git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} tag -l "#{ipc.tag}"))
           .and_return(tag_cmd)
         expect(ipc).to receive(:shellout!)
-          .with(%Q(git --git-dir=#{cache_path} --work-tree=#{install_dir} checkout -f "#{ipc.tag}"))
+          .with(%Q(git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} checkout -f "#{ipc.tag}"))
         ipc.restore
       end
 
@@ -191,11 +190,11 @@ module Omnibus
         let(:git_tag_output) { "\n" }
 
         it 'does nothing' do
-          expect(ipc).to receive(:shellout)
-            .with(%Q(git --git-dir=#{cache_path} --work-tree=#{install_dir} tag -l "#{ipc.tag}"))
+          expect(ipc).to receive(:shellout!)
+            .with(%Q(git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} tag -l "#{ipc.tag}"))
             .and_return(tag_cmd)
           expect(ipc).to_not receive(:shellout!)
-            .with(%Q(git --git-dir=#{cache_path} --work-tree=#{install_dir} checkout -f "#{ipc.tag}"))
+            .with(%Q(git -c core.autocrlf=false --git-dir=#{cache_path} --work-tree=#{install_dir} checkout -f "#{ipc.tag}"))
           ipc.restore
         end
       end

data/spec/unit/health_check_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'pedump'
 
 module Omnibus
   describe HealthCheck do
@@ -12,8 +13,93 @@ module Omnibus
       )
     end
 
+    def mkdump(base, size, x64 = false)
+      dump = double(PEdump)
+      pe = double(PEdump::PE,
+        x64?: x64,
+        ioh: double(x64 ? PEdump::IMAGE_OPTIONAL_HEADER64 : PEdump::IMAGE_OPTIONAL_HEADER32,
+          ImageBase: base,
+          SizeOfImage: size,
+        ),
+      )
+      expect(dump).to receive(:pe).and_return(pe)
+      dump
+    end
+
     subject { described_class.new(project) }
 
+    context 'on windows' do
+      before do
+        stub_ohai(platform: 'windows', version: '2012')
+      end
+
+      it 'will perform dll base relocation checks' do
+        stub_ohai(platform: 'windows', version: '2012')
+        expect(subject.relocation_checkable?).to be true
+      end
+
+      context 'when performing dll base relocation checks' do
+        let(:pmdumps) do
+          {
+            'a' => mkdump(0x10000000, 0x00001000),
+            'b/b' => mkdump(0x20000000, 0x00002000),
+            'c/c/c' => mkdump(0x30000000, 0x00004000),
+          }
+        end
+
+        let(:search_dir) { "#{project.install_dir}/embedded/bin" }
+
+        before do
+          r = allow(Dir).to receive(:glob).with("#{search_dir}/*.dll")
+          pmdumps.each do |file, dump|
+            path = File.join(search_dir, file)
+            r.and_yield(path)
+            expect(File).to receive(:open).with(path, 'rb').and_yield(double(File))
+            expect(PEdump).to receive(:new).with(path).and_return(dump)
+          end
+        end
+
+        context 'when given non-overlapping dlls' do
+          it 'should always return true' do
+            expect(subject.run!).to eq(true)
+          end
+
+          it 'should not identify conflicts' do
+            expect(subject.relocation_check).to eq({})
+          end
+        end
+
+        context 'when presented with overlapping dlls' do
+          let(:pmdumps) do
+            {
+              'a' => mkdump(0x10000000, 0x00001000),
+              'b/b' => mkdump(0x10000500, 0x00002000),
+              'c/c/c' => mkdump(0x30000000, 0x00004000),
+            }
+          end
+
+          it 'should always return true' do
+            expect(subject.run!).to eq(true)
+          end
+
+          it 'should identify two conflicts' do
+            expect(subject.relocation_check).to eq({
+              'a' => {
+                base: 0x10000000,
+                size: 0x00001000,
+                conflicts: [ 'b' ],
+              },
+              'b' => {
+                base: 0x10000500,
+                size: 0x00002000,
+                conflicts: [ 'a' ],
+              },
+            })
+          end
+        end
+      end
+    end
+
     context 'on linux' do
       before { stub_ohai(platform: 'ubuntu', version: '12.04') }
 
@@ -68,6 +154,10 @@ module Omnibus
 
         expect { subject.run! }.to_not raise_error
       end
+
+      it 'will not perform dll base relocation checks' do
+        expect(subject.relocation_checkable?).to be false
+      end
     end
   end
 end

data/spec/unit/library_spec.rb

@@ -8,7 +8,7 @@ module Omnibus
     def generate_software(name, version, dependencies = [])
       software = Software.new(project, "#{name}.rb")
       software.name(name)
-      software.version(version)
+      software.default_version(version)
 
       dependencies.each do |dependency|
         software.dependency(dependency)

data/spec/unit/packagers/bff_spec.rb

@@ -137,12 +137,67 @@ module Omnibus
         end
       end
 
+      context 'when paths with colons/commas are present', if: !windows? do
+        let(:contents) do
+          subject.write_gen_template
+          File.read(gen_file)
+        end
+
+        before do
+          create_file("#{staging_dir}/man3/App::Cpan.3")
+          create_file("#{staging_dir}/comma,file")
+          create_directory("#{staging_dir}/colon::dir/file")
+          create_directory("#{staging_dir}/comma,dir/file")
+        end
+
+        it 'renames colon filenames in the template' do
+          expect(contents).to include("/man3/App____Cpan.3")
+        end
+
+        it 'renames colon directory names in the template' do
+          expect(contents).to include("/colon____dir/file")
+        end
+
+        it 'renames comma filenames in the template' do
+          expect(contents).to include("/comma__file")
+        end
+
+        it 'renames comma directory names in the template' do
+          expect(contents).to include("/comma__dir/file")
+        end
+
+        context 'creates a config script' do
+          it 'when there wasn\'t one provided' do
+            FileUtils.rm_f("#{subject.scripts_staging_dir}/config")
+            subject.write_gen_template
+            expect(File).to exist("#{subject.scripts_staging_dir}/config")
+          end
+
+          it 'when one is provided in the project\'s def' do
+            create_file("#{project_root}/package-scripts/project/config")
+            subject.write_gen_template
+            contents = File.read("#{subject.scripts_staging_dir}/config")
+            expect(contents).to include("mv '/man3/App____Cpan.3' '/man3/App::Cpan.3'")
+          end
+
+          it 'with mv commands for all the renamed files' do
+            subject.write_gen_template
+            contents = File.read("#{subject.scripts_staging_dir}/config")
+            expect(contents).to include("mv '/man3/App____Cpan.3' '/man3/App::Cpan.3'")
+            expect(contents).to include("mv '/comma__file' '/comma,file'")
+            expect(contents).to include("mv '/colon____dir/file' '/colon::dir/file'")
+            expect(contents).to include("mv '/comma__dir/file' '/comma,dir/file'")
+          end
+        end
+      end
+
       context 'when script files are present' do
         before do
           create_file("#{subject.scripts_staging_dir}/preinst")
           create_file("#{subject.scripts_staging_dir}/postinst")
           create_file("#{subject.scripts_staging_dir}/prerm")
           create_file("#{subject.scripts_staging_dir}/postrm")
+          create_file("#{subject.scripts_staging_dir}/config")
         end
 
         it 'writes them into the template' do
@@ -151,27 +206,75 @@ module Omnibus
 
           expect(contents).to include("    Pre-installation Script: #{subject.scripts_staging_dir}/preinst")
           expect(contents).to include("    Post-installation Script: #{subject.scripts_staging_dir}/postinst")
+          expect(contents).to include("    Configuration Script: #{subject.scripts_staging_dir}/config")
           expect(contents).to include("    Pre_rm Script: #{subject.scripts_staging_dir}/prerm")
           expect(contents).to include("    Unconfiguration Script: #{subject.scripts_staging_dir}/postrm")
         end
       end
+
+      context 'when the log_level is :debug, it' do
+        before do
+          Omnibus.logger.level = :debug
+        end
+
+        it 'prints the rendered template' do
+          output = capture_logging { subject.write_gen_template }
+          expect(output).to include("Package Name: project")
+        end
+      end
     end
 
     describe '#create_bff_file' do
+      # Need to mock out the id calls
+      let(:id_shellout) {
+        shellout_mock = double("shellout_mock")
+        allow(shellout_mock).to receive(:stdout).and_return("300")
+        shellout_mock
+      }
+
       before do
         allow(subject).to receive(:shellout!)
         allow(Dir).to receive(:chdir) { |_, &b| b.call }
+        allow(subject).to receive(:shellout!)
+          .with("id -u").and_return(id_shellout)
+        allow(subject).to receive(:shellout!)
+          .with("id -g").and_return(id_shellout)
+
+        create_file(File.join(staging_dir, '.info', "#{project.name}.inventory")) {
+          <<-INVENTORY.gsub(/^\s{12}/, '')
+            /opt/project/version-manifest.txt:
+                      owner = root
+                      group = system
+                      mode = 644
+                      type = FILE
+                      class = apply,inventory,angry-omnibus-toolchain
+                      size = 1906
+                      checksum = "02776    2 "
+          INVENTORY
+        }
+        create_file("#{staging_dir}/file") { "http://goo.gl/TbkO01" }
+      end
+
+      it 'gets the build uid' do
+        expect(subject).to receive(:shellout!)
+          .with("id -u")
+        subject.create_bff_file
+      end
+
+      it 'gets the build gid' do
+        expect(subject).to receive(:shellout!)
+          .with("id -g")
+        subject.create_bff_file
       end
 
-      it 'chowns the directory' do
+      it 'chowns the directory to root' do
         # A note - the /opt/ here is essentially project.install_dir one level up.
         # There is nothing magical about 'opt' as a directory.
         expect(subject).to receive(:shellout!)
-          .with(/chown -R 0:0 #{staging_dir}\/opt$/)
+          .with(/chown -Rh 0:0 #{staging_dir}\/opt$/)
         subject.create_bff_file
       end
 
-
       it 'logs a message' do
         output = capture_logging { subject.create_bff_file }
         expect(output).to include('Creating .bff file')
@@ -182,6 +285,26 @@ module Omnibus
           .with(/\/usr\/sbin\/mkinstallp -d/)
         subject.create_bff_file
       end
+
+      it 'chowns the directory back to the build user' do
+        # A note - the /opt/ here is essentially project.install_dir one level up.
+        # There is nothing magical about 'opt' as a directory.
+        # 300 is just what we set the mock for the build uid/gid to return.
+        expect(subject).to receive(:shellout!)
+          .with(/chown -Rh 300:300 #{staging_dir}/)
+        subject.create_bff_file
+      end
+
+      context 'when the log_level is :debug, it' do
+        before do
+          Omnibus.logger.level = :debug
+        end
+
+        it 'prints the inventory file' do
+          output = capture_logging { subject.create_bff_file }
+          expect(output).to match(%r{^/opt/project})
+        end
+      end
     end
 
     describe '#safe_base_package_name' do

data/spec/unit/packagers/deb_spec.rb

@@ -198,6 +198,8 @@ module Omnibus
         create_file("#{staging_dir}/.filea") { ".filea" }
         create_file("#{staging_dir}/file1") { "file1" }
         create_file("#{staging_dir}/file2") { "file2" }
+        create_file("#{staging_dir}/DEBIAN/preinst") { "preinst" }
+        create_file("#{staging_dir}/DEBIAN/postrm") { "postrm" }
       end
 
       it 'generates the file' do
@@ -209,9 +211,12 @@ module Omnibus
         subject.write_md5_sums
         contents = File.read("#{staging_dir}/DEBIAN/md5sums")
 
-        expect(contents).to include("9334770d184092f998009806af702c8c .filea")
-        expect(contents).to include("826e8142e6baabe8af779f5f490cf5f5 file1")
-        expect(contents).to include("1c1c96fd2cf8330db0bfa936ce82f3b9 file2")
+        expect(contents).to include("9334770d184092f998009806af702c8c  .filea")
+        expect(contents).to include("826e8142e6baabe8af779f5f490cf5f5  file1")
+        expect(contents).to include("1c1c96fd2cf8330db0bfa936ce82f3b9  file2")
+        expect(contents).to_not include("1c1c96fd2cf8330db0bfa936ce82f3b9 file2")
+        expect(contents).to_not include("DEBIAN/preinst")
+        expect(contents).to_not include("DEBIAN/postrm")
       end
     end
 

data/spec/unit/packagers/pkg_spec.rb

@@ -4,9 +4,9 @@ module Omnibus
   describe Packager::PKG do
     let(:project) do
       Project.new.tap do |project|
-        project.name('project')
+        project.name('project-full-name')
         project.homepage('https://example.com')
-        project.install_dir('/opt/project')
+        project.install_dir('/opt/project-full-name')
         project.build_version('1.2.3')
         project.build_iteration('2')
         project.maintainer('Chef Software')
@@ -15,12 +15,12 @@ module Omnibus
 
     subject { described_class.new(project) }
 
-    let(:project_root) { File.join(tmp_path, 'project/root') }
+    let(:project_root) { File.join(tmp_path, 'project-full-name/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')
+      subject.identifier('com.getchef.project-full-name')
 
       Config.project_root(project_root)
       Config.package_dir(package_dir)
@@ -48,7 +48,7 @@ module Omnibus
 
     describe '#package_name' do
       it 'includes the name, version, and build iteration' do
-        expect(subject.package_name).to eq('project-1.2.3-2.pkg')
+        expect(subject.package_name).to eq('project-full-name-1.2.3-2.pkg')
       end
     end
 
@@ -69,7 +69,7 @@ module Omnibus
         let(:scripts) { %w( preinstall postinstall ) }
         before do
           scripts.each do |script_name|
-            create_file("#{project_root}/package-scripts/project/#{script_name}") do
+            create_file("#{project_root}/package-scripts/project-full-name/#{script_name}") do
               "Contents of #{script_name}"
             end
           end
@@ -90,7 +90,7 @@ module Omnibus
         let(:default_scripts) { %w( preinst postinst ) }
         before do
           default_scripts.each do |script_name|
-            create_file("#{project_root}/package-scripts/project/#{script_name}") do
+            create_file("#{project_root}/package-scripts/project-full-name/#{script_name}") do
               "Contents of #{script_name}"
             end
           end
@@ -114,12 +114,12 @@ module Omnibus
       it 'executes the pkgbuild command' do
         expect(subject).to receive(:shellout!).with <<-EOH.gsub(/^ {10}/, '')
           pkgbuild \\
-            --identifier "com.getchef.project" \\
+            --identifier "com.getchef.project-full-name" \\
             --version "1.2.3" \\
             --scripts "#{staging_dir}/Scripts" \\
-            --root "/opt/project" \\
-            --install-location "/opt/project" \\
-            "project-core.pkg"
+            --root "/opt/project-full-name" \\
+            --install-location "/opt/project-full-name" \\
+            "project-full-name-core.pkg"
         EOH
 
         subject.build_component_pkg
@@ -136,9 +136,9 @@ module Omnibus
         subject.write_distribution_file
         contents = File.read("#{staging_dir}/Distribution")
 
-        expect(contents).to include('<pkg-ref id="com.getchef.project"/>')
-        expect(contents).to include('<line choice="com.getchef.project"/>')
-        expect(contents).to include('project-core.pkg')
+        expect(contents).to include('<pkg-ref id="com.getchef.project-full-name"/>')
+        expect(contents).to include('<line choice="com.getchef.project-full-name"/>')
+        expect(contents).to include('project-full-name-core.pkg')
       end
     end
 
@@ -149,7 +149,7 @@ module Omnibus
             productbuild \\
               --distribution "#{staging_dir}/Distribution" \\
               --resources "#{staging_dir}/Resources" \\
-              "#{package_dir}/project-1.2.3-2.pkg"
+              "#{package_dir}/project-full-name-1.2.3-2.pkg"
           EOH
 
           subject.build_product_pkg
@@ -167,7 +167,7 @@ module Omnibus
               --distribution "#{staging_dir}/Distribution" \\
               --resources "#{staging_dir}/Resources" \\
               --sign "My Special Identity" \\
-              "#{package_dir}/project-1.2.3-2.pkg"
+              "#{package_dir}/project-full-name-1.2.3-2.pkg"
             EOH
           subject.build_product_pkg
         end
@@ -187,14 +187,14 @@ module Omnibus
 
     describe '#component_pkg' do
       it 'returns the project name with -core.pkg' do
-        expect(subject.component_pkg).to eq('project-core.pkg')
+        expect(subject.component_pkg).to eq('project-full-name-core.pkg')
       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
-          expect(subject.safe_base_package_name).to eq('project')
+          expect(subject.safe_base_package_name).to eq('project-full-name')
           expect(subject).to_not receive(:log)
         end
       end
@@ -225,7 +225,7 @@ module Omnibus
         before { subject.identifier(nil) }
 
         it 'is interpreted' do
-          expect(subject.safe_identifier).to eq('test.chefsoftware.pkg.project')
+          expect(subject.safe_identifier).to eq('test.chefsoftware.pkg.project-full-name')
         end
       end