remote_run 0.1.4 → 0.1.5

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format=nested

data/.rvmrc

@@ -1,3 +1 @@
-export rvm_path="/Users/pivotal/.rvm"
-rvm_gemset_create_on_use_flag=1
-rvm_install_on_use_flag=1
+rvm 1.9.2-p180-patched@remote_run --create

data/Gemfile

@@ -1,7 +1,10 @@
 source "http://rubygems.org"
 
+gemspec
+
 gem "highline"
-gem "rspec"
 gem "rake"
-
-gemspec
+group :development do
+  gem "rspec"
+  gem "ruby-debug19"
+end

data/Rakefile

@@ -1,2 +1,11 @@
+require 'rake'
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+task :default => :spec
+
+desc "Run all specs in spec directory (excluding plugin specs)"
+RSpec::Core::RakeTask.new(:spec)

data/lib/remote_run/configuration.rb

@@ -1,6 +1,7 @@
 module RemoteRun
   class Configuration
-    attr_accessor :remote_path, :local_path, :login_as, :exclude, :temp_path, :quiet, :before_task, :after_task, :before_run, :after_run, :around_task, :around_run
+    attr_accessor :remote_path, :local_path, :login_as, :exclude, :temp_path, :quiet, :before_task, :after_task, :before_run, :after_run, :around_task, :around_run,
+      :known_hosts, :ssh_options, :rsync_options
     attr_reader :local_hostname, :identifier, :start_time
     attr_reader :host_manager, :task_manager
 
@@ -9,12 +10,15 @@ module RemoteRun
       @host_manager = HostManager.new
 
       @local_path = Dir.getwd
-      @login_as = `whoami`.strip
+      @login_as = ENV["USER"]
       @remote_path = "/tmp/remote"
       @exclude = []
       @temp_path = "/tmp/remote"
       @quiet = false
       @start_time = Time.now
+      @known_hosts = File.expand_path("#{ENV['HOME']}/.ssh/known_hosts")
+      @ssh_options = "-o NoHostAuthenticationForLocalhost=yes -o UserKnownHostsFile=#{known_hosts} -o NumberOfPasswordPrompts=0 -o StrictHostKeyChecking=no -o ConnectTimeout=3 -4 "
+      @rsync_options = "--delete --rsh='ssh #{ssh_options}' --timeout=60 -a"
 
       # used in the runner
       @identifier = `echo $RANDOM`.strip
@@ -27,7 +31,7 @@ module RemoteRun
       @after_task = Proc.new{}
       @around_task = Proc.new {|&block| block.call }
       $runner = self
-      yield self
+      yield self if block_given?
     end
 
     def hosts
@@ -40,7 +44,7 @@ module RemoteRun
 
     def hosts=(hostnames)
       hostnames.each do |hostname|
-        @host_manager.add(Host.new(hostname))
+        @host_manager.add(Host.new(hostname, self))
       end
     end
 

data/lib/remote_run/host.rb

@@ -2,12 +2,12 @@ module RemoteRun
   class Host
     FAIL = 1
     PASS = 0
-    SSH_CONFIG = " -o NumberOfPasswordPrompts=0 -o StrictHostKeyChecking=no -4 "
-    attr_reader :hostname
+    attr_reader :hostname, :configuration
 
-    def initialize(hostname)
+    def initialize(hostname, configuration)
       @hostname = hostname
-      @lock_file = LockFile.new(@hostname, $runner.local_hostname, $runner.identifier)
+      @lock_file = LockFile.new(@hostname, $runner.local_hostname, $runner.identifier, configuration)
+      @configuration = configuration
     end
 
     def lock
@@ -21,15 +21,15 @@ module RemoteRun
     end
 
     def run(task)
-      command = %Q{ssh #{SSH_CONFIG} #{ssh_host_and_user} 'cd #{$runner.remote_path}; #{task}' 2>&1}
+      command = %Q{ssh #{configuration.ssh_options} #{ssh_host_and_user} 'cd #{$runner.remote_path}; #{task}' 2>&1}
       system(command)
       $?.exitstatus
     end
 
     def copy_codebase
-      system("ssh #{SSH_CONFIG} #{ssh_host_and_user} 'mkdir -p #{$runner.remote_path}'")
+      system("ssh #{configuration.ssh_options} #{ssh_host_and_user} 'mkdir -p #{$runner.remote_path}'")
       excludes = $runner.exclude.map { |dir| "--exclude '#{dir}'"}
-      if system(%{rsync --delete --delete-excluded #{excludes.join(" ")} --rsh='ssh #{SSH_CONFIG}' --timeout=60 -a #{$runner.temp_path}/ #{ssh_host_and_user}:#{$runner.remote_path}/})
+      if system(%{rsync #{configuration.rsync_options} --delete-excluded #{excludes.join(" ")} #{$runner.temp_path}/ #{ssh_host_and_user}:#{$runner.remote_path}/})
         return true
       else
         return false
@@ -37,7 +37,7 @@ module RemoteRun
     end
 
     def is_up?
-      result = `ssh #{SSH_CONFIG} -o ConnectTimeout=2 #{ssh_host_and_user} "echo 'success'" 2>/dev/null`.strip
+      result = `ssh #{configuration.ssh_options} #{ssh_host_and_user} "echo 'success'" 2>/dev/null`.strip
       if result == "success"
         return true
       else
@@ -47,7 +47,7 @@ module RemoteRun
 
     def start_ssh_master_connection
       fork do
-        system("ssh #{SSH_CONFIG} #{ssh_host_and_user} -M &> /dev/null")
+        system("ssh #{configuration.ssh_options} #{ssh_host_and_user} -M &> /dev/null")
       end
     end
 
@@ -68,10 +68,10 @@ module RemoteRun
     class LockFile
       FILE = "/tmp/remote-run-lock"
 
-      def initialize(remote_hostname, local_hostname, unique_run_marker)
+      def initialize(remote_hostname, local_hostname, unique_run_marker, configuration)
         @filename = FILE
         @locker = "#{local_hostname}-#{unique_run_marker}"
-        @remote_file = RemoteFile.new(remote_hostname)
+        @remote_file = RemoteFile.new(remote_hostname, configuration)
       end
 
       def release
@@ -93,8 +93,9 @@ module RemoteRun
       end
 
       class RemoteFile
-        def initialize(hostname)
+        def initialize(hostname, configuration)
           @hostname = hostname
+          @configuration = configuration
         end
 
         def exist?(file_path)
@@ -114,11 +115,11 @@ module RemoteRun
         end
 
         def run(command)
-          `ssh #{Host::SSH_CONFIG} #{$runner.login_as}@#{@hostname} '#{command};'`.strip
+          `ssh #{@configuration.ssh_options} #{$runner.login_as}@#{@hostname} '#{command};'`.strip
         end
 
         def run_and_test(command)
-          system("ssh #{Host::SSH_CONFIG} #{$runner.login_as}@#{@hostname} '#{command}' 2>/dev/null")
+          system("ssh #{@configuration.ssh_options} #{$runner.login_as}@#{@hostname} '#{command}' 2>/dev/null")
         end
       end
     end

data/lib/remote_run/runner.rb

@@ -39,7 +39,7 @@ module RemoteRun
     def sync_working_copy_to_temp_location
       log("Creating temporary copy of #{@configuration.local_path} in #{@configuration.temp_path}...")
       excludes = @configuration.exclude.map { |dir| "--exclude '#{dir}'"}
-      system("rsync --delete --delete-excluded #{excludes.join(" ")} -aq #{@configuration.local_path}/ #{@configuration.temp_path}/")
+      system("rsync #{Configuration::RSYNC_CONFIG} --delete-excluded #{excludes.join(" ")} -q #{@configuration.local_path}/ #{@configuration.temp_path}/")
       log("Done.")
     end
 

data/lib/remote_run/version.rb

@@ -1,3 +1,3 @@
 module RemoteRun
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/remote_run/configuration_spec.rb

@@ -1,21 +1,18 @@
 require 'spec_helper'
 describe RemoteRun::Configuration do
-  let(:hosts){ ["foo", "bar"] }
-  let(:user){ "baz" }
-  let!(:pre_run) { double(call: true) }
-  let!(:post_run) { double(call: true) }
+  let!(:before_run) { double(call: true) }
+  let!(:after_run) { double(call: true) }
   subject do
     RemoteRun::Configuration.new do |config|
-      config.hosts = hosts
-      config.login_as = user
-      config.pre_run = pre_run
-      config.post_run = post_run
+      config.before_run = before_run
+      config.around_run = Proc.new {}
+      config.after_run = after_run
     end
   end
 
   it "pre_run should have a callable block" do
-    pre_run.should_receive(:call).once
-    post_run.should_receive(:call).once
+    before_run.should_receive(:call).once
+    after_run.should_receive(:call).once
     subject.run
   end
 end

data/spec/remote_run/host_spec.rb

@@ -1,9 +1,10 @@
 require 'spec_helper'
 
 describe RemoteRun::Host do
-  context "when locking" do
-    let(:host) { RemoteRun::Host.new("localhost") }
+  let(:configuration) { RemoteRun::Configuration.new }
+  let(:host) { RemoteRun::Host.new("localhost", configuration) }
 
+  context "when locking" do
     it "can be locked" do
       host.lock.should be_true
     end
@@ -15,15 +16,14 @@ describe RemoteRun::Host do
 
     it "tells the lock file to get a lock" do
       host.lock
-      `ssh localhost 'cat /tmp/remote-run-lock'`.strip.should == "#{$runner.local_hostname}-#{$runner.identifier}"
+      ssh_command("localhost", "test -e #{RemoteRun::Host::LockFile::FILE} && cat #{RemoteRun::Host::LockFile::FILE}").should == "#{$runner.local_hostname}-#{$runner.identifier}"
     end
   end
 
   context "when locked by someone else" do
     before { lock_file.get }
-    let(:host) { RemoteRun::Host.new("localhost") }
     let(:lock_file) {
-      lock_file = RemoteRun::Host::LockFile.new("localhost", "myfakelocalhost", "999")
+      lock_file = RemoteRun::Host::LockFile.new("localhost", "myfakelocalhost", "999", configuration)
     }
 
     it "cannot be unlocked by me" do
@@ -33,8 +33,6 @@ describe RemoteRun::Host do
 
   context "when locked by me" do
     before { host.lock }
-    let(:host) { RemoteRun::Host.new("localhost") }
-
     it "cannot be locked" do
       host.lock.should be_false
     end
@@ -44,23 +42,21 @@ describe RemoteRun::Host do
     end
 
     it "removes a file on the remote filesystem to unlock" do
-      `ssh localhost 'test -e /tmp/remote-run-lock'; echo $?;`.strip.should == "0"
+      ssh_command("localhost", "test -e #{RemoteRun::Host::LockFile::FILE}; echo $?").should == "0"
       host.unlock
-      `ssh localhost 'test -e /tmp/remote-run-lock'; echo $?;`.strip.should == "1"
+      ssh_command("localhost", "test -e #{RemoteRun::Host::LockFile::FILE}; echo $?").should == "1"
     end
   end
 
   context "when checking to see if a host is up" do
     context "when using an authorized host" do
-      let(:host) { RemoteRun::Host.new("localhost") }
-
       it "returns true" do
         host.is_up?.should be_true
       end
     end
 
     context "when using an unauthorized host" do
-      let(:host) { RemoteRun::Host.new("foozmcbarry") }
+      let(:host) { RemoteRun::Host.new("foozmcbarry", configuration) }
 
       it "returns false" do
         host.is_up?.should be_false
@@ -70,12 +66,10 @@ describe RemoteRun::Host do
 
   context "when running a task" do
     before do
-      `ssh localhost 'rm -rf /tmp/testing-remote-run'`
+      ssh_command "localhost", "rm -rf /tmp/testing-remote-run"
       host.lock
     end
 
-    let(:host) { RemoteRun::Host.new("localhost") }
-
     context "when executing a shell command with a zero status code" do
       it "returns zero" do
         host.run("date > /dev/null").should == 0
@@ -91,17 +85,15 @@ describe RemoteRun::Host do
 
   describe "#copy_codebase" do
     before do
-      `ssh localhost 'rm -rf /tmp/testing-remote-run'`
+      ssh_command "localhost", "rm -rf /tmp/testing-remote-run"
       host.lock
     end
 
-    let(:host) { RemoteRun::Host.new("localhost") }
-
     it "copies the codebase to a remote directory" do
       $runner.remote_path = "/tmp/testing-remote-run"
-      `ssh localhost 'test -e /tmp/testing-remote-run'; echo $?`.strip.should_not == "0"
+      ssh_command("localhost", "test -e /tmp/testing-remote-run; echo $?").should_not == "0"
       host.copy_codebase
-      `ssh localhost 'test -e /tmp/testing-remote-run'; echo $?`.strip.should == "0"
+      ssh_command("localhost", "test -e /tmp/testing-remote-run; echo $?").should == "0"
     end
   end
 end

data/spec/remote_run/runner_spec.rb

@@ -3,7 +3,7 @@ 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(:configuration) { double(:configuration, before_task: nil, after_task: nil,around_task: nil, task_manager: task_manager, host_manager: host_manager) }
   let(:runner) { RemoteRun::Runner.new(configuration) }
   subject { runner }
   it { should be }

data/spec/spec_helper.rb

@@ -14,3 +14,9 @@ RSpec.configure do |config|
     system("rm -f #{RemoteRun::Host::LockFile::FILE}")
   end
 end
+
+def ssh_command(host, cmd)
+  result = `ssh -q -o NoHostAuthenticationForLocalhost=yes -o UserKnownHostsFile=/dev/null -o NumberOfPasswordPrompts=0 -o StrictHostKeyChecking=no -o ConnectTimeout=3 -4 #{host} '#{cmd}'`.strip
+  raise "SSH Execution Error: #{result}" unless $?.success?
+  result
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_run
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-04 00:00:00.000000000Z
+date: 2012-01-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2165476480 !ruby/object:Gem::Requirement
+  requirement: &70153015390580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165476480
+  version_requirements: *70153015390580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2165475960 !ruby/object:Gem::Requirement
+  requirement: &70153015390040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165475960
+  version_requirements: *70153015390040
 description: Can be used as a parallel unit test runner
 email:
 - casecommons-dev@googlegroups.com
@@ -41,6 +41,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .rvmrc
 - Gemfile
 - LICENSE
@@ -71,15 +72,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2891303972546043614
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2891303972546043614
 requirements: []
 rubyforge_project: remote_run
-rubygems_version: 1.8.11
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: Run N shell scripts on a pool of remote hosts