caterer 0.11.2 → 1.0.0

data/lib/caterer/provisioner/shell.rb

@@ -0,0 +1,83 @@
+require 'digest'
+require 'tilt'
+require 'erubis'
+require 'erb'
+
+module Caterer
+  module Provisioner
+    class Shell < Base
+
+      attr_accessor :path, :inline, :args
+
+      def initialize(image, opts={})
+        @image  = image
+        @path   = opts[:path] if opts[:path]
+        @inline = opts[:inline] if opts[:inline]
+        @args   = opts[:args] if opts[:args]
+      end
+
+      # config dsl
+
+      def path(path)
+        @path = path
+      end
+
+      def inline(inline)
+        @inline = inline
+      end
+
+      def args(args)
+        @args = args
+      end
+
+      def errors
+        errors = {}
+        
+        if not @path and not @inline
+          errors[:action] = "cannot be determined. Please set 'inline' or 'script'"
+        end
+
+        if errors.length > 0
+          errors
+        end
+
+      end
+
+      def prepare(server)
+        # create lib dir
+        server.ssh.sudo "mkdir -p #{dest_lib_dir}", :stream => true
+        server.ssh.sudo "chown -R #{server.username} #{dest_lib_dir}", :stream => true
+
+        # create script
+        server.ui.info "Generating shell script..."
+        server.ssh.upload(StringIO.new(script_content), dest_script_path)
+        server.ssh.sudo "chmod +x #{dest_script_path}", :stream => true
+      end
+
+      def provision_cmd
+        "#{dest_script_path} #{@args}"
+      end
+
+      def dest_lib_dir
+        "#{image.lib_dir}/shell"
+      end
+
+      def dest_script_path
+        "#{dest_lib_dir}/#{uuid}"
+      end
+
+      def uuid
+        @uuid ||= ::Digest::MD5.hexdigest((@inline or @path))
+      end
+
+      def script_content
+        if @inline
+          Tilt.new(File.expand_path('../../../templates/provisioner/shell/script.erb', __FILE__)).render(self)          
+        else
+          File.read @path
+        end
+      end
+
+    end
+  end
+end

data/lib/caterer/provisioners.rb

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

data/lib/caterer/server.rb

@@ -18,25 +18,12 @@ module Caterer
       @key    = opts[:key]
       @images = opts[:images] || []
       @data   = opts[:data] || {}
-      @engine = opts[:engine]
 
       @logger = Log4r::Logger.new("caterer::server")
 
       @logger.info("Server: #{opts.inspect}")
     end
 
-    def bootstrap(opts={})
-      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
         @images.each do |i|
@@ -44,27 +31,10 @@ module Caterer
           run_action(:provision, opts.merge({:image => i}))
         end
       else
-        ui.info "*** Provisioning ***"
-        run_action(:provision, opts.merge({:engine => @engine}))
+        ui.error "*** No image to provision ***"
       end
     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
-
-    def reboot(opts={})
-      run_action(:reboot, opts)
-    end
-
     def lock(opts={})
       ui.info "*** Locking ***"
       run_action(:lock, opts)
@@ -80,11 +50,6 @@ module Caterer
       run_action(:clean, opts)
     end
 
-    def reboot!
-      ui.info "Rebooting..."
-      ssh.sudo "shutdown -r now", :stream => true
-    end
-
     def lock!
       ui.info "Locking..."
       ssh.sudo "touch #{lock_path}"
@@ -100,6 +65,23 @@ module Caterer
       res == 0 ? true : false
     end
 
+    def prepare!
+      ui.info "Preparing server..."
+      ssh.sudo "mkdir -p #{config.dest_dir}", :stream => true
+      ssh.sudo "mkdir -p #{config.dest_dir}/lib", :stream => true
+      ssh.sudo "mkdir -p #{config.dest_dir}/bin", :stream => true
+      ssh.sudo "chown -R #{username} #{config.dest_dir}", :stream => true
+    end
+
+    def cleanup!
+      ui.info "Cleaning up server..."
+      ssh.sudo "rm -rf #{config.dest_dir}"
+    end
+
+    def config
+      @config ||= Caterer.config
+    end
+
     def ssh
       @ssh ||= Communication::SSH.new(self)
     end

data/lib/caterer/version.rb

@@ -1,3 +1,3 @@
 module Caterer
-  VERSION = "0.11.2"
+  VERSION = "1.0.0"
 end

data/lib/templates/image/bin_wrapper.erb

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+echo "Provisioning <%= @name %>..."
+
+<% @provisioners.each do |p| -%>
+<%= p.provision_cmd %>
+
+<% end -%>

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

@@ -1,4 +1,4 @@
-file_cache_path "<%= dest_dir %>"
+file_cache_path "<%= dest_cache_dir %>"
 node_name "<%= server.host %>"
 cookbook_path <%= final_cookbook_paths.inspect %>
 data_bag_path "<%= target_data_bags_path %>"

data/lib/templates/provisioner/shell/script.erb

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+<%= @inline %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -191,21 +191,19 @@ files:
 - lib/caterer/action/config/validate/provisioner.rb
 - lib/caterer/action/environment.rb
 - lib/caterer/action/environment/setup.rb
+- lib/caterer/action/image.rb
+- lib/caterer/action/image/cleanup.rb
+- lib/caterer/action/image/prepare.rb
+- lib/caterer/action/image/run.rb
 - lib/caterer/action/provisioner.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/uninstall.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/cleanup.rb
 - lib/caterer/action/server/lock.rb
 - lib/caterer/action/server/platform.rb
-- lib/caterer/action/server/reboot.rb
+- lib/caterer/action/server/prepare.rb
 - lib/caterer/action/server/unlock.rb
 - lib/caterer/action/server/validate.rb
 - lib/caterer/action/server/validate/ssh.rb
@@ -216,14 +214,11 @@ files:
 - lib/caterer/command.rb
 - lib/caterer/command/base.rb
 - lib/caterer/command/berks.rb
-- lib/caterer/command/bootstrap.rb
 - lib/caterer/command/clean.rb
 - lib/caterer/command/lock.rb
 - lib/caterer/command/provision.rb
-- lib/caterer/command/reboot.rb
-- lib/caterer/command/test.rb
+- lib/caterer/command/server.rb
 - lib/caterer/command/unlock.rb
-- lib/caterer/command/up.rb
 - lib/caterer/commands.rb
 - lib/caterer/communication.rb
 - lib/caterer/communication/rsync.rb
@@ -231,17 +226,18 @@ files:
 - lib/caterer/config.rb
 - lib/caterer/config/base.rb
 - lib/caterer/config/berkshelf.rb
-- lib/caterer/config/group.rb
-- lib/caterer/config/image.rb
-- lib/caterer/config/member.rb
 - lib/caterer/config/provisioner.rb
 - lib/caterer/config/provisioner/base.rb
 - lib/caterer/config/provisioner/chef_solo.rb
 - lib/caterer/environment.rb
+- lib/caterer/group.rb
+- lib/caterer/image.rb
 - lib/caterer/logger.rb
+- lib/caterer/member.rb
 - lib/caterer/provisioner.rb
 - lib/caterer/provisioner/base.rb
 - lib/caterer/provisioner/chef_solo.rb
+- lib/caterer/provisioner/shell.rb
 - lib/caterer/provisioners.rb
 - lib/caterer/server.rb
 - lib/caterer/util.rb
@@ -249,15 +245,17 @@ files:
 - lib/caterer/util/retryable.rb
 - lib/caterer/util/shell.rb
 - lib/caterer/version.rb
+- lib/templates/image/bin_wrapper.erb
 - lib/templates/provisioner/chef_solo/bootstrap.sh
-- lib/templates/provisioner/chef_solo/bootstrap/debian.sh
-- lib/templates/provisioner/chef_solo/bootstrap/el.sh
-- lib/templates/provisioner/chef_solo/bootstrap/fedora.sh
-- lib/templates/provisioner/chef_solo/bootstrap/sles.sh
-- lib/templates/provisioner/chef_solo/bootstrap/smartos.sh
-- lib/templates/provisioner/chef_solo/bootstrap/suse.sh
-- lib/templates/provisioner/chef_solo/bootstrap/ubuntu.sh
+- lib/templates/provisioner/chef_solo/install/debian.sh
+- lib/templates/provisioner/chef_solo/install/el.sh
+- lib/templates/provisioner/chef_solo/install/fedora.sh
+- lib/templates/provisioner/chef_solo/install/sles.sh
+- lib/templates/provisioner/chef_solo/install/smartos.sh
+- lib/templates/provisioner/chef_solo/install/suse.sh
+- lib/templates/provisioner/chef_solo/install/ubuntu.sh
 - lib/templates/provisioner/chef_solo/solo.erb
+- lib/templates/provisioner/shell/script.erb
 - lib/templates/server/platform.sh
 homepage: ''
 licenses: []
@@ -273,7 +271,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2702261551377672085
+      hash: 141391927136989178
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -282,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2702261551377672085
+      hash: 141391927136989178
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

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

@@ -1,14 +0,0 @@
-module Caterer
-  module Action
-    module Provisioner
-      class Bootstrap < Base
-        
-        def call(env)
-          env[:provisioner].bootstrap(env[:server])
-          @app.call(env)
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,29 +0,0 @@
-module Caterer
-  module Action
-    module Provisioner
-      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
-          else
-            Caterer.provisioners.get(env[:engine] || default_engine).new
-          end
-        end
-
-        def default_engine
-          Caterer.config.provisioner.default_engine
-        end
-
-      end     
-    end
-  end
-end

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

@@ -1,14 +0,0 @@
-module Caterer
-  module Action
-    module Provisioner
-      class Provision < Base
-
-        def call(env)
-          env[:provisioner].provision(env[:server])
-          @app.call(env)
-        end
-        
-      end
-    end
-  end
-end

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

@@ -1,10 +0,0 @@
-module Caterer
-  module Action
-    module Provisioner
-      module Validate
-        autoload :Bootstrapped, 'caterer/action/provisioner/validate/bootstrapped'
-        autoload :Engine,       'caterer/action/provisioner/validate/engine'
-      end
-    end
-  end
-end

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

@@ -1,22 +0,0 @@
-module Caterer
-  module Action
-    module Provisioner
-      module Validate
-        class Bootstrapped < Base
-
-          def call(env)
-
-            if not env[:provisioner].bootstrapped?(env[:server])
-              env[:ui].error "Server not bootstrapped, cannot continue"
-              return
-            end
-
-            @app.call(env)
-
-          end
-          
-        end
-      end
-    end
-  end
-end

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

@@ -1,24 +0,0 @@
-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