cluster_bomb 0.2.6 → 0.3.0

data/lib/cluster_bomb/bomb.rb

@@ -142,7 +142,7 @@ module ClusterBomb
       if @configuration.has_ssh_options? user
         ssh_options = @configuration.ssh_options(user)
       else
-        ssh_options={}
+        ssh_options={} # Use ssh agent or config file
       end
       @username = ssh_options[:user] || user
       @cluster.credentials(@username, ssh_options)

data/lib/cluster_bomb/bomb_shell.rb

@@ -1,4 +1,4 @@
-require 'readline'
+require 'rb-readline'
 require 'cluster_bomb/history.rb'
 require 'cluster_bomb/logging.rb'
 require 'cluster_bomb/dispatcher.rb'

data/lib/cluster_bomb/cluster.rb

@@ -2,6 +2,7 @@ require 'net/ssh'
 require 'net/scp'
 require 'net/sftp'
 require 'cluster_bomb/logging'
+require 'shellwords'
 
 # Represents a cluster of hosts over which to operate
 module ClusterBomb
@@ -109,12 +110,14 @@ module ClusterBomb
         elsif !host.connect_failed
           Thread.new {
             begin
-              #puts "Connecting #{host.name}"          
-              c = Net::SSH.start(host.name, @user_name, @ssh_options)
+              #puts "Connecting #{host.name}"
+              name, port = host.name.split(':')
+              port ||= "22"
+              c = Net::SSH.start(name, @user_name, @ssh_options.merge({:port=>port.to_i}))
               @connection_cache[host.name] = c
               @connection_mutex.synchronize { @connections << {:connection=>c, :host=>host} }
               host.connected=true
-              #puts "Connected #{host.name}"          
+              #puts "Connected #{host.name}"
             rescue Exception => e
               host.connect_failed = true
               host.connected=false
@@ -183,7 +186,7 @@ module ClusterBomb
        
     # Build sudo-fied command. Really only works for bash afaik   
     def mksudo(command)
-      "sudo sh -c '(#{command})'"
+      "sudo /bin/bash -c #{Shellwords.escape(command)}"
     end 
     
     def run(command, options={}, &task)

data/lib/cluster_bomb/dispatcher.rb

@@ -19,9 +19,9 @@ module ClusterBomb
     COMMAND_AUTOCOMPLETE = COMMANDS.collect{|c|c[:name]} + ['with','use']
     def init_autocomplete
       Readline.completion_proc=proc {|s| self.dispatcher_completion_proc(s)}
-      Readline.completer_word_break_characters = 7.chr  
+      Readline.completer_word_break_characters = 7.chr
       Readline.completion_case_fold = true
-      Readline.completion_append_character = ''      
+      Readline.completion_append_character = ''
     end
     def process_cmd(line)
        # cmd = cmd.strip.downcase
@@ -44,10 +44,11 @@ module ClusterBomb
          puts "Available commands:"
          COMMANDS.each do |cr|
            puts "    #{cr[:name]} - #{cr[:description]}"
-         end         
+         end
        end
        return true
     end
+
     def dispatcher_completion_proc(s)      
       # No line buffer for mac, so no way to get command context
       # Very lame with libedit. Will not return candidates, and 
@@ -61,7 +62,7 @@ module ClusterBomb
         tokens << ''
       end
       # Initial command only
-      if tokens.length <= 1 && tokens[0] != '\\'
+      if tokens.length  <= 1 && tokens[0] != '\\'
         ret = COMMAND_AUTOCOMPLETE.grep(/^#{s}/)
       else
         if tokens[0]=~/:?with.*/
@@ -78,16 +79,16 @@ module ClusterBomb
           ret = shawtie_names.grep(/#{tokens[0][1..-1]}/)
           ret = ret.collect {|r|"\\#{r}"}
         end
-        
-      end      
+
+      end
       ret
     end
-    
+
     def dir_completion_proc(tokens)
       choices=dir_list(tokens[1])
       secondary_completion_proc(tokens,choices)
     end
-    
+
     def dir_list(token)
       m = token.match(/(.*\/).*$/)
       if m && m[1]
@@ -97,10 +98,10 @@ module ClusterBomb
       end      
       ret.collect {|p| (File.directory? p) ? "#{p}/" : "#{p}"}
     end
-    
+
     def secondary_completion_proc(tokens, choices)
       if tokens[1]==''
-        choices
+        choices.collect {|c| "#{tokens[0]} #{c}"}
       else
         tokens[1] = tokens[1].gsub(/\./,'\.')
         choices.grep(/^#{tokens[1]}/).collect {|c| "#{tokens[0]} #{c}"}

metadata

@@ -1,76 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cluster_bomb
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 6
-  version: 0.2.6
+version: !ruby/object:Gem::Version
+  version: 0.3.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - hayzeus
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-10 00:00:00 -06:00
-default_executable: cb
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: net-ssh
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: net-scp
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: net-sftp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: Capistrano-like multi-host shell and task execution
 email: mikey@swampgas.com
-executables: 
+executables:
 - cb
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/cb
 - lib/cluster_bomb/actest.rb
 - lib/cluster_bomb/bomb.rb
@@ -84,39 +95,29 @@ files:
 - lib/cluster_bomb/roles.rb
 - lib/cluster_bomb/shawties.rb
 - lib/cluster_bomb/stdtasks.rb
-has_rdoc: true
 homepage: http://www.swampgas.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-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: 
-      - 1
-      - 8
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
+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.1
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Do stuff across clusters
 test_files: []
-
+has_rdoc: