caterer 0.4.0 → 0.5.0

data/lib/caterer/action/provisioner.rb

@@ -5,8 +5,11 @@ module Caterer
       autoload :Bootstrap,  'caterer/action/provisioner/bootstrap'
       autoload :Cleanup,    'caterer/action/provisioner/cleanup'
       autoload :Install,    'caterer/action/provisioner/install'
+      autoload :Lock,       'caterer/action/provisioner/lock'
       autoload :Prepare,    'caterer/action/provisioner/prepare'
       autoload :Provision,  'caterer/action/provisioner/provision'
+      autoload :Unlock,     'caterer/action/provisioner/unlock'
+      autoload :Validate,   'caterer/action/provisioner/validate'
     end
   end
 end

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

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

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

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

data/lib/caterer/action/server.rb

@@ -1,7 +1,10 @@
 module Caterer
   module Action
     module Server
+      autoload :Lock,     'caterer/action/server/lock'
+      autoload :Reboot,   'caterer/action/server/reboot'
       autoload :Validate, 'caterer/action/server/validate'
+      autoload :Unlock,   'caterer/action/server/unlock'
     end
   end
 end

data/lib/caterer/action/server/lock.rb

@@ -0,0 +1,14 @@
+module Caterer
+  module Action
+    module Server
+      class Lock < Base
+        
+        def call(env)
+          env[:server].lock!
+          @app.call(env)
+        end
+
+      end
+    end
+  end
+end

data/lib/caterer/action/server/reboot.rb

@@ -0,0 +1,12 @@
+module Caterer
+  module Action
+    module Server
+      class Reboot < Base
+        def call(env)
+          env[:server].reboot!
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/caterer/action/server/unlock.rb

@@ -0,0 +1,14 @@
+module Caterer
+  module Action
+    module Server
+      class Unlock < Base
+        
+        def call(env)
+          env[:server].unlock!
+          @app.call(env)
+        end
+
+      end
+    end
+  end
+end

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

@@ -2,7 +2,8 @@ module Caterer
   module Action
     module Server
       module Validate
-        autoload :SSH, 'caterer/action/server/validate/ssh'
+        autoload :SSH,      'caterer/action/server/validate/ssh'
+        autoload :Unlocked, 'caterer/action/server/validate/Unlocked'
       end
     end
   end

data/lib/caterer/action/server/validate/unlocked.rb

@@ -0,0 +1,21 @@
+module Caterer
+  module Action
+    module Server
+      module Validate
+        class Unlocked < Base
+          
+          def call(env)
+
+            if env[:server].locked?
+              env[:ui].error "Server is currently locked, cannot proceed"
+              return
+            end
+
+            @app.call(env)
+          end
+
+        end        
+      end
+    end
+  end
+end

data/lib/caterer/actions.rb

@@ -4,47 +4,67 @@ Caterer.actions.register(:validate) do
     use Caterer::Action::Config::Validate::Image
     use Caterer::Action::Config::Validate::Provisioner
     use Caterer::Action::Server::Validate::SSH
+    use Caterer::Action::Server::Validate::Unlocked
   end
 end
 
-Caterer.actions.register(:prepare) do
+Caterer.actions.register(:lock) do
   Vli::Action::Builder.new do
-    use Caterer::Action::Provisioner::Prepare
+    use Caterer::Action::Config::Validate::Image
+    use Caterer::Action::Config::Validate::Provisioner
+    use Caterer::Action::Server::Validate::SSH
+    use Caterer::Action::Server::Lock
   end
 end
 
-Caterer.actions.register(:cleanup) do
+Caterer.actions.register(:unlock) do
   Vli::Action::Builder.new do
-    use Caterer::Action::Provisioner::Cleanup
+    use Caterer::Action::Config::Validate::Image
+    use Caterer::Action::Config::Validate::Provisioner
+    use Caterer::Action::Server::Validate::SSH
+    use Caterer::Action::Server::Unlock
   end
 end
 
 Caterer.actions.register(:bootstrap) do
   Vli::Action::Builder.new do
     use Caterer.actions.get(:validate)
-    use Caterer.actions.get(:prepare)
+    use Caterer::Action::Provisioner::Prepare
+    use Caterer::Action::Server::Lock
     use Caterer::Action::Provisioner::Bootstrap
-    use Caterer.actions.get(:cleanup)
+    use Caterer::Action::Provisioner::Install
+    use Caterer::Action::Provisioner::Cleanup
+    use Caterer::Action::Server::Unlock
   end
 end
 
 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::Validate::Bootstrapped
+    use Caterer::Action::Provisioner::Prepare
+    use Caterer::Action::Server::Lock
     use Caterer::Action::Provisioner::Provision
-    use Caterer.actions.get(:cleanup)
+    use Caterer::Action::Provisioner::Cleanup
+    use Caterer::Action::Server::Unlock
   end
 end
 
 Caterer.actions.register(:up) do
   Vli::Action::Builder.new do
     use Caterer.actions.get(:validate)
-    use Caterer.actions.get(:prepare)
+    use Caterer::Action::Provisioner::Prepare
+    use Caterer::Action::Server::Lock
     use Caterer::Action::Provisioner::Bootstrap
-    use Caterer::Action::Provisioner::Install
     use Caterer::Action::Provisioner::Provision
-    use Caterer.actions.get(:cleanup)
+    use Caterer::Action::Provisioner::Cleanup
+    use Caterer::Action::Server::Unlock
+  end
+end
+
+Caterer.actions.register(:reboot) do
+  Vli::Action::Builder.new do
+    use Caterer::Action::Server::Validate::SSH
+    use Caterer::Action::Server::Reboot
   end
 end

data/lib/caterer/command.rb

@@ -2,9 +2,11 @@ module Caterer
   module Command
     autoload :Base,       'caterer/command/base'
     autoload :Bootstrap,  'caterer/command/bootstrap'
+    autoload :Lock,       'caterer/command/lock'
     autoload :Provision,  'caterer/command/provision'
     autoload :Reboot,     'caterer/command/reboot'
     autoload :Test,       'caterer/command/test'
+    autoload :Unlock,     'caterer/command/unlock'
     autoload :Up,         'caterer/command/up'
   end
 end

data/lib/caterer/command/base.rb

@@ -22,7 +22,10 @@ module Caterer
         opts.on('-P PORT', '--port PORT', 'assumes 22') do |p|
           options[:port] = p
         end
-        opts.on('-d JSON', '--data JSON', 'json data that the provisioner may use' )do |d|
+        opts.on('-e ENGINE', '--engine ENGINE', 'provision engine' ) do |e|
+          options[:engine] = e
+        end
+        opts.on('-d JSON', '--data JSON', 'json data that the provisioner may use' ) do |d|
           options[:data] = d
         end
         opts.on('-i IMAGE', '--image IMAGE', 'corresponds to a image in Caterfile') do |i|

data/lib/caterer/command/lock.rb

@@ -0,0 +1,24 @@
+module Caterer
+  module Command
+    class Lock < Base
+      
+      def execute
+        options = {}
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: cater lock HOST [options]"
+        end
+
+        # Parse the options
+        argv = parse_options(opts, options, true)
+        return if not argv
+
+        with_target_servers(argv, options) do |server|
+          server.lock
+        end
+
+        0
+      end
+
+    end
+  end
+end

data/lib/caterer/command/reboot.rb

@@ -5,15 +5,17 @@ module Caterer
       def execute
         options = {}
         opts = OptionParser.new do |opts|
-          opts.banner = "Usage: cater provision HOST [options]"
+          opts.banner = "Usage: cater reboot HOST [options]"
         end
 
         # Parse the options
         argv = parse_options(opts, options, true)
         return if not argv
 
-        @env.ui.info options
-        @env.ui.info argv
+        with_target_servers(argv, options) do |server|
+          server.reboot
+        end
+
         0
       end
 

data/lib/caterer/command/unlock.rb

@@ -0,0 +1,24 @@
+module Caterer
+  module Command
+    class Unlock < Base
+      
+      def execute
+        options = {}
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: cater unlock HOST [options]"
+        end
+
+        # Parse the options
+        argv = parse_options(opts, options, true)
+        return if not argv
+
+        with_target_servers(argv, options) do |server|
+          server.unlock
+        end
+
+        0
+      end
+
+    end
+  end
+end

data/lib/caterer/commands.rb

@@ -1,6 +1,7 @@
 # commands
-Caterer.commands.register(:test)      { Caterer::Command::Test }
 Caterer.commands.register(:bootstrap) { Caterer::Command::Bootstrap }
+Caterer.commands.register(:lock)      { Caterer::Command::Lock }
 Caterer.commands.register(:provision) { Caterer::Command::Provision }
+Caterer.commands.register(:reboot)    { Caterer::Command::Reboot }
+Caterer.commands.register(:unlock)    { Caterer::Command::Unlock }
 Caterer.commands.register(:up)        { Caterer::Command::Up }
-Caterer.commands.register(:reboot)    { Caterer::Command::Reboot }

data/lib/caterer/communication/rsync.rb

@@ -4,13 +4,23 @@ module Caterer
   module Communication
     class Rsync
       
+      class << self
+        
+        def available?
+          `command -v rsync &>/dev/null`
+          $?.exitstatus == 0 ? true : false
+        end
+
+      end
+
       def initialize(server)
         @server = server
-        @logger = Log4r::Logger.new("caterer::communication::ssh")
+        @logger = Log4r::Logger.new("caterer::communication::rsync")
       end
 
       def sync(from, to)
-        PTY.spawn(rsync_cmd(from, to)) do |stdout, stdin|
+        exit_status = nil
+        PTY.spawn(rsync_cmd(from, to)) do |stdout, stdin, pid|
           eof = false
           until eof do
             begin
@@ -18,29 +28,20 @@ module Caterer
               if out.match /password:/
                 stdin.puts @server.password
               else
-                print out if print_worthy out
+                @logger.debug("stdout: #{out}")
               end
             rescue EOFError
               eof = true
             end
           end
+          Process.wait(pid)
+          exit_status = $?.exitstatus
         end
+        exit_status
       end
 
       protected
 
-      def print_worthy(data)
-        [
-          /^\r\n$/, # empty lines
-          /^Warning: Permanently added/, # key added nonsense
-        ].each do |cruft|
-          if data.match cruft
-            return false
-          end
-        end
-        true
-      end
-
       def rsync_cmd(from, to)
         "rsync -zr -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p #{@server.port}' --delete #{from} #{@server.username}@#{@server.host}:#{to}"
       end

data/lib/caterer/provisioner/base.rb

@@ -9,11 +9,12 @@ module Caterer
         @config = config
       end
 
-      def bootstrap(script=nil);  end
-      def prepare;    end
-      def install;    end
-      def provision;  end
-      def cleanup;    end
+      def bootstrap; end
+      def bootstrapped?; true; end
+      def cleanup; end
+      def install; end
+      def prepare; end
+      def provision; end
 
     end
   end

data/lib/caterer/provisioner/chef_solo.rb

@@ -10,10 +10,6 @@ module Caterer
       
       def bootstrap
 
-        if bootstrap_scripts.length == 0
-          server.ui.warn "No bootstrap scripts to execute"
-        end
-
         # validate
         with_bootstrap_scripts do |script, count|
 
@@ -45,6 +41,11 @@ module Caterer
 
       end
 
+      def bootstrapped?
+        res = server.ssh.sudo "command -v chef-solo &>/dev/null"
+        res == 0 ? true : false
+      end
+
       def prepare
         # create base dir
         server.ssh.sudo "mkdir -p #{base_path}", :stream => true
@@ -115,6 +116,8 @@ module Caterer
       end
 
       def cleanup
+        server.ui.info "Cleaning up..."
+
         # installer
         server.ssh.sudo "rm -f #{install_path}", :stream => true
 
@@ -136,11 +139,16 @@ module Caterer
         if File.exists? from
           if @server.can_rsync?
             from += "/" if not from.match /\/$/
-            @server.rsync.sync(from, to)        
+            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 "mv #{to}/#{unique}/**/* #{to}/", :stream => true
             server.ssh.sudo "rm -rf #{to}/#{unique}", :stream => true
           end
         end
@@ -180,6 +188,14 @@ module Caterer
         "#{base_path}/data_bags"
       end
 
+      def solo_path
+        "#{base_path}/solo.rb"
+      end
+
+      def json_config_path
+        "#{base_path}/config.json"
+      end
+
       def config_bootstrap
         config.bootstrap_script
       end
@@ -188,10 +204,6 @@ module Caterer
         File.expand_path("../../../templates/provisioner/chef_solo/bootstrap.sh", __FILE__)
       end
 
-      def solo_path
-        "#{base_path}/solo.rb"
-      end
-
       def solo_content
         Tilt.new(File.expand_path('../../../templates/provisioner/chef_solo/solo.erb', __FILE__)).render(self)
       end
@@ -204,10 +216,6 @@ module Caterer
         {:run_list => config.run_list}.merge(config.json).merge(server.data)
       end
 
-      def json_config_path
-        "#{base_path}/config.json"
-      end
-
       def command_string
         "chef-solo -c #{solo_path} -j #{json_config_path}"
       end

data/lib/caterer/server.rb

@@ -15,6 +15,10 @@ module Caterer
       @key    = opts[:key]
       @images = opts[:images] || []
       @data   = opts[:data] || {}
+
+      @logger = Log4r::Logger.new("caterer::server")
+
+      @logger.info("Server: #{opts.inspect}")
     end
 
     def bootstrap(opts={})
@@ -51,6 +55,46 @@ module Caterer
       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
+    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
+    end
+
+    def reboot!
+      ui.info "Rebooting..."
+      ssh.sudo "shutdown -r now", :stream => true
+    end
+
+    def lock!
+      ui.info "Locking..."
+      ssh.sudo "touch #{lock_path}"
+    end
+
+    def unlock!
+      ui.info "Unlocking..."
+      ssh.sudo "rm -f #{lock_path}"
+    end
+
+    def locked?
+      res = ssh.sudo "[ -f #{lock_path} ]"
+      res == 0 ? true : false
+    end
+
     def ssh
       @ssh ||= Communication::SSH.new(self)
     end
@@ -60,7 +104,7 @@ module Caterer
     end
 
     def can_rsync?
-      true
+      !Vli::Util::Platform.windows? and Communication::Rsync.available?
     end
 
     def ssh_opts
@@ -116,5 +160,11 @@ module Caterer
       env.action_runner.run(name, options)
     end
 
+    protected
+
+    def lock_path
+      "/tmp/cater.lock"
+    end
+
   end
 end

data/lib/caterer/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-22 00:00:00.000000000 Z
+date: 2012-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -193,17 +193,25 @@ files:
 - lib/caterer/action/provisioner/install.rb
 - lib/caterer/action/provisioner/prepare.rb
 - lib/caterer/action/provisioner/provision.rb
+- lib/caterer/action/provisioner/validate.rb
+- lib/caterer/action/provisioner/validate/bootstrapped.rb
 - lib/caterer/action/server.rb
+- lib/caterer/action/server/lock.rb
+- lib/caterer/action/server/reboot.rb
+- lib/caterer/action/server/unlock.rb
 - lib/caterer/action/server/validate.rb
 - lib/caterer/action/server/validate/ssh.rb
+- lib/caterer/action/server/validate/unlocked.rb
 - lib/caterer/actions.rb
 - lib/caterer/cli.rb
 - lib/caterer/command.rb
 - lib/caterer/command/base.rb
 - lib/caterer/command/bootstrap.rb
+- lib/caterer/command/lock.rb
 - lib/caterer/command/provision.rb
 - lib/caterer/command/reboot.rb
 - lib/caterer/command/test.rb
+- lib/caterer/command/unlock.rb
 - lib/caterer/command/up.rb
 - lib/caterer/commands.rb
 - lib/caterer/communication.rb