rye 0.6.4 → 0.6.5

data/CHANGES.txt

@@ -6,6 +6,13 @@ TODO
 * Fingerprints: ssh-keygen -l -f id_rsa_repos.pub
 
 
+#### 0.6.5 (2009-05-10) #############################
+
+* CHANGE: Default exit code is now 0 instead of -1
+* CHANGE: Removed Sys (using sysinfo gem)
+* CHANGE: Removed vendor/highline-1.5.1 (it's now available via gem)
+
+
 #### 0.6.4 (2009-05-04) #############################
 
 * FIXED: authorize_remote was not returning to the directory it started with. 

data/README.rdoc

@@ -103,6 +103,8 @@ Rye permits only a limited number of system commands to be run. This default whi
   * net-scp
   * highline
   * drydock
+  * sysinfo
+  * storable
 
 
 == Known Issues

data/bin/rye

@@ -9,6 +9,7 @@
 #
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+#%w{net-ssh sysinfo drydock}.each { |dir| $:.unshift File.join(File.dirname(__FILE__), '..', '..', dir, 'lib') }
 
 require 'stringio'
 require 'yaml'

data/lib/rye.rb

@@ -3,17 +3,19 @@
 # a the issue with Ruby 1.9 that causes the prompts to hang.
 $:.unshift File.join(File.dirname(__FILE__), '..', 'vendor', 'highline-1.5.1', 'lib')
 
-require 'tempfile'
 require 'logger'
+require 'thread'
+require 'base64'
 require 'net/ssh'
 require 'net/scp'
-require 'thread'
-require 'highline'
 require 'openssl'
-require 'base64'
+require 'tempfile'
+require 'highline'
+
+require 'storable'
+require 'sysinfo'
 
 require 'esc'
-require 'sys'
 
 # = Rye
 #
@@ -45,7 +47,7 @@ module Rye
 
   unless defined?(SYSINFO)
     VERSION = 0.6.freeze
-    SYSINFO = SystemInfo.new.freeze
+    SYSINFO = SysInfo.new.freeze
   end
   
   @@agent_env = Hash.new  # holds ssh-agent env vars

data/lib/rye/box.rb

@@ -597,7 +597,7 @@ module Rye
       block ||= Proc.new do |channel, type, data|
         channel[:stdout] ||= ""
         channel[:stderr] ||= ""
-        channel[:exit_code] ||= -1
+        channel[:exit_code] ||= 0
         channel[:stdout] << data if type == :stdout
         channel[:stderr] << data if type == :stderr
         channel.on_request("exit-status") do |ch, data|

data/rye.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "rye"
   s.rubyforge_project = "rye"
-  s.version = "0.6.4"
+  s.version = "0.6.5"
   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"
@@ -10,10 +10,14 @@
   
   # = DEPENDENCIES =
   # Add all gem dependencies
-  s.add_dependency 'net-ssh'
-  s.add_dependency 'net-scp'
-  s.add_dependency 'highline'
   s.add_dependency 'drydock'
+  s.add_dependency 'highline', '>= 1.5.1'
+  s.add_dependency 'sysinfo', '>= 0.5.1'
+  s.add_dependency 'storable', '>= 0.5.1'
+  s.add_dependency 'net-ssh', '>= 2.0.9'
+  s.add_dependency 'net-scp', '>= 1.0.2'
+  #s.add_dependency 'net-ssh-gateway'
+  #s.add_dependency 'net-ssh-multi'
   
   # = EXECUTABLES =
   # The list of executables in your project (if any). Don't include the path, 
@@ -32,7 +36,6 @@
   README.rdoc
   Rakefile
   bin/rye
-  bin/try
   lib/esc.rb
   lib/rye.rb
   lib/rye/box.rb
@@ -40,49 +43,7 @@
   lib/rye/key.rb
   lib/rye/rap.rb
   lib/rye/set.rb
-  lib/sys.rb
   rye.gemspec
-  try/copying.rb
-  try/keys.rb
-  tst/10-key1
-  tst/10-key1.pub
-  tst/10-key2
-  tst/10-key2.pub
-  tst/10_keys_test.rb
-  tst/50_rset_test.rb
-  tst/60-file.mp3
-  tst/60_rbox_transfer_test.rb
-  tst/70_rbox_env_test.rb
-  vendor/highline-1.5.1/CHANGELOG
-  vendor/highline-1.5.1/INSTALL
-  vendor/highline-1.5.1/LICENSE
-  vendor/highline-1.5.1/README
-  vendor/highline-1.5.1/Rakefile
-  vendor/highline-1.5.1/TODO
-  vendor/highline-1.5.1/examples/ansi_colors.rb
-  vendor/highline-1.5.1/examples/asking_for_arrays.rb
-  vendor/highline-1.5.1/examples/basic_usage.rb
-  vendor/highline-1.5.1/examples/color_scheme.rb
-  vendor/highline-1.5.1/examples/limit.rb
-  vendor/highline-1.5.1/examples/menus.rb
-  vendor/highline-1.5.1/examples/overwrite.rb
-  vendor/highline-1.5.1/examples/page_and_wrap.rb
-  vendor/highline-1.5.1/examples/password.rb
-  vendor/highline-1.5.1/examples/trapping_eof.rb
-  vendor/highline-1.5.1/examples/using_readline.rb
-  vendor/highline-1.5.1/lib/highline.rb
-  vendor/highline-1.5.1/lib/highline/color_scheme.rb
-  vendor/highline-1.5.1/lib/highline/compatibility.rb
-  vendor/highline-1.5.1/lib/highline/import.rb
-  vendor/highline-1.5.1/lib/highline/menu.rb
-  vendor/highline-1.5.1/lib/highline/question.rb
-  vendor/highline-1.5.1/lib/highline/system_extensions.rb
-  vendor/highline-1.5.1/setup.rb
-  vendor/highline-1.5.1/test/tc_color_scheme.rb
-  vendor/highline-1.5.1/test/tc_highline.rb
-  vendor/highline-1.5.1/test/tc_import.rb
-  vendor/highline-1.5.1/test/tc_menu.rb
-  vendor/highline-1.5.1/test/ts_all.rb
   )
   
   s.extra_rdoc_files = %w[README.rdoc LICENSE.txt]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rye
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-03 00:00:00 -04:00
+date: 2009-05-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: net-ssh
+  name: drydock
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -23,34 +23,54 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: net-scp
+  name: highline
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.5.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: highline
+  name: sysinfo
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.5.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: drydock
+  name: storable
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.5.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: net-ssh
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: net-scp
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.2
     version: 
 description: "Rye: Safely run SSH commands on a bunch of machines at the same time (from Ruby)."
 email: delano@solutious.com
@@ -67,7 +87,6 @@ files:
 - README.rdoc
 - Rakefile
 - bin/rye
-- bin/try
 - lib/esc.rb
 - lib/rye.rb
 - lib/rye/box.rb
@@ -75,49 +94,7 @@ files:
 - lib/rye/key.rb
 - lib/rye/rap.rb
 - lib/rye/set.rb
-- lib/sys.rb
 - rye.gemspec
-- try/copying.rb
-- try/keys.rb
-- tst/10-key1
-- tst/10-key1.pub
-- tst/10-key2
-- tst/10-key2.pub
-- tst/10_keys_test.rb
-- tst/50_rset_test.rb
-- tst/60-file.mp3
-- tst/60_rbox_transfer_test.rb
-- tst/70_rbox_env_test.rb
-- vendor/highline-1.5.1/CHANGELOG
-- vendor/highline-1.5.1/INSTALL
-- vendor/highline-1.5.1/LICENSE
-- vendor/highline-1.5.1/README
-- vendor/highline-1.5.1/Rakefile
-- vendor/highline-1.5.1/TODO
-- vendor/highline-1.5.1/examples/ansi_colors.rb
-- vendor/highline-1.5.1/examples/asking_for_arrays.rb
-- vendor/highline-1.5.1/examples/basic_usage.rb
-- vendor/highline-1.5.1/examples/color_scheme.rb
-- vendor/highline-1.5.1/examples/limit.rb
-- vendor/highline-1.5.1/examples/menus.rb
-- vendor/highline-1.5.1/examples/overwrite.rb
-- vendor/highline-1.5.1/examples/page_and_wrap.rb
-- vendor/highline-1.5.1/examples/password.rb
-- vendor/highline-1.5.1/examples/trapping_eof.rb
-- vendor/highline-1.5.1/examples/using_readline.rb
-- vendor/highline-1.5.1/lib/highline.rb
-- vendor/highline-1.5.1/lib/highline/color_scheme.rb
-- vendor/highline-1.5.1/lib/highline/compatibility.rb
-- vendor/highline-1.5.1/lib/highline/import.rb
-- vendor/highline-1.5.1/lib/highline/menu.rb
-- vendor/highline-1.5.1/lib/highline/question.rb
-- vendor/highline-1.5.1/lib/highline/system_extensions.rb
-- vendor/highline-1.5.1/setup.rb
-- vendor/highline-1.5.1/test/tc_color_scheme.rb
-- vendor/highline-1.5.1/test/tc_highline.rb
-- vendor/highline-1.5.1/test/tc_import.rb
-- vendor/highline-1.5.1/test/tc_menu.rb
-- vendor/highline-1.5.1/test/ts_all.rb
 has_rdoc: true
 homepage: http://solutious.com/
 licenses: []

data/bin/try

@@ -1,201 +0,0 @@
-#!/usr/bin/ruby
-
-# Rye -- A working example
-#
-# If your reading this via the rdocs you won't be able to see the code
-# See: http://github.com/delano/rye/blob/master/bin/try
-#
-# Usage: bin/try
-#
-
-RYE_HOME = File.join(File.dirname(__FILE__), '..')
-$:.unshift File.join(RYE_HOME, 'lib')
-
-require 'stringio'
-require 'yaml'
-require 'rye'
-
-
-puts %Q(
-# ------------------------------------------------------------------
-#   EXAMPLE 1 -- Basic Usage
-#)
-
-rbox = Rye::Box.new('localhost')
-
-# Commands are run as methods on the Rye::Box object
-puts rbox.uptime                   # => 11:02  up 16:01, 3 users
-
-# The response value for all commands is a Rye::Rap object. The rap is a
-# subclass of Array so you can treat it as an Array, but it can also act 
-# like a String if there's only one element. 
-p rbox.ls(:a, '/')                 # => ['.', '..', 'bin', 'etc', ...]
-
-# You can change directories
-puts rbox.pwd                      # => /home/rye
-puts rbox['/usr/bin'].pwd          # => /usr/bin
-puts rbox.pwd                      # => /usr/bin
-
-# You can specify environment variables
-rbox.setenv(:RYE, "Forty Creek")
-rbox.env                           # => ['HOME=/home/rye', 'RYE=Forty Creek', ...]
-
-# The commands method returns an Array of available commands:                        
-puts rbox.commands.join(', ')      # => pwd, touch, echo, wc, ...
-
-# When you're done you can disconnect explicitly. 
-# (Although Rye does this automatically at exit.)
-rbox.disconnect
-
-
-puts %Q(
-# ------------------------------------------------------------------
-#   EXAMPLE 2 -- Disabling Safe-Mode
-#)
-
-rbox_safe = Rye::Box.new('localhost')
-rbox_wild = Rye::Box.new('localhost', :safe => false)
-
-# Safe-mode is enabled by default. In safe-mode, all command 
-# arguments are thoroughly escaped. This prevents access to
-# environment variables and file globs (among other things).
-p rbox_safe.echo('$HOME')                                    # => "$HOME"
-p rbox_safe['/etc'].ls('host*')  rescue Rye::CommandError    # Doesn't exist
-p rbox_safe.ls('-l | wc -l')     rescue Rye::CommandError    # => '|' is not a valid ls arg
-
-# Here's the same commands with safe-mode disabled:
-p rbox_wild.echo('$HOME')                   # => "/home/rye"
-p rbox_wild['/etc'].ls('host*')             # => ["hostconfig", "hosts"]
-p rbox_wild.ls('-l | wc -l')                # => 110
-p rbox_wild.echo('$HOME > /tmp/rye-home')   # => 
-p rbox_wild.cat('/tmp/rye-home')            # => "/home/rye"
-
-
-
-puts %Q(
-# ------------------------------------------------------------------
-#   EXAMPLE 3 -- Custom Commands
-#)
-
-rbox = Rye::Box.new('localhost')
-rbox.add_keys('/private/key/path')   # Specify additional private keys
-
-# There's currently no rye900 command
-p rbox.commands.member?('rye9000')   # => false
-
-# But we can add our own commands to the Rye::Cmd class. They 
-# automatically become available to all Rye::Box objects.
-module Rye::Cmd
-  def rye9000(*args)
-    run_command("ls", args)
-  end
-  def somescript(*args)
-    run_command("/path/to/my/script", args)
-  end
-end
-
-# We can now run rye9000 (with arguments)
-p rbox.rye9000('-a')                 # => [".", "..", ".bashrc", ...]
-p rbox.commands.member?('rye9000')   # => true
-
-
-puts %Q(
-# ------------------------------------------------------------------
-#   EXAMPLE 4 -- Accessing Multiple Machines
-#)
-
-rset = Rye::Set.new('default', :parallel => true)
-rbox = Rye::Box.new
-p rbox
-
-rset.add_keys('/private/key/path')     # For passwordless logins 
-rset.add_boxes(rbox, '127.0.0.1')      # Add boxes as hostnames or objects
-
-# Calling methods on Rye::Set objects is very similar to calling them on
-# Rye::Box objects. In fact, it's identical:
-p rset.uptime        # => [[14:19:02 up 32 days, 19:35 ...], [14:19:02 up 30 days, 01:35]]
-p rset['/usr'].ls    # => [['bin', 'etc', ...], ['bin', 'etc', ...]]
-
-# Like Rye::Box, the response value is a Rye::Rap object containing the
-# responses from each box. Each response is itself a Rye::Rap object.
-unames = rset.uname
-p unames                               # => [["Darwin"], ["Darwin"]]
-puts unames.class                      # => Rye::Rap
-
-# The Rye::Rap object also keeps a reference to the object that called the 
-# command. In this case, it will keep a reference to Rye::Set:
-puts unames.set.class                  # => Rye::Set
-puts unames.set == rset                # => true
-puts unames.size                       # => 2
-puts unames.first                      # => Darwin
-puts unames.first.class                # => Rye::Rap
-puts unames.first.box.class            # => Rye::Box
-puts unames.first.box == rbox          # => true
-
-# Envrionment variables can be set the same way as with Rye::Box
-rset.setenv(:RYE, "Forty Creek")
-p rset.env.first.select { |env| env =~ /RYE/ }  # => ["RYE=Forty Creek"]
-
-
-puts %Q(
-# ------------------------------------------------------------------
-#   EXAMPLE 5 -- ERROR HANDLING
-#)
-
-rbox = Rye::Box.new('localhost', :safe => false) # Note: safe mode is off
-
-# Rye follows the standard convention of taking exception to a non-zero 
-# exit code by raising a Rye::CommandError. In this case, rye9000.test
-# is not found by the ls command.
-begin
-  rbox.ls('rye.test')
-rescue Rye::CommandError => ex
-  puts ex.exit_code                  # => 1
-  puts ex.stderr                     # => ls: rye.test: No such file or directory
-end
-
-# The Rye:Rap response objects also give you the STDOUT and STDERR
-# content separately. Here we redirect STDOUT to STDERR, so this
-# will return nothing:
-puts rbox.uname('-a 1>&2').stdout    # =>
-
-# It all went to STDERR:
-puts rbox.uname('-a 1>&2').stderr    # => Darwin ryehost 9.6.0 ...
-
-# There were no actual errors so the exit code should be 0.
-puts rbox.uname('-a 1>&2').exit_code # => 0
-
-
-puts %Q(
-# ------------------------------------------------------------------
-#   EXAMPLE 6 -- FILE TRANSFERS
-#)
-
-dir_upload = "#{Rye.sysinfo.tmpdir}/rye-upload/"
-dir_download = "#{Rye.sysinfo.tmpdir}/rye-download/"
-
-rbox = Rye::Box.new("localhost", :info => false)
-
-# Rye ships without an rm method (for safety!). Here 
-# we add the rm method only to this instance of rbox.
-def rbox.rm(*args); cmd('rm', args); end
-
-rbox.rm(:r, :f, dir_upload) # Silently delete test dirs
-rbox.rm(:r, :f, dir_download)
-
-rbox.upload("#{RYE_HOME}/README.rdoc", 
-            "#{RYE_HOME}/LICENSE.txt", dir_upload)
-
-applejack = StringIO.new("Some in-memory content")
-rbox.upload(applejack, "#{dir_upload}/applejack.txt")
-
-p rbox.ls(dir_upload)            # => [README.rdoc, LICENSE.txt, applejack.txt]
-p rbox.cat("#{dir_upload}/applejack.txt")   # => "Some in-memory content"
-
-filecontent = StringIO.new
-rbox.download("#{dir_upload}/applejack.txt", filecontent)
-filecontent.rewind           
-p filecontent.read
-
-
-