host.rb in remote_run-0.1.1

- old
+ new
@@ -1,129 +1,126 @@
-class Host
-  FAIL = 1
-  PASS = 0
-  SSH_CONFIG = " -o ControlMaster=auto -o ControlPath=~/.ssh/master-%l-%r@%h:%p -o NumberOfPasswordPrompts=0 -o StrictHostKeyChecking=no -4 "
-  attr_reader :hostname
-  attr_reader :lock_file
+module RemoteRun
+  class Host
+    FAIL = 1
+    PASS = 0
+    SSH_CONFIG = " -o ControlMaster=auto -o ControlPath=~/.ssh/master-%l-%r@%h:%p -o NumberOfPasswordPrompts=0 -o StrictHostKeyChecking=no -4 "
+    attr_reader :hostname
 
-  def initialize(hostname)
-    @hostname = hostname
-    @lock_file = LockFile.new(@hostname, $runner.local_hostname, $runner.identifier)
-  end
+    def initialize(hostname)
+      @hostname = hostname
+      @lock_file = LockFile.new(@hostname, $runner.local_hostname, $runner.identifier)
+    end
 
-  def lock
-    unless locked?
-      @lock_file.get && locked_by_me?
+    def lock
+      unless locked?
+        @lock_file.get && locked_by_me?
+      end
     end
-  end
 
-  def unlock
-    @lock_file.release
-  end
+    def unlock
+      @lock_file.release
+    end
 
-  def run(task)
-    Runner.log("Running '#{task}' on #{@hostname}", :white)
-    command = %Q{ssh #{SSH_CONFIG} #{ssh_host_and_user} 'cd #{$runner.remote_path}; #{task}' 2>&1}
-    system(command)
-    $?.exitstatus
-  end
-
-  def copy_codebase
-    Runner.log("Copying from #{$runner.temp_path} to #{@hostname}:#{$runner.remote_path}", :yellow)
-    system("ssh #{SSH_CONFIG} #{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}/})
-      Runner.log("Finished copying to #{@hostname}", :green)
-      return true
-    else
-      Runner.log("rsync failed on #{@hostname}.", :red)
-      return false
+    def run(task)
+      command = %Q{ssh #{SSH_CONFIG} #{ssh_host_and_user} 'cd #{$runner.remote_path}; #{task}' 2>&1}
+      system(command)
+      $?.exitstatus
     end
-  end
 
-  def is_up?
-    result = `ssh #{SSH_CONFIG} -o ConnectTimeout=2 #{ssh_host_and_user} "echo 'success'" 2>/dev/null`.strip
-    if result == "success"
-      Runner.log("#{@hostname} is up", :green)
-      return true
-    else
-      Runner.log("#{@hostname} is down: #{result}", :red)
-      return false
+    def copy_codebase
+      system("ssh #{SSH_CONFIG} #{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}/})
+        return true
+      else
+        return false
+      end
     end
-  end
 
-  def start_ssh_master_connection
-    system("ssh #{SSH_CONFIG} #{ssh_host_and_user} -M &> /dev/null")
-  end
-
-  private
-
-  def ssh_host_and_user
-    "#{$runner.login_as}@#{@hostname}"
-  end
-
-  def locked?
-    @lock_file.locked?
-  end
-
-  def locked_by_me?
-    @lock_file.locked_by_me?
-  end
-
-  class LockFile
-    FILE = "/tmp/remote-run-lock"
-
-    def initialize(remote_hostname, local_hostname, unique_run_marker)
-      @filename = FILE
-      @locker = "#{local_hostname}-#{unique_run_marker}"
-      @remote_file = RemoteFile.new(remote_hostname)
+    def is_up?
+      result = `ssh #{SSH_CONFIG} -o ConnectTimeout=2 #{ssh_host_and_user} "echo 'success'" 2>/dev/null`.strip
+      if result == "success"
+        return true
+      else
+        return false
+      end
     end
 
-    def release
-      if locked_by_me?
-        @remote_file.delete(@filename)
+    def start_ssh_master_connection
+      fork do
+        system("ssh #{SSH_CONFIG} #{ssh_host_and_user} -M &> /dev/null")
       end
     end
 
+    private
+
+    def ssh_host_and_user
+      "#{$runner.login_as}@#{@hostname}"
+    end
+
     def locked?
-      @remote_file.exist?(@filename)
+      @lock_file.locked?
     end
 
     def locked_by_me?
-      @remote_file.exist?(@filename) && @remote_file.read(@filename).strip == @locker
+      @lock_file.locked_by_me?
     end
 
-    def get
-      @remote_file.write(@filename, @locker)
-    end
+    class LockFile
+      FILE = "/tmp/remote-run-lock"
 
-    class RemoteFile
-      def initialize(hostname)
-        @hostname = hostname
+      def initialize(remote_hostname, local_hostname, unique_run_marker)
+        @filename = FILE
+        @locker = "#{local_hostname}-#{unique_run_marker}"
+        @remote_file = RemoteFile.new(remote_hostname)
       end
 
-      def exist?(file_path)
-        run_and_test("test -f #{file_path}")
+      def release
+        if locked_by_me?
+          @remote_file.delete(@filename)
+        end
       end
 
-      def read(file_path)
-        run("test -e #{file_path} && cat #{file_path}")
+      def locked?
+        @remote_file.exist?(@filename)
       end
 
-      def write(file_path, text)
-        run_and_test("test -e #{file_path} || echo #{text} > #{file_path}")
+      def locked_by_me?
+        @remote_file.exist?(@filename) && @remote_file.read(@filename).strip == @locker
       end
 
-      def delete(file_path)
-        run_and_test("rm -f #{file_path}")
+      def get
+        @remote_file.write(@filename, @locker)
       end
 
-      def run(command)
-        `ssh #{Host::SSH_CONFIG} #{$runner.login_as}@#{@hostname} '#{command};'`.strip
-      end
+      class RemoteFile
+        def initialize(hostname)
+          @hostname = hostname
+        end
 
-      def run_and_test(command)
-        system("ssh #{Host::SSH_CONFIG} #{$runner.login_as}@#{@hostname} '#{command}' 2>/dev/null")
+        def exist?(file_path)
+          run_and_test("test -f #{file_path}")
+        end
+
+        def read(file_path)
+          run("test -e #{file_path} && cat #{file_path}")
+        end
+
+        def write(file_path, text)
+          run_and_test("test -e #{file_path} || echo #{text} > #{file_path}")
+        end
+
+        def delete(file_path)
+          run_and_test("rm -f #{file_path}")
+        end
+
+        def run(command)
+          `ssh #{Host::SSH_CONFIG} #{$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")
+        end
       end
     end
   end
 end
 