omnibus 4.0.0.beta.1 → 4.0.0.rc.1

data/spec/support/git_helpers.rb

@@ -33,6 +33,14 @@ module Omnibus
           git %|remote add origin "#{remote_url}"|
           git %|push origin master|
 
+          options[:annotated_tags].each do |tag|
+            File.open('tag', 'w') { |f| f.write(tag) }
+            git %|add tag|
+            git %|commit -am "Create tag #{tag}"|
+            git %|tag "#{tag}" -m "#{tag}"|
+            git %|push origin "#{tag}"|
+          end if options[:annotated_tags]
+
           options[:tags].each do |tag|
             File.open('tag', 'w') { |f| f.write(tag) }
             git %|add tag|

data/spec/unit/builder_spec.rb

@@ -48,6 +48,12 @@ module Omnibus
       end
     end
 
+    describe '#appbundle' do
+      it 'is a DSL method' do
+        expect(subject).to have_exposed_method(:appbundle)
+      end
+    end
+
     describe '#block' do
       it 'is a DSL method' do
         expect(subject).to have_exposed_method(:block)

data/spec/unit/config_spec.rb

@@ -41,6 +41,7 @@ module Omnibus
     include_examples 'a configurable', :append_timestamp, true
     include_examples 'a configurable', :build_retries, 0
     include_examples 'a configurable', :use_git_caching, true
+    include_examples 'a configurable', :fetcher_read_timeout, 60
 
     describe '#workers' do
       context 'when the Ohai data is not present' do

data/spec/unit/generator_spec.rb

@@ -53,8 +53,6 @@ module Omnibus
 
         expect(structure).to include(*%w(
           omnibus-name/resources/bff/gen.template.erb
-          omnibus-name/resources/bff/postinstall.sh
-          omnibus-name/resources/bff/unpostinstall.sh
         ))
       end
     end
@@ -82,16 +80,6 @@ module Omnibus
       end
     end
 
-    context 'with the --makeself-assets flag' do
-      it 'generates the proper file structure' do
-        Generator.new(['name'], path: tmp_path, makeself_assets: true).invoke_all
-
-        expect(structure).to include(*%w(
-          omnibus-name/resources/makeself/post_extract.sh.erb
-        ))
-      end
-    end
-
     context 'with the --msi-assets flag' do
       it 'generates the proper file structure' do
         Generator.new(['name'], path: tmp_path, msi_assets: true).invoke_all

data/spec/unit/packagers/base_spec.rb

@@ -71,6 +71,22 @@ module Omnibus
       end
     end
 
+    describe '#install_dir' do
+      it 'is a DSL method' do
+        expect(subject).to have_exposed_method(:install_dir)
+      end
+
+      it 'returns the project instances install_dir' do
+        expect(subject.install_dir).to eq('/opt/project')
+      end
+    end
+
+    describe '#windows_safe_path' do
+      it 'is a DSL method' do
+        expect(subject).to have_exposed_method(:windows_safe_path)
+      end
+    end
+
     describe '#run!' do
       before do
         allow(subject).to receive(:remove_directory)

data/spec/unit/packagers/bff_spec.rb

@@ -25,6 +25,7 @@ module Omnibus
 
       allow(subject).to receive(:staging_dir).and_return(staging_dir)
       create_directory(staging_dir)
+      create_directory(subject.scripts_staging_dir)
     end
 
     describe '#id' do
@@ -43,6 +44,41 @@ module Omnibus
       end
     end
 
+    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")
+      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}")
+      end
+    end
+
+    describe '#write_scripts' do
+      context 'when scripts are given' do
+        let(:scripts) { %w( preinst postinst prerm postrm ) }
+        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 = "#{subject.scripts_staging_dir}/#{script_name}"
+            contents = File.read(script_file)
+            expect(contents).to include("Contents of #{script_name}")
+          end
+        end
+      end
+    end
+
     describe '#write_gen_template' do
       before do
         allow(subject).to receive(:safe_architecture).and_return('x86_64')
@@ -67,8 +103,6 @@ module Omnibus
         expect(contents).to include("  Fileset VRMF: 1.2.3.2")
         expect(contents).to include("  Fileset Description: The full stack of project")
         expect(contents).to include("  USRLIBLPPFiles")
-        expect(contents).to include("    Configuration Script:")
-        expect(contents).to include("    Unconfiguration Script:")
         expect(contents).to include("  EOUSRLIBLPPFiles")
         expect(contents).to include("  Bosboot required: N")
         expect(contents).to include("  License agreement acceptance required: N")
@@ -98,6 +132,25 @@ module Omnibus
           expect(contents).to include("/file2")
         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")
+        end
+
+        it 'writes them into the template' do
+          subject.write_gen_template
+          contents = File.read(gen_file)
+
+          expect(contents).to include("    Pre-installation Script: #{subject.scripts_install_dir}/preinst")
+          expect(contents).to include("    Post-installation Script: #{subject.scripts_install_dir}/postinst")
+          expect(contents).to include("    Pre_rm Script: #{subject.scripts_install_dir}/prerm")
+          expect(contents).to include("    Unconfiguration Script: #{subject.scripts_install_dir}/postrm")
+        end
+      end
     end
 
     describe '#create_bff_file' do
@@ -118,10 +171,10 @@ module Omnibus
       end
     end
 
-    describe '#safe_project_name' do
+    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_project_name).to eq('project')
+          expect(subject.safe_base_package_name).to eq('project')
           expect(subject).to_not receive(:log)
         end
       end
@@ -131,7 +184,7 @@ module Omnibus
 
         it 'returns the value while logging a message' do
           output = capture_logging do
-            expect(subject.safe_project_name).to eq('pro-ject123.for-realz-2')
+            expect(subject.safe_base_package_name).to eq('pro-ject123.for-realz-2')
           end
 
           expect(output).to include("The `name' compontent of BFF package names can only include")

data/spec/unit/packagers/deb_spec.rb

@@ -247,10 +247,10 @@ module Omnibus
       end
     end
 
-    describe '#safe_project_name' do
+    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_project_name).to eq('project')
+          expect(subject.safe_base_package_name).to eq('project')
           expect(subject).to_not receive(:log)
         end
       end
@@ -260,7 +260,7 @@ module Omnibus
 
         it 'returns the value while logging a message' do
           output = capture_logging do
-            expect(subject.safe_project_name).to eq('Pro-ject123.for-realz-2')
+            expect(subject.safe_base_package_name).to eq('Pro-ject123.for-realz-2')
           end
 
           expect(output).to include("The `name' compontent of Debian package names can only include")
@@ -319,6 +319,18 @@ module Omnibus
           expect(subject.safe_architecture).to eq('i386')
         end
       end
+
+      context 'when i686' do
+        before do
+          stub_ohai(platform: 'ubuntu', version: '12.04') do |data|
+            data['kernel']['machine'] = 'i686'
+          end
+        end
+
+        it 'returns i386' do
+          expect(subject.safe_architecture).to eq('i386')
+        end
+      end
     end
   end
 end

data/spec/unit/packagers/makeself_spec.rb

@@ -43,19 +43,66 @@ module Omnibus
       end
     end
 
-    describe '#write_post_extract_file' do
-      it 'generates the file' do
-        subject.write_post_extract_file
-        expect("#{staging_dir}/post_extract.sh").to be_a_file
-        expect("#{staging_dir}/post_extract.sh").to be_an_executable
+    describe '#write_scripts' do
+      before do
+        create_file("#{project_root}/package-scripts/project/makeselfinst") { 'Contents of makeselfinst' }
+      end
+
+      it 'copies the scripts into the STAGING dir' do
+        subject.write_scripts
+        expect("#{staging_dir}/makeselfinst").to be_a_file
       end
 
       it 'has the correct content' do
-        subject.write_post_extract_file
-        contents = File.read("#{staging_dir}/post_extract.sh")
+        subject.write_scripts
+        contents = File.read("#{staging_dir}/makeselfinst")
+
+        expect(contents).to include('Contents of makeselfinst')
+      end
+    end
+
+    describe '#write_scripts' do
+      context 'when scripts are given' do
+        let(:scripts) { %w( makeselfinst ) }
+        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 the 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 ) }
+        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 the staging dir' do
+          subject.write_scripts
 
-        expect(contents).to include("DEST_DIR=/opt/project")
-        expect(contents).to include("CONFIG_DIR=/etc/project")
+          default_scripts.each do |script_name|
+            mapped_name = Packager::Makeself::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
 

data/spec/unit/packagers/pkg_spec.rb

@@ -27,6 +27,7 @@ module Omnibus
 
       allow(subject).to receive(:staging_dir).and_return(staging_dir)
       create_directory(staging_dir)
+      create_directory("#{staging_dir}/Scripts")
     end
 
     describe 'DSL' do
@@ -57,13 +58,65 @@ module Omnibus
       end
     end
 
+    describe '#scripts_dir' do
+      it 'is nested inside the staging_dir' do
+        expect(subject.scripts_dir).to eq("#{staging_dir}/Scripts")
+      end
+    end
+
+    describe '#write_scripts' do
+      context 'when scripts are given' do
+        let(:scripts) { %w( preinstall postinstall ) }
+        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}/Scripts/#{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( preinst postinst ) }
+        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::PKG::SCRIPT_MAP[script_name.to_sym]
+            script_file = "#{staging_dir}/Scripts/#{mapped_name}"
+            contents = File.read(script_file)
+            expect(contents).to include("Contents of #{script_name}")
+          end
+        end
+      end
+    end
+
+
     describe '#build_component_pkg' do
       it 'executes the pkgbuild command' do
         expect(subject).to receive(:shellout!).with <<-EOH.gsub(/^ {10}/, '')
           pkgbuild \\
             --identifier "com.getchef.project" \\
             --version "1.2.3" \\
-            --scripts "#{project_root}/package-scripts/project" \\
+            --scripts "#{staging_dir}/Scripts" \\
             --root "/opt/project" \\
             --install-location "/opt/project" \\
             "project-core.pkg"
@@ -138,10 +191,10 @@ module Omnibus
       end
     end
 
-    describe '#safe_project_name' do
+    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_project_name).to eq('project')
+          expect(subject.safe_base_package_name).to eq('project')
           expect(subject).to_not receive(:log)
         end
       end
@@ -151,7 +204,7 @@ module Omnibus
 
         it 'returns the value while logging a message' do
           output = capture_logging do
-            expect(subject.safe_project_name).to eq('project123forrealz2')
+            expect(subject.safe_base_package_name).to eq('project123forrealz2')
           end
 
           expect(output).to include("The `name' compontent of Mac package names can only include")

data/spec/unit/packagers/rpm_spec.rb

@@ -153,10 +153,34 @@ module Omnibus
       end
 
       context 'when scripts are given' do
+        let(:scripts) {  %w( pre post preun postun verifyscript pretans posttrans ) }
+
+        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 the spec' do
+          subject.write_rpm_spec
+          contents = File.read(spec_file)
+
+          scripts.each do |script_name|
+            expect(contents).to include("%#{script_name}")
+            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( preinst postinst prerm postrm ) }
+
         before do
-          Packager::RPM::SCRIPTS.each do |name|
-            create_file("#{project_root}/package-scripts/project/#{name}") do
-              "Contents of #{name}"
+          default_scripts.each do |default_name|
+            create_file("#{project_root}/package-scripts/project/#{default_name}") do
+              "Contents of #{default_name}"
             end
           end
         end
@@ -165,20 +189,11 @@ module Omnibus
           subject.write_rpm_spec
           contents = File.read(spec_file)
 
-          expect(contents).to include("%pre")
-          expect(contents).to include("Contents of pre")
-          expect(contents).to include("%post")
-          expect(contents).to include("Contents of post")
-          expect(contents).to include("%preun")
-          expect(contents).to include("Contents of preun")
-          expect(contents).to include("%postun")
-          expect(contents).to include("Contents of postun")
-          expect(contents).to include("%verifyscript")
-          expect(contents).to include("Contents of verifyscript")
-          expect(contents).to include("%pretans")
-          expect(contents).to include("Contents of pretans")
-          expect(contents).to include("%posttrans")
-          expect(contents).to include("Contents of posttrans")
+          default_scripts.each do |script_name|
+            mapped_name = Packager::RPM::SCRIPT_MAP[script_name.to_sym]
+            expect(contents).to include("%#{mapped_name}")
+            expect(contents).to include("Contents of #{script_name}")
+          end
         end
       end
 
@@ -265,10 +280,10 @@ module Omnibus
       end
     end
 
-    describe '#safe_project_name' do
+    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_project_name).to eq('project')
+          expect(subject.safe_base_package_name).to eq('project')
           expect(subject).to_not receive(:log)
         end
       end
@@ -278,7 +293,7 @@ module Omnibus
 
         it 'returns the value while logging a message' do
           output = capture_logging do
-            expect(subject.safe_project_name).to eq('pro-ject123.for-realz-2')
+            expect(subject.safe_base_package_name).to eq('pro-ject123.for-realz-2')
           end
 
           expect(output).to include("The `name' compontent of RPM package names can only include")
@@ -301,14 +316,14 @@ module Omnibus
       end
 
       context 'when the project build_version has invalid characters' do
-        before { project.build_version("1.2$alpha.##__2") }
+        before { project.build_version("1.2-pre$alpha.##__2") }
 
         it 'returns the value while logging a message' do
           output = capture_logging do
-            expect(subject.safe_version).to eq('1.2-alpha.-2')
+            expect(subject.safe_version).to eq('1.2_pre$alpha.##__2')
           end
 
-          expect(output).to include("The `version' compontent of RPM package names can only include")
+          expect(output).to include("The `version' component of RPM package names can only include")
         end
       end
     end