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

data/spec/unit/project_spec.rb

@@ -23,6 +23,7 @@ module Omnibus
 
     it_behaves_like 'a cleanroom setter', :name, %|name 'chef'|
     it_behaves_like 'a cleanroom setter', :friendly_name, %|friendly_name 'Chef'|
+    it_behaves_like 'a cleanroom setter', :package_name, %|package_name 'chef.package'|
     it_behaves_like 'a cleanroom setter', :maintainer, %|maintainer 'Chef Software, Inc'|
     it_behaves_like 'a cleanroom setter', :homepage, %|homepage 'https://getchef.com'|
     it_behaves_like 'a cleanroom setter', :description, %|description 'Installs the thing'|
@@ -41,6 +42,8 @@ module Omnibus
     it_behaves_like 'a cleanroom setter', :config_file, %|config_file '/path/to/config.rb'|
     it_behaves_like 'a cleanroom setter', :extra_package_file, %|extra_package_file '/path/to/asset'|
 
+    it_behaves_like 'a cleanroom getter', :files_path
+
     describe 'basics' do
       it 'returns a name' do
         expect(subject.name).to eq('sample')
@@ -123,26 +126,34 @@ module Omnibus
     end
 
     describe '#dirty!' do
+      let(:software) { double(Omnibus::Software) }
+
       it 'dirties the cache' do
-        subject.instance_variable_set(:@dirty, nil)
-        subject.dirty!
+        subject.instance_variable_set(:@culprit, nil)
+        subject.dirty!(software)
         expect(subject).to be_dirty
       end
+
+      it 'sets the culprit' do
+        subject.instance_variable_set(:@culprit, nil)
+        subject.dirty!(software)
+        expect(subject.culprit).to be(software)
+      end
     end
 
     describe '#dirty?' do
       it 'returns true by default' do
-        subject.instance_variable_set(:@dirty, nil)
+        subject.instance_variable_set(:@culprit, nil)
         expect(subject).to_not be_dirty
       end
 
       it 'returns true when the cache is dirty' do
-        subject.instance_variable_set(:@dirty, true)
+        subject.instance_variable_set(:@culprit, true)
         expect(subject).to be_dirty
       end
 
       it 'returns false when the cache is not dirty' do
-        subject.instance_variable_set(:@dirty, false)
+        subject.instance_variable_set(:@culprit, false)
         expect(subject).to_not be_dirty
       end
     end

data/spec/unit/software_spec.rb

@@ -22,7 +22,6 @@ module Omnibus
     it_behaves_like 'a cleanroom getter', :project
     it_behaves_like 'a cleanroom setter', :name, %|name 'libxml2'|
     it_behaves_like 'a cleanroom setter', :description, %|description 'The XML magician'|
-    it_behaves_like 'a cleanroom setter', :always_build, %|always_build true|
     it_behaves_like 'a cleanroom setter', :dependency, %|dependency 'libxslt'|
     it_behaves_like 'a cleanroom setter', :source, %|source url: 'https://source.example.com'|
     it_behaves_like 'a cleanroom setter', :default_version, %|default_version '1.2.3'|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta.1
+  version: 4.0.0.rc.1
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-sugar
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appbundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Omnibus is a framework for building self-installing, full-stack software
   builds.
 email: releng@getchef.com
@@ -259,6 +273,7 @@ files:
 - lib/omnibus/generator_files/config/software/zlib.rb.erb
 - lib/omnibus/generator_files/gitignore.erb
 - lib/omnibus/generator_files/omnibus.rb.erb
+- lib/omnibus/generator_files/package_scripts/makeselfinst.erb
 - lib/omnibus/generator_files/package_scripts/postinst.erb
 - lib/omnibus/generator_files/package_scripts/postrm.erb
 - lib/omnibus/generator_files/package_scripts/preinst.erb
@@ -297,8 +312,6 @@ files:
 - lib/omnibus/version.rb
 - omnibus.gemspec
 - resources/bff/gen.template.erb
-- resources/bff/postinstall.sh
-- resources/bff/unpostinstall.sh
 - resources/deb/conffiles.erb
 - resources/deb/control.erb
 - resources/deb/md5sums.erb
@@ -307,7 +320,6 @@ files:
 - resources/dmg/icon.png
 - resources/makeself/makeself-header.sh
 - resources/makeself/makeself.sh
-- resources/makeself/post_extract.sh.erb
 - resources/msi/assets/LICENSE.rtf
 - resources/msi/assets/banner_background.bmp
 - resources/msi/assets/dialog_background.bmp
@@ -398,7 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Omnibus is a framework for building self-installing, full-stack software

data/resources/makeself/post_extract.sh.erb

@@ -1,27 +0,0 @@
-#!/bin/bash
-#
-# Installs <%= friendly_name %>
-#
-
-PROGNAME=`basename $0`
-INSTALLER_DIR=`dirname $0`
-DEST_DIR=<%= install_dir %>
-CONFIG_DIR=/etc/<%= name %>
-USAGE="usage: $0"
-
-error_exit()
-{
-  echo "${PROGNAME}: ${1:-"Unknown Error"}" 1>&2
-  exit 1
-}
-
-# move the actual files into place
-rm -rf $DEST_DIR/* || error_exit "Cannot remove contents of $DEST_DIR"
-mkdir -p $DEST_DIR || error_exit "Cannot create $DEST_DIR"
-cp -R $INSTALLER_DIR $DEST_DIR || error_exit "Cannot install to $DEST_DIR"
-rm -f $DEST_DIR/$PROGNAME
-
-# You may want to symlink your packages bin files into /usr/bin
-# ln -sf $DEST_DIR/bin/<%= name %> /usr/bin || error_exit "Cannot link <%= name %> to /usr/bin"
-
-exit 0