jason-o-matic-deep_test 1.2.2.2 → 1.2.2.3

data/lib/deep_test/distributed/multi_test_server_proxy.rb

@@ -4,6 +4,7 @@ module DeepTest
       def initialize(options, slaves)
         DeepTest.logger.debug "MultiTestServerProxy#initialize #{slaves.length} slaves"
         @slave_controller = DispatchController.new(options, slaves)
+        @slaves = slaves
       end
 
       def spawn_worker_server(options)
@@ -14,8 +15,15 @@ module DeepTest
       end
 
       def sync(options)
-        DeepTest.logger.debug "dispatch sync for #{options.origin_hostname}"
-        @slave_controller.dispatch(:sync, options)
+        if options.sync_options[:push_code]
+          @slaves.each do |slave|
+            DeepTest.logger.debug "sync to: #{slave.inspect}"
+            RSync.sync(slave.connection_info, options, options.mirror_path(slave.config[:work_dir]))
+          end
+        else
+          DeepTest.logger.debug "dispatch sync for #{options.origin_hostname}"
+          @slave_controller.dispatch(:sync, options)
+        end
       end
 
       class WorkerServerProxy

data/lib/deep_test/distributed/rsync.rb

@@ -13,23 +13,33 @@ module DeepTest
           @connection_info = connection_info
           @options = options
           @sync_options = options.sync_options
+          raise "Pushing code to a daemon isn't supported at the moment" if @sync_options[:daemon] && @sync_options[:push_code]
         end
 
         def command(destination)
           # The '/' after source tells rsync to copy the contents
           # of source to destination, rather than the source directory
           # itself
-          "rsync -az --delete #{@sync_options[:rsync_options]} #{source_location}/ #{destination}".strip.squeeze(" ")
+          "rsync -az --delete #{@sync_options[:rsync_options]} #{source_location}/ #{destination_location(destination)}".strip.squeeze(" ")
         end
 
         def source_location
-          source = ""
-          unless @sync_options[:local]
-            source << @sync_options[:username] << '@' if @sync_options[:username]
-            source << @connection_info.address
-            source << (@sync_options[:daemon] ? '::' : ':')
-          end
-          source << @sync_options[:source]
+          loc = ""
+          loc << common_location_options unless @sync_options[:local] || @sync_options[:push_code]
+          loc << @sync_options[:source]
+        end
+
+        def destination_location(destination)
+          loc = ""
+          loc << common_location_options unless @sync_options[:local] || !@sync_options[:push_code]
+          loc << destination
+        end
+        
+        def common_location_options
+          loc = ""
+          loc << @sync_options[:username] << '@' if @sync_options[:username]
+          loc << @connection_info.address
+          loc << (@sync_options[:daemon] ? '::' : ':')
         end
       end
     end

data/lib/deep_test/distributed/test_server.rb

@@ -33,6 +33,14 @@ module DeepTest
         DeepTest.logger.debug "Syncing #{options.sync_options[:source]} to #{path}"
         RSync.sync(DRbClientConnectionInfo.new, options, path)
       end
+      
+      def connection_info
+        DRbClientConnectionInfo.new
+      end
+      
+      def config
+        @config
+      end
 
       def servers
         [DRbObject.new_with_uri(DRb.uri)]

data/lib/deep_test/options.rb

@@ -54,7 +54,7 @@ module DeepTest
     end
 
     def origin_hostname
-      (Socket.gethostname == @origin_hostname) ? 'localhost' : @origin_hostname
+      @origin_hostname
     end
 
     # Don't store UI instances in the options instance, which will

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jason-o-matic-deep_test
 version: !ruby/object:Gem::Version 
-  version: 1.2.2.2
+  version: 1.2.2.3
 platform: ruby
 authors: 
 - anonymous z, Dan Manges, David Vollbracht