remote_run 0.1.1 → 0.1.2

data/examples/demo-remote-run

@@ -3,20 +3,22 @@ require 'rubygems'
 require 'bundler/setup'
 require 'remote_run'
 
-Runner.log("Scanning 10.64.20.* for hosts...", :yellow)
+puts("Scanning 10.64.20.* for hosts...")
 #hosts = `nmap -p 22 10.64.20.1/24 --open -sV | grep -B3 "Debian" | grep 10.64.20 | cut -f 5 -d " "`.lines.map(&:strip)
 hosts = %w{ 10.64.20.1 10.64.20.12 10.64.20.15 10.64.20.18 10.64.20.21 10.64.20.26 10.64.20.30 10.64.20.38 10.64.20.43 10.64.20.47 10.64.20.49 10.64.20.50 10.64.20.51 10.64.20.53 10.64.20.56 10.64.20.58 10.64.20.59 10.64.20.61 10.64.20.62 10.64.20.64 10.64.20.66 10.64.20.69 10.64.20.74 10.64.20.76 10.64.20.79 10.64.20.80 10.64.20.93 10.64.20.101 10.64.20.110 10.64.20.111 10.64.20.122 10.64.20.149 10.64.20.164 10.64.20.168 10.64.20.198 10.64.20.209 10.64.20.214 10.64.20.221 10.64.20.244 10.64.20.245 10.64.20.246 10.64.20.247 10.64.20.248 10.64.20.249 10.64.20.250 10.64.20.251 10.64.20.252 10.64.20.253 10.64.20.254 } 
-Runner.log("With all tasks passing...")
+puts("With all tasks passing...")
 tasks = []
 50.times do |n|
   tasks << "sleep 2; date;"
 end
 tasks << "cat /foo/bar"
 
-Runner.run do |config|
+configuration = RemoteRun::Configuration.new do |config|
   config.tasks = tasks
   config.login_as = "pivotalcb"
   config.hosts = hosts
 end
 
-Runner.log("Expected one failure to test that it still works...")
+RemoteRun::Runner.new(configuration).run
+
+puts("Expected one failure to test that it still works...")

data/lib/remote_run/configuration.rb

@@ -69,6 +69,12 @@ module RemoteRun
         end
         @hosts
       end
+
+      def start_ssh_master_connections
+        hosts.each do |host|
+          host.start_ssh_master_connection
+        end
+      end
     end
 
     class TaskManager

data/lib/remote_run/runner.rb

@@ -23,8 +23,6 @@ module RemoteRun
       handle_results
     end
 
-    private
-
     def setup_unlock_on_exit
       at_exit do
         @configuration.hosts.each do |host|
@@ -37,9 +35,7 @@ module RemoteRun
     end
 
     def start_ssh_master_connections
-      @configuration.hosts.each do |host|
-        host.start_ssh_master_connection
-      end
+      @host_manager.start_ssh_master_connections
     end
 
     def sync_working_copy_to_temp_location
@@ -84,9 +80,11 @@ module RemoteRun
 
     def start_task(host)
       task = @task_manager.find_task
-      @children << fork do
+      task.pid = fork do
         start_forked_task(host, task)
       end
+      task.host = host
+      @children << task
     end
 
     def start_forked_task(host, task)
@@ -129,11 +127,15 @@ module RemoteRun
     end
 
     def check_for_finished
-      @children.each do |child_pid|
+      @children.each do |task|
+        child_pid = task.pid
         if task_is_finished?(child_pid)
-          @failed << child_pid unless $?.success?
+          unless $?.success?
+            @failed << child_pid
+            log("Task '#{task.command}' failed on #{task.host.hostname}")
+          end
           @results << $?.exitstatus
-          @children.delete(child_pid)
+          @children.delete(task)
         end
       end
     end

data/lib/remote_run/task.rb

@@ -1,8 +1,8 @@
 module RemoteRun
   class Task
-    attr_accessor :command
+    attr_accessor :command, :pid, :host
 
-    def initialize(command)
+    def initialize(command = nil)
       @command = command
     end
   end

data/lib/remote_run/version.rb

@@ -1,3 +1,3 @@
 module RemoteRun
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/remote_run/configuration_spec.rb

@@ -1,11 +1,12 @@
 require 'spec_helper'
 
 describe RemoteRun::Configuration::HostManager do
+  let(:host) { double(:host, is_up?: true, name: "foobar") }
   subject { RemoteRun::Configuration::HostManager.new }
 
   describe "#add" do
     it "adds the given host to a list of hosts" do
-      subject.add(stub(:host, :is_up? => true, :name => "foobar"))
+      subject.add(host)
       subject.hosts.size.should == 1
       subject.hosts.first.name.should == "foobar"
     end
@@ -13,7 +14,6 @@ describe RemoteRun::Configuration::HostManager do
 
   describe "#hosts" do
     it "returns all hosts in the list" do
-      host = stub(:host, :is_up? => true, :name => "foobar")
       subject.add(host)
       subject.hosts.should == [host]
     end
@@ -21,12 +21,11 @@ describe RemoteRun::Configuration::HostManager do
 
   describe "#start_ssh_master_connections" do
     before do
-      @host = stub(:host, :is_up? => true, :name => "foobar")
-      subject.add(@host)
+      subject.add(host)
     end
 
     it "asks each host to start their ssh master connection" do
-      @host.should_receive(:start_ssh_master_connection)
+      host.should_receive(:start_ssh_master_connection)
       subject.start_ssh_master_connections
     end
   end

data/spec/remote_run/runner_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe RemoteRun::Runner do
+  let(:host_manager) { double(:host_manager) }
+  let(:task_manager) { double(:task_manager, count: 0) }
+  let(:configuration) { double(:configuration, task_manager: task_manager, host_manager: host_manager) }
+  let(:runner) { RemoteRun::Runner.new(configuration) }
+  subject { runner }
+  it { should be }
+
+  describe "#start_ssh_master_connections" do
+    it "should delegate to the host manager" do
+      host_manager.should_receive(:start_ssh_master_connections)
+      runner.start_ssh_master_connections
+    end
+  end
+
+  describe "#start_task" do
+    let(:task) { RemoteRun::Task.new }
+    let(:host) { double(:host) }
+    let(:pid) { double(:pid) }
+    before do
+      runner.stub(:fork).and_return(pid)
+      task_manager.stub(:find_task).and_return(task)
+      runner.start_task(host)
+    end
+    describe "the task" do
+      subject { task }
+      its(:pid) { should == pid }
+      its(:host) { should == host }
+    end
+  end
+end

data/spec/remote_run/task_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe RemoteRun::Task do
+  let(:command) { double(:command) }
+  subject { RemoteRun::Task.new(command) }
+  it { should be }
+  its(:command) { should == command }
+
+  describe "pid attribute" do
+    let(:pid) { double(:pid) }
+    before { subject.pid = pid }
+    its(:pid) { should == pid }
+  end
+
+  describe "host attribute" do
+    let(:host) { double(:host) }
+    before { subject.host = host }
+    its(:host) { should == host }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_run
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2151951040 !ruby/object:Gem::Requirement
+  requirement: &2173524580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151951040
+  version_requirements: *2173524580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151943360 !ruby/object:Gem::Requirement
+  requirement: &2173523920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151943360
+  version_requirements: *2173523920
 description: Can be used as a parallel unit test runner
 email:
 - casecommons-dev@googlegroups.com
@@ -57,6 +57,7 @@ files:
 - spec/remote_run/configuration_spec.rb
 - spec/remote_run/host_spec.rb
 - spec/remote_run/runner_spec.rb
+- spec/remote_run/task_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/Casecommons/remote_run
 licenses: []
@@ -72,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3128109979642869878
+      hash: 3135936709983633521
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -81,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3128109979642869878
+      hash: 3135936709983633521
 requirements: []
 rubyforge_project: remote_run
 rubygems_version: 1.8.10
@@ -92,4 +93,5 @@ test_files:
 - spec/remote_run/configuration_spec.rb
 - spec/remote_run/host_spec.rb
 - spec/remote_run/runner_spec.rb
+- spec/remote_run/task_spec.rb
 - spec/spec_helper.rb