spatula 0.0.7 → 0.0.8

data/README.textile

@@ -2,7 +2,7 @@ h1. Spatula
 
 Spatula is a command line helper app for use with "Chef":http://www.opscode.com/chef. It currently lets you search and install cookbooks from http://cookbooks.opscode.com.  It does not yet implement the full API, but that will be coming in future versions (as I need it). If you need it to support the full API *right now*, please make it do so and send me a pull request :-)
 
-Spatula is really, really alpha. It does not handle errors at all, but it works pretty well given that you hand it the correct input. Please give it a try and pretty please fork it and make it better.  
+Spatula is really, really alpha. It does not handle errors at all, but it works pretty well given that you hand it the correct input. Please give it a try and pretty please fork it and make it better.
 
 h1. Installation
 
@@ -11,12 +11,12 @@ You can get spatula from gemcutter.
 <pre>
 # Gemcutter:
 # Follow the instructions on http://gemcutter.org/ then...
-gem install spatula 
+gem install spatula
 </pre>
 
 h1. Usage
 
-Spatula currently supports 3 commands: search, show, and install.
+Spatula currently supports 6 commands: search, show, install, prepare, and cook.
 
 <pre>
 $ spatula search apache2
@@ -25,19 +25,28 @@ apache2 Installs and configures all aspects of apache2 using Debian style symlin
 
 $ spatula show apache2
 name:   apache2
-average_rating: 
+average_rating:
 category:       Web Servers
 created_at:     2009-10-25T23:47:55Z
 updated_at:     2009-10-25T23:47:55Z
 maintainer:     jtimberman
 latest_version: http://cookbooks.opscode.com/api/v1/cookbooks/apache2/versions/0_9_1
-external_url:   
+external_url:
 versions:       http://cookbooks.opscode.com/api/v1/cookbooks/apache2/versions/0_9_1
 description:    Installs and configures all aspects of apache2 using Debian style symlinks with helper definitions
 
 $ spatula install apache2
 ... downloads the apache2 cookbook and installs it into $(pwd)/cookbooks ...
 ... also creates a $(pwd)/cookbook_tarballs dir to store the download ...
+
+$ spatula prepare user@192.168.1.101
+... installs ruby, chef and dependencies on 192.168.1.101
+... starts by adding your ssh public key to authorized_keys
+
+$ spatula cook user@192.168.1.101 <node>
+... uploads all of the files in the current directory to /tmp/chef-solo/
+... expects solo.rb and <node>.json to live in ./config
+
 </pre>
 
 h1. About

data/lib/spatula.rb

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

data/lib/spatula/prepare.rb

@@ -2,15 +2,23 @@
 module Spatula
   class Prepare < SshCommand
     def run
+      upload_ssh_key if @upload_key
       send "run_for_#{os}"
     end
 
     def os
       etc_issue = `#{ssh_command("cat /etc/issue")}`
-      if etc_issue =~ /ubuntu/i
+      case etc_issue
+      when /ubuntu/i
         "ubuntu"
+      when /debian/i
+        "debian"
+      when /fedora/i
+        "fedora"
+      when ""
+        raise "Couldn't get system info from /etc/issue. Please check your SSH credentials."
       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."
+        raise "Sorry, we currently only support prepare on ubuntu, debian & fedora. Please fork http://github.com/trotter/spatula and add support for your OS. I'm happy to incorporate pull requests."
       end
     end
 
@@ -23,5 +31,36 @@ module Spatula
 
       ssh "sudo gem install rdoc chef ohai --no-ri --no-rdoc --source http://gems.opscode.com --source http://gems.rubyforge.org"
     end
+
+    def run_for_debian
+      ssh 'sudo apt-get update'
+      ssh 'sudo apt-get install -y build-essential zlib1g-dev libssl-dev libreadline5-dev curl rsync screen vim'
+      ssh 'curl -L http://rubyforge.org/frs/download.php/71096/ruby-enterprise-1.8.7-2010.02.tar.gz | tar xzvf -'
+      # install REE 1.8.7 (and rubygems and irb and rake) to /usr
+      ssh 'cd ruby-enterprise-1.8.7-2010.02 && sudo echo -e "\n/usr\n" | ./installer'
+
+      ssh "sudo gem install rdoc chef ohai --no-ri --no-rdoc --source http://gems.opscode.com --source http://gems.rubyforge.org"
+    end
+
+    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"
+      ssh "#{sudo} gem install chef --no-ri --no-rdoc --source http://gems.opscode.com --source http://gems.rubyforge.org"
+    end
+
+    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
+        end
+      end
+      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
   end
 end

data/lib/spatula/ssh_command.rb

@@ -4,12 +4,13 @@ module Spatula
       new(*args).run
     end
 
-    def initialize(server, port=nil, login=nil, identity=nil)
+    def initialize(server, port=nil, login=nil, identity=nil, upload_key=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
     end
 
     def ssh(command)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Trotter Cashion
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-05 00:00:00 -04:00
+date: 2010-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -35,6 +36,7 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -71,6 +73,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -78,6 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -87,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Command line helper app for use with Chef