rye 0.5.3 → 0.5.4

data/CHANGES.txt

@@ -5,6 +5,14 @@ TODO
 * Fingerprints: ssh-keygen -l -f id_rsa_repos.pub
 
 
+#### 0.5.4 (2009-04-22) #############################
+
+* FIXED: Sys is now returning environment paths and home path in JRuby.
+* ADDED: Better Interrupt handling
+* ADDED: Rings terminal bell when asks to Continue after HostKey error.
+* CHANGE: Removed require 'rubygems'
+
+
 #### 0.5.3 (2009-04-20) #############################
 
 * FIXED: Rye::Box.connect raises exceptions instead of exits

data/bin/rye

@@ -10,7 +10,6 @@
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
-require 'rubygems'
 require 'stringio'
 require 'yaml'
 require 'drydock'
@@ -116,7 +115,17 @@ debug :off
 # will run after Rye shuts down the ssh-agent. 
 begin
   Drydock.run!(ARGV, STDIN) if Drydock.run? && !Drydock.has_run?
+rescue Drydock::ArgError, Drydock::OptError=> ex
+  STDERR.puts ex.message
+  STDERR.puts ex.usage
+rescue Rudy::Error => ex
+  STDERR.puts ex.message
 rescue => ex
   STDERR.puts "ERROR (#{ex.class.to_s}): #{ex.message}"
   STDERR.puts ex.backtrace if Drydock.debug?
+rescue Interrupt
+  puts "#{$/}Exiting... "
+  exit 1
+rescue SystemExit
+  # Don't balk
 end

data/bin/try

@@ -10,7 +10,6 @@
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
-require 'rubygems'
 require 'stringio'
 require 'yaml'
 require 'rye'

data/lib/rye.rb

@@ -2,6 +2,7 @@
 require 'rubygems' unless defined? Gem
 
 require 'tempfile'
+require 'logger'
 require 'net/ssh'
 require 'net/scp'
 require 'thread'
@@ -26,7 +27,7 @@ require 'sys'
 #
 # rset = Rye::Set.new("dev-machines")
 # rset.add_boxes('host1', 'host2', 'host3', 'host4')
-# rset.ps('aux').grep
+# rset.ps('aux')
 #
 # * See +bin/try+ for a bunch of working examples. 
 # * See Rye::Box#initialize for info about disabling safe-mode.
@@ -291,6 +292,7 @@ module Rye
   rescue => ex
     STDERR.puts "Error initializing the SSH Agent (is OpenSSL installed?):"
     STDERR.puts ex.message
+    STDERR.puts ex.backtrace
     exit 1
   end
   

data/lib/rye/box.rb

@@ -146,7 +146,8 @@ module Rye
       rescue Net::SSH::HostKeyMismatch => ex
         STDERR.puts ex.message
         STDERR.puts "NOTE: EC2 instances generate new SSH keys on first boot."
-        if highline.ask("Continue? ").match(/y|yes/i)
+        print "\a" # Ring the bell
+        if highline.ask("Continue? ").strip.match(/\Ay|yes|sure|ya\z/i)
           @opts[:paranoid] = false
           retry
         else

data/lib/sys.rb

@@ -7,7 +7,7 @@ require 'socket'
 # specifically lib/platform.rb. 
 class SystemInfo #:nodoc:all
   unless defined?(IMPLEMENTATIONS)
-    VERSION = 4.freeze
+    VERSION = 5.freeze
     IMPLEMENTATIONS = [
     
       # These are for JRuby, System.getproperty('os.name'). 
@@ -121,7 +121,7 @@ class SystemInfo #:nodoc:all
       end
       
     end
-
+    
     [os, impl, arch]
   end
 
@@ -244,8 +244,11 @@ class SystemInfo #:nodoc:all
   def paths
     if @os == :unix
       (ENV['PATH'] || '').split(':')
-    elsif
-      (ENV['PATH'] || '').split(';') # Note tested!
+    elsif @os == :win32
+      (ENV['PATH'] || '').split(';') # Not tested!
+    elsif @os == :java
+      delim = @impl == :windows ? ';' : ':'
+      (ENV['PATH'] || '').split(delim)
     else
       raise "paths not implemented for: #{@os}"
     end
@@ -260,6 +263,12 @@ class SystemInfo #:nodoc:all
       File.expand_path(ENV['HOME'])
     elsif @os == :win32
       File.expand_path(ENV['USERPROFILE'])
+    elsif @os == :java
+      if @impl == :windows
+        File.expand_path(ENV['USERPROFILE'])
+      else
+        File.expand_path(ENV['HOME'])
+      end
     else
       raise "paths not implemented for: #{@os}"
     end

data/rye.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "rye"
   s.rubyforge_project = "rye"
-  s.version = "0.5.3"
+  s.version = "0.5.4"
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rye
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-20 00:00:00 -04:00
+date: 2009-04-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency