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

data/lib/omnibus/packagers/solaris.rb

@@ -37,14 +37,14 @@ module Omnibus
 
       Dir.chdir(staging_dir) do
         shellout! "pkgmk -o -r #{install_dirname} -d /tmp/pkgmk -f /tmp/pkgmk/Prototype"
-        shellout! "pkgchk -vd /tmp/pkgmk #{project.name}"
-        shellout! "pkgtrans /tmp/pkgmk /var/cache/omnibus/pkg/#{package_name} #{project.name}"
+        shellout! "pkgchk -vd /tmp/pkgmk #{project.package_name}"
+        shellout! "pkgtrans /tmp/pkgmk /var/cache/omnibus/pkg/#{package_name} #{project.package_name}"
       end
     end
 
     # @see Base#package_name
     def package_name
-      "#{project.name}-#{pkgmk_version}.#{Ohai['kernel']['machine']}.solaris"
+      "#{project.package_name}-#{pkgmk_version}.#{Ohai['kernel']['machine']}.solaris"
     end
 
     def pkgmk_version
@@ -92,8 +92,8 @@ module Omnibus
         TZ=PST
         PATH=/sbin:/usr/sbin:/usr/bin:/usr/sadm/install/bin
         BASEDIR=#{install_dirname}
-        PKG=#{project.name}
-        NAME=#{project.name}
+        PKG=#{project.package_name}
+        NAME=#{project.package_name}
         ARCH=#{`uname -p`.chomp}
         VERSION=#{pkgmk_version}
         CATEGORY=application

data/lib/omnibus/project.rb

@@ -120,6 +120,27 @@ module Omnibus
     end
     expose :friendly_name
 
+    #
+    # Set or retrieve the package name of the project. Defaults to the package
+    # name defaults to the project name.
+    #
+    # @example
+    #   package_name 'com.chef.project'
+    #
+    # @param [String] val
+    #   the package name to set
+    #
+    # @return [String]
+    #
+    def package_name(val = NULL)
+      if null?(val)
+        @package_name || name
+      else
+        @package_name = val
+      end
+    end
+    expose :package_name
+
     #
     # **[Required]** Set or retrieve the path at which the project should be
     # installed by the generated package.
@@ -170,6 +191,21 @@ module Omnibus
     end
     expose :default_root
 
+    #
+    # Path to the +/files+ directory in the omnibus project. This directory can
+    # contain arbritary files used by the project.
+    #
+    # @example
+    #   patch = File.join(files_path, 'rubygems', 'patch.rb')
+    #
+    # @return [String]
+    #   path to the files directory
+    #
+    def files_path
+      File.expand_path("#{Config.project_root}/files")
+    end
+    expose :files_path
+
     #
     # **[Required]** Set or retrieve the the package maintainer.
     #
@@ -830,10 +866,23 @@ module Omnibus
     # install path cache, or software definitions to invalidate the cache for
     # this project.
     #
+    # @param [Software] software
+    #   the software that dirtied the cache
+    #
     # @return [true, false]
     #
-    def dirty!
-      @dirty = true
+    def dirty!(software)
+      raise ProjectAlreadyDirty.new(self) if culprit
+      @culprit = software
+    end
+
+    #
+    # The software definition which dirtied this project.
+    #
+    # @return [Software, nil]
+    #
+    def culprit
+      @culprit
     end
 
     #
@@ -842,7 +891,7 @@ module Omnibus
     # @return [true, false]
     #
     def dirty?
-      !!@dirty
+      !!culprit
     end
 
     #
@@ -907,8 +956,8 @@ module Omnibus
 
       # Copy the generated package and metadata back into the workspace
       package_path = File.join(Config.package_dir, packager.package_name)
-      FileUtils.cp(package_path, destination)
-      FileUtils.cp("#{package_path}.metadata.json", destination)
+      FileUtils.cp(package_path, destination, preserve: true)
+      FileUtils.cp("#{package_path}.metadata.json", destination, preserve: true)
     end
 
     #

data/lib/omnibus/software.rb

@@ -160,19 +160,6 @@ module Omnibus
     end
     expose :description
 
-    #
-    # Always build the given software definition.
-    #
-    # @param [true, false] val
-    #
-    # @return [true, false]
-    #
-    def always_build(val)
-      @always_build = val
-      @always_build
-    end
-    expose :always_build
-
     #
     # Add a software dependency to this software.
     #
@@ -717,20 +704,32 @@ module Omnibus
       end
     end
 
-    # Actually build the software package
+    #
+    # Build the software package. If git caching is turned on (see
+    # {Config#use_git_caching}), the build is restored according to the
+    # documented restoration procedure in the git cache. If the build cannot
+    # be restored (if the tag does not exist), the actual build steps are
+    # executed.
+    #
+    # @return [true]
+    #
     def build_me
-      # Build if we need to
-      if always_build?
-        log.info(log_key) { "Forcing build because `always_build' was given" }
-        execute_build
-      else
-        if GitCache.new(self).restore
+      if Config.use_git_caching
+        if project.dirty?
+          log.info(log_key) do
+            "Building because `#{project.culprit.name}' dirtied the cache"
+          end
+          execute_build
+        elsif git_cache.restore
           log.info(log_key) { "Restored from cache" }
-          true
         else
-          log.info(log_key) { "Could not restore from cache, building..." }
+          log.info(log_key) { "Could not restore from cache" }
           execute_build
+          project.dirty!(self)
         end
+      else
+        log.debug(log_key) { "Forcing build because git caching is off" }
+        execute_build
       end
 
       project.build_version_dsl.resolve(self)
@@ -792,22 +791,12 @@ module Omnibus
     private
 
     #
-    # Determine if this software should always be built. A software should
-    # always be built if git caching is disabled ({Config#use_git_caching}) or
-    # if the parent project has dirtied the cache.
+    # The git caching implementation for this software.
     #
-    # @return [true, false]
+    # @return [GitCache]
     #
-    def always_build?
-      unless Config.use_git_caching
-        return true
-      end
-
-      if project.dirty?
-        return true
-      end
-
-      !!@always_build
+    def git_cache
+      @git_cache ||= GitCache.new(self)
     end
 
     #
@@ -838,18 +827,27 @@ module Omnibus
       end
     end
 
+    #
+    # Actually build this software, executing the steps provided in the
+    # {#build} block and dirtying the cache.
+    #
+    # @return [void]
+    #
     def execute_build
       fetcher.clean
       builder.build
 
       if Config.use_git_caching
-        GitCache.new(self).incremental
+        git_cache.incremental
         log.info(log_key) { 'Dirtied the cache' }
       end
-
-      project.dirty!
     end
 
+    #
+    # The log key for this software, including its name.
+    #
+    # @return [String]
+    #
     def log_key
       @log_key ||= "#{super}: #{name}"
     end

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = '4.0.0.beta.1'
+  VERSION = '4.0.0.rc.1'
 end

data/omnibus.gemspec

@@ -35,4 +35,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec',       '~> 3.0'
   gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'appbundler'
 end

data/resources/bff/gen.template.erb

@@ -6,8 +6,9 @@ Fileset
   Fileset VRMF: <%= version %>
   Fileset Description: <%= description %>
   USRLIBLPPFiles
-    Configuration Script: <%= configuration_script %>
-    Unconfiguration Script: <%= unconfiguration_script %>
+  <% scripts.each do |name, install_path| -%>
+    <%= name %>: <%= install_path %>
+  <% end -%>
   EOUSRLIBLPPFiles
   Bosboot required: N
   License agreement acceptance required: N

data/resources/rpm/signing.erb

@@ -29,7 +29,7 @@ PTY.spawn(rpm_cmd) do |r, w, pid|
     begin
       line = r.gets
       puts line
-      if line =~ /failed/
+      if (line =~ /failed/) && !(line =~ /warning:/)
         STDERR.puts 'RPM signing failure'
         exit 1
       end

data/spec/functional/builder_spec.rb

@@ -10,8 +10,8 @@ module Omnibus
     # a real Ruby just for functional tests.
     #
     def fake_embedded_bin(name)
-      create_directory(bin_dir)
-      create_link(Bundler.which(name), File.join(bin_dir, name))
+      create_directory(embedded_bin_dir)
+      create_link(Bundler.which(name), File.join(embedded_bin_dir, name))
     end
 
     subject { described_class.new(software) }
@@ -131,13 +131,85 @@ module Omnibus
 
         fake_embedded_bin('bundle')
 
-        subject.bundle('install')
+        # Pass GEM_HOME and GEM_PATH to subprocess so our fake bin works
+        options = {}
+        options[:env] = {
+          'GEM_HOME' => ENV['GEM_HOME'],
+          'GEM_PATH' => ENV['GEM_PATH'],
+        }
+
+        subject.bundle('install', options)
         output = capture_logging { subject.build }
 
         expect(output).to include('bundle install')
       end
     end
 
+    describe '#appbundle' do
+      it 'executes the command as the embedded appbundler' do
+
+        source_dir       = "#{Omnibus::Config.source_dir}/example"
+        embedded_app_dir = "#{software.install_dir}/embedded/apps/example"
+        bin_dir          = "#{software.install_dir}/bin"
+
+        FileUtils.mkdir(source_dir)
+
+        gemspec = File.join(source_dir, 'example.gemspec')
+        File.open(gemspec, 'w') do |f|
+          f.write <<-EOH.gsub(/^ {12}/, '')
+            Gem::Specification.new do |gem|
+              gem.name           = 'example'
+              gem.version        = '1.0.0'
+              gem.author         = 'Chef Software, Inc.'
+              gem.email          = 'info@getchef.com'
+              gem.description    = 'Installs a thing'
+              gem.summary        = gem.description
+            end
+          EOH
+        end
+
+        gemfile      = File.join(source_dir, 'Gemfile')
+        File.open(gemfile, 'w') do |f|
+          f.write <<-EOH.gsub(/^ {12}/, '')
+            gemspec
+          EOH
+        end
+
+        gemfile_lock = File.join(source_dir, 'Gemfile.lock')
+        File.open(gemfile_lock, 'w') do |f|
+          f.write <<-EOH.gsub(/^ {12}/, '')
+            PATH
+              remote: .
+              specs:
+                example (1.0.0)
+
+            GEM
+              specs:
+
+            PLATFORMS
+              ruby
+
+            DEPENDENCIES
+              example!
+          EOH
+        end
+
+        fake_embedded_bin('appbundler')
+
+        # Pass GEM_HOME and GEM_PATH to subprocess so our fake bin works
+        options = {}
+        options[:env] = {
+          'GEM_HOME' => ENV['GEM_HOME'],
+          'GEM_PATH' => ENV['GEM_PATH'],
+        }
+
+        subject.appbundle('example', options)
+        output = capture_logging { subject.build }
+
+        expect(output).to include("/opt/chefdk/embedded/bin/appbundler '#{embedded_app_dir}' '#{bin_dir}'")
+      end
+    end
+
     describe '#rake' do
       it 'executes the command as the embedded rake' do
         rakefile = File.join(tmp_path, 'Rakefile')

data/spec/functional/fetchers/git_fetcher_spec.rb

@@ -98,6 +98,16 @@ module Omnibus
         end
       end
 
+      context 'when the version is an annnotated tag' do
+        let(:version)  { 'v1.2.4' }
+        let(:remote)   { remote_git_repo('zlib', annotated_tags: [version]) }
+
+        it 'it defererences and parses the annotated tag' do
+          subject.fetch
+          expect(revision).to eq('efde208366abd0f91419d8a54b45e3f6e0540105')
+        end
+      end
+
       context 'when the version is a branch' do
         let(:version) { 'sethvargo/magic_ponies' }
         let(:remote)  { remote_git_repo('zlib', branches: [version]) }
@@ -108,15 +118,34 @@ module Omnibus
         end
       end
 
-      context 'when the version is a ref' do
+      context 'when the version is a full SHA-1' do
+        let(:version) { '45ded6d3b1a35d66ed866b2c3eb418426e6382b0' }
+        let(:remote)  { remote_git_repo('zlib') }
+
+        it 'parses the full SHA-1' do
+          subject.fetch
+          expect(revision).to eq('45ded6d3b1a35d66ed866b2c3eb418426e6382b0')
+        end
+      end
+
+      context 'when the version is a abbreviated SHA-1' do
         let(:version) { '45ded6d' }
         let(:remote)  { remote_git_repo('zlib') }
 
-        it 'parses the ref' do
+        it 'parses the abbreviated SHA-1' do
           subject.fetch
           expect(revision).to eq('45ded6d3b1a35d66ed866b2c3eb418426e6382b0')
         end
       end
+
+      context 'when the version is a non-existent ref' do
+        let(:version) { 'fufufufufu' }
+        let(:remote)  { remote_git_repo('zlib') }
+
+        it 'raise an exception' do
+          expect { subject.fetch }.to raise_error(UnresolvableGitReference)
+        end
+      end
     end
 
     describe '#version_for_cache' do

data/spec/support/examples.rb

@@ -15,8 +15,9 @@ RSpec.shared_examples 'a software' do |name = 'chefdk'|
   let(:softwares_dir) { File.join(project_root, 'config', 'software', name) }
   let(:templates_dir) { File.join(project_root, 'config', 'templates', name) }
 
-  let(:install_dir) { File.join(project_root, 'opt', name) }
-  let(:bin_dir)     { File.join(install_dir, 'embedded', 'bin') }
+  let(:install_dir)      { File.join(project_root, 'opt', name) }
+  let(:bin_dir)          { File.join(install_dir, 'bin') }
+  let(:embedded_bin_dir) { File.join(install_dir, 'embedded', 'bin') }
 
   let(:software) do
     double(Omnibus::Software,
@@ -52,5 +53,10 @@ RSpec.shared_examples 'a software' do |name = 'chefdk'|
 
     FileUtils.mkdir_p(install_dir)
     FileUtils.mkdir_p(bin_dir)
+    FileUtils.mkdir_p(embedded_bin_dir)
+
+    allow(software).to receive(:with_embedded_path).and_return(
+      "PATH" => "#{bin_dir}:#{embedded_bin_dir}:#{ENV['PATH']}"
+    )
   end
 end