spatula 0.0.11 → 0.0.12

data/lib/spatula.rb

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

data/lib/spatula/prepare.rb

@@ -3,7 +3,7 @@ module Spatula
   class Prepare < SshCommand
 
     RUBYGEMS_VERSION = "1.6.2"
-    RUBY_PATH = "1.9/ruby-1.9.2-p180.tar.gz"
+    DEFAULT_RUBY_VERSION = "1.9.2-p180"
 
     def run
 
@@ -49,18 +49,27 @@ module Spatula
 
     def run_for_fedora
       sudo = ssh('which sudo > /dev/null 2>&1') ? 'sudo' : ''
-      ssh "#{sudo} yum install -y make gcc rsync sudo openssl-devel rubygems ruby-devel ruby-shadow curl"
+      ssh "#{sudo} yum install -y make gcc gcc-c++ rsync sudo openssl-devel rubygems ruby-devel ruby-shadow curl"
     end
 
     def run_for_centos
-      ssh "#{sudo} yum install -y make gcc rsync sudo openssl-devel curl"
-      install_ruby_1_9_2
+      ssh "#{sudo} yum install -y make gcc gcc-c++ rsync sudo openssl-devel curl"
+      install_ruby
       install_chef
     end
 
-    def install_ruby_1_9_2
-      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"
+    def ruby_version
+      @ruby_version || DEFAULT_RUBY_VERSION
+    end
+
+    def ruby_path
+      rev = ruby_version.match(/^(\d+\.\d+)/)[1]
+      "#{rev}/ruby-#{ruby_version}.tar.gz"
+    end
+
+    def install_ruby
+      ssh "curl -L 'ftp://ftp.ruby-lang.org/pub/ruby/#{ruby_path}' | tar xvzf -"
+      ssh "cd ruby-#{ruby_version} && ./configure && make && #{sudo} make install"
     end
 
     def install_rubygems

data/lib/spatula/ssh_command.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatula
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-12 00:00:00.000000000 -04:00
+date: 2011-05-16 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2152565900 !ruby/object:Gem::Requirement
+  requirement: &2157008840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.13.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152565900
+  version_requirements: *2157008840
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152565380 !ruby/object:Gem::Requirement
+  requirement: &2157008240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: 1.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152565380
+  version_requirements: *2157008240
 description: ! "  Spatula is a command line helper app for use with Chef. It currently
   lets you\n  search and install cookbooks from http://cookbooks.opscode.com.\n"
 email: cashion@gmail.com