caterer 1.0.4 → 1.0.5

data/lib/caterer/action/berkshelf/clean.rb

@@ -12,9 +12,14 @@ module Caterer
 
         def call(env)
 
-          if env[:provisioner].is_a? Caterer::Provisioner::ChefSolo or env[:force_berks_clean]
-            ::Berkshelf.formatter.msg "cleaning Caterer's shelf"
-            FileUtils.remove_dir(shelf, fore: true)
+          config = env[:config]
+          image  = config.images[env[:image]]
+
+          image.provisioners.each do |provisioner|
+            if provisioner.is_a? Caterer::Provisioner::ChefSolo or env[:force_berks_clean]
+              ::Berkshelf.formatter.msg "cleaning Caterer's shelf"
+              FileUtils.remove_dir(shelf, fore: true)
+            end
           end
 
           @app.call(env)

data/lib/caterer/action/berkshelf/install.rb

@@ -20,8 +20,13 @@ module Caterer
 
         def call(env)
 
-          if env[:provisioner].is_a? Caterer::Provisioner::ChefSolo
-            configure_cookbooks_path(env[:provisioner])
+          config = env[:config]
+          image  = config.images[env[:image]]
+
+          image.provisioners.each do |provisioner|
+            if provisioner.is_a? Caterer::Provisioner::ChefSolo
+              configure_cookbooks_path(provisioner)
+            end
           end
 
           if needs_update? or env[:force_berks_install]

data/lib/caterer/berkshelf.rb

@@ -31,7 +31,7 @@ module Caterer
 
       Caterer.config_keys.register(:berkshelf) { Config::Berkshelf }
 
-      Caterer.actions[:provision].insert(Caterer::Action::Provisioner::Prepare, install)
+      Caterer.actions[:provision].insert(Caterer::Action::Server::Lock, install)
 
       Caterer.actions[:clean].use clean
 

data/lib/caterer/version.rb

@@ -1,3 +1,3 @@
 module Caterer
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -271,7 +271,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3139505216028486009
+      hash: -1508035868694574119
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -280,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3139505216028486009
+      hash: -1508035868694574119
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23