caterer 0.11.0 → 0.11.1

data/Vagrantfile

@@ -3,8 +3,12 @@
 Vagrant.configure("2") do |config|
 
   # ubuntu
-  config.vm.box     = 'precise'
-  config.vm.box_url = 'http://files.vagrantup.com/precise64.box'
+  # config.vm.box     = 'precise'
+  # config.vm.box_url = 'http://files.vagrantup.com/precise64.box'
+
+  # centos
+  config.vm.box     = 'pagoda_cent6_minimal'
+  config.vm.box_url = 'https://s3.amazonaws.com/vagrant.pagodabox.com/boxes/centos-6.4-x86_64-minimal.box'
 
   config.vm.provider "virtualbox" do |v|
     v.customize ["modifyvm", :id, "--cpus", "2", "--memory", "1024", "--cpuexecutioncap", "75"]

data/lib/caterer/action/server.rb

@@ -2,6 +2,7 @@ module Caterer
   module Action
     module Server
       autoload :Lock,     'caterer/action/server/lock'
+      autoload :Platform, 'caterer/action/server/platform'
       autoload :Reboot,   'caterer/action/server/reboot'
       autoload :Validate, 'caterer/action/server/validate'
       autoload :Unlock,   'caterer/action/server/unlock'

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

@@ -0,0 +1,14 @@
+module Caterer
+  module Action
+    module Server
+      class Platform < Base
+        
+        def call(env)
+          platform = env[:server].detect_platform
+          @app.call(env) if platform
+        end
+
+      end
+    end
+  end
+end

data/lib/caterer/actions.rb

@@ -29,6 +29,7 @@ Caterer.actions.register(:bootstrap) do
   Vli::Action::Builder.new do
     use Caterer::Action::Environment::Setup
     use Caterer.actions.get(:validate)
+    use Caterer::Action::Server::Platform
     use Caterer::Action::Provisioner::Load
     use Caterer::Action::Provisioner::Prepare
     use Caterer::Action::Server::Lock
@@ -43,6 +44,7 @@ Caterer.actions.register(:provision) do
   Vli::Action::Builder.new do
     use Caterer::Action::Environment::Setup
     use Caterer.actions.get(:validate)
+    use Caterer::Action::Server::Platform
     use Caterer::Action::Provisioner::Load
     use Caterer::Action::Provisioner::Prepare
     use Caterer::Action::Provisioner::Validate::Bootstrapped
@@ -57,6 +59,7 @@ Caterer.actions.register(:up) do
   Vli::Action::Builder.new do
     use Caterer::Action::Environment::Setup
     use Caterer.actions.get(:validate)
+    use Caterer::Action::Server::Platform
     use Caterer::Action::Provisioner::Load
     use Caterer::Action::Provisioner::Prepare
     use Caterer::Action::Server::Lock
@@ -72,6 +75,7 @@ Caterer.actions.register(:reboot) do
   Vli::Action::Builder.new do
     use Caterer::Action::Environment::Setup
     use Caterer::Action::Server::Validate::SSH
+    use Caterer::Action::Server::Platform
     use Caterer::Action::Server::Reboot
   end
 end
@@ -80,6 +84,7 @@ Caterer.actions.register(:clean) do
   Vli::Action::Builder.new do
     use Caterer::Action::Environment::Setup
     use Caterer.actions.get(:validate)
+    use Caterer::Action::Server::Platform
     use Caterer::Action::Provisioner::Load
     use Caterer::Action::Provisioner::Uninstall
   end

data/lib/caterer/communication/rsync.rb

@@ -27,7 +27,7 @@ module Caterer
           until eof do
             begin
               out = stdout.readpartial(4096)
-              if out.match /password:/
+              if out.match /(p|P)assword:/
                 stdin.puts server.password
               else
                 @logger.debug("stdout: #{out}")

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

@@ -5,7 +5,7 @@ module Caterer
         attr_accessor :dest_dir, :run_list, :json, :cookbooks_path, :roles_path, :data_bags_path, :bootstrap_scripts
 
         def initialize
-          @dest_dir          = '/opt/cater_chef_solo'
+          @dest_dir          = '/opt/cater/chef_solo'
           @run_list          = []
           @json              = {}
           @cookbooks_path    = ['cookbooks']

data/lib/caterer/provisioner/chef_solo.rb

@@ -8,6 +8,8 @@ module Caterer
   module Provisioner
     class ChefSolo < Base
       
+      include Util::Shell
+
       attr_reader :run_list
       attr_accessor :dest_dir, :json, :cookbooks_path, :roles_path
       attr_accessor :data_bags_path, :bootstrap_scripts
@@ -130,16 +132,14 @@ module Caterer
       def install(server)
         server.ui.info "Preparing installation..."
 
-        # upload
-        server.ssh.upload install_script, "#{target_install_path}"
+        installer = install_script(server.platform)
 
-        # set permissions
-        server.ssh.sudo "chown #{server.username} #{target_install_path}", :stream => true
-        server.ssh.sudo "chmod +x #{target_install_path}", :stream => true
+        if not File.exists? installer
+          server.ui.error "#{server.platform} doesn't have an install script"
+          return
+        end
 
-        # run
-        server.ui.info "Installing chef-solo..."
-        res = server.ssh.sudo "#{target_install_path}", :stream => true
+        res = server.ssh.sudo bash(File.read(installer)), :stream => true
 
         unless res == 0
           server.ui.error "install failed with exit code: #{res}"
@@ -261,8 +261,8 @@ module Caterer
         "#{dest_dir}/config.json"
       end
 
-      def install_script
-        File.expand_path("../../../templates/provisioner/chef_solo/bootstrap.sh", __FILE__)
+      def install_script(platform)
+        File.expand_path("../../../templates/provisioner/chef_solo/bootstrap/#{platform}.sh", __FILE__)
       end
 
       def solo_content(server)

data/lib/caterer/server.rb

@@ -3,6 +3,8 @@ require 'digest'
 
 module Caterer
   class Server
+
+    include Util::Shell
     
     attr_reader :env
 
@@ -172,6 +174,27 @@ module Caterer
       env.action_runner.run(name, options)
     end
 
+    def detect_platform
+      @platform ||= begin
+        ui.info "Detecting platform..."
+        out = ""
+        res = ssh.sudo bash(File.read(platform_script)) do |_stream, data|
+          out += data
+        end
+        if res == 0
+          out.strip # success
+        else
+          ui.error "Unknown platform"
+          false
+        end
+      end
+    end
+    alias :platform :detect_platform
+
+    def platform_script
+      File.expand_path("../../templates/server/platform.sh", __FILE__)
+    end
+
     def upload_directory(from, to)
       if File.exists? from
         if can_rsync?

data/lib/caterer/util.rb

@@ -2,5 +2,6 @@ module Caterer
   module Util
     autoload :ANSIEscapeCodeRemover,  'caterer/util/ansi_escape_code_remover'
     autoload :Retryable,              'caterer/util/retryable'
+    autoload :Shell,                  'caterer/util/shell'
   end
 end

data/lib/caterer/util/shell.rb

@@ -0,0 +1,41 @@
+module Caterer
+  module Util
+    module Shell
+      
+      # strategy:
+      # 1- escape the escapes
+      # 2- escape quotes
+      # 3- escape dollar signs
+      def escape(cmd)
+        cmd.gsub!(/\\/, "\\\\\\")
+        cmd.gsub!(/"/, "\\\"")
+        cmd.gsub!(/\$/, "\\$")
+        cmd
+      end
+
+      def bash(cmd)
+        "bash -c \"#{escape(cmd)}\""
+      end
+
+      def su(user, cmd)
+        "su #{user} -l -c \"#{escape(cmd)}\""
+      end
+
+      def env(vars)
+        vars ||= {}
+        env = ''
+        vars.each do |key, val|
+          env += " " if not env == ''
+          env += env_string(key, val)
+        end
+        (env == '')? env : "#{env} "
+      end
+
+      def env_string(key, val)
+        key = key.to_s if not key.is_a? String
+        %Q{#{key.upcase}="#{escape(val)}"}
+      end
+
+    end
+  end
+end

data/lib/caterer/version.rb

@@ -1,3 +1,3 @@
 module Caterer
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

data/lib/templates/provisioner/chef_solo/bootstrap.sh

@@ -34,13 +34,26 @@ detect_platform() {
     then
       platform="el"
     fi
-  # Apple OS X
   elif [ -f "/usr/bin/sw_vers" ];
   then
     platform="mac_os_x"
   elif [ -f "/etc/release" ];
   then
-    platform="solaris2"
+    if [[ -n $(cat /etc/release | grep "SmartOS") ]]; then
+      platform="smartos"
+    elif [[ -n $(cat /etc/release | grep "OmniOS") ]]; then
+      platform="omnios"
+    elif [[ -n $(cat /etc/release | grep "OpenIndiana") ]]; then
+      platform="openindiana"
+    elif [[ -n $(cat /etc/release | grep "OpenSolaris") ]]; then
+      platform="opensolaris"
+    elif [[ -n $(cat /etc/release | grep "Oracle Solaris") ]]; then
+      platform="oracle_solaris"
+    elif [[ -n $(cat /etc/release | grep "Solaris") ]]; then
+      platform="solaris2"
+    elif [[ -n $(cat /etc/release | grep "NexentaCore") ]]; then
+      platform="nexentacore"
+    fi
   elif [ -f "/etc/SuSE-release" ];
   then
     if grep -q 'Enterprise' /etc/SuSE-release;
@@ -74,9 +87,25 @@ install() {
     "sles" )
       yast -i $1
       ;;
+  esac
+}
+
+bootstrap() {
+  echo "bootstrapping chef..."
+  case $(detect_platform) in
+    "smartos" )
+      # made this one myself :)
+      echo "downloading chef fatclient..."
+      wget -q -P https://s3.amazonaws.com/packages.pagodabox.com/tar/smartos/chef/chef-fatclient.tar.bz2
+      cd /; tar -xjf /tmp/Chef-fatclient-SmartOS-10.14.2.tar.bz2
+      # make an executable link
+      mkdir -p /opt/local/bin
+      ln -s /opt/local/bin/chef-solo /opt/chef/bin/chef-solo 
+      # cleanup
+      rm -f /tmp/Chef-fatclient-SmartOS-10.14.2.tar.bz2
+      ;;
     *)
-      echo "sorry, I don't have a bootstrap for this platform"
-      exit 1
+      curl -L https://www.opscode.com/chef/install.sh | bash
       ;;
   esac
 }
@@ -86,4 +115,4 @@ exists curl || install curl
 exists rsync || install rsync
 
 # install chef-solo
-exists chef-solo || curl -L https://www.opscode.com/chef/install.sh | bash
+exists chef-solo || bootstrap

data/lib/templates/provisioner/chef_solo/bootstrap/debian.sh

@@ -0,0 +1,11 @@
+# install curl
+echo "ensure curl exists..."
+command -v curl &>/dev/null || apt-get -y --force-yes install curl
+
+# install rsync
+echo "ensure rsync exists..."
+command -v rsync &>/dev/null || apt-get -y --force-yes install rsync
+
+# install chef
+echo "bootstrapping chef..."
+curl -L https://www.opscode.com/chef/install.sh | bash

data/lib/templates/provisioner/chef_solo/bootstrap/el.sh

@@ -0,0 +1,11 @@
+# install curl
+echo "ensure curl exists..."
+command -v curl &>/dev/null || yum -y install curl
+
+# install rsync
+echo "ensure rsync exists..."
+command -v rsync &>/dev/null || yum -y install rsync
+
+# install chef
+echo "bootstrapping chef..."
+curl -L https://www.opscode.com/chef/install.sh | bash

data/lib/templates/provisioner/chef_solo/bootstrap/fedora.sh

@@ -0,0 +1,11 @@
+# install curl
+echo "ensure curl exists..."
+command -v curl &>/dev/null || yum -y install curl
+
+# install rsync
+echo "ensure rsync exists..."
+command -v rsync &>/dev/null || yum -y install rsync
+
+# install chef
+echo "bootstrapping chef..."
+curl -L https://www.opscode.com/chef/install.sh | bash

data/lib/templates/provisioner/chef_solo/bootstrap/sles.sh

@@ -0,0 +1,11 @@
+# install curl
+echo "ensure curl exists..."
+command -v curl &>/dev/null || yast -i curl
+
+# install rsync
+echo "ensure rsync exists..."
+command -v rsync &>/dev/null || yast -i rsync
+
+# install chef
+echo "bootstrapping chef..."
+curl -L https://www.opscode.com/chef/install.sh | bash

data/lib/templates/provisioner/chef_solo/bootstrap/smartos.sh

@@ -0,0 +1,6 @@
+# download and install fatclient
+[[ -d /opt/chef ]] || (cd /; curl -k -s -S https://s3.amazonaws.com/packages.pagodabox.com/tar/smartos/chef/chef-fatclient.tar.bz2 | bzcat | tar -xf -)
+
+# create symlink for chef-solo
+[[ -d /opt/local/bin ]] || mkdir -p /opt/local/bin
+[[ -f /opt/local/bin/chef-solo ]] || ln -s /opt/chef/bin/chef-solo /opt/local/bin/chef-solo

data/lib/templates/provisioner/chef_solo/bootstrap/suse.sh

@@ -0,0 +1,11 @@
+# install curl
+echo "ensure curl exists..."
+command -v curl &>/dev/null || yast -i curl
+
+# install rsync
+echo "ensure rsync exists..."
+command -v rsync &>/dev/null || yast -i rsync
+
+# install chef
+echo "bootstrapping chef..."
+curl -L https://www.opscode.com/chef/install.sh | bash

data/lib/templates/provisioner/chef_solo/bootstrap/ubuntu.sh

@@ -0,0 +1,11 @@
+# install curl
+echo "ensure curl exists..."
+command -v curl &>/dev/null || apt-get -y --force-yes install curl
+
+# install rsync
+echo "ensure rsync exists..."
+command -v rsync &>/dev/null || apt-get -y --force-yes install rsync
+
+# install chef
+echo "bootstrapping chef..."
+curl -L https://www.opscode.com/chef/install.sh | bash

data/lib/templates/server/platform.sh

@@ -0,0 +1,48 @@
+platform=""
+if [ -f "/etc/lsb-release" ];
+then
+  platform=$(grep DISTRIB_ID /etc/lsb-release | cut -d "=" -f 2 | tr '[A-Z]' '[a-z]')
+elif [ -f "/etc/debian_version" ];
+then
+  platform="debian"
+elif [ -f "/etc/redhat-release" ];
+then
+  platform="el"
+elif [ -f "/etc/system-release" ];
+then
+  platform=$(sed 's/^\(.\+\) release.\+/\1/' /etc/system-release | tr '[A-Z]' '[a-z]')
+  # amazon is built off of fedora, so act like RHEL
+  if [ "$platform" = "amazon linux ami" ];
+  then
+    platform="el"
+  fi
+elif [ -f "/usr/bin/sw_vers" ];
+then
+  platform="mac_os_x"
+elif [ -f "/etc/release" ];
+then
+  if [[ -n $(cat /etc/release | grep "SmartOS") ]]; then
+    platform="smartos"
+  elif [[ -n $(cat /etc/release | grep "OmniOS") ]]; then
+    platform="omnios"
+  elif [[ -n $(cat /etc/release | grep "OpenIndiana") ]]; then
+    platform="openindiana"
+  elif [[ -n $(cat /etc/release | grep "OpenSolaris") ]]; then
+    platform="opensolaris"
+  elif [[ -n $(cat /etc/release | grep "Oracle Solaris") ]]; then
+    platform="oracle_solaris"
+  elif [[ -n $(cat /etc/release | grep "Solaris") ]]; then
+    platform="solaris2"
+  elif [[ -n $(cat /etc/release | grep "NexentaCore") ]]; then
+    platform="nexentacore"
+  fi
+elif [ -f "/etc/SuSE-release" ];
+then
+  if grep -q 'Enterprise' /etc/SuSE-release;
+  then
+      platform="sles"
+  else
+      platform="suse"
+  fi
+fi
+echo $platform

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -204,6 +204,7 @@ files:
 - lib/caterer/action/provisioner/validate/engine.rb
 - lib/caterer/action/server.rb
 - lib/caterer/action/server/lock.rb
+- lib/caterer/action/server/platform.rb
 - lib/caterer/action/server/reboot.rb
 - lib/caterer/action/server/unlock.rb
 - lib/caterer/action/server/validate.rb
@@ -246,9 +247,18 @@ files:
 - lib/caterer/util.rb
 - lib/caterer/util/ansi_escape_code_remover.rb
 - lib/caterer/util/retryable.rb
+- lib/caterer/util/shell.rb
 - lib/caterer/version.rb
 - 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/solo.erb
+- lib/templates/server/platform.sh
 homepage: ''
 licenses: []
 post_install_message: 
@@ -263,7 +273,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4401693944212608239
+      hash: 4321504824518012860
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -272,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4401693944212608239
+      hash: 4321504824518012860
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23