rye 0.9.7 → 0.9.8

data/VERSION

@@ -0,0 +1 @@
+0.9.8

data/gem-public_cert.pem

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMQ8wDQYDVQQDDAZkZWxh
+bm8xGTAXBgoJkiaJk/IsZAEZFglzb2x1dGlvdXMxEzARBgoJkiaJk/IsZAEZFgNj
+b20wHhcNMTMwMjA2MTE1NzQ1WhcNMTQwMjA2MTE1NzQ1WjBBMQ8wDQYDVQQDDAZk
+ZWxhbm8xGTAXBgoJkiaJk/IsZAEZFglzb2x1dGlvdXMxEzARBgoJkiaJk/IsZAEZ
+FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDg1hMtl0XsMuUK
+AKTgYWv3gjj7vuEsE2EjT+vyBg8/LpqVVwZziiaebJT9IZiQ+sCFqbiakj0b53pI
+hg1yOaBEmH6/W0L7rwzqaRV9sW1eJs9JxFYQCnd67zUnzj8nnRlOjG+hhIG+Vsij
+npsGbt28pefuNZJjO5q2clAlfSniIIHfIsU7/StEYu6FUGOjnwryZ0r5yJlr9RrE
+Gs+q0DW8QnZ9UpAfuDFQZuIqeKQFFLE7nMmCGaA+0BN1nLl3fVHNbLHq7Avk8+Z+
+ZuuvkdscbHlO/l+3xCNQ5nUnHwq0ADAbMLOlmiYYzqXoWLjmeI6me/clktJCfN2R
+oZG3UQvvAgMBAAGjOTA3MAkGA1UdEwQCMAAwHQYDVR0OBBYEFMSJOEtHzE4l0azv
+M0JK0kKNToK1MAsGA1UdDwQEAwIEsDANBgkqhkiG9w0BAQUFAAOCAQEAtOdE73qx
+OH2ydi9oT2hS5f9G0y1Z70Tlwh+VGExyfxzVE9XwC+iPpJxNraiHYgF/9/oky7ZZ
+R9q0/tJneuhAenZdiQkX7oi4O3v9wRS6YHoWBxMPFKVRLNTzvVJsbmfpCAlp5/5g
+ps4wQFy5mibElGVlOobf/ghqZ25HS9J6kd0/C/ry0AUtTogsL7TxGwT4kbCx63ub
+3vywEEhsJUzfd97GCABmtQfRTldX/j7F1z/5wd8p+hfdox1iibds9ZtfaZA3KzKn
+kchWN9B6zg9r1XMQ8BM2Jz0XoPanPe354+lWwjpkRKbFow/ZbQHcCLCq24+N6b6g
+dgKfNDzwiDpqCA==
+-----END CERTIFICATE-----

data/lib/rye.rb

@@ -1,5 +1,11 @@
 # vim: set sw=2 ts=2 :
 
+module Rye
+  unless defined?(Rye::HOME)
+    HOME = File.expand_path( File.join(File.dirname(__FILE__), '..') )
+  end
+end
+
 require 'logger'
 require 'thread'
 require 'base64'
@@ -19,11 +25,11 @@ require 'esc'
 #
 # Safely run remote commands via SSH in Ruby.
 #
-# Rye is similar to Rush[http://rush.heroku.com] but everything 
+# Rye is similar to Rush[http://rush.heroku.com] but everything
 # happens over SSH (no HTTP daemon) and the default settings are
 # less dangerous (for safety). For example, file globs and the
-# "rm" command are disabled so unless otherwise specified, you 
-# can't do this: <tt>rbox.rm('/etc/**/*')</tt>. 
+# "rm" command are disabled so unless otherwise specified, you
+# can't do this: <tt>rbox.rm('/etc/**/*')</tt>.
 #
 # However, you can do this:
 #
@@ -31,7 +37,7 @@ require 'esc'
 # rset.add_boxes('host1', 'host2', 'host3', 'host4')
 # rset.ps('aux')
 #
-# * See +bin/try+ for a bunch of working examples. 
+# * See +bin/try+ for a bunch of working examples.
 # * See Rye::Box#initialize for info about disabling safe-mode.
 #
 #--
@@ -42,22 +48,38 @@ require 'esc'
 #++
 module Rye
   extend self
-  
-  VERSION = "0.9.7".freeze unless defined?(VERSION)
-  
+
+  module VERSION
+    @path = File.join(Rye::HOME, 'VERSION')
+    class << self
+      attr_reader :version, :path
+      def version
+        @version || read_version
+      end
+      def read_version
+        return if @version
+        @version = File.read(path).strip!
+      end
+      def prerelease?() false end
+      def to_a()     version.split('.')   end
+      def to_s()     version              end
+      def inspect()  version              end
+    end
+  end
+
   @@sysinfo = nil
   @@agent_env = Hash.new  # holds ssh-agent env vars
   @@mutex = Mutex.new     # for synchronizing threads
-  
+
   # Accessor for an instance of SystemInfo
   def Rye.sysinfo
     @@sysinfo = SysInfo.new if @@sysinfo.nil?
     @@sysinfo
   end
-  
+
   # Accessor for an instance of SystemInfo
   def sysinfo; Rye.sysinfo end
-  
+
   class RyeError < RuntimeError; end
   class NoBoxes < RyeError; end
   class NoPassword < RyeError
@@ -82,19 +104,19 @@ module Rye
     def stdout; @rap.stdout if @rap; end
     def exit_status; @rap.exit_status if @rap; end
   end
-  
-  # Reload Rye dynamically. Useful with irb. 
-  # NOTE: does not reload rye.rb. 
+
+  # Reload Rye dynamically. Useful with irb.
+  # NOTE: does not reload rye.rb.
   def reload
     pat = File.join(File.dirname(__FILE__), 'rye')
     %w{key rap cmd box set hop}.each {|lib| load File.join(pat, "#{lib}.rb") }
   end
-  
+
   def mutex
     @@mutex
   end
-  
-  # Looks for private keys in +path+ and returns and Array of paths
+
+  # Looks for private keys in +path+ and returns an Array of paths
   # to the files it finds. Raises an Exception if path does not exist.
   # If path is a file rather than a directory, it will check whether
   # that single file is a private key.
@@ -105,12 +127,12 @@ module Rye
     else
       files = [path]
     end
-    
+
     files = files.select do |file|
       next if File.directory?(file)
       pk = nil
       begin
-        tmp = Rye::Key.from_file(file) 
+        tmp = Rye::Key.from_file(file)
         pk = tmp if tmp.private?
       rescue OpenSSL::PKey::PKeyError
       end
@@ -118,15 +140,15 @@ module Rye
     end
     files || []
   end
-  
-  # Add one or more private keys to the SSH Agent. 
-  # * +keys+ one or more file paths to private keys used for passwordless logins. 
+
+  # Add one or more private keys to the SSH Agent.
+  # * +keys+ one or more file paths to private keys used for passwordless logins.
   def add_keys(*keys)
     keys = keys.flatten.compact || []
     return if keys.empty?
     Rye.shell("ssh-add", keys)
   end
-  
+
   # Returns an Array of info about the currently available
   # SSH keys, as provided by the SSH Agent.
   #
@@ -142,25 +164,25 @@ module Rye
     #end
     Dir.glob(File.join(Rye.sysinfo.home, '.ssh', 'id_*sa'))
   end
-  
+
   def remote_host_keys(*hostnames)
     hostnames = hostnames.flatten.compact || []
     return if hostnames.empty?
     Rye.shell("ssh-keyscan", hostnames)
   end
-  
-  # Takes a command with arguments and returns it in a 
-  # single String with escaped args and some other stuff. 
-  # 
+
+  # Takes a command with arguments and returns it in a
+  # single String with escaped args and some other stuff.
+  #
   # * +cmd+ The shell command name or absolute path.
-  # * +args+ an Array of command arguments.  
+  # * +args+ an Array of command arguments.
   #
   # The command is searched for in the local PATH (where
   # Rye is running). An exception is raised if it's not
   # found. NOTE: Because this happens locally, you won't
   # want to use this method if the environment is quite
   # different from the remote machine it will be executed
-  # on. 
+  # on.
   #
   # The command arguments are passed through Escape.shell_command
   # (that means you can't use environment variables or asterisks).
@@ -177,32 +199,32 @@ module Rye
     end
     Rye.escape(@safe, found_cmd, *args)
   end
-  
-  # An all ruby implementation of unix "which" command. 
+
+  # An all ruby implementation of unix "which" command.
   #
   # * +executable+ the name of the executable
-  # 
+  #
   # 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 
-      next unless File.exists? path             # occurrences of shortname  
-      Dir.new(path).entries.member?(shortname)  # found in the paths. 
+    dir = Rye.sysinfo.paths.select do |path|    # dir contains all of the
+      next unless File.exists? path             # occurrences of shortname
+      Dir.new(path).entries.member?(shortname)  # found in the paths.
     end
     File.join(dir.first, shortname) unless dir.empty? # Return just the first
   end
-  
+
   # Execute a local system command (via the shell, not SSH)
-  #  
+  #
   # * +cmd+ the executable path (relative or absolute)
   # * +args+ Array of arguments to be sent to the command. Each element
   # is one argument:. i.e. <tt>['-l', 'some/path']</tt>
   #
   # NOTE: shell is a bit paranoid so it escapes every argument. This means
-  # you can only use literal values. That means no asterisks too. 
+  # you can only use literal values. That means no asterisks too.
   #
   # Returns a Rye::Rap object.
   #
@@ -227,27 +249,27 @@ module Rye
     rap.add_exit_status($?)
     rap
   end
-  
+
   # Creates a string from +cmd+ and +args+. If +safe+ is true
-  # it will send them through Escape.shell_command otherwise 
-  # it will return them joined by a space character. 
+  # it will send them through Escape.shell_command otherwise
+  # it will return them joined by a space character.
   def escape(safe, cmd, *args)
     args = args.flatten.compact || []
     safe ? Escape.shell_command(cmd, *args).to_s : [cmd, args].flatten.compact.join(' ')
   end
-  
+
   def sshagent_info
     @@agent_env
   end
-  
-  # Returns +str+ with the leading indentation removed. 
+
+  # Returns +str+ with the leading indentation removed.
   # Stolen from http://github.com/mynyml/unindent/ because it was better.
   def without_indent(str)
     indent = str.split($/).each {|line| !line.strip.empty? }.map {|line| line.index(/[^\s]/) }.compact.min
     str.gsub(/^[[:blank:]]{#{indent}}/, '')
   end
-  
-  # 
+
+  #
   # Generates a string of random alphanumeric characters.
   # * +len+ is the length, an Integer. Default: 8
   # * +safe+ in safe-mode, ambiguous characters are removed (default: true):
@@ -259,7 +281,7 @@ module Rye
      1.upto(len) { |i| str << chars[rand(chars.size-1)] }
      str
   end
-  
+
   class Tpl
     attr_reader :src, :result, :basename
     def initialize(src, basename='rye-template')
@@ -286,13 +308,13 @@ module Rye
     end
     def to_s() src end
   end
-  
-  private 
-  
+
+  private
+
   Rye.reload
-  
+
 end
 
 
 
-  
+

data/lib/rye/box.rb

@@ -106,6 +106,7 @@ module Rye
     # * :password => the user's password (ignored if there's a valid private key)
     # * :templates => the template engine to use for uploaded files. One of: :erb (default)
     # * :sudo => Run all commands via sudo (default: false)
+    # * :password_prompt => Show a password prompt on auth failure (default: true)
     #
     # NOTE: +opts+ can also contain any parameter supported by 
     # Net::SSH.start that is not already mentioned above.
@@ -132,7 +133,8 @@ module Rye
         :error => STDERR,
         :getenv => true,
         :templates => :erb,
-        :quiet => false
+        :quiet => false,
+        :password_prompt => true
       }.merge(opts)
       
       # Close the SSH session before Ruby exits. This will do nothing
@@ -150,8 +152,9 @@ module Rye
       @rye_ostype, @rye_impltype = @rye_opts.delete(:ostype), @rye_opts.delete(:impltype)
       @rye_quiet, @rye_sudo = @rye_opts.delete(:quiet), @rye_opts.delete(:sudo)
       @rye_templates = @rye_opts.delete(:templates)
-      
-      # Store the state of the terminal 
+      @rye_password_prompt = @rye_opts.delete(:password_prompt)
+
+      # Store the state of the terminal
       @rye_stty_save = `stty -g`.chomp rescue nil
       
       unless @rye_templates.nil?
@@ -684,7 +687,7 @@ module Rye
         # only auth method
         if @rye_opts[:auth_methods] == ["publickey"]
           raise Net::SSH::AuthenticationFailed
-        elsif STDIN.tty? && retried <= 3
+        elsif @rye_password_prompt && (STDIN.tty? && retried <= 3)
           STDERR.puts "Passwordless login failed for #{@rye_user}"
           @rye_opts[:password] = highline.ask("Password: ") { |q| q.echo = '' }.strip
           @rye_opts[:auth_methods].push *['keyboard-interactive', 'password']

data/lib/rye/dsl.rb

@@ -0,0 +1,100 @@
+require 'docile'
+
+module Rye
+  class Set
+    def run cmd
+      instance_eval &@@command[cmd]
+    end
+  end
+end
+
+@hosts, @hostsets, @contexts = {}, {}, {}
+@parallel = nil
+
+@@colors = false || ENV['COLORS'] || ENV['TERM'].match(/.*color.*/)
+@@command = {}
+
+def parallel state; @parallel = state; end
+def colors   state; @@colors  = state; end
+
+def host(hostname, *args, &block)
+  @hosts[hostname] = Rye::Box.new(hostname, *args) unless @hosts.key? hostname
+  Docile.dsl_eval(Rye::Set.new.add_box(@hosts[hostname]), &block) if block_given?
+end
+
+def hostset(setname, *args, &block)
+  @hostsets[setname] = Rye::Set.new(setname) unless @hostsets.key? setname
+  args.each do |host|
+    @hosts[host] = Rye::Box.new(host) unless @hosts.key? host
+    @hostsets[setname].add_box @hosts[host] unless @hostsets[setname].boxes.include? @hosts[host]
+  end
+  if @parallel
+    @hostsets[setname].parallel = true
+    Docile.dsl_eval(@hostsets[setname], &block) if block_given?
+  else
+    @hostsets[setname].boxes.each do |host|
+      Docile.dsl_eval(Rye::Set.new.add_box(host), &block) if block_given?
+    end
+  end
+end
+
+def command_group(name, &block)
+  @@command[name] = Proc.new &block
+end
+
+def exit_status_check(cmd, opts={})
+  enable_quiet_mode
+  @pass = opts[:pass_str] || cmd.to_s + ' Passed Status Check'
+  @fail = opts[:fail_str] || cmd.to_s + ' Failed Status Check'
+  def results(obj, out)
+    if obj.exit_status == 0
+      info out, :altstring => @pass
+    else
+      err out, :altstring => @fail
+    end
+  end
+  out = execute cmd
+  if out[0].class == Rye::Rap
+    out.each do |rap|
+      results(rap, out)
+    end
+  elsif out.exit_status == 0
+    results(out, out)
+  end
+  disable_quiet_mode
+end
+
+def strwrap(msg, opts={})
+  out = ''
+  unless @@colors
+    msg.each do |str|
+      unless opts.key? :altstring
+        out += str.to_s.gsub!(/^/, "[#{str.obj.hostname}] ") + "\n"
+      else
+        out += "[#{str.obj.hostname}] #{opts[:altstring]}\n"
+      end
+    end
+  else
+    msg.each do |str|
+      unless opts.key? :altstring
+        out += str.to_s.gsub!(/^(.*)$/, str.obj.hostname)
+      else
+        out += "#{str.obj.hostname} " + opts[:altstring]
+      end
+    end
+  end
+  out
+end
+
+def info msg, *opts
+  STDOUT.puts strwrap(msg, *opts)
+end
+
+def err msg, *opts
+  STDOUT.puts strwrap(msg, *opts)
+end
+
+def debug msg, *opts
+  STDOUT.puts strwrap(msg, *opts)
+end
+

data/rye.gemspec

@@ -1,61 +1,101 @@
-@spec = Gem::Specification.new do |s|
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
   s.name = "rye"
-  s.rubyforge_project = "rye"
-  s.version = "0.9.7"
-  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"
+  s.version = "0.9.8"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Delano Mandelbaum"]
+  s.cert_chain = ["gem-public_cert.pem"]
+  s.date = "2013-02-06"
+  s.description = "Run SSH commands on a bunch of machines at the same time (from Ruby)."
   s.email = "delano@solutious.com"
-  s.homepage = "http://github.com/delano/rye/"
-  
-  # = DEPENDENCIES =
-  # Add all gem dependencies
-  s.add_dependency 'annoy'
-  s.add_dependency 'sysinfo', '>= 0.7.3'
-  
-  s.add_dependency 'highline', '>= 1.5.1'
-  s.add_dependency 'net-ssh', '>= 2.0.13'
-  s.add_dependency 'net-scp', '>= 1.0.2'
-  #s.add_dependency 'net-ssh-multi'
-  
-  # = EXECUTABLES =
-  # The list of executables in your project (if any). Don't include the path, 
-  # just the base filename.
-  s.executables = %w[]
-  
-  # = MANIFEST =
-  # The complete list of files to be included in the release. When GitHub packages your gem, 
-  # it doesn't allow you to run any command that accesses the filesystem. You will get an
-  # error. You can ask your VCS for the list of versioned files:
-  # git ls-files
-  # svn list -R
-  s.files = %w(
-  CHANGES.txt
-  LICENSE.txt
-  README.rdoc
-  Rakefile
-  Rudyfile
-  bin/try
-  lib/esc.rb
-  lib/rye.rb
-  lib/rye/box.rb
-  lib/rye/cmd.rb
-  lib/rye/key.rb
-  lib/rye/rap.rb
-  lib/rye/set.rb
-  lib/rye/hop.rb
-  rye.gemspec
-  )
-  
-  s.extra_rdoc_files = %w[README.rdoc LICENSE.txt]
-  s.has_rdoc = true
-  s.rdoc_options = ["--line-numbers", "--title", s.summary, "--main", "README.rdoc"]
-  s.require_paths = %w[lib]
-  s.rubygems_version = '1.3.0'
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    "CHANGES.txt",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "Rudyfile",
+    "VERSION",
+    "gem-public_cert.pem",
+    "lib/esc.rb",
+    "lib/rye.rb",
+    "lib/rye/box.rb",
+    "lib/rye/cmd.rb",
+    "lib/rye/dsl.rb",
+    "lib/rye/hop.rb",
+    "lib/rye/key.rb",
+    "lib/rye/rap.rb",
+    "lib/rye/set.rb",
+    "rye.gemspec",
+    "try/10_basic_tryouts.rb",
+    "try/12_batch_tryouts.rb",
+    "try/13_set_tryouts.rb",
+    "try/14_auth_methods_tryouts.rb",
+    "try/15_file_tryouts.rb",
+    "try/20_file_transfer_tryouts.rb",
+    "try/25_template_upload.rb",
+    "try/30_safemode_tryouts.rb",
+    "try/35_basics_with_hop.rb",
+    "try/70_rye_cli_tryouts.rb",
+    "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/65_rbox_file_append_test.rb",
+    "tst/70_rbox_env_test.rb",
+    "tst/dsl_example.rb",
+    "tst/rye.rb",
+    "tst/shell.rb",
+    "tst/shell2.rb",
+    "tst/shell3.rb",
+    "tst/test_hop.rb"
+  ]
+  s.homepage = "https://github.com/delano/rye"
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "rye"
+  s.rubygems_version = "1.8.25"
+  s.signing_key = "/mnt/gem/gem-private_key.pem"
+  s.summary = "Run SSH commands on a bunch of machines at the same time (from Ruby)."
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<annoy>, [">= 0"])
+      s.add_runtime_dependency(%q<sysinfo>, [">= 0.7.3"])
+      s.add_runtime_dependency(%q<highline>, [">= 1.5.1"])
+      s.add_runtime_dependency(%q<net-ssh>, [">= 2.0.13"])
+      s.add_runtime_dependency(%q<net-scp>, [">= 1.0.2"])
+      s.add_runtime_dependency(%q<docile>, [">= 1.0.1"])
+    else
+      s.add_dependency(%q<annoy>, [">= 0"])
+      s.add_dependency(%q<sysinfo>, [">= 0.7.3"])
+      s.add_dependency(%q<highline>, [">= 1.5.1"])
+      s.add_dependency(%q<net-ssh>, [">= 2.0.13"])
+      s.add_dependency(%q<net-scp>, [">= 1.0.2"])
+      s.add_dependency(%q<docile>, [">= 1.0.1"])
+    end
+  else
+    s.add_dependency(%q<annoy>, [">= 0"])
+    s.add_dependency(%q<sysinfo>, [">= 0.7.3"])
+    s.add_dependency(%q<highline>, [">= 1.5.1"])
+    s.add_dependency(%q<net-ssh>, [">= 2.0.13"])
+    s.add_dependency(%q<net-scp>, [">= 1.0.2"])
+    s.add_dependency(%q<docile>, [">= 1.0.1"])
   end
-  
 end
+