royw-drbman 0.0.1 → 0.0.2

data/.gitignore

@@ -1,6 +1,9 @@
 *.sw?
 .DS_Store
+.yardoc
 coverage
 rdoc
+doc
 pkg
+tmp
 *~

data/Rakefile

@@ -52,3 +52,9 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+require 'yard'
+YARD::Rake::YardocTask.new do |t|
+  t.files   = ['lib/**/*.rb']   # optional
+  # t.options = ['--any', '--extra', '--opts'] # optional
+end
+

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/drbman.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{drbman}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roy Wright"]
-  s.date = %q{2009-07-14}
+  s.date = %q{2009-07-16}
   s.default_executable = %q{drbman}
   s.email = %q{roy@wright.org}
   s.executables = ["drbman"]
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "examples/primes/lib/primes/sieve_of_eratosthenes.rb",
      "examples/primes/spec/primes_spec.rb",
      "examples/primes/spec/spec_helper.rb",
+     "examples/primes/stress_test.rb",
      "lib/drbman.rb",
      "lib/drbman/cli.rb",
      "lib/drbman/drb_pool.rb",
@@ -58,7 +59,8 @@ Gem::Specification.new do |s|
      "examples/primes/lib/primes/sieve_of_eratosthenes.rb",
      "examples/primes/lib/primes.rb",
      "examples/primes/spec/primes_spec.rb",
-     "examples/primes/spec/spec_helper.rb"
+     "examples/primes/spec/spec_helper.rb",
+     "examples/primes/stress_test.rb"
   ]
 
   if s.respond_to? :specification_version then

data/examples/primes/lib/drb_server/prime_helper.rb

@@ -1,34 +1,44 @@
 require 'drb'
-require 'log4r'
 
+# A helper object for calculating primes using the Sieve of Eratosthenes
+#
+# == Usage
+# ruby prime_helper.rb foo.example.com 1234
+# will run the service as: druby://foo.example.com:1234
+#
+# ruby prime_helper.rb foo.example.com
+# will run the service as: druby://foo.example.com:9000
+#
+# ruby prime_helper.rb
+# will run the service as: druby://localhost:9000
+#
 class PrimeHelper
   attr_accessor :name
-  def non_primes(ip, n)
+  
+  # Find the multiples of the give prime number that are less than the 
+  # given maximum.
+  # @example
+  #  multiples_of(5,20) => [10, 15]
+  # @param [Integer] prime the prime number to find the multiples of
+  # @param [Integer] maximum the maximum integer
+  # @return [Array<Integer>] the array of the prime multiples
+  def multiples_of(prime, maximum)
     a = []
-    2.upto((n - 1) / ip) { |i| a << (i * ip) }
+    2.upto((maximum - 1) / prime) { |i| a << (i * prime) }
     a
   end
+  
+  # Stop the DRb service
   def stop_service
     DRb.stop_service
   end
 end
 
-logger = Log4r::Logger.new('prime_helper')
-logger.outputters = Log4r::FileOutputter.new(:console, :filename => File.join(File.dirname(__FILE__), '../prime_helper.log'))
-Log4r::Outputter[:console].formatter  = Log4r::PatternFormatter.new(:pattern => "%m")
-logger.level = Log4r::INFO
-
 machine = 'localhost'
 machine = ARGV[0] unless ARGV.length < 1
 port = 9000
 port = ARGV[1] unless ARGV.length < 2
-service = "druby://#{machine}:#{port}"
-logger.info { "ARGV => #{ARGV.inspect}" }
-logger.info { "machine => #{machine}" }
-logger.info { "port => #{port}" }
-logger.info { "drb service => #{service}" }
 server = PrimeHelper.new
-server.name = service
-DRb.start_service(service, server)
+server.name = "druby://#{machine}:#{port}"
+DRb.start_service(server.name, server)
 DRb.thread.join
-logger.info { "finished" }

data/examples/primes/lib/primes/cli.rb

@@ -55,6 +55,12 @@ class CLI < UserChoices::Command
     builder.add_choice(:debug, :type => :boolean, :default => false) do |command_line|
       command_line.uses_switch('-v', '--verbose', 'Display debug messages')
     end
+    builder.add_choice(:leave, :type => :boolean, :default => false) do |command_line|
+      command_line.uses_switch('-l', '--leave', 'Leave files on host machines')
+    end
+    builder.add_choice(:ssh_debug, :type => :boolean, :default => false) do |command_line|
+      command_line.uses_switch('-s', '--ssh-debug', 'Display the ssh debug messages')
+    end
     builder.add_choice(:hosts, :type => [:string], :default => []) do |command_line|
       command_line.uses_option('-H', '--hosts "HOST,HOST"', 'Comma separated host machines, ex: "machine1{,machine2{,...}}"')
     end

data/examples/primes/lib/primes/sieve_of_eratosthenes.rb

@@ -1,29 +1,50 @@
-# Command design pattern
+# The Sieve of Eratosthenes prime number finder
+# Note, uses the Command design pattern
 class SieveOfEratosthenes
   attr_reader :primes_elapse_time
-  def initialize(n, choices, logger)
-    @n = n.to_i
+
+  # Use the Sieve of Eratosthenes to find prime numbers
+  #
+  # @param [Integer] maximum find all primes lower than this maximum value
+  # @option choices [Array<String>] :dirs array of local directories to copy to the host machines.  REQUIRED
+  # @option choices [String] :run the name of the file to run on the host machine.  REQUIRED
+  #  This file should start the drb server.  Note, this file will be daemonized before running.
+  # @option choices [Array<String>] :hosts array of host machine descriptions "{user{:password}@}machine{:port}"
+  #  This defaults to ['localhost']
+  # @option choices [Integer] :port default port number used to assign to hosts without a port number.
+  #  The port number is incremented for each host.  This defaults to 9000
+  # @option choices [Array<String>] :gems array of gem names to verify are installed on the host machine.
+  #  Note, 'daemons' is always added to this array.
+  # @param [Logger] logger the logger to use
+  def initialize(maximum, choices, logger)
+    @maximum = maximum.to_i
     @choices = choices
     @logger = logger
     
     # we need at least one host that has a drb server running
     @choices[:hosts] = ['localhost'] if @choices[:hosts].blank?
     
+    # specify the directories to copy to the host machine
+    @choices[:dirs] = [File.join(File.dirname(__FILE__), '../drb_server')]
+
     # set the file to be ran that contains the drb server
     @choices[:run] = 'drb_server/prime_helper.rb' if @choices[:run].blank?
+    
+    # specify gems required by the drb server object
+    # each host will be checked to make sure these gems are installed
     @choices[:gems] = ['log4r']
     
-    # specify the directories to copy to the host machine
-    @choices[:dirs] = [File.join(File.dirname(__FILE__), '../drb_server')]
   end
   
+  # Calculate the primes
+  # @return [Array<Integer] the primes in an Array
   def execute
     result = []
     @logger.debug { @choices.pretty_inspect }
 
     Drbman.new(@logger, @choices) do |drbman|
       @primes_elapse_time = elapse do
-        result = primes(@n, drbman)
+        result = primes(@maximum, drbman)
       end
     end
     result
@@ -31,12 +52,12 @@ class SieveOfEratosthenes
   
   private
   
-  def primes(n, drbman)
+  def primes(maximum, drbman)
     indices = []
-    if n > 2
-      composites = calc_composites(n, drbman)
+    if maximum > 2
+      composites = calc_composites(maximum, drbman)
       flat_comps = composites.flatten.uniq
-      indices = calc_indices(flat_comps, n)
+      indices = calc_indices(flat_comps, maximum)
     end
     indices
   end
@@ -45,21 +66,19 @@ class SieveOfEratosthenes
   # sqr_primes = [2,3]
   # composites = [[2*2, 2*3, 2*4,...,2*9], [3*2, 3*3, 3*4,...,3*6]]
   # returns Array
-  def calc_composites(n, drbman)
-    sqr_primes = primes(Math.sqrt(n).to_i, drbman)
+  def calc_composites(maximum, drbman)
+    sqr_primes = primes(Math.sqrt(maximum).to_i, drbman)
     composites = []
     threads = []
     mutex = Mutex.new
     sqr_primes.each do |ip|
       # parallelize via threads
       # then use the drb object within the thread
-      threads << Thread.new(ip, n) do |value, max|
-        # @logger.debug { "thread(#{ip}, #{n})" }
+      threads << Thread.new(ip, maximum) do |prime, max|
         drbman.get_object do |prime_helper|
-          # @logger.debug { "prime_helper.name => #{prime_helper.name}" }
-          non_primes = prime_helper.non_primes(value, max)
+          prime_multiples = prime_helper.multiples_of(prime, max)
           mutex.synchronize do
-            composites << non_primes
+            composites << prime_multiples
           end
         end
       end
@@ -68,9 +87,9 @@ class SieveOfEratosthenes
     composites
   end
   
-  def calc_indices(flat_comps, n)
+  def calc_indices(flat_comps, maximum)
     indices = []
-    flags = Array.new(n, true)
+    flags = Array.new(maximum, true)
     flat_comps.each {|i| flags[i] = false}
     flags.each_index {|i| indices << i if flags[i] }
     indices.shift(2)

data/examples/primes/spec/primes_spec.rb

@@ -1,6 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'primes'
 
+# Note, these assume you have an ssh public key set up for
+# this box (i.e: it does an "ssh localhost").
 
 describe('SieveOfEratosthenes') do
   before(:each) do
@@ -14,11 +16,20 @@ describe('SieveOfEratosthenes') do
     sieve = Primes.new(@logger, @choices)
     sieve.execute.should == [2,3,5,7,11,13,17,19]
   end
-  it 'should take a while' do
-    sieve = SieveOfEratosthenes.new(10000000, @choices, @logger)
-    primes = sieve.execute
-    puts "#{primes.length} primes found"
-    primes.length.should == 664579
+  
+  it 'should find 303 primes below 2000 with single host' do
+    @choices[:max_integer] = 2000
+    @choices[:hosts] = ['localhost']
+    sieve = Primes.new(@logger, @choices)
+    sieve.execute.length.should == 303
+  end
+
+  it 'should find 303 primes below 2000 with two hosts' do
+    @choices[:max_integer] = 2000
+    @choices[:hosts] = ['localhost', 'localhost']
+    sieve = Primes.new(@logger, @choices)
+    sieve.execute.length.should == 303
   end
+  
 end
 

data/examples/primes/stress_test.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+good = 0
+bad = 0
+for cnt in 1..200
+  if `bin/primes 2000 -H localhost,localhost` =~ /303\sprimes\sfound/
+    good += 1
+    putc '.'
+  else
+    bad += 1
+    putc 'x'
+  end
+  puts " #{cnt}" if (cnt % 50) == 0
+  STDOUT.flush
+end
+puts
+puts "good: #{good}"
+puts "bad:  #{bad}"

data/lib/drbman/cli.rb

@@ -55,6 +55,12 @@ class CLI < UserChoices::Command
     builder.add_choice(:run, :type => :string, :default => nil) do |command_line|
       command_line.uses_option('-r', '--run "COMMAND"', "The ruby file that starts the drb server")
     end
+    builder.add_choice(:leave, :type => :boolean, :default => false) do |command_line|
+      command_line.uses_switch('-l', '--leave', 'Leave files on host machines')
+    end
+    builder.add_choice(:ssh_debug, :type => :boolean, :default => false) do |command_line|
+      command_line.uses_switch('-s', '--ssh-debug', 'Display the ssh debug messages')
+    end
     builder.add_choice(:hosts, :type => [:string], :default => []) do |command_line|
       command_line.uses_option('-H', '--hosts "HOST,HOST"', 'Comma separated account URLs, ex: "{user{:pass}@}machine1{,{user{:pass}@}machine2}"')
     end

data/lib/drbman/drb_pool.rb

@@ -100,9 +100,15 @@ class DrbPool
   
   # Adds an in_use attribute
   module InUse
+    # set the in_use flag
+    # @param [Boolean] flag
+    # @return [Boolean] the new state of the in_use flag
     def in_use=(flag)
       @in_use = (flag ? true : false)
     end
+    
+    # get the in_use flag
+    # @return [Boolean] the state of the in_use flag
     def in_use?
       @in_use
     end

data/lib/drbman/drbman.rb

@@ -15,22 +15,22 @@
 class Drbman
   # @param [Logger] logger the logger
   # @param [UserChoices,Hash] choices
-  # @option choices [Array<String>] :dirs array of local directories to copy to the host machines.  REQUIRED
-  # @option choices [String] :run the name of the file to run on the host machine.  REQUIRED
+  # @option choices [Array<String>] :dirs array of local directories to copy to the host machines (REQUIRED).
+  # @option choices [String] :run the name of the file to run on the host machine (REQUIRED).
   #  This file should start the drb server.  Note, this file will be daemonized before running.
-  # @option choices [Array<String>] :hosts array of host machine descriptions "{user{:password}@}machine{:port}"
-  #  This defaults to ['localhost']
-  # @option choices [Integer] :port default port number used to assign to hosts without a port number.
-  #  The port number is incremented for each host.  This defaults to 9000
-  # @option choices [Array<String>] :gems array of gem names to verify are installed on the host machine.
-  #  Note, 'daemons' is always added to this array.
+  # @option choices [Array<String>] :hosts (['localhost']) array of host machine descriptions "{user{:password}@}machine{:port}".
+  # @option choices [Integer] :port (9000) default port number used to assign to hosts without a port number,
+  #  the port number is incremented for each host.
+  # @option choices [Array<String>] :gems ([]) array of gem names to verify are installed on the host machine,
+  #  note, 'daemons' is always added to this array.
+  # @option choices [Array<String>] :keys (['~/.ssh/id_dsa', '~/.ssh/id_rsa']) array of ssh key file names.
   # @yield [Drbman]
   # @example Usage
-  # Drbman.new(logger, choices) do |drbman|
-  #   drbman.get_object do |obj|
-  #     obj.do_something
+  #   Drbman.new(logger, choices) do |drbman|
+  #     drbman.get_object do |obj|
+  #       obj.do_something
+  #     end
   #   end
-  # end
   def initialize(logger, choices, &block)
     @logger = logger
     @user_choices = choices
@@ -38,20 +38,20 @@ class Drbman
     # @hosts[machine_description] = HostMachine instance
     @hosts = {}
 
-    choices[:port] ||= 9000
-    choices[:hosts] ||= ['localhost']
-    choices[:gems] ||= []
-    choices[:gems] = (choices[:gems] + ['daemons']).uniq.compact
+    @user_choices[:port] ||= 9000
+    @user_choices[:hosts] ||= ['localhost']
+    @user_choices[:gems] ||= []
+    @user_choices[:gems] = (@user_choices[:gems] + ['daemons']).uniq.compact
     
-    raise ArgumentError.new('Missing choices[:run]') if choices[:run].blank?
-    raise ArgumentError.new('Missing choices[:hosts]') if choices[:hosts].blank?
-    raise ArgumentError.new('Missing choices[:dirs]') if choices[:dirs].blank?
+    raise ArgumentError.new('Missing choices[:run]')   if @user_choices[:run].blank?
+    raise ArgumentError.new('Missing choices[:hosts]') if @user_choices[:hosts].blank?
+    raise ArgumentError.new('Missing choices[:dirs]')  if @user_choices[:dirs].blank?
     
     # populate the @hosts hash.  key => host machine description, value => HostMachine instance
-    port = choices[:port]
+    port = @user_choices[:port]
     @user_choices[:hosts].each do |host|
       host = "#{host}:#{port}" unless host =~ /\:\d+\s*$/
-      @hosts[host] = HostMachine.new(host, @logger)
+      @hosts[host] = HostMachine.new(host, @logger, @user_choices)
       port += 1
     end
     
@@ -87,12 +87,7 @@ class Drbman
     @hosts.each do |name, machine|
       threads << Thread.new(machine) do |host_machine|
         host_machine.session do |host|
-          # begin
-            startup(host)
-          # rescue Exception => e
-          #   @logger.error { e }
-          #   @logger.debug { e.backtrace.join("\n") }
-          # end
+          startup(host)
         end
       end
     end
@@ -122,7 +117,7 @@ class Drbman
   # @param [HostMachine] host the host machine
   # @raise [Exception] when a component is not installed on the host
   def startup(host)
-    @logger.info { "Setting up: #{host.name}" }
+    @logger.debug { "Setting up: #{host.name}" }
     check_gems(host)
     create_directory(host)
     upload_dirs(host)
@@ -133,7 +128,7 @@ class Drbman
   # Stop the drb server on the given host then remove the drb files from the host
   # @param [HostMachine] host the host machine
   def cleanup(host)
-    @logger.info { "Cleaning up: #{host.name}" }
+    @logger.debug { "Cleaning up: #{host.name}" }
     stop_drb_server(host)
     cleanup_files(host)
   end
@@ -144,7 +139,7 @@ class Drbman
   def cleanup_files(host)
     unless host.dir.blank? || (host.dir =~ /[\*\?]/)
       @logger.debug { "#{host.name}: rm -rf #{host.dir}"}
-      host.sh("rm -rf #{host.dir}")
+      host.sh("rm -rf #{host.dir}") unless @user_choices[:leave]
     end
   end
   
@@ -201,7 +196,7 @@ class Drbman
   def check_gems(host)
     missing_gems = []
     @user_choices[:gems].each do |gem_name|
-      case host.sh("gem list -l -i #{gem_name}")
+      case str = host.sh("gem list -l -i #{gem_name}")
       when /false/i
         missing_gems << gem_name
       when /command not found/
@@ -218,11 +213,13 @@ class Drbman
   # Note, requires 'uuidgen' in the path on the host machine
   # @todo maybe generate a random uuid locally instead
   # @param [HostMachine] host the host machine
+  # @return [String] the created directory path
   def create_directory(host)
     host.uuid = UUIDTools::UUID.random_create
     host.dir = "~/.drbman/#{host.uuid}".strip
     host.sh("mkdir -p #{host.dir}")
     @logger.debug { "host directory: #{host.dir}" }
+    host.dir
   end
   
 end

data/lib/drbman/host_machine.rb

@@ -11,15 +11,24 @@ class HostMachine
   attr_accessor :uuid, :dir, :controller
   attr_reader :name, :machine, :user, :port
   
+  class << self
+    attr_accessor :connection_mutex
+  end
+  @connection_mutex = Mutex.new
+  
   # @param [String] host_string describes the host to connect to.
   #  The format is "{user{:password}@}machine{:port}"
   # @param [Logger] logger the logger to use
-  def initialize(host_string, logger)
+  # @param [UserChoices,Hash] choices
+  # @option choices [Array<String>] :keys (['~/.ssh/id_dsa', '~/.ssh/id_rsa']) array of ssh key file names.
+  def initialize(host_string, logger, choices)
     @logger = logger
+    @choices = choices
     @machine = 'localhost'
     @user = ENV['USER']
     @port = 9000
-    @password = {:keys => ['~/.ssh/id_dsa']}
+    keys = choices[:keys] || ["~/.ssh/id_dsa", "~/.ssh/id_rsa"]
+    @password = {:keys => keys.collect{|name| name.gsub('~', ENV['HOME'])}.select{|name| File.exist?(name)}}
     case host_string
     when /^(\S+)\:(\S+)\@(\S+)\:(\d+)$/
       @user = $1
@@ -57,9 +66,20 @@ class HostMachine
   #   @logger.debug { host.sh("ls -lR #{host.dir}") }
   # end
   def session(&block)
-    connect
-    yield self
-    disconnect
+    begin
+      # this is ugly but apparently net-ssh can fail public_key authentication
+      # when ran in parallel.
+      HostMachine.connection_mutex.synchronize do
+        connect
+      end
+      yield self
+    rescue Exception => e
+      @logger.error { e }
+      @logger.error { e.backtrace.join("\n") }
+      raise e
+    ensure
+      disconnect
+    end
   end
   
   # upload a directory structure to the host machine.
@@ -68,7 +88,6 @@ class HostMachine
   # @raise [Exception] if the files are not copied
   def upload(local_src, remote_dest)
     @logger.debug { "upload(\"#{local_src}\", \"#{remote_dest}\")" }
-    connect
     result = nil
     unless @ssh.nil?
       begin
@@ -82,13 +101,12 @@ class HostMachine
       end
     end
   end
-  
+
   # download a directory structure from the host machine.
   # @param [String] remote_src the source directory on the host machine
   # @param [String] local_dest the destination directory on the local machine
   # @raise [Exception] if the files are not copied
   def download(remote_src, local_dest)
-    connect
     result = nil
     unless @ssh.nil?
       begin
@@ -109,84 +127,56 @@ class HostMachine
   #
   # @param [String] command the command to run
   # @param [Hash] opts
-  # @options opts [Array<String>] :source array of files to source. defaults to ['~/.profile', '~/.bashrc']
+  # @option opts [Array<String>] :source (['~/.profile', '~/.bashrc']) array of files to source.
+  # @return [String, nil] the output from running the command
   def sh(command, opts={})
-    @logger.debug { "sh \"#{command}\""}
-    # if opts[:source].blank?
-    #   opts[:source] = ['~/.profile', '~/.bashrc']
-    # end
-    connect
-    result = nil
     unless @ssh.nil?
-      if @pre_commands.nil?
-        @pre_commands = []
-        opts[:source] ||= []
-        opts[:source].each do |name|
-          ls_out = @ssh.exec!("ls #{name}")
-          @pre_commands << "source #{name}" if ls_out =~ /^\s*\S+\/#{File.basename(name)}\s*$/
-        end
-      end
-      commands = @pre_commands.clone
+      opts[:source] = ['~/.profile', '~/.bashrc'] if opts[:source].blank?
+      result = nil
+      commands = pre_commands(opts[:source])
       commands << command
       command_line = commands.join(' && ')
+      @logger.debug { "sh: \"#{command_line}\""}
       result = @ssh.exec!(command_line)
+      @logger.debug { "=> #{result}" }
     end
     result
   end
   
-  # run a command as the superuser on the host machine
-  # Note that the environment on the host machine is the default environment instead
-  # of the user's environment.  So by default we try to source ~/.profile and ~/.bashrc
-  #
-  # @param [String] command the command to run
-  # @param [Hash] opts
-  # @options opts [Array<String>] :source array of files to source. defaults to ['~/.profile', '~/.bashrc']
-  def sudo(command, opts={})
-    @logger.debug { "sudo \"#{command}\""}
-    # if opts[:source].blank?
-    #   opts[:source] = ['~/.profile', '~/.bashrc']
-    # end
-    connect
-    result = nil
-    unless @ssh.nil?
-      buf = []
-      @ssh.open_channel do |channel|
-        if @pre_commands.nil?
-          @pre_commands = []
-          opts[:source] ||= []
-          opts[:source].each do |name|
-            ls_out = @ssh.exec!("ls #{name}")
-            @pre_commands << "source #{name}" if ls_out =~ /^\s*\S+\/#{File.basename(name)}\s*$/
-          end
-        end
-        commands = @pre_commands.clone
-        commands << "sudo -p 'sudo password: ' #{command}"
-        command_line = commands.join(' && ')
-        channel.exec(command_line) do |ch, success|
-          ch.on_data do |ch, data|
-            if data =~ /sudo password: /
-              ch.send_data("#{@password[:password]}\n")
-            else
-              buf << data
-            end
-          end
+  private
+  
+  def pre_commands(sources)
+    if @pre_commands.nil?
+      @pre_commands = []
+      unless @ssh.nil?
+        sources.each do |name|
+          ls_out = @ssh.exec!("ls #{name}")
+          @pre_commands << "source #{name}" if ls_out =~ /^\s*\S+\/#{File.basename(name)}\s*$/
         end
       end
-      @ssh.loop
-      result = buf.compact.join('')
     end
-    result
+    @pre_commands.clone
   end
-
+  
   # connect to the host machine
+  # note, you should not need to call the connect method.
+  # @see {#session}
   def connect
     if @ssh.nil?
-      @ssh = Net::SSH.start(@machine, @user, @password)
+      options = @password.merge({
+        :timeout=>2, 
+        :auth_methods => %w(publickey hostbased password)
+        })
+      options = @password.merge({:verbose=>Logger::DEBUG}) if @choices[:ssh_debug]
+      @logger.debug { "connect: @machine=>#{@machine}, @user=>#{@user}, options=>#{options.inspect}" }
+      @ssh = Net::SSH.start(@machine, @user, options)
       # @ssh.forward.local(@port, @machine, @port)
     end
   end
   
-  # disconnect from the host machine
+  # disconnect from the host machine.
+  # note, you should not need to call the disconnect method.
+  # @see {#session}
   def disconnect
     if @ssh
       @ssh.close
@@ -194,19 +184,24 @@ class HostMachine
     end
   end
 
-  private
-  
   # Does the local directory tree and the remote directory tree contain the same files?
   # Calculates a MD5 hash for each file then compares the hashes
   # @param [String] local_path local directory
   # @param [String] remote_path remote directory
+  # @return [Boolean] asserted if the files in both directory trees are identical
   def same_files?(local_path, remote_path)
-    remote_md5 = @ssh.exec!(md5_command_line(remote_path))
-    local_md5 = `#{md5_command_line(local_path)}`
-    @logger.debug { "same_files? local_md5 => #{local_md5}, remote_md5 => #{remote_md5}"}
-    remote_md5 == local_md5
+    result = false
+    unless @ssh.nil?
+      remote_md5 = @ssh.exec!(md5_command_line(remote_path))
+      local_md5 = `#{md5_command_line(local_path)}`
+      @logger.debug { "same_files? local_md5 => #{local_md5}, remote_md5 => #{remote_md5}"}
+      result = (remote_md5 == local_md5)
+    end
+    result
   end
   
+  # @param [String] dirname the directory name to use in building the md5 command line
+  # @return [String] the command line for finding the md5 hash value
   def md5_command_line(dirname)
     line = "cat \`find #{dirname} -type f | sort\` | ruby -e \"require 'digest/md5';puts Digest::MD5.hexdigest(STDIN.read)\""
     @logger.debug { line }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: royw-drbman
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Roy Wright
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-14 00:00:00 -07:00
+date: 2009-07-16 00:00:00 -07:00
 default_executable: drbman
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,6 +100,7 @@ files:
 - examples/primes/lib/primes/sieve_of_eratosthenes.rb
 - examples/primes/spec/primes_spec.rb
 - examples/primes/spec/spec_helper.rb
+- examples/primes/stress_test.rb
 - lib/drbman.rb
 - lib/drbman/cli.rb
 - lib/drbman/drb_pool.rb
@@ -146,3 +147,4 @@ test_files:
 - examples/primes/lib/primes.rb
 - examples/primes/spec/primes_spec.rb
 - examples/primes/spec/spec_helper.rb
+- examples/primes/stress_test.rb