spatula 0.0.5 → 0.0.6

data/lib/spatula/cook.rb

@@ -2,15 +2,10 @@ module Spatula
   # TODO: Set REMOTE_CHEF_PATH using value for file_cache_path
   REMOTE_CHEF_PATH = "/tmp/chef-solo" # Where to find upstream cookbooks
 
-  class Cook
-    def self.run(*args)
-      new(*args).run
-    end
-
-    def initialize(server, node, port=22)
-      @server = server
+  class Cook < SshCommand
+    def initialize(server, node, port=nil, login=nil, identity=nil)
+      super(server, port, login, identity)
       @node = node
-      @port = port
     end
 
     def run
@@ -18,11 +13,12 @@ module Spatula
         ok = sh "ruby -c #{recipe} >/dev/null 2>&1"
         raise "Syntax error in #{recipe}" if not ok
       end
+
       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} \""
+        sh "rsync -rlP --rsh=\"ssh #{ssh_opts}\" --delete --exclude '.*' ./ #@server:#{REMOTE_CHEF_PATH}"
+        ssh "cd #{REMOTE_CHEF_PATH}; #{chef_cmd}"
       end
     end
 
@@ -30,9 +26,5 @@ module Spatula
       def chef_cmd
         "sudo chef-solo -c config/solo.rb -j config/#@node.json"
       end
-
-      def sh(command)
-        system command
-      end
   end
 end

data/lib/spatula/prepare.rb

@@ -1,26 +1,6 @@
 # Prepare :server: for chef solo to run on it
 module Spatula
-  class Prepare
-    def self.run(*args)
-      new(*args).run
-    end
-
-    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 ssh_command(command)
-    end
-
-    def ssh_command(command)
-      %Q|ssh -t#@port_switch #@login_switch #@identity_switch #@server "#{command.gsub('"', '\\"')}"|
-    end
-
+  class Prepare < SshCommand
     def run
       send "run_for_#{os}"
     end
@@ -43,10 +23,5 @@ module Spatula
 
       ssh "sudo gem install rdoc chef ohai --no-ri --no-rdoc --source http://gems.opscode.com --source http://gems.rubyforge.org"
     end
-
-    private
-      def sh(command)
-        system command
-      end
   end
 end

data/lib/spatula/ssh_command.rb

@@ -0,0 +1,32 @@
+module Spatula
+  class SshCommand
+    def self.run(*args)
+      new(*args).run
+    end
+
+    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 ssh_command(command)
+    end
+
+    def ssh_command(command)
+      %Q|ssh -t#{ssh_opts} #@server "#{command.gsub('"', '\\"')}"|
+    end
+
+    def ssh_opts
+      "#@port_switch #@login_switch #@identity_switch"
+    end
+
+    private
+      def sh(command)
+        system command
+      end
+  end
+end

data/lib/spatula.rb

@@ -25,7 +25,7 @@ module Spatula
       # Use ENV['HOME'] as the base here 
       tarball_dir = "#{ENV['HOME']}/.spatula/cookbook_tarballs"
       FileUtils.mkdir_p(tarball_dir)
-      system "curl #{file} -o #{tarball_dir}"
+      system "curl #{file} -o #{tarball_dir}/#{filename}"
       system "tar xzvf #{tarball_dir}/#{filename} -C cookbooks"
     end
 
@@ -36,9 +36,11 @@ module Spatula
     end
 
     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
+    method_options :port => nil 
+    method_options :login    => nil
+    method_options :identity => nil
     def cook(server, node)
-      Cook.run(server, node, options[:port])
+      Cook.run(server, node, options[:port], options[:login], options[:identity])
     end
 
     desc "prepare SERVER", "Install software/libs required by chef on SERVER"
@@ -73,6 +75,7 @@ if __FILE__ == $0
   $: << File.dirname(__FILE__)
 end
 
+require 'spatula/ssh_command'
 require 'spatula/search'
 require 'spatula/prepare'
 require 'spatula/cook'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Trotter Cashion
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 -04:00
+date: 2010-04-11 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - lib/spatula/cook.rb
 - lib/spatula/prepare.rb
 - lib/spatula/search.rb
+- lib/spatula/ssh_command.rb
 - lib/spatula.rb
 has_rdoc: true
 homepage: http://trottercashion.com