caterer 0.5.0 → 0.6.0

data/lib/caterer/action/config/validate/image.rb

@@ -5,12 +5,15 @@ module Caterer
         class Image < Base
 
           def call(env)
-            # check to ensure the image exists
-            image = env[:config].images[env[:image]]
 
-            if not image
-              env[:ui].error "image ':#{env[:image]}' is not defined"
-              return
+            if env[:image]
+              # check to ensure the image exists
+              image = env[:config].images[env[:image]]
+
+              if not image
+                env[:ui].error "image ':#{env[:image]}' is not defined"
+                return
+              end              
             end
 
             @app.call(env)

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

@@ -5,19 +5,22 @@ module Caterer
         class Provisioner < Base
           
           def call(env)
-            provisioner = env[:config].images[env[:image]].provisioner
 
-            if not provisioner
-              env[:ui].error "provisioner for image ':#{env[:image]}' is not defined"
-              return
-            end
-            
-            if errors = provisioner.errors
-              errors.each do |key, val|
-                env[:ui].error "image :#{env[:image]} provisioner error -> #{key} #{val}"
+            if env[:image]
+              provisioner = env[:config].images[env[:image]].provisioner
+
+              if not provisioner
+                env[:ui].error "provisioner for image ':#{env[:image]}' is not defined"
+                return
               end
-              return
-            end
+              
+              if errors = provisioner.errors
+                errors.each do |key, val|
+                  env[:ui].error "image :#{env[:image]} provisioner error -> #{key} #{val}"
+                end
+                return
+              end                        
+            end          
 
             @app.call(env)
           end

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

@@ -1,13 +1,19 @@
-require 'active_support/inflector'
-
 module Caterer
   module Action
     module Provisioner
       class Base < Action::Base
         
         def provisioner(env)
-          config = env[:config].images[env[:image]].provisioner
-          "Caterer::Provisioner::#{config.name.to_s.classify}".constantize.new(env[:server], config)
+
+          if image = env[:image]
+            env[:config].images[image].provisioner
+          else
+            Caterer.provisioners.get(env[:engine] || default_engine).new
+          end
+        end
+
+        def default_engine
+          Caterer.config.default_provisioner
         end
 
       end

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

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

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

@@ -4,7 +4,7 @@ module Caterer
       class Prepare < Base
 
         def call(env)
-          provisioner(env).prepare
+          provisioner(env).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
+          provisioner(env).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?
+            if not provisioner(env).bootstrapped?(env[:server])
               env[:ui].error "Server not bootstrapped, cannot continue"
               return
             end

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

@@ -0,0 +1,24 @@
+module Caterer
+  module Action
+    module Provisioner
+      module Validate
+        class Engine < Base
+
+          def call(env)
+
+            if env[:engine]
+              if not Caterer.provisioners.get(env[:engine])
+                env[:ui].error "Unsupported provision engine #{env[:engine]}"
+                return
+              end
+            end
+
+            @app.call(env)
+
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -3,6 +3,7 @@ module Caterer
     module Provisioner
       module Validate
         autoload :Bootstrapped, 'caterer/action/provisioner/validate/bootstrapped'
+        autoload :Engine,       'caterer/action/provisioner/validate/engine'
       end
     end
   end

data/lib/caterer/actions.rb

@@ -3,6 +3,7 @@ Caterer.actions.register(:validate) do
   Vli::Action::Builder.new do
     use Caterer::Action::Config::Validate::Image
     use Caterer::Action::Config::Validate::Provisioner
+    use Caterer::Action::Provisioner::Validate::Engine
     use Caterer::Action::Server::Validate::SSH
     use Caterer::Action::Server::Validate::Unlocked
   end

data/lib/caterer/command/base.rb

@@ -60,7 +60,7 @@ module Caterer
           argv.first.split(",").each do |host|
             
             if group = @env.config.groups[host.to_sym]
-              group.members.each do |member|
+              group.members.each do |key, member|
                 servers << init_server(group, member, options)
               end
             else
@@ -99,6 +99,10 @@ module Caterer
         opts[:images] = image_list(options) || member.images || group.images
         opts[:key]    = options[:key] || member.key || group.key
 
+        if engine = options[:engine]
+          opts[:engine] = engine.to_sym
+        end
+
         opts[:data] = begin
           data = nil
           if json = options[:data]

data/lib/caterer/config/base.rb

@@ -3,10 +3,12 @@ module Caterer
     class Base
 
       attr_reader :images, :groups
+      attr_accessor :default_provisioner
 
       def initialize
         @images  = {}
         @groups  = {}
+        @default_provisioner = :chef_solo
       end
 
       def image(name)

data/lib/caterer/config/image.rb

@@ -1,5 +1,3 @@
-require 'active_support/inflector'
-
 module Caterer
   module Config
     class Image
@@ -11,7 +9,9 @@ module Caterer
       end
 
       def provision(type)
-        @provisioner = "Caterer::Config::Provision::#{type.to_s.classify}".constantize.new(type)
+        provisioner_klass = Caterer.provisioners.get(type)
+        raise ":#{type} is not a valida provisioner" if not provisioner_klass
+        @provisioner = provisioner_klass.new
         yield @provisioner if block_given?
       end
 

data/lib/caterer/provisioner/base.rb

@@ -2,19 +2,16 @@ module Caterer
   module Provisioner
     class Base
 
-      attr_reader :server, :config
+      # config dsl
+      def errors; end
 
-      def initialize(server, config=nil)
-        @server = server
-        @config = config
-      end
-
-      def bootstrap; end
-      def bootstrapped?; true; end
-      def cleanup; end
-      def install; end
-      def prepare; end
-      def provision; end
+      # provision dsl
+      def bootstrap(server); end
+      def bootstrapped?(server); true; end
+      def cleanup(server); end
+      def install(server); end
+      def prepare(server); end
+      def provision(server); end
 
     end
   end

data/lib/caterer/provisioner/chef_solo.rb

@@ -8,7 +8,76 @@ module Caterer
   module Provisioner
     class ChefSolo < Base
       
-      def bootstrap
+      attr_reader :run_list
+      attr_accessor :json, :cookbooks_path, :roles_path
+      attr_accessor :data_bags_path, :bootstrap_scripts
+
+      def initialize
+        @run_list          = []
+        @json              = {}
+        @cookbooks_path    = ['cookbooks']
+        @roles_path        = ['roles']
+        @data_bags_path    = ['data_bags']
+        @bootstrap_scripts = []
+      end
+
+      # config DSL
+
+      def add_recipe(recipe)
+        @run_list << "recipe[#{recipe}]"
+      end
+
+      def add_role(role)
+        @run_list << "role[#{role}]"
+      end
+
+      # I don't like this at all, but it seems to make the best Caterfile workflow
+      def add_image(image)
+        image = Caterer.config.images[image]
+        raise "Unknown image :#{image}" if not image
+
+        provisioner = image.provisioner
+        raise "No provisioner for :#{image}" if not provisioner
+
+        if not provisioner.class == self.class
+          raise "add_image incompatibility: #{provisioner.class} != #{self.class}"
+        end
+
+        @run_list += provisioner.run_list
+        @bootstrap_scripts += provisioner.bootstrap_scripts
+      end
+
+      def add_bootstrap(script)
+        @bootstrap_scripts << script
+      end
+
+      def errors
+        errors = {}
+
+        if not @run_list.length > 0
+          errors[:run_list] = "is empty"
+        end
+
+        if not @cookbooks_path.is_a? Array
+          errors[:cookbooks_path] = "must be an array"
+        end
+
+        if not @roles_path.is_a? Array
+          errors[:roles_path] = "must be an array"
+        end
+
+        if not @data_bags_path.is_a? Array
+          errors[:data_bags_path] = "must be an array"
+        end
+
+        if errors.length > 0
+          errors
+        end
+      end
+
+      # provision engine
+
+      def bootstrap(server)
 
         # validate
         with_bootstrap_scripts do |script, count|
@@ -24,10 +93,10 @@ module Caterer
         with_bootstrap_scripts do |script, count|
 
           server.ui.info "Uploading #{script}..."
-          server.ssh.upload script, "#{bootstrap_path}-#{count}"
+          server.ssh.upload script, "#{target_bootstrap_path}-#{count}"
 
-          server.ssh.sudo "chown #{server.username} #{bootstrap_path}-#{count}", :stream => true
-          server.ssh.sudo "chmod +x #{bootstrap_path}-#{count}", :stream => true
+          server.ssh.sudo "chown #{server.username} #{target_bootstrap_path}-#{count}", :stream => true
+          server.ssh.sudo "chmod +x #{target_bootstrap_path}-#{count}", :stream => true
 
         end
 
@@ -35,189 +104,162 @@ module Caterer
         with_bootstrap_scripts do |script, count|
 
           server.ui.info "Running #{script}..."
-          server.ssh.sudo "#{bootstrap_path}-#{count}", :stream => true
+          server.ssh.sudo "#{target_bootstrap_path}-#{count}", :stream => true
 
         end
 
       end
 
-      def bootstrapped?
+      def bootstrapped?(server)
         res = server.ssh.sudo "command -v chef-solo &>/dev/null"
         res == 0 ? true : false
       end
 
-      def prepare
+      def prepare(server)
         # create base dir
-        server.ssh.sudo "mkdir -p #{base_path}", :stream => true
-        server.ssh.sudo "chown -R #{server.username} #{base_path}", :stream => true
+        server.ssh.sudo "mkdir -p #{target_base_path}", :stream => true
+        server.ssh.sudo "chown -R #{server.username} #{target_base_path}", :stream => true
       end
 
-      def install
+      def install(server)
         server.ui.info "Preparing installation..."
 
         # upload
-        server.ssh.upload install_script, "#{install_path}"
+        server.ssh.upload install_script, "#{target_install_path}"
 
         # set permissions
-        server.ssh.sudo "chown #{server.username} #{install_path}", :stream => true
-        server.ssh.sudo "chmod +x #{install_path}", :stream => true
+        server.ssh.sudo "chown #{server.username} #{target_install_path}", :stream => true
+        server.ssh.sudo "chmod +x #{target_install_path}", :stream => true
 
         # run
         server.ui.info "Installing chef-solo..."
-        server.ssh.sudo "#{install_path}", :stream => true
+        server.ssh.sudo "#{target_install_path}", :stream => true
       end
 
-      def provision
+      def provision(server)
 
         # create cookbooks directory
-        server.ssh.sudo "mkdir -p #{cookbooks_path}", :stream => true
-        server.ssh.sudo "chown -R #{server.username} #{cookbooks_path}", :stream => true
+        server.ssh.sudo "mkdir -p #{target_cookbooks_path}", :stream => true
+        server.ssh.sudo "chown -R #{server.username} #{target_cookbooks_path}", :stream => true
 
         # sync cookbooks
         server.ui.info "Syncing cookbooks..."
-        config.cookbooks_path.each do |path|
-          upload_directory path, "#{cookbooks_path}/#{Digest::MD5.hexdigest(path)}"
+        cookbooks_path.each do |path|
+          server.upload_directory path, "#{target_cookbooks_path}/#{Digest::MD5.hexdigest(path)}"
         end
 
         # create roles directory
-        server.ssh.sudo "mkdir -p #{roles_path}", :stream => true
-        server.ssh.sudo "chown -R #{server.username} #{roles_path}", :stream => true
+        server.ssh.sudo "mkdir -p #{target_roles_path}", :stream => true
+        server.ssh.sudo "chown -R #{server.username} #{target_roles_path}", :stream => true
 
         # sync roles
         server.ui.info "Syncing roles..."
-        config.roles_path.each do |path|
-          upload_directory path, roles_path
+        roles_path.each do |path|
+          server.upload_directory path, target_roles_path
         end
 
         # create data_bags directory
-        server.ssh.sudo "mkdir -p #{data_bags_path}", :stream => true
-        server.ssh.sudo "chown -R #{server.username} #{data_bags_path}", :stream => true
+        server.ssh.sudo "mkdir -p #{target_data_bags_path}", :stream => true
+        server.ssh.sudo "chown -R #{server.username} #{target_data_bags_path}", :stream => true
 
         # sync databags
         server.ui.info "Syncing data bags..."
-        config.data_bags_path.each do |path|
-          upload_directory path, data_bags_path
+        data_bags_path.each do |path|
+          server.upload_directory path, target_data_bags_path
         end
 
         # create solo.rb
         server.ui.info "Generating solo.rb..."
-        server.ssh.upload(StringIO.new(solo_content), solo_path)
+        server.ssh.upload(StringIO.new(solo_content(server)), target_solo_path)
 
         # create json
         server.ui.info "Generating json config..."
-        server.ssh.upload(StringIO.new(json_config), json_config_path)
+        server.ssh.upload(StringIO.new(json_config(config_data.merge(server.data))), target_json_config_path)
 
         # set permissions on everything
-        server.ssh.sudo "chown -R #{server.username} #{base_path}", :stream => true
+        server.ssh.sudo "chown -R #{server.username} #{target_base_path}", :stream => true
 
         # run
         server.ui.info "Running chef-solo..."
         server.ssh.sudo command_string, :stream => true
       end
 
-      def cleanup
+      def cleanup(server)
         server.ui.info "Cleaning up..."
 
         # installer
-        server.ssh.sudo "rm -f #{install_path}", :stream => true
+        server.ssh.sudo "rm -f #{target_install_path}", :stream => true
 
         # bootstrap scripts
-        server.ssh.sudo "rm -f #{bootstrap_path}*", :stream => true
+        server.ssh.sudo "rm -f #{target_bootstrap_path}*", :stream => true
 
         # solo.rb
-        server.ssh.sudo "rm -f #{solo_path}", :stream => true
+        server.ssh.sudo "rm -f #{target_solo_path}", :stream => true
 
         # json
-        server.ssh.sudo "rm -f #{json_config_path}", :stream => true
+        server.ssh.sudo "rm -f #{target_json_config_path}", :stream => true
 
         # for now, leave cookbooks, roles, and data bags for faster provisioning
       end
 
       protected
 
-      def upload_directory(from, to)
-        if File.exists? from
-          if @server.can_rsync?
-            from += "/" if not from.match /\/$/
-            res = @server.rsync.sync(from, to)
-            server.ui.error "rsync was unsuccessful" if res != 0
-          else
-            server.ui.warn "Rsync unavailable, falling back to scp (slower)..."
-            unique = Digest::MD5.hexdigest(from)
-            server.ssh.sudo "rm -rf #{to}/*", :stream => true
-            server.ssh.sudo "mkdir -p #{to}/#{unique}", :stream => true
-            server.ssh.sudo "chown -R #{server.username} #{to}/#{unique}", :stream => true
-            server.ssh.upload from, "#{to}/#{unique}"
-            server.ssh.sudo "mv #{to}/#{unique}/**/* #{to}/", :stream => true
-            server.ssh.sudo "rm -rf #{to}/#{unique}", :stream => true
-          end
-        end
-      end
-
       def with_bootstrap_scripts
-        config.bootstrap_scripts.each_with_index do |script, index|
+        bootstrap_scripts.each_with_index do |script, index|
           yield script, index if block_given?
         end
       end
 
-      def bootstrap_scripts
-        config.bootstrap_scripts
-      end
-
-      def base_path
+      def target_base_path
         "/tmp/cater-chef-solo"
       end
 
-      def install_path
-        "#{base_path}/install"
-      end
-
-      def bootstrap_path
-        "#{base_path}/bootstrap"
+      def target_install_path
+        "#{target_base_path}/install"
       end
 
-      def cookbooks_path
-        "#{base_path}/cookbooks"
+      def target_bootstrap_path
+        "#{target_base_path}/bootstrap"
       end
 
-      def roles_path
-        "#{base_path}/roles"
+      def target_cookbooks_path
+        "#{target_base_path}/cookbooks"
       end
 
-      def data_bags_path
-        "#{base_path}/data_bags"
+      def target_roles_path
+        "#{target_base_path}/roles"
       end
 
-      def solo_path
-        "#{base_path}/solo.rb"
+      def target_data_bags_path
+        "#{target_base_path}/data_bags"
       end
 
-      def json_config_path
-        "#{base_path}/config.json"
+      def target_solo_path
+        "#{target_base_path}/solo.rb"
       end
 
-      def config_bootstrap
-        config.bootstrap_script
+      def target_json_config_path
+        "#{target_base_path}/config.json"
       end
 
       def install_script
         File.expand_path("../../../templates/provisioner/chef_solo/bootstrap.sh", __FILE__)
       end
 
-      def solo_content
-        Tilt.new(File.expand_path('../../../templates/provisioner/chef_solo/solo.erb', __FILE__)).render(self)
+      def solo_content(server)
+        Tilt.new(File.expand_path('../../../templates/provisioner/chef_solo/solo.erb', __FILE__)).render(self, {:server => server})
       end
 
-      def json_config
-        MultiJson.dump(config_data)
+      def json_config(data)
+        MultiJson.dump(data)
       end
 
       def config_data
-        {:run_list => config.run_list}.merge(config.json).merge(server.data)
+        {:run_list => run_list}.merge(json)
       end
 
       def command_string
-        "chef-solo -c #{solo_path} -j #{json_config_path}"
+        "chef-solo -c #{target_solo_path} -j #{target_json_config_path}"
       end
 
     end

data/lib/caterer/provisioners.rb

@@ -0,0 +1 @@
+Caterer.provisioners.register(:chef_solo) { Caterer::Provisioner::ChefSolo }

data/lib/caterer/server.rb

@@ -15,6 +15,7 @@ module Caterer
       @key    = opts[:key]
       @images = opts[:images] || []
       @data   = opts[:data] || {}
+      @engine = opts[:engine]
 
       @logger = Log4r::Logger.new("caterer::server")
 
@@ -22,22 +23,38 @@ module Caterer
     end
 
     def bootstrap(opts={})
-      if @images.length == 0
-        ui.error "image list is empty, nothing to do"
-      end
-      @images.each do |i|
-        ui.info "*** Bootstrapping image: #{i} ***"
-        run_action(:bootstrap, opts.merge({:image => i}))
+      if @images.length > 0
+        @images.each do |i|
+          ui.info "*** Bootstrapping image: #{i} ***"
+          run_action(:bootstrap, opts.merge({:image => i}))
+        end        
+      else
+        ui.info "*** Bootstrapping ***"
+        run_action(:bootstrap, opts.merge({:engine => @engine}))
       end
     end
 
     def provision(opts={})
-      if @images.length == 0
-        ui.error "image list is empty, nothing to do"
+      if @images.length > 0
+        @images.each do |i|
+          ui.info "*** Provisioning image: #{i} ***"
+          run_action(:provision, opts.merge({:image => i}))
+        end
+      else
+        ui.info "*** Provisioning ***"
+        run_action(:provision, opts.merge({:engine => @engine}))
       end
-      @images.each do |i|
-        ui.info "*** Provisioning image: #{i} ***"
-        run_action(:provision, opts.merge({:image => i}))
+    end
+
+    def up(opts={})
+      if @images.length > 0
+        @images.each do |i|
+          ui.info "*** Up'ing image: #{i} ***"
+          run_action(:up, opts.merge({:image => i}))
+        end        
+      else
+        ui.info "*** Up'ing ***"
+        run_action(:up, opts.merge({:engine => @engine}))
       end
     end
 
@@ -45,34 +62,14 @@ module Caterer
       run_action(:reboot, opts)
     end
 
-    def up(opts={})
-      if @images.length == 0
-        ui.error "image list is empty, nothing to do"
-      end
-      @images.each do |i|
-        ui.info "*** Up'ing image: #{i} ***"
-        run_action(:up, opts.merge({:image => i}))
-      end
-    end
-
     def lock(opts={})
-      if @images.length == 0
-        ui.error "image list is empty, nothing to do"
-      end
-      @images.each do |i|
-        ui.info "*** Locking image: #{i} ***"
-        run_action(:lock, opts.merge({:image => i}))
-      end
+      ui.info "*** Locking ***"
+      run_action(:lock, opts)
     end
 
     def unlock(opts={})
-      if @images.length == 0
-        ui.error "image list is empty, nothing to do"
-      end
-      @images.each do |i|
-        ui.info "*** Unlocking image: #{i} ***"
-        run_action(:unlock, opts.merge({:image => i}))
-      end
+      ui.info "*** Unlocking ***"
+      run_action(:unlock, opts)
     end
 
     def reboot!
@@ -112,7 +109,7 @@ module Caterer
         opts[:paranoid] = false
         opts[:port]     = port
         opts[:password] = password if password
-        opts[:keys]     = ["#{@key}"] if @key
+        opts[:keys]     = [].tap {|keys| keys << @key if @key }
       end
     end
 
@@ -160,6 +157,26 @@ module Caterer
       env.action_runner.run(name, options)
     end
 
+    def upload_directory(from, to)
+      if File.exists? from
+        if can_rsync?
+          from += "/" if not from.match /\/$/
+          res = rsync.sync(from, to)
+          ui.error "rsync was unsuccessful" if res != 0
+        else
+          # yuck. Heaven help the poor soul who hath not rsync...
+          ui.warn "Rsync unavailable, falling back to scp (slower)..."
+          unique = Digest::MD5.hexdigest(from)
+          ssh.sudo "rm -rf #{to}/*", :stream => true
+          ssh.sudo "mkdir -p #{to}/#{unique}", :stream => true
+          ssh.sudo "chown -R #{username} #{to}/#{unique}", :stream => true
+          ssh.upload from, "#{to}/#{unique}"
+          ssh.sudo "mv #{to}/#{unique}/**/* #{to}/", :stream => true
+          ssh.sudo "rm -rf #{to}/#{unique}", :stream => true
+        end
+      end
+    end
+
     protected
 
     def lock_path

data/lib/caterer/version.rb

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

data/lib/caterer.rb

@@ -23,6 +23,10 @@ module Caterer
     @commands ||= Vli::Registry.new
   end
 
+  def provisioners
+    @provisioners ||= Vli::Registry.new
+  end
+
   def config
     @config ||= Config::Base.new
   end
@@ -34,4 +38,5 @@ module Caterer
 end
 
 require 'caterer/commands'
-require 'caterer/actions'
+require 'caterer/actions'
+require 'caterer/provisioners'

data/lib/templates/provisioner/chef_solo/solo.erb

@@ -1,5 +1,5 @@
-file_cache_path "<%= base_path %>"
+file_cache_path "<%= target_base_path %>"
 node_name "<%= server.host %>"
-cookbook_path <%= config.cookbooks_path.map { |path| "#{cookbooks_path}/#{Digest::MD5.hexdigest(path)}" }.inspect %>
-data_bag_path "<%= data_bags_path %>"
-role_path "<%= roles_path %>"
+cookbook_path <%= cookbooks_path.map { |path| "#{target_cookbooks_path}/#{Digest::MD5.hexdigest(path)}" }.inspect %>
+data_bag_path "<%= target_data_bags_path %>"
+role_path "<%= target_roles_path %>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-23 00:00:00.000000000 Z
+date: 2012-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -195,6 +195,7 @@ files:
 - lib/caterer/action/provisioner/provision.rb
 - lib/caterer/action/provisioner/validate.rb
 - lib/caterer/action/provisioner/validate/bootstrapped.rb
+- lib/caterer/action/provisioner/validate/engine.rb
 - lib/caterer/action/server.rb
 - lib/caterer/action/server/lock.rb
 - lib/caterer/action/server/reboot.rb
@@ -222,13 +223,12 @@ files:
 - lib/caterer/config/group.rb
 - lib/caterer/config/image.rb
 - lib/caterer/config/member.rb
-- lib/caterer/config/provision.rb
-- lib/caterer/config/provision/chef_solo.rb
 - lib/caterer/environment.rb
 - lib/caterer/logger.rb
 - lib/caterer/provisioner.rb
 - lib/caterer/provisioner/base.rb
 - lib/caterer/provisioner/chef_solo.rb
+- lib/caterer/provisioners.rb
 - lib/caterer/server.rb
 - lib/caterer/util.rb
 - lib/caterer/util/ansi_escape_code_remover.rb

data/lib/caterer/config/provision/chef_solo.rb

@@ -1,74 +0,0 @@
-module Caterer
-  module Config
-    module Provision
-
-      class ChefSolo
-        
-        attr_reader :name, :run_list
-        attr_accessor :json, :cookbooks_path, :roles_path, :data_bags_path, :bootstrap_scripts
-
-        def initialize(name)
-          @name              = name
-          @run_list          = []
-          @json              = {}
-          @cookbooks_path    = ['cookbooks']
-          @roles_path        = ['roles']
-          @data_bags_path    = ['data_bags']
-          @bootstrap_scripts = []
-        end
-
-        def add_recipe(recipe)
-          @run_list << "recipe[#{recipe}]"
-        end
-
-        def add_role(role)
-          @run_list << "role[#{role}]"
-        end
-
-        def add_image(image)
-          image = Caterer.config.images[image]
-          raise "Unknown image :#{image}" if not image
-
-          provisioner = image.provisioner
-          raise "No provisioner for :#{image}" if not provisioner
-
-          if not provisioner.name == :chef_solo
-            raise "Incompatible provisioner. Must be :#{provisioner.name}"
-          end
-
-          @run_list += provisioner.run_list
-          @bootstrap_scripts += provisioner.bootstrap_scripts
-        end
-
-        def add_bootstrap(script)
-          @bootstrap_scripts << script
-        end
-
-        def errors
-          errors = {}
-
-          if not @run_list.length > 0
-            errors[:run_list] = "is empty"
-          end
-
-          if not @cookbooks_path.is_a? Array
-            errors[:cookbooks_path] = "must be an array"
-          end
-
-          if not @roles_path.is_a? Array
-            errors[:roles_path] = "must be an array"
-          end
-
-          if not @data_bags_path.is_a? Array
-            errors[:data_bags_path] = "must be an array"
-          end
-
-          if errors.length > 0
-            errors
-          end
-        end
-
-      end
-    end
-  end
-end

data/lib/caterer/config/provision.rb

@@ -1,7 +0,0 @@
-module Caterer
-  module Config
-    module Provision
-      autoload :ChefSolo, 'caterer/config/provision/chef_solo'
-    end
-  end
-end