rye 0.9.1 → 0.9.2

data/CHANGES.txt

@@ -1,5 +1,12 @@
 RYE, CHANGES
 
+#### 0.9.2 (2010-10-25) #############################
+
+* FIXED: add_keys stores key paths for Rye::Box and Rye::Set
+* ADDED: remove_keys method for Rye::Box and Rye::Set
+* ADDED: interactive_ssh adds private paths to ssh command
+
+
 #### 0.9.1 (2010-10-18) #############################
 
 * CHANGE: Don't add keys to ssh-agent in Rye::Box and Rye::Set

data/lib/rye.rb

@@ -42,7 +42,7 @@ require 'esc'
 module Rye
   extend self
   
-  VERSION = "0.9.1".freeze unless defined?(VERSION)
+  VERSION = "0.9.2".freeze unless defined?(VERSION)
   
   @@sysinfo = nil
   @@agent_env = Hash.new  # holds ssh-agent env vars

data/lib/rye/box.rb

@@ -260,34 +260,38 @@ module Rye
     #
     # TODO: refactor to use net_ssh_exec! in 0.9
     def interactive_ssh(run=true)
-      debug "interactive_ssh with keys: #{Rye.keys.inspect}"
-      run = false unless STDIN.tty?      
-      cmd = Rye.prepare_command("ssh", "#{@rye_user}@#{@rye_host}")
+      debug "interactive_ssh with keys: #{@rye_opts[:keys].inspect}"
+      run = false unless STDIN.tty?
+      args = []
+      @rye_opts[:keys].each { |key| args.push *[:i, key] }
+      args << "#{@rye_user}@#{@rye_host}"
+      cmd = Rye.prepare_command("ssh", args)
       return cmd unless run
       system(cmd)
     end
     
-    # Add one or more private keys to the SSH Agent. 
-    # * +additional_keys+ is a list of file paths to private keys
+    # Add one or more private keys to the list of key paths.
+    # * +keys+ is a list of file paths to private keys
     # Returns the instance of Box
-    def add_keys(*additional_keys)
-      if Rye.sysinfo.os == :windows
-        @rye_opts[:keys] ||= []
-        @rye_opts[:keys] += additional_keys.flatten
-        return @rye_opts[:keys]
-      end
-      additional_keys = [additional_keys].flatten.compact || []
-      return if additional_keys.empty?
-      #ret = Rye.add_keys(additional_keys) 
-      #if ret.is_a?(Rye::Rap)
-      #  debug "ssh-add exit_status: #{ret.exit_status}" 
-      #  debug "ssh-add stdout: #{ret.stdout}"
-      #  debug "ssh-add stderr: #{ret.stderr}"
-      #end
+    def add_keys(*keys)
+      @rye_opts[:keys] ||= []
+      @rye_opts[:keys] += keys.flatten.compact
+      @rye_opts[:keys].uniq!
       self # MUST RETURN self
     end
     alias :add_key :add_keys
     
+    # Remove one or more private keys fromt he list of key paths.
+    # * +keys+ is a list of file paths to private keys
+    # Returns the instance of Box
+    def remove_keys(*keys)
+      @rye_opts[:keys] ||= []
+      @rye_opts[:keys] -= keys.flatten.compact
+      @rye_opts[:keys].uniq!
+      self # MUST RETURN self
+    end
+    alias :remove_key :remove_keys
+    
     # Return the value of uname in lowercase
     # This is a temporary fix. We can use SysInfo for this, upload
     # it, execute it directly, parse the output.

data/lib/rye/set.rb

@@ -66,20 +66,31 @@ module Rye
     end
     alias :add_boxes :add_box
     
-    # Add one or more private keys to the SSH Agent. 
+    # Add one or more private keys to each box. Also stores key paths
+    # in the set so when new boxes are added they will get the same keys,
     # * +additional_keys+ is a list of file paths to private keys
     # Returns the instance of Rye::Set
-    def add_key(*additional_keys)
-      if Rye.sysinfo.os == :windows
-        @opts[:keys] ||= []
-        @opts[:keys] += additional_keys.flatten
-        return @opts[:keys]
+    def add_keys(*additional_keys)
+      additional_keys = additional_keys.flatten.compact
+      @opts[:keys] ||= []
+      @opts[:keys] += additional_keys
+      @opts[:keys].uniq!
+      @boxes.each do |box|
+        box.add_keys *additional_keys
       end
-      additional_keys = [additional_keys].flatten.compact || []
-      #Rye.add_keys(additional_keys)
       self
     end
-    alias :add_keys :add_key
+    alias :add_key :add_keys
+    
+    def remove_keys(*keys)
+      @opts[:keys] ||= []
+      @opts[:keys] -= keys.flatten.compact
+      @boxes.each do |box|
+        box.remove_keys keys.flatten.compact
+      end
+      self
+    end
+    alias :remove_key :remove_keys
     
     # Add an environment variable. +n+ and +v+ are the name and value.
     # Returns the instance of Rye::Set

data/rye.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "rye"
   s.rubyforge_project = "rye"
-  s.version = "0.9.1"
+  s.version = "0.9.2"
   s.summary = "Rye: Safely run SSH commands on a bunch of machines at the same time (from Ruby)."
   s.description = s.summary
   s.author = "Delano Mandelbaum"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rye
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 -04:00
+date: 2010-10-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency