octosh 0.0.6 → 0.0.7

data/Gemfile

@@ -5,6 +5,7 @@ gem 'net-scp', '1.0.4'
 gem 'highline', '1.6.15'
 gem 'uuid', '2.3.5'
 gem 'parallel', '0.5.19'
+gem 'colorize', '0.5.8'
 
 group :test do
   gem 'rake', '0.9.2.2'

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    colorize (0.5.8)
     diff-lcs (1.1.3)
     highline (1.6.15)
     macaddr (1.6.1)
@@ -26,6 +27,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  colorize (= 0.5.8)
   highline (= 1.6.15)
   net-scp (= 1.0.4)
   net-ssh (= 2.6.1)

data/lib/octosh/cli.rb

@@ -11,41 +11,54 @@ module Octosh
     class MODE
       CONFIG = :config
       INLINE = :inline
+      INTERACTIVE = :interactive
     end
     
     @password = nil
     
     def self.start
-      options = OpenStruct.new
+      options = {}
+      
+      # Default configuration
+      options[:default_user] = "root"
+      options[:password_prompt] = true
+      options[:uniform_password] = false
+      options[:forward_agent] = false
+      options[:interactive] = false
 
       optparse = OptionParser.new do|opts|
         opts.banner = "Usage: octosh [options] [octo config file]"
         
         opts.on('-c', '--config FILE', 'Octo config file') do |file|
-          options.config = file
+          options[:config] = file
         end
         
+        opts.on('-i', '--interactive', 'Interactive shell prompt') do
+          options[:interactive] = true
+        end
+          
         opts.on('-b', '--bash COMMAND', 'Explicitly define a command(s) to run on all hosts (Requires --hosts switch)') do |bash|
-          options.bash = bash
+          options[:bash] = bash
         end
         
         opts.on('-s', '--script SCRIPT', 'Path to script to run on all hosts (Requires --hosts switch)') do |script|
-          options.script = script
+          options[:script] = script
         end
         
         opts.on('-r', '--hosts USER@HOST,USER@HOST', Array, 'Lists of hosts to use when using inline execution (with -b or -s switches)') do |list|
-          options.hosts = list
+          options[:hosts] = list
         end
         
-        options.default_user = "root"
         opts.on('-u', '--user USER', 'User to use when a user isn\'t defined in the --hosts list (ie. just IP address)') do |user|
-          options.default_user = user
+          options[:default_user] = user
         end
         
-        options.password_prompt = true
-        options.uniform_password = false
         opts.on('-p', '--uniform-password', 'Uniform password') do
-          options.uniform_password = true
+          options[:uniform_password] = true
+        end
+        
+        opts.on('--forward-agent', 'Forward Agent') do
+          options[:forward_agent] = true
         end
         
         opts.on_tail('-h', '--help', 'Display this screen' ) do
@@ -54,29 +67,34 @@ module Octosh
         end
       end.parse!
       
-      if not ARGV.empty? and not options.config
+      if not ARGV.empty? and not options[:config]
         puts "Using config file"
-        options.config = ARGV[0]
-        options.mode = Octosh::CLI::MODE::CONFIG
-      elsif ARGV.empty? and options.config
+        options[:config] = ARGV[0]
+        options[:mode] = Octosh::CLI::MODE::CONFIG
+      elsif ARGV.empty? and options[:config]
         puts "Using config file"
-        options.mode = Octosh::CLI::MODE::CONFIG
-      elsif not ARGV.empty? and options.config
-        puts "Two config files specified (#{options.config} and #{ARGV[0]}), using explicit config file (#{options.config})"
-        options.mode = Octosh::CLI::MODE::CONFIG
-      elsif (options.bash or options.script) and options.hosts
+        options[:mode] = Octosh::CLI::MODE::CONFIG
+      elsif not ARGV.empty? and options[:config]
+        puts "Two config files specified (#{options[:config]} and #{ARGV[0]}), using explicit config file (#{options[:config]})"
+        options[:mode] = Octosh::CLI::MODE::CONFIG
+      elsif options[:interactive]
+        puts "Interactive mode"
+        options[:mode] = Octosh::CLI::MODE::INTERACTIVE
+        shell = Octosh::Shell.new(options[:hosts], options)
+        shell.start
+      elsif (options[:bash] or options[:script]) and options[:hosts]
         puts "Using inline execution"
-        options.mode = Octosh::CLI::MODE::INLINE
+        options[:mode] = Octosh::CLI::MODE::INLINE
         
-        if options.bash and options.script
+        if options[:bash] and options[:script]
           "Error -- Cannot specify both an inline command to run (-b) and a script file (-s)"
           exit
-        elsif options.bash
+        elsif options[:bash]
           puts "Inline bash"
-          self.inline_bash(options.hosts, options.bash, options.default_user, options.password_prompt, options.uniform_password)
-        elsif options.script
+          self.inline_bash(options[:hosts], options[:bash], options[:default_user], options)
+        elsif options[:script]
           puts "Call script on each server"
-          self.exec_script(options.hosts, options.script, options.default_user, options.password_prompt, options.uniform_password)
+          self.exec_script(options[:hosts], options[:script], options[:default_user], options)
         else
           "Error -- Something broke"
           exit
@@ -102,11 +120,11 @@ module Octosh
       end
     end
     
-    def self.inline_bash(hosts, bash, user, password_prompt=true, uniform_password=false)
+    def self.inline_bash(hosts, bash, user, options)
       workers = []
       
       hosts.each do |host|
-        prompt_for_password(password_prompt, uniform_password)
+        prompt_for_password(options[:password_prompt], options[:uniform_password])
         exec_user,hostname = ""
         if host.include? '@'
           # USer defined with host, override provided user
@@ -115,7 +133,8 @@ module Octosh
           exec_user = user
           hostname = host
         end
-        worker = Octosh::Worker.new(hostname, exec_user, @password)
+        
+        worker = Octosh::Worker.new(hostname, exec_user, @password, options)
         workers << worker
       end
       
@@ -124,11 +143,11 @@ module Octosh
       end
     end
     
-    def self.exec_script(hosts, script, user, password_prompt=true, uniform_password=false)
+    def self.exec_script(hosts, script, user, options)
       workers = []
       
       hosts.each do |host|
-        prompt_for_password(password_prompt, uniform_password)
+        prompt_for_password(options[:password_prompt], options[:uniform_password])
         exec_user,hostname = ""
         if host.include? '@'
           # USer defined with host, override provided user
@@ -137,7 +156,7 @@ module Octosh
           exec_user = user
           hostname = host
         end
-        worker = Octosh::Worker.new(hostname, exec_user, @password)
+        worker = Octosh::Worker.new(hostname, exec_user, @password, options)
         workers << worker
       end
       

data/lib/octosh/helper.rb

@@ -1,4 +1,18 @@
 module Octosh
+  
+  module OUTPUT_COLORS
+    RED = 31
+    GREEN = 32
+    YELLOW = 33
+    BLUE = 34
+    MAGENTA = 35
+    CYAN = 36
+  end
+  
+  module COLORS
+    COLORS = [Octosh::OUTPUT_COLORS::BLUE, Octosh::OUTPUT_COLORS::YELLOW, Octosh::OUTPUT_COLORS::GREEN, Octosh::OUTPUT_COLORS::MAGENTA, Octosh::OUTPUT_COLORS::CYAN]
+  end
+  
   class Helper
     
     def self.password_prompt(prompt="Password: ")

data/lib/octosh/shell.rb

@@ -0,0 +1,56 @@
+module Octosh
+  class Shell
+    
+    @workers = []
+    @password = nil
+    
+    def initialize(hosts, options)
+      colors = Octosh::COLORS::COLORS.dup
+      @workers = []
+      hosts.each do |host|
+        prompt_for_password(options[:password_prompt], options[:uniform_password])
+        exec_user,hostname = ""
+        if host.include? '@'
+          # USer defined with host, override provided user
+          exec_user,hostname = host.split('@')
+        else
+          exec_user = options[:default_user]
+          hostname = host
+        end
+        worker_options = options.dup
+        worker_options[:color] = colors.shift
+        colors << worker_options[:color]
+        worker = Octosh::Worker.new(hostname, exec_user, @password, worker_options)
+        worker.connect
+        @workers << worker
+      end
+    end
+    
+    def colorize(text, color_code)
+      "\e[#{color_code}m#{text}\e[0m"
+    end
+    
+    def prompt_for_password(password_prompt, uniform_password, host="current host")
+      if password_prompt
+        # Password authentication
+        if uniform_password and @password.nil?
+          # One password for all hosts
+          @password = Octosh::Helper.password_prompt("Password: ")
+        elsif not uniform_password
+          # One password for each host
+          @password = Octosh::Helper.password_prompt("Password for #{host}: ")
+        end
+      end
+    end
+    
+    def start
+      while true
+        print ">> "
+        command = gets
+        Parallel.each(@workers, :in_threads => @workers.length) do |worker|
+          print colorize(worker.exec(command), worker.options[:color])
+        end
+      end
+    end
+  end
+end

data/lib/octosh/version.rb

@@ -1,3 +1,3 @@
 module Octosh
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/octosh/worker/worker.rb

@@ -3,34 +3,54 @@ require 'net/scp'
 require 'uuid'
 require 'pathname'
 
-module Octosh
+module Octosh  
   class Worker
     
-    attr_reader :host, :user, :password, :ssh
+    attr_reader :host, :user, :password, :ssh, :options
+        
+    @connected = false
     
-    def initialize(host, user, pass)
+    def initialize(host, user, pass, options = {})
       @host = host
       @user = user
       @password = pass
-      
-      @ssh = Net::SSH.start(@host, @user, :password => @password)
+      @options = options
+    end
+    
+    def connected?
+      return @connected
+    end
+    
+    def connect_if_not_connected
+      if not connected?
+        connect
+      end
+    end
+    
+    def connect
+      if not connected?
+        forward_agent = @options[:forward_agent] || false
+        @ssh = Net::SSH.start(@host, @user, :password => @password, :forward_agent => forward_agent)
+        @connected = true
+      end
     end
     
     def exec(command)
+      connect_if_not_connected
       channel = @ssh.open_channel do |ch|
         ch.exec(command) do |ch, success|
           raise "Error executing #{command}" unless success
           
           ch.on_data do |c, data|
-            puts "#{@host} -- #{data.to_s}"
+            return data.to_s
           end
           
           ch.on_extended_data do |c, type, data|
-            puts "#{@host} -- #{data}"
+            return data.to_s
           end
           
           ch.on_close do
-            #puts "Octosh execution complete!"
+            # For now do nothing
           end
         end
       end
@@ -39,14 +59,17 @@ module Octosh
     end
     
     def put(local_path, remote_path)
+      connect_if_not_connected      
       @ssh.scp.upload!(local_path, remote_path)
     end
     
     def get(remote_path, local_path)
+      connect_if_not_connected
       @ssh.scp.download!(remote_path, local_path)
     end
     
     def read(remote_path)
+      connect_if_not_connected
       return @ssh.scp.download!(remote_path)
     end
     

data/lib/octosh.rb

@@ -1,3 +1,4 @@
 require 'octosh/helper'
 
+require 'octosh/shell'
 require 'octosh/worker'

data/spec/worker_spec.rb

@@ -3,13 +3,33 @@ require 'spec_helper'
 describe Octosh::Worker do
   
   it "should instantiate" do
-    # Removed until we setup mocking for the SSH communication
-    #worker = Octosh::Worker.new('127.0.0.1', 'bob', 'password')
+    worker = Octosh::Worker.new('127.0.0.1', 'bob', 'password')
     
-    #worker.should_not be_nil
-    #worker.host.should == '127.0.0.1'
-    #worker.user.should == 'bob'
-    #worker.password.should == 'password'
+    worker.should_not be_nil
+    worker.host.should == '127.0.0.1'
+    worker.user.should == 'bob'
+    worker.password.should == 'password'
   end
   
+  it "should #connect_if_not_connected" do
+    worker = Octosh::Worker.new('127.0.0.1', 'bob', 'password')
+    
+    Net::SSH.should_receive(:start).with("127.0.0.1", "bob", :password => "password", :forward_agent=>false)
+    worker.connect_if_not_connected
+  end
+  
+  it "should #exec a command" do
+    worker = Octosh::Worker.new('127.0.0.1', 'bob', 'password')
+    worker.should_receive(:exec)
+    worker.exec("date")
+  end
+  
+  it "should #exec_script" do
+    worker = Octosh::Worker.new('127.0.0.1', 'bob', 'password')
+    worker.should_receive(:put).with("/tmp/somescript.sh", kind_of(String))
+    worker.should_receive(:exec).with(kind_of(String))
+    worker.should_receive(:exec).with(kind_of(String))
+    
+    worker.exec_script("/tmp/somescript.sh")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octosh
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-18 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies: []
 description: Octosh
 email:
@@ -29,6 +29,7 @@ files:
 - lib/octosh.rb
 - lib/octosh/cli.rb
 - lib/octosh/helper.rb
+- lib/octosh/shell.rb
 - lib/octosh/version.rb
 - lib/octosh/worker.rb
 - lib/octosh/worker/worker.rb
@@ -47,6 +48,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 806447710594273081
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: