spatula 0.0.4 → 0.0.5

data/lib/spatula/cook.rb

@@ -18,11 +18,19 @@ module Spatula
         ok = sh "ruby -c #{recipe} >/dev/null 2>&1"
         raise "Syntax error in #{recipe}" if not ok
       end
-      sh "rsync -rlP --rsh=\"ssh -p#@port\" --delete --exclude '.*' ./ #@server:#{REMOTE_CHEF_PATH}"
-      sh "ssh -t -p #@port -A #@server \"cd #{REMOTE_CHEF_PATH}; sudo chef-solo -c config/solo.rb -j config/#@node.json \""
+      if @server =~ /^local$/i
+        sh chef_cmd
+      else
+        sh "rsync -rlP --rsh=\"ssh -p#@port\" --delete --exclude '.*' ./ #@server:#{REMOTE_CHEF_PATH}"
+        sh "ssh -t -p #@port -A #@server \"cd #{REMOTE_CHEF_PATH}; #{chef_cmd} \""
+      end
     end
 
     private
+      def chef_cmd
+        "sudo chef-solo -c config/solo.rb -j config/#@node.json"
+      end
+
       def sh(command)
         system command
       end

data/lib/spatula/prepare.rb

@@ -5,18 +5,38 @@ module Spatula
       new(*args).run
     end
 
-    def initialize(server, port=22)
+    def initialize(server, port=nil, login=nil, identity=nil)
       @server = server
       @port   = port
+      @port_switch = port ? " -p #{port}" : '' 
+      @login_switch = login ? "-l #{login}" : ''
+      @identity_switch = identity ? %Q|-i "#{identity}"| : ''
     end
 
-    def ssh command
-      sh %Q|ssh -t -p #@port #@server "#{command.gsub('"', '\\"')}"|
+    def ssh(command)
+      sh ssh_command(command)
+    end
+
+    def ssh_command(command)
+      %Q|ssh -t#@port_switch #@login_switch #@identity_switch #@server "#{command.gsub('"', '\\"')}"|
     end
 
     def run
+      send "run_for_#{os}"
+    end
+
+    def os
+      etc_issue = `#{ssh_command("cat /etc/issue")}`
+      if etc_issue =~ /ubuntu/i
+        "ubuntu"
+      else
+        raise "Sorry, we currently only support ubuntu for preparing. Please fork http://github.com/trotter/spatula and add support for your OS. I'm happy to incorporate pull requests."
+      end
+    end
+
+    def run_for_ubuntu
       ssh "sudo apt-get update"
-      ssh "sudo aptitude -y install ruby irb ri libopenssl-ruby1.8 libshadow-ruby1.8 ruby1.8-dev gcc g++ rsync"
+      ssh "sudo aptitude -y install ruby irb ri libopenssl-ruby1.8 libshadow-ruby1.8 ruby1.8-dev gcc g++ rsync curl"
       ssh "curl -L 'http://rubyforge.org/frs/download.php/69365/rubygems-1.3.6.tgz' | tar xvzf -"
       ssh "cd rubygems* && sudo ruby setup.rb --no-ri --no-rdoc"
       ssh "sudo ln -sfv /usr/bin/gem1.8 /usr/bin/gem"

data/lib/spatula.rb

@@ -35,16 +35,18 @@ module Spatula
       Search.run(query, options[:start], options[:count])
     end
 
-    desc "cook SERVER NODE", "Cook SERVER with the specification in config/NODE.js"
+    desc "cook SERVER NODE", "Cook SERVER with the specification in config/NODE.js. Use local as the server to cook this box."
     method_options :port => 22
     def cook(server, node)
       Cook.run(server, node, options[:port])
     end
 
     desc "prepare SERVER", "Install software/libs required by chef on SERVER"
-    method_options :port => 22
+    method_options :port     => nil
+    method_options :login    => nil
+    method_options :identity => nil
     def prepare(server)
-      Prepare.run(server, port)
+      Prepare.run(server, options[:port], options[:login], options[:identity])
     end
 
     private

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Trotter Cashion
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-07 00:00:00 -05:00
+date: 2010-03-18 00:00:00 -04:00
 default_executable: 
 dependencies: []