rye 0.8.8 → 0.8.9

data/CHANGES.txt

@@ -1,6 +1,11 @@
 RYE, CHANGES
 
 
+#### 0.8.9 (2009-08-26) #############################
+
+* FIXED: authorize-local for Windows
+
+
 #### 0.8.8 (2009-08-25) #############################
 
 * FIXED: Rye::Box#guess_user_home for Windows SSH support

data/bin/rye

@@ -79,10 +79,11 @@ command :authorize_local do |obj|
   user = Rye.sysinfo.user
 
   puts "Authorizing #{user}@localhost"
-  rbox = Rye::Box.new('localhost')
+  rbox = Rye::Box.new('localhost', :debug => false)
   puts "Added public keys for: ", rbox.authorize_keys_local
-  puts "Now try: " << "ssh #{user}@localhost"
-  
+  unless Rye.sysinfo.os == :windows
+    puts "Now try: " << "ssh #{user}@localhost"
+  end
 end
 command_alias :local_authorize, :local_authorise
 

data/lib/rye/box.rb

@@ -224,7 +224,7 @@ module Rye
     # * +additional_keys+ is a list of file paths to private keys
     # Returns the instance of Box
     def add_keys(*additional_keys)
-      if Rye.sysinfo.os == :win32
+      if Rye.sysinfo.os == :windows
         @rye_opts[:keys] ||= []
         @rye_opts[:keys] += additional_keys.flatten
         return @rye_opts[:keys]
@@ -348,7 +348,7 @@ module Rye
         user_defaults['HOME'] = '/export/home'
       elsif ostmp == "darwin"
         user_defaults['HOME'] = '/Users'
-      elsif ostmp == "win32"
+      elsif ostmp == "windows"
         user_defaults['HOME'] = 'C:/Documents and Settings'
       else
         raw = self.quietly { useradd(:D) } rescue ["HOME=/home"]
@@ -425,19 +425,30 @@ module Rye
       rap.add_exit_code(0)
       rap
     end
-    
+    require 'fileutils'
     # Authorize the current user to login to the local machine via
     # SSH without a password. This is the same functionality as
     # authorize_keys_remote except run with local shell commands. 
     def authorize_keys_local
       added_keys = []
+      ssh_dir = File.join(Rye.sysinfo.home, '.ssh')
       Rye.keys.each do |path|
         debug "# Public key for #{path}"
         k = Rye::Key.from_file(path).public_key.to_ssh2
-        Rye.shell(:mkdir, :p, :m, '700', '$HOME/.ssh') # Silently create dir if it doesn't exist
-        Rye.shell(:echo, "'#{k}' >> $HOME/.ssh/authorized_keys")
-        Rye.shell(:echo, "'#{k}' >> $HOME/.ssh/authorized_keys2")
-        Rye.shell(:chmod, '-R', '0600', '$HOME/.ssh/authorized_keys*')
+        FileUtils.mkdir ssh_dir unless File.exists? ssh_dir
+        
+        authkeys_file = File.join(ssh_dir, 'authorized_keys')
+        
+        debug "Writing to #{authkeys_file}"
+        File.open(authkeys_file, 'a')       {|f| f.write("#{$/}#{k}") }
+        File.open("#{authkeys_file}2", 'a') {|f| f.write("#{$/}#{k}") }
+        
+        unless Rye.sysinfo.os == :windows
+          Rye.shell(:chmod, '700', ssh_dir)
+          Rye.shell(:chmod, '0600', authkeys_file)
+          Rye.shell(:chmod, '0600', "#{authkeys_file}2")
+        end
+        
         added_keys << path
       end
       added_keys

data/lib/rye/set.rb

@@ -69,7 +69,7 @@ module Rye
     # * +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 == :win32
+      if Rye.sysinfo.os == :windows
         @opts[:keys] ||= []
         @opts[:keys] += additional_keys.flatten
         return @opts[:keys]

data/lib/rye.rb

@@ -43,7 +43,7 @@ module Rye
   extend self
 
   unless defined?(SYSINFO)
-    VERSION = "0.8.8".freeze
+    VERSION = "0.8.9".freeze
     SYSINFO = SysInfo.new.freeze
   end
   
@@ -184,6 +184,7 @@ module Rye
   # Returns the absolute path if found in PATH otherwise nil.
   def which(executable)
     return unless executable.is_a?(String)
+    return executable if Rye.sysinfo.os == :windows
     #return executable if File.exists?(executable) # SHOULD WORK, MUST TEST
     shortname = File.basename(executable)
     dir = Rye.sysinfo.paths.select do |path|    # dir contains all of the 
@@ -315,7 +316,7 @@ module Rye
   
   Rye.reload
   
-  unless Rye.sysinfo.os == :win32
+  unless Rye.sysinfo.os == :windows
     begin
       @@mutex.synchronize {                   # One thread only
         start_sshagent_environment            # Run this now

data/rye.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "rye"
   s.rubyforge_project = "rye"
-  s.version = "0.8.8"
+  s.version = "0.8.9"
   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"
@@ -13,9 +13,10 @@
   s.add_dependency 'drydock'
   s.add_dependency 'sysinfo'
   s.add_dependency 'storable'
+  s.add_dependency 'sysinfo', '>= 0.7.0'
   
   s.add_dependency 'highline', '>= 1.5.1'
-  s.add_dependency 'net-ssh', '>= 2.0.11'
+  s.add_dependency 'net-ssh', '>= 2.0.13'
   s.add_dependency 'net-scp', '>= 1.0.2'
   #s.add_dependency 'net-ssh-gateway'
   #s.add_dependency 'net-ssh-multi'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rye
 version: !ruby/object:Gem::Version 
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -42,6 +42,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: sysinfo
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.7.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: highline
   type: :runtime
@@ -60,7 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.11
+        version: 2.0.13
     version: 
 - !ruby/object:Gem::Dependency 
   name: net-scp