caterer 0.6.0 → 0.6.1

data/lib/caterer/action/provisioner.rb

@@ -1,10 +1,10 @@
 module Caterer
   module Action
     module Provisioner
-      autoload :Base,       'caterer/action/provisioner/base'
       autoload :Bootstrap,  'caterer/action/provisioner/bootstrap'
       autoload :Cleanup,    'caterer/action/provisioner/cleanup'
       autoload :Install,    'caterer/action/provisioner/install'
+      autoload :Load,       'caterer/action/provisioner/load'
       autoload :Lock,       'caterer/action/provisioner/lock'
       autoload :Prepare,    'caterer/action/provisioner/prepare'
       autoload :Provision,  'caterer/action/provisioner/provision'

data/lib/caterer/action/provisioner/bootstrap.rb

@@ -4,7 +4,7 @@ module Caterer
       class Bootstrap < Base
         
         def call(env)
-          provisioner(env).bootstrap(env[:server])
+          env[:provisioner].bootstrap(env[:server])
           @app.call(env)
         end
 

data/lib/caterer/action/provisioner/cleanup.rb

@@ -4,7 +4,7 @@ module Caterer
       class Cleanup < Base
 
         def call(env)
-          provisioner(env).cleanup(env[:server])
+          env[:provisioner].cleanup(env[:server])
           @app.call(env)
         end
         

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

@@ -4,7 +4,7 @@ module Caterer
       class Install < Base
 
         def call(env)
-          provisioner(env).install(env[:server])
+          env[:provisioner].install(env[:server])
           @app.call(env)
         end
         

data/lib/caterer/action/provisioner/{base.rb → load.rb}

@@ -1,9 +1,16 @@
 module Caterer
   module Action
     module Provisioner
-      class Base < Action::Base
-        
-        def provisioner(env)
+      class Load < Base
+
+        def call(env)
+
+          env[:provisioner] = load_provisioner(env)
+
+          @app.call(env)
+        end
+
+        def load_provisioner(env)
 
           if image = env[:image]
             env[:config].images[image].provisioner
@@ -16,7 +23,7 @@ module Caterer
           Caterer.config.default_provisioner
         end
 
-      end
+      end     
     end
   end
 end

data/lib/caterer/action/provisioner/prepare.rb

@@ -4,7 +4,7 @@ module Caterer
       class Prepare < Base
 
         def call(env)
-          provisioner(env).prepare(env[:server])
+          env[:provisioner].prepare(env[:server])
           @app.call(env)
         end
 

data/lib/caterer/action/provisioner/provision.rb

@@ -4,7 +4,7 @@ module Caterer
       class Provision < Base
 
         def call(env)
-          provisioner(env).provision(env[:server])
+          env[:provisioner].provision(env[:server])
           @app.call(env)
         end
         

data/lib/caterer/action/provisioner/validate/bootstrapped.rb

@@ -6,7 +6,7 @@ module Caterer
 
           def call(env)
 
-            if not provisioner(env).bootstrapped?(env[:server])
+            if not env[:provisioner].bootstrapped?(env[:server])
               env[:ui].error "Server not bootstrapped, cannot continue"
               return
             end

data/lib/caterer/actions.rb

@@ -11,8 +11,6 @@ end
 
 Caterer.actions.register(:lock) do
   Vli::Action::Builder.new do
-    use Caterer::Action::Config::Validate::Image
-    use Caterer::Action::Config::Validate::Provisioner
     use Caterer::Action::Server::Validate::SSH
     use Caterer::Action::Server::Lock
   end
@@ -20,8 +18,6 @@ end
 
 Caterer.actions.register(:unlock) do
   Vli::Action::Builder.new do
-    use Caterer::Action::Config::Validate::Image
-    use Caterer::Action::Config::Validate::Provisioner
     use Caterer::Action::Server::Validate::SSH
     use Caterer::Action::Server::Unlock
   end
@@ -30,6 +26,7 @@ end
 Caterer.actions.register(:bootstrap) do
   Vli::Action::Builder.new do
     use Caterer.actions.get(:validate)
+    use Caterer::Action::Provisioner::Load
     use Caterer::Action::Provisioner::Prepare
     use Caterer::Action::Server::Lock
     use Caterer::Action::Provisioner::Bootstrap
@@ -42,8 +39,9 @@ end
 Caterer.actions.register(:provision) do
   Vli::Action::Builder.new do
     use Caterer.actions.get(:validate)
-    use Caterer::Action::Provisioner::Validate::Bootstrapped
+    use Caterer::Action::Provisioner::Load
     use Caterer::Action::Provisioner::Prepare
+    use Caterer::Action::Provisioner::Validate::Bootstrapped
     use Caterer::Action::Server::Lock
     use Caterer::Action::Provisioner::Provision
     use Caterer::Action::Provisioner::Cleanup
@@ -54,7 +52,9 @@ end
 Caterer.actions.register(:up) do
   Vli::Action::Builder.new do
     use Caterer.actions.get(:validate)
+    use Caterer::Action::Provisioner::Load
     use Caterer::Action::Provisioner::Prepare
+    use Caterer::Action::Provisioner::Validate::Bootstrapped
     use Caterer::Action::Server::Lock
     use Caterer::Action::Provisioner::Bootstrap
     use Caterer::Action::Provisioner::Provision

data/lib/caterer/version.rb

@@ -1,3 +1,3 @@
 module Caterer
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -187,10 +187,10 @@ files:
 - lib/caterer/action/config/validate/image.rb
 - lib/caterer/action/config/validate/provisioner.rb
 - lib/caterer/action/provisioner.rb
-- lib/caterer/action/provisioner/base.rb
 - lib/caterer/action/provisioner/bootstrap.rb
 - lib/caterer/action/provisioner/cleanup.rb
 - lib/caterer/action/provisioner/install.rb
+- lib/caterer/action/provisioner/load.rb
 - lib/caterer/action/provisioner/prepare.rb
 - lib/caterer/action/provisioner/provision.rb
 - lib/caterer/action/provisioner/validate.rb