ndo 0.2.1 → 0.2.2

data/Gemfile

@@ -1,10 +1,15 @@
 source "http://rubygems.org"
 
-gem 'open4',          '~> 1.0.1'
-gem 'procrastinate',  '~> 0.3.0'
-gem 'text-highlight', '~> 1.0.0'
+gem 'open4',          '>= 0.9'
+gem 'procrastinate',  '~> 0.3'
+gem 'text-highlight', '~> 1.0'
 
 group :development do
   gem 'rspec'
   gem 'flexmock'
+  
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'rb-fsevent'
+  gem 'growl_notify'
 end

data/Gemfile.lock

@@ -1,28 +1,41 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
-    flexmock (0.8.11)
-    open4 (1.0.1)
-    procrastinate (0.3.0)
+    diff-lcs (1.1.3)
+    flexmock (0.9.0)
+    growl_notify (0.0.1)
+      rb-appscript
+    guard (0.6.3)
+      thor (~> 0.14.6)
+    guard-rspec (0.4.5)
+      guard (>= 0.4.0)
+    open4 (1.1.0)
+    procrastinate (0.3.1)
       state_machine (~> 0.9.4)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rb-appscript (0.6.1)
+    rb-fsevent (0.4.3.1)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec-mocks (2.6.0)
     state_machine (0.9.4)
     text-highlight (1.0.2)
+    thor (0.14.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   flexmock
-  open4 (~> 1.0.1)
-  procrastinate (~> 0.3.0)
+  growl_notify
+  guard
+  guard-rspec
+  open4 (>= 0.9)
+  procrastinate (~> 0.3)
+  rb-fsevent
   rspec
-  text-highlight (~> 1.0.0)
+  text-highlight (~> 1.0)

data/README

@@ -0,0 +1,33 @@
+ndo does things N times. 
+
+SYNOPSIS
+
+  mc = Ndo::MultiCommand.new('uname -n', %w(hostA hostB hostC))
+  results = mc.run
+  
+  results['hostA'] # => 'hostA'
+  results.each do |result|
+    result # => "hostA", "hostB", "hostC"
+  end
+  
+ON THE COMMAND LINE
+
+1) Create a host set
+
+A host set is a file in below ~/.ndo that contains a list of host names,
+separated by newlines. Easily generated. 
+
+2) Run a command on a host set
+
+  $ ndo my_host_set ls
+  callisto     Tue Sep 13 09:17:41 CEST 2011
+  cyllene      Tue Sep 13 09:17:41 CEST 2011
+  helike       Tue Sep 13 09:17:41 CEST 2011
+  himalia      Tue Sep 13 09:17:41 CEST 2011
+  
+As you can see, it appears that time synch works on these machines. 
+
+STATUS
+
+This is a very early version; It could handle errors better. That said, ndo is
+a very useful tool that can replace vlad or capistrano for easy things. 

data/bin/ndo

@@ -29,9 +29,10 @@ require 'text/highlight'
 hl = Text::ANSIHighlighter.new
 String.highlighter = hl
 
-results = Ndo::MultiCommand.new(command, hosts).run
-results.each do |host, output|
-  output.chomp!
+results = Ndo::MultiHost.new(hosts).run(command)
+results.each do |host, result|
+  output = result.stdout.chomp
+  
   if output.index("\n")
     # Multiline output
     output.gsub!(/\n/, "\n    ")

data/lib/ndo.rb

@@ -1,4 +1,8 @@
 
 module Ndo
-  autoload :MultiCommand, 'ndo/multi_command'
-end
+end
+
+require 'ndo/host'
+require 'ndo/popen'
+require 'ndo/result'
+require 'ndo/multi_host'

data/lib/ndo/host.rb

@@ -1,6 +1,9 @@
 require 'stringio'
 require 'open4'
 
+# Runs a command via ssh on a host. This is initially stolen from vlad (the
+# deployer), then rewritten and modified. 
+#
 class Ndo::Host
   attr_reader :name
   def initialize(hostname)
@@ -20,61 +23,65 @@ class Ndo::Host
     end
   end
   
-  def run command
-    cmd = ['ssh', name, command].flatten
-    result = []
-
-    pid, inn, out, err = Open4.popen4(*cmd)
-
-    inn.sync   = true
-    streams    = [out, err]
-    out_stream = {
-      out => StringIO.new,
-      err => StringIO.new,
-    }
-
-    # Handle process termination ourselves
-    status = nil
-    Thread.start do
-      status = Process.waitpid2(pid).last
+  class Accumulator
+    attr_reader :buffer
+    
+    def initialize(stream)
+      @stream = stream
+      @buffer = ''
+      @eof = false
     end
-
-    until streams.empty? do
-      # don't busy loop
-      selected, = select streams, nil, nil, 0.1
-
-      next if selected.nil? or selected.empty?
-
-      selected.each do |stream|
-        if stream.eof? then
-          streams.delete stream if status # we've quit, so no more writing
-          next
-        end
-
-        data = stream.readpartial(1024)
-        out_stream[stream].write data
-        # 
-        # if stream == err and data =~ sudo_prompt then
-        #   inn.puts sudo_password
-        #   data << "\n"
-        #   $stderr.write "\n"
-        # end
-
-        result << data
-      end
+    
+    def copy_if_ready(ready_list)
+      return unless ready_list.include?(@stream)
+      
+      @buffer << @stream.read_nonblock(1024)
+    rescue EOFError
+      @eof = true
     end
-
-    unless status.success? then
+    
+    def eof?
+      @eof
+    end
+  end
+  
+  def run(command)
+    cmd = ['ssh', name, command].flatten
+    
+    process = Ndo.popen(*cmd)
+    accums = [
+      Accumulator.new(process.stdout), 
+      Accumulator.new(process.stderr)]
+    
+    # Copy stdout, stderr to buffers
+    loop do
+      ios = [process.stdout, process.stderr]
+      ready,_,_ = IO.select(ios)
+      
+      # Test for process closed
+      break if accums.any? { |acc| acc.eof? }
+      
+      # Copy data
+      accums.each { |acc| acc.copy_if_ready(ready) }
+    end
+    
+    # We're done reading: prepare return value
+    buffers = accums.map { |acc| acc.buffer  }
+    
+    process.wait 
+    
+    # Raise ExecutionFailure if the command failed
+    unless process.success?
+      status = process.status
       raise ExecutionFailure.new(
         "Command failed (#{status.inspect})", 
-        *streams.map { |strm| out_stream[strm].string }
+        *buffers
       )
     end
-
-    out_stream.map { |io, copy| copy.string }
+    
+    # Return [STDOUT, STDERR] buffers
+    buffers
   ensure
-    inn.close rescue nil
-    out.close rescue nil
-    err.close rescue nil
+    process.close_all
   end
 end

data/lib/ndo/{multi_command.rb → multi_host.rb}

@@ -2,39 +2,36 @@
 require 'procrastinate'
 require 'procrastinate/implicit'
 
-require 'ndo/results'
-require 'ndo/host'
-
 # A class to execute a command on a list of hosts in parallel; allows access
 # to results and is thus a) multi threaded and b) Ruby 1.9.2 only. 
 #
-class Ndo::MultiCommand
+class Ndo::MultiHost
   include Procrastinate
 
-  attr_reader :command
   attr_reader :hosts
   
-  def initialize(command, hosts)
-    @command  = command
+  def initialize(hosts)
     @hosts    = hosts
   end
   
   # Runs the command on all hosts. Returns a result collection. 
   #
-  def run
+  def run(command)
     proxy = Procrastinate.proxy(self)
 
-    Ndo::Results.new.tap { |results| 
-      hosts.each { |host|
-        results.store host, proxy.run_for_host(host)
-      }}
+    hosts.inject(Hash.new) do |hash, host_name|
+      hash[host_name] = Ndo::Result.new(
+        host_name, 
+        proxy.run_for_host(command, host_name))
+      hash
+    end
   end
   
-  def run_for_host(host)
+  def run_for_host(command, host)
     begin
-      Ndo::Host.new(host).run(@command).first
+      Ndo::Host.new(host).run(command)
     rescue => b
-      "Failure: #{b}"
+      b
     end
   end
 end

data/lib/ndo/popen.rb

@@ -0,0 +1,54 @@
+
+module Ndo
+  Process = Struct.new(:pid, :stdin, :stdout, :stderr) do
+    def status
+      wait unless @status
+      @status
+    end
+    def wait
+      _, @status = ::Process.waitpid2(pid)
+    end
+    def success?
+      status.success?
+    end
+    def close_all
+      [stdin, stdout, stderr].
+        each(&:close)
+    end
+  end
+  
+  Pipe = Struct.new(:read, :write)
+  
+  # NOTE: This was using the Open4 gem previously. That method turned out to
+  # not be portable across rubies and operating systems, that's why we try
+  # our luck with maintaining this popen4 here. 
+  #
+  def popen(*cmd)
+    c_in, c_out, c_err = 3.times.map { Pipe.new(*IO.pipe) }
+
+    pid = fork do
+      c_in.write.close
+      STDIN.reopen(c_in.read)
+      c_in.read.close
+      
+      c_out.read.close
+      STDOUT.reopen(c_out.write)
+      c_out.write.close
+      
+      c_err.read.close
+      STDERR.reopen(c_err.write)
+      c_err.write.close
+      
+      exec(*cmd)
+      fail "NOT REACHED: EXEC FAILED"
+    end
+
+    c_in.read.close
+    c_out.write.close
+    c_err.write.close
+    
+    # c_in.sync = true
+    Process.new(pid, c_in.write, c_out.read, c_err.read)
+  end
+  module_function :popen
+end

data/lib/ndo/result.rb

@@ -0,0 +1,31 @@
+
+# Represents a command result for a single host. 
+#
+class Ndo::Result
+  attr_reader :host_name
+  attr_reader :future
+  
+  def initialize(host_name, future)
+    @host_name, @future = host_name, future
+  end
+  
+  def value
+    future.value
+  end
+  
+  def stdout
+    value.first
+  end
+  
+  def stderr
+    value.last
+  end
+  
+  def success?
+    value.kind_of?(Array)
+  end
+  
+  def exception
+    value
+  end
+end

metadata

@@ -1,143 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ndo
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
+version: !ruby/object:Gem::Version
+  version: 0.2.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Kaspar Schiess
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-28 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: open4
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 1
-        version: 1.0.1
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+date: 2011-09-13 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: procrastinate
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70263477941020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: text-highlight
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70263477941020
+- !ruby/object:Gem::Dependency
+  name: text-highlight
+  requirement: &70263477940560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70263477940560
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70263477940180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: flexmock
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70263477940180
+- !ruby/object:Gem::Dependency
+  name: flexmock
+  requirement: &70263477939760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *70263477939760
 description: 
 email: kaspar.schiess@absurd.li
-executables: 
+executables:
 - ndo
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README
 - lib/ndo/host.rb
-- lib/ndo/multi_command.rb
-- lib/ndo/results.rb
+- lib/ndo/multi_host.rb
+- lib/ndo/popen.rb
+- lib/ndo/result.rb
 - lib/ndo.rb
 - bin/ndo
-has_rdoc: true
 homepage: http://blog.absurd.li
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Execute commands on multiple hosts at once.
 test_files: []
-

data/lib/ndo/results.rb

@@ -1,25 +0,0 @@
-
-class Ndo::Results
-  def initialize
-    @map = Hash.new
-  end
-  
-  def [](host)
-    @map[host].value
-  end
-  
-  include Enumerable
-  def each
-    @map.each { |host, future| 
-      begin
-        yield host, future.value
-      rescue Procrastinate::ChildDeath
-        
-      end }
-  end
-  
-  def store(host, future)
-    @map.store host, future
-  end
-end
-