spatula 0.0.9 → 0.0.10

data/lib/spatula.rb

@@ -49,8 +49,9 @@ module Spatula
     method_options :login    => nil
     method_options :identity => nil
     method_options :upload_key => nil
+    method_options :keyfile => :string
     def prepare(server)
-      Prepare.run(server, options[:port], options[:login], options[:identity], options[:upload_key])
+      Prepare.run(server, options[:port], options[:login], options[:identity], options[:upload_key], options[:keyfile])
     end
 
     private

data/lib/spatula/prepare.rb

@@ -1,7 +1,16 @@
 # Prepare :server: for chef solo to run on it
 module Spatula
   class Prepare < SshCommand
+
+    RUBYGEMS_VERSION = "1.6.2"
+    RUBY_PATH = "1.9/ruby-1.9.2-p180.tar.gz"
+
     def run
+
+      if @key_file and !@upload_key
+        @upload_key = true
+      end
+
       upload_ssh_key if @upload_key
       send "run_for_#{os}"
     end
@@ -50,12 +59,12 @@ module Spatula
     end
 
     def install_ruby_1_9_2
-      ssh "curl -L 'ftp://ftp.ruby-lang.org//pub/ruby/1.9/ruby-1.9.2-p136.tar.gz' | tar xvzf -"
+      ssh "curl -L 'ftp://ftp.ruby-lang.org//pub/ruby/#{RUBY_PATH}' | tar xvzf -"
       ssh "cd ruby-1.9.2-* && ./configure && make && #{sudo} make install"
     end
 
     def install_rubygems
-      ssh "curl -L 'http://rubyforge.org/frs/download.php/69365/rubygems-1.3.6.tgz' | tar xvzf -"
+      ssh "curl -L 'http://production.cf.rubygems.org/rubygems/rubygems-#{RUBYGEMS_VERSION}.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"
     end
@@ -70,15 +79,21 @@ module Spatula
 
     def upload_ssh_key
       authorized_file = "~/.ssh/authorized_keys"
-      key_file = nil
-      %w{rsa dsa}.each do |key_type|
-        filename = "#{ENV['HOME']}/.ssh/id_#{key_type}.pub"
-        if File.exists?(filename)
-          key_file = filename
-          break
+
+      unless @key_file
+        %w{rsa dsa}.each do |key_type|
+          filename = "#{ENV['HOME']}/.ssh/id_#{key_type}.pub"
+          if File.exists?(filename)
+            @key_file = filename
+            break
+          end
         end
       end
-      key = File.open(key_file).read.split(' ')[0..1].join(' ')
+
+      raise "Key file '#{@key_file}' not found: aborting." unless File.exists?(@key_file)
+
+      key = File.open(@key_file).read.split(' ')[0..1].join(' ')
+
       ssh "mkdir -p .ssh && echo #{key} >> #{authorized_file}"
       ssh "cat #{authorized_file} | sort | uniq > #{authorized_file}.tmp && mv #{authorized_file}.tmp #{authorized_file}"
     end

data/lib/spatula/ssh_command.rb

@@ -4,13 +4,14 @@ module Spatula
       new(*args).run
     end
 
-    def initialize(server, port=nil, login=nil, identity=nil, upload_key=nil)
+    def initialize(server, port=nil, login=nil, identity=nil, upload_key=nil, key_file=nil)
       @server = server
       @port   = port
       @port_switch = port ? " -p #{port}" : '' 
       @login_switch = login ? "-l #{login}" : ''
       @identity_switch = identity ? %Q|-i "#{identity}"| : ''
       @upload_key = upload_key
+      @key_file = key_file
     end
 
     def ssh(command)

metadata

@@ -2,7 +2,7 @@
 name: spatula
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Trotter Cashion
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-20 00:00:00 -05:00
+date: 2011-03-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency