caterer 0.1.2 → 0.2.0

data/caterer.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'net-ssh'
   gem.add_dependency 'net-scp'
   gem.add_dependency 'tilt'
+  gem.add_dependency 'erubis'
   gem.add_dependency 'oj'
   gem.add_dependency 'multi_json', '>= 1.3'
 

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

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

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

@@ -0,0 +1,14 @@
+module Caterer
+  module Action
+    module Provisioner
+      class Install < Base
+
+        def call(env)
+          provisioner(env).install
+          @app.call(env)
+        end
+        
+      end
+    end
+  end
+end

data/lib/caterer/action/provisioner.rb

@@ -4,6 +4,7 @@ module Caterer
       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 :Prepare,    'caterer/action/provisioner/prepare'
       autoload :Provision,  'caterer/action/provisioner/provision'
     end

data/lib/caterer/actions.rb

@@ -32,6 +32,7 @@ Caterer.actions.register(:provision) do
   Vli::Action::Builder.new do
     use Caterer.actions.get(:validate)
     use Caterer.actions.get(:prepare)
+    use Caterer::Action::Provisioner::Install
     use Caterer::Action::Provisioner::Provision
     use Caterer.actions.get(:cleanup)
   end
@@ -42,6 +43,7 @@ Caterer.actions.register(:up) do
     use Caterer.actions.get(:validate)
     use Caterer.actions.get(:prepare)
     use Caterer::Action::Provisioner::Bootstrap
+    use Caterer::Action::Provisioner::Install
     use Caterer::Action::Provisioner::Provision
     use Caterer.actions.get(:cleanup)
   end

data/lib/caterer/command/bootstrap.rb

@@ -6,10 +6,6 @@ module Caterer
         options = {}
         opts = OptionParser.new do |opts|
           opts.banner = "Usage: cater bootstrap HOST [options]"
-          opts.separator ""
-          opts.on("-s SCRIPT", "--script SCRIPT", 'optional bootstrap script') do |s|
-            options[:script] = s
-          end
         end
 
         # Parse the options
@@ -17,7 +13,7 @@ module Caterer
         return if not argv
 
         with_target_servers(argv, options) do |server|
-          server.bootstrap({:script => options[:script]})
+          server.bootstrap
         end
 
         0

data/lib/caterer/command/up.rb

@@ -6,10 +6,6 @@ module Caterer
         options = {}
         opts = OptionParser.new do |opts|
           opts.banner = "Usage: cater provision HOST [options]"
-          opts.separator ""
-          opts.on("-s SCRIPT", "--script SCRIPT", 'optional bootstrap script') do |s|
-            options[:script] = s
-          end
         end
 
         # Parse the options
@@ -17,7 +13,7 @@ module Caterer
         return if not argv
 
         with_target_servers(argv, options) do |server|
-          server.up({:script => options[:script]})
+          server.up
         end
 
         0

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

@@ -5,15 +5,16 @@ module Caterer
       class ChefSolo
         
         attr_reader :name, :run_list
-        attr_accessor :json, :cookbooks_path, :roles_path, :data_bags_path, :bootstrap_script
+        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']
+          @name              = name
+          @run_list          = []
+          @json              = {}
+          @cookbooks_path    = ['cookbooks']
+          @roles_path        = ['roles']
+          @data_bags_path    = ['data_bags']
+          @bootstrap_scripts = []
         end
 
         def add_recipe(recipe)
@@ -25,7 +26,22 @@ module Caterer
         end
 
         def add_image(image)
-          @run_list += Caterer.config.images[image].provisioner.run_list
+          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
@@ -35,6 +51,18 @@ module Caterer
             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

data/lib/caterer/provisioner/base.rb

@@ -2,7 +2,7 @@ module Caterer
   module Provisioner
     class Base
 
-      attr_reader :server
+      attr_reader :server, :config
 
       def initialize(server, config=nil)
         @server = server
@@ -11,6 +11,7 @@ module Caterer
 
       def bootstrap(script=nil);  end
       def prepare;    end
+      def install;    end
       def provision;  end
       def cleanup;    end
 

data/lib/caterer/provisioner/chef_solo.rb

@@ -1,4 +1,6 @@
 require 'tilt'
+require 'erubis'
+require 'erb'
 require 'oj'
 require 'multi_json'
 
@@ -6,34 +8,64 @@ module Caterer
   module Provisioner
     class ChefSolo < Base
       
-      def bootstrap(script=nil)
+      def bootstrap
 
-        script ||= config_bootstrap || default_bootstrap
+        if bootstrap_scripts.length == 0
+          server.ui.warn "No bootstrap scripts to execute"
+        end
+
+        # validate
+        with_bootstrap_scripts do |script, count|
+
+          if not File.exists? script
+            server.ui.error "#{script} does not exist!"
+            return
+          end
 
-        if not File.exists? script
-          server.ui.error "Script does not exist!"
-          return
         end
 
         # upload
-        server.ui.info "Uploading bootstrap script..."
-        server.ssh.upload script, "#{bootstrap_path}"
+        with_bootstrap_scripts do |script, count|
 
-        # set permissions
-        server.ui.info "Applying permissions..."
-        server.ssh.sudo "chown #{server.username} #{bootstrap_path}", :stream => true
-        server.ssh.sudo "chmod 777 #{bootstrap_path}", :stream => true
+          server.ui.info "Uploading #{script}..."
+          server.ssh.upload script, "#{bootstrap_path}-#{count}"
+
+          server.ssh.sudo "chown #{server.username} #{bootstrap_path}-#{count}", :stream => true
+          server.ssh.sudo "chmod +x #{bootstrap_path}-#{count}", :stream => true
+
+        end
 
         # run
-        server.ui.info "Running bootstrap script..."
-        server.ssh.sudo "#{bootstrap_path}", :stream => true
+        with_bootstrap_scripts do |script, count|
+
+          server.ui.info "Running #{script}..."
+          server.ssh.sudo "#{bootstrap_path}-#{count}", :stream => true
+
+        end
+
       end
 
       def prepare
+        # create base dir
         server.ssh.sudo "mkdir -p #{base_path}", :stream => true
         server.ssh.sudo "chown -R #{server.username} #{base_path}", :stream => true
       end
 
+      def install
+        server.ui.info "Preparing installation..."
+
+        # upload
+        server.ssh.upload install_script, "#{install_path}"
+
+        # set permissions
+        server.ssh.sudo "chown #{server.username} #{install_path}", :stream => true
+        server.ssh.sudo "chmod +x #{install_path}", :stream => true
+
+        # run
+        server.ui.info "Installing chef-solo..."
+        server.ssh.sudo "#{install_path}", :stream => true
+      end
+
       def provision
 
         # create cookbooks directory
@@ -42,8 +74,8 @@ module Caterer
 
         # sync cookbooks
         server.ui.info "Syncing cookbooks..."
-        @config.cookbooks_path.each do |path|
-          upload_directory path, cookbooks_path
+        config.cookbooks_path.each do |path|
+          upload_directory path, "#{cookbooks_path}/#{Digest::MD5.hexdigest(path)}"
         end
 
         # create roles directory
@@ -52,7 +84,7 @@ module Caterer
 
         # sync roles
         server.ui.info "Syncing roles..."
-        @config.roles_path.each do |path|
+        config.roles_path.each do |path|
           upload_directory path, roles_path
         end
 
@@ -62,7 +94,7 @@ module Caterer
 
         # sync databags
         server.ui.info "Syncing data bags..."
-        @config.data_bags_path.each do |path|
+        config.data_bags_path.each do |path|
           upload_directory path, data_bags_path
         end
 
@@ -83,7 +115,19 @@ module Caterer
       end
 
       def cleanup
-        # server.ssh.sudo "rm -rf #{base_path}", :stream => true
+        # installer
+        server.ssh.sudo "rm -f #{install_path}", :stream => true
+
+        # bootstrap scripts
+        server.ssh.sudo "rm -f #{bootstrap_path}*", :stream => true
+
+        # solo.rb
+        server.ssh.sudo "rm -f #{solo_path}", :stream => true
+
+        # json
+        server.ssh.sudo "rm -f #{json_config_path}", :stream => true
+
+        # for now, leave cookbooks, roles, and data bags for faster provisioning
       end
 
       protected
@@ -102,10 +146,24 @@ module Caterer
         end
       end
 
+      def with_bootstrap_scripts
+        config.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
         "/tmp/cater-chef-solo"
       end
 
+      def install_path
+        "#{base_path}/install"
+      end
+
       def bootstrap_path
         "#{base_path}/bootstrap"
       end
@@ -123,10 +181,10 @@ module Caterer
       end
 
       def config_bootstrap
-        @config.bootstrap_script
+        config.bootstrap_script
       end
 
-      def default_bootstrap
+      def install_script
         File.expand_path("../../../templates/provisioner/chef_solo/bootstrap.sh", __FILE__)
       end
 
@@ -139,7 +197,7 @@ module Caterer
       end
 
       def json_config
-        MultiJson.dump(@config.json.merge({:run_list => @config.run_list}))
+        MultiJson.dump(config.json.merge({:run_list => config.run_list}))
       end
 
       def json_config_path

data/lib/caterer/version.rb

@@ -1,3 +1,3 @@
 module Caterer
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: erubis
+  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'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +190,7 @@ files:
 - 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/prepare.rb
 - lib/caterer/action/provisioner/provision.rb
 - lib/caterer/action/server.rb