fpm-cookery 0.13.0 → 0.14.0

data/.gitignore

@@ -8,3 +8,6 @@ tmp-build/
 tmp-dest/
 .buildpath
 .project
+.vagrant
+Vagrantfile
+/vendor

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# v0.14.0 (2013-05-31)
+* Install dependencies via Puppet. (andytinycat)
+* Add install-deps action to install dependencies. (andytinycat)
+* Fix log message. (ryansch)
+* Add a `patch` helper method to apply patches. (piavlo)
+* Support for [Omnibus](http://wiki.opscode.com/display/chef/Omnibus+Information)-style
+  packaging. (andytinycat)
+* Add recipe to build a fat (omnibus-style) package for fpm-cookery.
+* Add `:args` option for the curl handler. (torrancew)
+* Add `-V` command line option to show fpm-cookery and fpm versions.
+
 # v0.13.0 (2013-01-28)
 * Make local file source behave like the remote url source. (#14)
 

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source "https://rubygems.org"
 
 gemspec

data/LICENSE

@@ -0,0 +1,23 @@
+Copyright (c) 2009-2012 Max Howell and other contributors.
+Copyright (c) 2011 Bernd Ahlers
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -47,11 +47,13 @@ __fpm-cookery__ is my attempt to build such a tool.
 * Package creation via __fpm__.
 * Standalone recipe trees/books/you name it. No need to put the recipes into
   the __fpm-cookery__ source tree.
+* Can build [Omnibus](http://wiki.opscode.com/display/chef/Omnibus+Information)
+  style packages (allows you to embed many builds into the same package - 
+  used by the Opscode folks to build an embedded Ruby and the gems for Chef into
+  a single package; also the [Sensu](https://github.com/sensu/sensu) guys do something similar.)
 
 ## Upcoming Features
 
-* Apply custom patches.
-* Dependency checking.
 * Recipe validation.
 * More source types. (hg, bzr, ...)
 * Progress output and logging.
@@ -131,16 +133,17 @@ The following is an example recipe. I have some more in my recipe collection
 * No recipe documentation and API documentation yet.
 * No recipe validation yet.
 * No dependency validation yet.
-* No support for patches yet.
 * Pretty new and not well tested.
 
 ## Credits
 
 __fpm-cookery__ borrows lots of __ideas__ and also __code__ from the
 [homebrew](https://github.com/mxcl/homebrew) and
-[brew2deb](https://github.com/tmm1/brew2deb) projects. Both projects don't
-have any licensing information included in their repositories. So licensing
-is still an open question for now.
+[brew2deb](https://github.com/tmm1/brew2deb) projects.
+
+## License
+
+The BSD 2-Clause License - See [LICENSE](LICENSE) for details
 
 ## How To Contribute
 

data/fpm-cookery.gemspec

@@ -19,8 +19,10 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "fpm", "~> 0.4"
-  s.add_development_dependency "minitest"
+  s.add_development_dependency "minitest", "~> 4.0"
   s.add_development_dependency "rake"
+  s.add_development_dependency "puppet"
   s.add_runtime_dependency "fpm", "~> 0.4"
   s.add_runtime_dependency "facter"
+  s.add_runtime_dependency "puppet"
 end

data/lib/fpm/cookery/book.rb

@@ -1,14 +1,22 @@
+require 'singleton'
+
 module FPM
   module Cookery
     class Book
+      include Singleton
+
+      def initialize
+        @recipe = nil
+      end
+
       # Load the given file and instantiate an object. Wrap the class in an
       # anonymous module to avoid namespace cluttering. (see Kernel.load)
-      def self.load_recipe(filename, &callback)
+      def load_recipe(filename, &callback)
         Kernel.load(filename, true)
         callback.call(@recipe.new(filename))
       end
 
-      def self.loaded_recipe(klass)
+      def add_recipe_class(klass)
         @recipe = klass
       end
     end

data/lib/fpm/cookery/book_hook.rb

@@ -9,7 +9,7 @@ module FPM
 
       module ClassMethods
         def inherited(klass)
-          FPM::Cookery::Book.loaded_recipe(klass)
+          FPM::Cookery::Book.instance.add_recipe_class(klass)
         end
       end
     end

data/lib/fpm/cookery/cli.rb

@@ -2,6 +2,7 @@ require 'fpm/cookery/book_hook'
 require 'fpm/cookery/recipe'
 require 'fpm/cookery/facts'
 require 'fpm/cookery/packager'
+require 'fpm/cookery/omnibus_packager'
 require 'fpm/cookery/log'
 require 'fpm/cookery/log/output/console'
 require 'fpm/cookery/log/output/console_color'
@@ -21,8 +22,9 @@ module FPM
         options.banner = \
           "Usage: #{program} [options] [path/to/recipe.rb] action [...]"
         options.separator "Actions:"
-        options.separator "  package - builds the package"
-        options.separator "  clean - cleans up"
+        options.separator "  package        - builds the package"
+        options.separator "  clean          - cleans up"
+        options.separator "  install-deps   - installs build and runtime dependencies"
         options.separator "Options:"
 
         options.on("-c", "--color",
@@ -44,6 +46,14 @@ module FPM
           @platform = o
         end
 
+        options.on("-V", "--version", "Show fpm-cookery and fpm version") do
+          require 'fpm/version'
+          require 'fpm/cookery/version'
+
+          puts "fpm-cookery v#{FPM::Cookery::VERSION} (fpm v#{FPM::VERSION})"
+          exit 0
+        end
+
         # Parse flags and such, remainder is all non-option args.
         remainder = options.parse(argv)
 
@@ -112,14 +122,20 @@ module FPM
 
         FPM::Cookery::Recipe.send(:include, FPM::Cookery::BookHook)
 
-        FPM::Cookery::Book.load_recipe(@filename) do |recipe|
+        FPM::Cookery::Book.instance.load_recipe(@filename) do |recipe|
           packager = FPM::Cookery::Packager.new(recipe)
           packager.target = FPM::Cookery::Facts.target.to_s
 
           @actions.each do |action|
             case action
             when "clean" ; packager.cleanup
-            when "package" ; packager.dispense
+            when "package"
+              if recipe.omnibus_package == true
+                FPM::Cookery::OmnibusPackager.new(packager).run
+              else
+                packager.dispense
+              end
+            when "install-deps" ; packager.install_deps
             else
               # TODO(sissel): fail if this happens
               Log.error "Unknown action: #{action}"

data/lib/fpm/cookery/dependency_inspector.rb

@@ -0,0 +1,89 @@
+require 'puppet'
+require 'puppet/resource'
+require 'puppet/transaction/report'
+require 'fpm/cookery/facts'
+require 'fpm/cookery/log'
+
+# Init Puppet before using it
+Puppet.initialize_settings
+
+module FPM
+  module Cookery
+    class DependencyInspector
+
+      def self.verify!(depends, build_depends)
+
+        Log.info "Verifying build_depends and depends with Puppet"
+
+        missing = (build_depends + depends).reject do |package|
+          self.package_installed?(package)
+        end
+
+        if missing.length == 0
+          Log.info "All build_depends and depends packages installed"
+        else
+          Log.info "Missing/wrong version packages: #{missing.join(', ')}"
+          if Process.euid != 0
+            Log.error "Not running as root; please run 'sudo fpm-cook install-deps' to install dependencies."
+            exit 1
+          else
+            Log.info "Running as root; installing missing/wrong version build_depends and depends with Puppet"
+            missing.each do |package|
+              self.install_package(package)
+            end
+          end
+        end
+
+      end
+
+      def self.package_installed?(package)
+        Log.info("Verifying package: #{package}")
+        return unless self.package_suitable?(package)
+
+        # Use Puppet in noop mode to see if the package exists
+        Puppet[:noop] = true
+        resource = Puppet::Resource.new("package", package, :parameters => {
+          :ensure => "present"
+        })
+        result    = Puppet::Resource.indirection.save(resource)[1]
+        !result.resource_statuses.values.first.out_of_sync
+      end
+
+      def self.install_package(package)
+        Log.info("Installing package: #{package}")
+        return unless self.package_suitable?(package)
+
+        # Use Puppet to install a package
+        Puppet[:noop] = false
+        resource = Puppet::Resource.new("package", package, :parameters => {
+          :ensure => "present"
+        })
+        result = Puppet::Resource.indirection.save(resource)[1]
+        failed = Puppet::Resource.indirection.save(resource)[1].resource_statuses.values.first.failed
+        if failed
+          Log.fatal "While processing depends package '#{package}':"
+          result.logs.each {|log_line| Log.fatal log_line}
+          exit 1
+        else
+          result.logs.each {|log_line| Log.info log_line}
+        end
+      end
+
+      def self.package_suitable?(package)
+        # How can we handle "or" style depends?
+        if package =~ / \| /
+          Log.warn "Required package '#{package}' is an 'or' string; not attempting to find/install a package to satisfy"
+          return false
+        end
+
+        # We can't handle >=, <<, >>, <=
+        if package =~ />=|<<|>>|<=/
+          Log.warn "Required package '#{package}' has a relative version requirement; not attempting to find/install a package to satisfy"
+          return false
+        end
+        true
+      end
+
+    end
+  end
+end

data/lib/fpm/cookery/omnibus_packager.rb

@@ -0,0 +1,69 @@
+require 'fpm/cookery/packager'
+require 'fpm/cookery/facts'
+
+module FPM
+  module Cookery
+    class OmnibusPackager
+      include FPM::Cookery::Utils
+
+      attr_reader :packager, :recipe
+
+      def initialize(packager)
+        @packager = packager
+        @recipe = packager.recipe
+        @depends = []
+      end
+
+      def run
+        # Omnibus packages are many builds in one package; e.g. Ruby + Puppet together.
+        Log.info "Recipe #{recipe.name} is an Omnibus package; looking for child recipes to build"
+
+        recipe.omnibus_recipes.each do |name|
+          recipe_file = build_recipe_file_path(name)
+
+          unless File.exists?(recipe_file)
+            Log.fatal "Cannot find a recipe for #{name} at #{recipe_file}"
+            exit 1
+          end
+
+          FPM::Cookery::Book.instance.load_recipe(recipe_file) do |dep_recipe|
+            dep_recipe.destdir = "#{recipe.omnibus_dir}/embedded" if recipe.omnibus_dir
+            dep_recipe.omnibus_installing = true if recipe.omnibus_dir
+
+            pkg = FPM::Cookery::Packager.new(dep_recipe, :skip_package => true, :keep_destdir => true)
+            pkg.target = FPM::Cookery::Facts.target.to_s
+
+            Log.info "Located recipe at #{recipe_file} for child recipe #{name}; starting build"
+            pkg.dispense
+
+            @depends += dep_recipe.depends
+            Log.info "Finished building #{name}, moving on to next recipe"
+          end
+        end
+
+        # Now all child recipes are built; set depends to combined set of dependencies
+        recipe.class.depends(@depends.flatten.uniq)
+        Log.info "Combined dependencies: #{recipe.depends.join(', ')}"
+
+        recipe.destdir = recipe.omnibus_dir if recipe.omnibus_dir
+
+        if recipe.omnibus_additional_paths
+          packager.config[:input] = [ recipe.destdir ] + recipe.omnibus_additional_paths
+        else
+          packager.config[:input] = recipe.destdir
+        end
+
+        packager.config[:keep_destdir] = true
+
+        packager.dispense
+      end
+
+      private
+
+      def build_recipe_file_path(name)
+        # Look for recipes in the same dir as the recipe we loaded
+        File.expand_path(File.dirname(recipe.filename) + "/#{name}.rb")
+      end
+    end
+  end
+end

data/lib/fpm/cookery/package/dir.rb

@@ -5,7 +5,7 @@ module FPM
   module Cookery
     module Package
       class Dir < SimpleDelegator
-        def initialize(recipe)
+        def initialize(recipe, config = {})
           super(FPM::Package::Dir.new)
 
           self.name = recipe.name
@@ -29,11 +29,17 @@ module FPM
           attributes[:rpm_digest] = 'md5'
           attributes[:rpm_user] = 'root'
           attributes[:rpm_group] = 'root'
+          attributes[:rpm_defattrfile] = '-'
+          attributes[:rpm_defattrdir] = '-'
 
           # TODO replace remove_excluded_files() in packager with this.
           attributes[:excludes] = []
 
-          input('.')
+          inputs = config.fetch(:input, nil) || '.'
+
+          Array(inputs).each do |path|
+            input(path)
+          end
 
           # The call to input() overwrites the license and vendor attributes.
           # XXX Needs to be fixed in fpm/package/dir.rb.

data/lib/fpm/cookery/packager.rb

@@ -1,13 +1,12 @@
 #require 'digest/md5'
 #require 'fpm/cookery/recipe_inspector'
-#require 'fpm/cookery/dependency_inspector'
+require 'fpm/cookery/dependency_inspector'
 require 'fpm/cookery/utils'
 require 'fpm/cookery/source_integrity_check'
 require 'fpm/cookery/path'
 require 'fpm/cookery/log'
 require 'fpm/cookery/package/dir'
-require 'fpm/package/deb'
-require 'fpm/package/rpm'
+require 'fpm'
 
 module FPM
   module Cookery
@@ -21,6 +20,14 @@ module FPM
         @config = config
       end
 
+      def skip_package?
+        !!config[:skip_package]
+      end
+
+      def keep_destdir?
+        !!config[:keep_destdir]
+      end
+
       def target=(target)
         # TODO(sissel): do sanity checking
         @target = target
@@ -34,6 +41,11 @@ module FPM
         FileUtils.rm_rf(recipe.destdir)
       end
 
+      def install_deps
+        DependencyInspector.verify!(recipe.depends, recipe.build_depends)
+        Log.info("All dependencies installed!")
+      end
+
       def dispense
         env = ENV.to_hash
         package_name = "#{recipe.name}-#{recipe.version}"
@@ -44,7 +56,7 @@ module FPM
         Log.info ''
 
         # RecipeInspector.verify!(recipe)
-        # DependencyInspector.verify!(recipe.depends, recipe.build_depends)
+        DependencyInspector.verify!(recipe.depends, recipe.build_depends)
 
         recipe.installing = false
 
@@ -92,12 +104,12 @@ module FPM
             if File.exists?(build_cookie)
               Log.info 'Skipping build (`fpm-cook clean` to rebuild)'
             else
-              Log.info "Building in #{File.expand_path(extracted_source)}"
+              Log.info "Building in #{File.expand_path(extracted_source, recipe.builddir)}"
               recipe.build and FileUtils.touch(build_cookie)
             end
 
-            FileUtils.rm_rf(recipe.destdir)
-            recipe.destdir.mkdir
+            FileUtils.rm_rf(recipe.destdir) unless keep_destdir?
+            recipe.destdir.mkdir unless File.exists?(recipe.destdir)
 
             begin
               recipe.installing = true
@@ -109,7 +121,11 @@ module FPM
           end
         end
 
-        build_package(recipe, config)
+        if skip_package?
+          Log.info "Package building disabled"
+        else
+          build_package(recipe, config)
+        end
       ensure
         # Make sure we reset the environment.
         ENV.replace(env)
@@ -141,13 +157,13 @@ module FPM
           version = [ver, vendor_rev].join(vendor_delimiter)
 
           maintainer = recipe.maintainer || begin
-            username = `git config --get user.name`.strip
-            useremail = `git config --get user.email`.strip
+            username = git_config('user.name')
+            useremail = git_config('user.email')
 
             username && useremail ? "#{username} <#{useremail}>" : nil
           end
 
-          input = FPM::Cookery::Package::Dir.new(recipe)
+          input = FPM::Cookery::Package::Dir.new(recipe, :input => config[:input])
 
           input.version = version
           input.maintainer = maintainer
@@ -222,6 +238,15 @@ module FPM
           end
         end
       end
+
+      private
+
+      def git_config(key)
+        %x(git config --get #{key}).strip
+      rescue
+        Log.warn "Git config command for key '#{key}' failed."
+        nil
+      end
     end
   end
 end

data/lib/fpm/cookery/path_helper.rb

@@ -3,12 +3,16 @@ require 'fpm/cookery/path'
 module FPM
   module Cookery
     module PathHelper
-      attr_accessor :installing
+      attr_accessor :installing, :omnibus_installing
 
       def installing?
         installing
       end
 
+      def omnibus_installing?
+        omnibus_installing
+      end
+
       # Most of the path helper stuff comes from brew2deb and homebrew.
       def prefix(path = nil)
         current_pathname_for('usr')/path
@@ -61,7 +65,11 @@ module FPM
 
       private
       def current_pathname_for(dir)
-        installing? ? destdir/dir : Path.new("/#{dir}")
+        if omnibus_installing?
+          Path.new("/#{dir}")
+        else
+          installing? ? destdir/dir : Path.new("/#{dir}")
+        end
       end
     end
   end

data/lib/fpm/cookery/recipe.rb

@@ -56,10 +56,11 @@ module FPM
       attr_rw :arch, :description, :homepage, :maintainer, :md5, :name,
               :revision, :section, :sha1, :sha256, :spec, :vendor, :version,
               :pre_install, :post_install, :pre_uninstall, :post_uninstall,
-              :license
+              :license, :omnibus_package, :omnibus_dir
 
       attr_rw_list :build_depends, :config_files, :conflicts, :depends,
-                   :exclude, :patches, :provides, :replaces
+                   :exclude, :patches, :provides, :replaces, :omnibus_recipes,
+                   :omnibus_additional_paths
 
       class << self
         def source(source = nil, spec = {})

data/lib/fpm/cookery/source_handler/curl.rb

@@ -43,7 +43,8 @@ module FPM
 
         private
         def curl(url, path)
-          safesystem('curl', '-fL', '--progress-bar', '-o', path, url)
+          args = options[:args] || '-fL'
+          safesystem('curl', args, '--progress-bar', '-o', path, url)
         end
 
         def extracted_source

data/lib/fpm/cookery/source_handler/noop.rb

@@ -0,0 +1,22 @@
+require 'fpm/cookery/source_handler/template'
+
+module FPM
+  module Cookery
+    class SourceHandler
+      class Noop < FPM::Cookery::SourceHandler::Template
+        CHECKSUM = false
+        NAME = :noop
+
+        def fetch
+          Log.info "Noop source_handler; do nothing."
+        end
+
+        def extract
+          Log.info "Not extracting - noop source handler"
+          builddir
+        end
+
+      end
+    end
+  end
+end

data/lib/fpm/cookery/source_handler.rb

@@ -4,6 +4,7 @@ require 'fpm/cookery/source_handler/svn'
 require 'fpm/cookery/source_handler/git'
 require 'fpm/cookery/source_handler/hg'
 require 'fpm/cookery/source_handler/local_path'
+require 'fpm/cookery/source_handler/noop'
 require 'fpm/cookery/log'
 
 module FPM

data/lib/fpm/cookery/utils.rb

@@ -4,13 +4,22 @@ module FPM
       protected
       # From fpm. (lib/fpm/util.rb)
       def safesystem(*args)
-        success = system(*args)
+        success = system(*args.flatten)
         if !success
           raise "'system(#{args.inspect})' failed with error code: #{$?.exitstatus}"
         end
         return success
       end
 
+      def cleanenv_safesystem(*args)
+        bundler_vars = %w(BUNDLE_GEMFILE RUBYOPT BUNDLE_BIN_PATH GEM_HOME GEM_PATH)
+        bundled_env = ENV.to_hash
+        bundler_vars.each {|var| ENV.delete(var)}
+        result = safesystem(*args)
+        ENV.replace(bundled_env.to_hash)
+        result
+      end
+
       # From brew2deb. (lib/debian_formula.rb)
       def configure(*args)
         if args.last.is_a?(Hash)
@@ -57,6 +66,12 @@ module FPM
         end
       end
       alias_method :inreplace, :inline_replace # homebrew compat
+
+      def patch(src, level = 0)
+        raise "patch level must be integer" unless level.is_a?(Fixnum)
+        raise "#{src} does not exist" unless File.exist? src
+        safesystem "patch -p#{level} --batch < #{src}"
+      end
     end
   end
 end

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.13.0'
+    VERSION = '0.14.0'
   end
 end

data/recipes/fpm-cookery/fpm-cook.bin

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# Stolen from Vagrant
+
+# Get the directory where this script is. This will also resolve
+# any symlinks in the directory/script, so it will be the fully
+# resolved path.
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
+DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+
+# Useful variables
+EMBEDDED_DIR="${DIR}/../embedded"
+
+# Unset some variables that might be set by rvm and friends.
+unset RUBYOPT BUNDLE_GEMFILE BUNDLE_BIN_PATH GEM_HOME GEM_PATH GEMRC
+
+# Call the actual fpm-cook bin with our arguments
+${EMBEDDED_DIR}/bin/fpm-cook "$@"

data/recipes/fpm-cookery/recipe.rb

@@ -0,0 +1,72 @@
+class FPMCookery < FPM::Cookery::Recipe
+  description 'building packages'
+
+  name     'fpm-cookery'
+  version  '0.13.0'
+  revision 0
+  homepage 'https://github.com/bernd/fpm-cookery'
+
+  source '', :with => :noop
+
+  omnibus_package true
+  omnibus_recipes 'ruby'
+  omnibus_dir     '/opt/fpm-cookery'
+
+  def build
+    gem_install 'fpm-cookery', version
+  end
+
+  def install
+    destdir('bin').install workdir('fpm-cook.bin'), 'fpm-cook'
+
+    with_trueprefix do
+      create_post_install_hook
+      create_pre_uninstall_hook
+    end
+  end
+
+  private
+
+  def gem_install(name, version = nil)
+    v = version.nil? ? '' : "-v #{version}"
+    cleanenv_safesystem "#{destdir}/embedded/bin/gem install #{v} #{name}"
+  end
+
+  def create_post_install_hook
+    File.open(builddir('post-install'), 'w', 0755) do |f|
+      f.write <<-__POSTINST
+#!/bin/sh
+set -e
+
+BIN_PATH="#{destdir}/bin"
+BIN="fpm-cook"
+
+update-alternatives --install /usr/bin/$BIN $BIN $BIN_PATH/$BIN 100
+
+exit 0
+      __POSTINST
+
+      self.class.post_install(File.expand_path(f.path))
+    end
+  end
+
+  def create_pre_uninstall_hook
+    File.open(builddir('pre-uninstall'), 'w', 0755) do |f|
+      f.write <<-__PRERM
+#!/bin/sh
+set -e
+
+BIN_PATH="#{destdir}/bin"
+BIN="fpm-cook"
+
+if [ "$1" != "upgrade" ]; then
+  update-alternatives --remove $BIN $BIN_PATH/$BIN
+fi
+
+exit 0
+        __PRERM
+
+      self.class.pre_uninstall(File.expand_path(f.path))
+    end
+  end
+end

data/recipes/fpm-cookery/ruby.rb

@@ -0,0 +1,35 @@
+class Ruby200 < FPM::Cookery::Recipe
+  description 'The Ruby virtual machine'
+
+  name    'ruby'
+  version '2.0.0.0'
+  revision 0
+  homepage 'http://www.ruby-lang.org/'
+  source   'http://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p0.tar.bz2'
+  sha256   'c680d392ccc4901c32067576f5b474ee186def2fcd3fcbfa485739168093295f'
+
+  license 'The Ruby License'
+  section 'interpreters'
+
+  build_depends 'autoconf', 'libreadline6-dev', 'bison', 'zlib1g-dev',
+                'libssl-dev', 'libyaml-dev', 'libffi-dev', 'libgdbm-dev', 'libncurses5-dev',
+                'libreadline6-dev'
+
+  depends 'libffi6', 'libncurses5', 'libreadline6', 'libssl1.0.0',
+          'libtinfo5', 'libyaml-0-2', 'zlib1g', 'libffi6', 'libgdbm3', 'libncurses5',
+          'libreadline6'
+
+  def build
+    configure :prefix => destdir, 'disable-install-doc' => true
+    make
+  end
+
+  def install
+    make :install
+
+    # Shrink package.
+    rm_f "#{destdir}/lib/libruby-static.a"
+    safesystem "strip #{destdir}/bin/ruby"
+    safesystem "find #{destdir} -name '*.so*' | xargs strip"
+  end
+end

data/recipes/omnibustest/bundler-gem.rb

@@ -0,0 +1,21 @@
+class BundlerGem < FPM::Cookery::Recipe
+  description 'Bundler gem'
+
+  name 'bundler'
+  version '1.3.4'
+  revision 0
+  source "nothing", :with => :noop
+
+  vendor     'fpm'
+  license    'Unknown'
+
+  section 'interpreters'
+
+  def build
+    cleanenv_safesystem "#{destdir}/bin/gem install #{name} -v #{version}"
+  end
+
+  def install
+    # Do nothing!
+  end
+end

data/recipes/omnibustest/recipe.rb

@@ -0,0 +1,14 @@
+class OmnibusTest < FPM::Cookery::Recipe
+  homepage 'http://test'
+
+  section 'interpreters'
+  name 'omnibus-test'
+  version '1.0.0'
+  description 'Testing Omnibus package'
+  revision 0
+
+  omnibus_package true
+  omnibus_recipes "ruby", "bundler-gem"
+  omnibus_dir     '/opt/omnibustest'
+
+end

data/recipes/omnibustest/ruby.rb

@@ -0,0 +1,32 @@
+class Ruby200 < FPM::Cookery::Recipe
+  description 'The Ruby virtual machine'
+
+  name 'ruby'
+  version '2.0.0.0'
+  revision 0
+  homepage 'http://www.ruby-lang.org/'
+  source 'http://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p0.tar.bz2'
+  sha256 'c680d392ccc4901c32067576f5b474ee186def2fcd3fcbfa485739168093295f'
+
+  vendor     'fpm'
+  license    'The Ruby License'
+
+  section 'interpreters'
+
+  build_depends 'autoconf', 'libreadline6-dev', 'bison', 'zlib1g-dev',
+                'libssl-dev', 'libyaml-dev', 'libffi-dev', 'libgdbm-dev', 'libncurses5-dev',
+                'libreadline6-dev'
+
+  depends 'libffi6', 'libncurses5', 'libreadline6', 'libssl1.0.0',
+          'libtinfo5', 'libyaml-0-2', 'zlib1g', 'libffi6', 'libgdbm3', 'libncurses5',
+          'libreadline6'
+
+  def build
+    configure :prefix => destdir, 'disable-install-doc' => true
+    make
+  end
+
+  def install
+    make :install
+  end
+end

data/spec/path_helper_spec.rb

@@ -61,6 +61,22 @@ describe "PathHelper" do
             helper.send(name, 'blah').to_s.must_equal "#{helper.destdir}#{path}/blah"
           end
         end
+
+        context "with omnibus_installing set to true" do
+          before { helper.omnibus_installing = true }
+
+          it "does not add anything to the path" do
+            helper.send(name, 'blah').to_s.must_equal "#{path}/blah"
+          end
+        end
+
+        context "with omnibus_installing and installing set to true" do
+          before { helper.omnibus_installing = true ; helper.installing = true }
+
+          it "does not add anything to the path" do
+            helper.send(name, 'blah').to_s.must_equal "#{path}/blah"
+          end
+        end
       end
     end
   end
@@ -83,6 +99,24 @@ describe "PathHelper" do
     end
   end
 
+  describe "#omnibus_installing?" do
+    context "with omnibus_installing set to true" do
+      before { helper.omnibus_installing = true }
+
+      it "returns true" do
+        helper.omnibus_installing?.must_equal true
+      end
+    end
+
+    context "with omnibus_installing set to false" do
+      before { helper.omnibus_installing = false }
+
+      it "returns false" do
+        helper.omnibus_installing?.must_equal false
+      end
+    end
+  end
+
   describe "#with_trueprefix" do
     context "with installing set to true" do
       before { helper.installing = true }

data/spec/recipe_spec.rb

@@ -176,6 +176,18 @@ describe "Recipe" do
     end
   end
 
+  describe "#omnibus_package" do
+    it "can be set" do
+      check_attribute(:omnibus_package, true)
+    end
+  end
+
+  describe "#omnibus_dir" do
+    it "can be set" do
+      check_attribute(:omnibus_dir, '/foo')
+    end
+  end
+
   def self.spec_recipe_attribute_list(name, list)
     class_eval %Q{
       describe "##{name}" do
@@ -203,6 +215,7 @@ describe "Recipe" do
   spec_recipe_attribute_list(:patches, %w{one two})
   spec_recipe_attribute_list(:provides, %w{one two})
   spec_recipe_attribute_list(:replaces, %w{one two})
+  spec_recipe_attribute_list(:omnibus_recipes, %w{one two})
 
   describe ".source" do
     it "sets a source url" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fpm
@@ -29,6 +29,22 @@ dependencies:
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: puppet
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -91,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puppet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A tool for building software packages with fpm.
 email:
 - bernd@tuneafish.de
@@ -103,6 +135,7 @@ files:
 - .gitignore
 - CHANGELOG.md
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/fpm-cook
@@ -110,12 +143,14 @@ files:
 - lib/fpm/cookery/book.rb
 - lib/fpm/cookery/book_hook.rb
 - lib/fpm/cookery/cli.rb
+- lib/fpm/cookery/dependency_inspector.rb
 - lib/fpm/cookery/facts.rb
 - lib/fpm/cookery/log.rb
 - lib/fpm/cookery/log/color.rb
 - lib/fpm/cookery/log/output/console.rb
 - lib/fpm/cookery/log/output/console_color.rb
 - lib/fpm/cookery/log/output/null.rb
+- lib/fpm/cookery/omnibus_packager.rb
 - lib/fpm/cookery/package/dir.rb
 - lib/fpm/cookery/packager.rb
 - lib/fpm/cookery/path.rb
@@ -127,12 +162,19 @@ files:
 - lib/fpm/cookery/source_handler/git.rb
 - lib/fpm/cookery/source_handler/hg.rb
 - lib/fpm/cookery/source_handler/local_path.rb
+- lib/fpm/cookery/source_handler/noop.rb
 - lib/fpm/cookery/source_handler/svn.rb
 - lib/fpm/cookery/source_handler/template.rb
 - lib/fpm/cookery/source_integrity_check.rb
 - lib/fpm/cookery/utils.rb
 - lib/fpm/cookery/version.rb
+- recipes/fpm-cookery/fpm-cook.bin
+- recipes/fpm-cookery/recipe.rb
+- recipes/fpm-cookery/ruby.rb
 - recipes/nodejs/recipe.rb
+- recipes/omnibustest/bundler-gem.rb
+- recipes/omnibustest/recipe.rb
+- recipes/omnibustest/ruby.rb
 - recipes/redis/recipe.rb
 - recipes/redis/redis-server.init.d
 - spec/facts_spec.rb
@@ -155,15 +197,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1124392889621969599
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1124392889621969599
 requirements: []
 rubyforge_project: fpm-cookery
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A tool for building software packages with fpm.