fpm-cookery 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb9277f23528fc7aeb48ba0a8a10d9861c70917b
-  data.tar.gz: e1379467c6ffe436d779e6d32ed472352aa31e43
+  metadata.gz: aa7f46e1eb70773b5bfacf698d04a89225eb95ed
+  data.tar.gz: 12121c4b25f7a217724da9a8ec040aba3411e576
 SHA512:
-  metadata.gz: c703e14db35cff6e1a95778a7d7e0abc0519ff1f1ede27c11daf6d27bd8128cb18e1a36960187c3bcee0c4450af41939817706fbfc0d0fbad9bb839a7aa4d810
-  data.tar.gz: 1a833e697752e67acb1b0eda8a44ec825cc1d8e084ebd72ea72462e0b5ef3890a554f4d2397371cc61a4faabf170e96e4992326165c7115d8ec29b1ea3b6eb27
+  metadata.gz: d527a0a19a001c6e1efcbc2638727ac9f8eab6e389c693bc3efca07f5438757283f709e10621f986e7ad929cf4345b2f52835898703c7a13cf4be4c029b90b6a
+  data.tar.gz: eb924a9ed4ccc11fcd2e8850de9c95e1c9cd2c2d30926278419ba8cd99814c27cc4ba6ca5d0230cb3bf10135735f143331478e8a00f8331460b190782b322a6a

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.20.1 (2014-03-14)
+* Unbreak omnibus and chain packagers. (#69)
+
 # v0.20.0 (2014-03-07)
 * Add `--tmp-root` command line option.
 * Add `--pkg-dir` command line option.

data/lib/fpm/cookery/book.rb

@@ -11,9 +11,9 @@ module FPM
 
       # Load the given file and instantiate an object. Wrap the class in an
       # anonymous module to avoid namespace cluttering. (see Kernel.load)
-      def load_recipe(filename, &callback)
+      def load_recipe(filename, config, &callback)
         Kernel.load(filename, true)
-        callback.call(@recipe)
+        callback.call(@recipe.new(filename, config))
       end
 
       def add_recipe_class(klass)

data/lib/fpm/cookery/chain_packager.rb

@@ -8,7 +8,7 @@ module FPM
 
       attr_reader :packager, :recipe, :config
 
-      def initialize(packager, config = {})
+      def initialize(packager, config)
         @packager = packager
         @recipe = packager.recipe
         @config = config
@@ -27,8 +27,8 @@ module FPM
 
           Log.info "Located recipe at #{recipe_file} for child recipe #{name}; starting build"
 
-          FPM::Cookery::Book.instance.load_recipe(recipe_file) do |dep_recipe|
-            depPackager = FPM::Cookery::Packager.new(dep_recipe, config)
+          FPM::Cookery::Book.instance.load_recipe(recipe_file, config) do |dep_recipe|
+            depPackager = FPM::Cookery::Packager.new(dep_recipe, config.to_hash)
             depPackager.target = FPM::Cookery::Facts.target.to_s
 
             #Chain, chain, chain ...

data/lib/fpm/cookery/cli.rb

@@ -68,8 +68,7 @@ module FPM
 
           FPM::Cookery::BaseRecipe.send(:include, FPM::Cookery::BookHook)
 
-          FPM::Cookery::Book.instance.load_recipe(recipe_file) do |recipe_class|
-            recipe = recipe_class.new(recipe_file, config)
+          FPM::Cookery::Book.instance.load_recipe(recipe_file, config) do |recipe|
             packager = FPM::Cookery::Packager.new(recipe, config.to_hash)
             packager.target = FPM::Cookery::Facts.target.to_s
 
@@ -105,9 +104,9 @@ module FPM
 
         def exec(config, recipe, packager)
           if recipe.omnibus_package == true
-            FPM::Cookery::OmnibusPackager.new(packager, config.to_hash).run
+            FPM::Cookery::OmnibusPackager.new(packager, config).run
           elsif recipe.chain_package == true
-            FPM::Cookery::ChainPackager.new(packager, config.to_hash).run
+            FPM::Cookery::ChainPackager.new(packager, config).run
           else
             packager.dispense
           end

data/lib/fpm/cookery/omnibus_packager.rb

@@ -6,9 +6,9 @@ module FPM
     class OmnibusPackager
       include FPM::Cookery::Utils
 
-      attr_reader :packager, :recipe
+      attr_reader :packager, :recipe, :config
 
-      def initialize(packager, config = {})
+      def initialize(packager, config)
         @packager = packager
         @config = config
         @recipe = packager.recipe
@@ -25,7 +25,7 @@ module FPM
             exit 1
           end
 
-          FPM::Cookery::Book.instance.load_recipe(recipe_file) do |dep_recipe|
+          FPM::Cookery::Book.instance.load_recipe(recipe_file, config) do |dep_recipe|
             dep_recipe.destdir = "#{recipe.omnibus_dir}/embedded" if recipe.omnibus_dir
             dep_recipe.omnibus_installing = true if recipe.omnibus_dir
             if dep_recipe.omnibus_recipes.any?

data/lib/fpm/cookery/recipe.rb

@@ -109,7 +109,9 @@ module FPM
         pkg_depends = self.class.depends_all
         if self.class.omnibus_package
           self.class.omnibus_recipes.each { |omni_recipe|
-            Book.instance.load_recipe(File.expand_path(omni_recipe + '.rb', File.dirname(filename))) do |recipe|
+            recipe_file = File.expand_path(omni_recipe + '.rb', File.dirname(filename))
+
+            Book.instance.load_recipe(recipe_file, config) do |recipe|
               pkg_depends << recipe.depends_all
             end
           }

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.20.0'
+    VERSION = '0.20.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Bernd Ahlers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec