royw-drbman 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/drbman.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{drbman}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roy Wright"]
-  s.date = %q{2009-07-17}
+  s.date = %q{2009-07-19}
   s.default_executable = %q{drbman}
   s.email = %q{roy@wright.org}
   s.executables = ["drbman"]

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

@@ -5,14 +5,14 @@ class SieveOfEratosthenes
 
   # 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
+  # @param [Integer] maximum find all primes lower than this maximum value - REQUIRED.
+  # @option choices [Hash<String,String>] :dirs hash of local directories to copy to the host 
+  #   machines where key is local source and value is directory on host machine - 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>] :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.
   # @param [Logger] logger the logger to use
@@ -25,7 +25,7 @@ class SieveOfEratosthenes
     @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')]
+    @choices[:dirs] = {File.join(File.dirname(__FILE__), '../drb_server') => 'drb_server'}
 
     # set the file to be ran that contains the drb server
     @choices[:run] = 'drb_server/prime_helper.rb' if @choices[:run].blank?

data/lib/drbman/drbman.rb

@@ -15,7 +15,8 @@
 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 [Hash<String,String>] :dirs hash of local directories to copy to the host 
+  #   machines where key is local source and value is directory on host machine - 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 (['localhost']) array of host machine descriptions "{user{:password}@}machine{:port}".
@@ -192,12 +193,12 @@ class Drbman
   def upload_dirs(host)
     unless @user_choices[:dirs].blank?
       drb_server_file = File.join(File.dirname(__FILE__), "../drb_server/drbman_server.rb")
-      @user_choices[:dirs].each do |name|
-        if File.directory?(name)
-          host.upload(name, "#{host.dir}/#{File.basename(name)}")
-          host.upload(drb_server_file, "#{host.dir}/#{File.basename(name)}")
+      @user_choices[:dirs].each do |src,dest|
+        if File.directory?(src)
+          host.upload(src, "#{host.dir}/#{dest}")
+          host.upload(drb_server_file, "#{host.dir}/#{dest}/drbman_server.rb")
         else
-          @logger.error { "\"#{name}\" is not a directory" }
+          @logger.error { "\"#{src}\" is not a directory" }
         end
       end
     end

data/lib/drbman/host_machine.rb

@@ -111,6 +111,7 @@ class HostMachine
         @ssh.loop
       rescue Exception => e
         # only raise the exception if the files differ
+        @logger.debug { e }
         raise e unless same_files?(local_src, remote_dest)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: royw-drbman
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Roy Wright
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-17 00:00:00 -07:00
+date: 2009-07-19 00:00:00 -07:00
 default_executable: drbman
 dependencies: 
 - !ruby/object:Gem::Dependency