octosh 0.0.7 → 0.0.8

data/README.md

@@ -44,6 +44,26 @@ Instead of inline scripting, you can also pass a path to a script to run on each
 
 ```octosh -s /path/to/script -u someuser -p -r 192.168.0.100,192.168.0.101,192.168.0.102```
 
+There's also...
+
+
+INTERACTIVE MODE
+----------------
+
+Interactive mode can be activate with the `-i` flag, for example...
+
+```octosh -i -u someuser -p -r 192.168.0.100,192.168.0.101,192.168.0.102```
+
+You will be prompted for the password(s), and then be greeted by the Octoshell prompt. From here, you can operate as normal as you would on a single server, but all commands will be ran on all servers, color-coded per server.
+
+There are a few special commands however (IN PROGRESS)…
+
+* `put PATH` -- Upload file at PATH to the CWD on the remote hosts
+* `get FILE` -- Download FILE to the CWD on the local machine. Files will be stored in the format "FILENAME-HOST.EXT"
+* `exit` -- Cleanly close the conneciton to all servers and quit OSH
+
+
+
 
 ROADMAP
 -------

data/lib/octosh/helper.rb

@@ -1,16 +1,7 @@
 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]
+    COLORS = [:default, :blue, :green, :yellow, :red, :magenta, :cyan, :white, :light_black, :light_red, :light_green, :light_yellow, :light_blue, :light_magenta, :light_cyan]
   end
   
   class Helper

data/lib/octosh/shell.rb

@@ -1,6 +1,15 @@
+require 'colorize'
+
 module Octosh
+  
+  module Commands
+    GET = :get
+    PUT = :put
+    EXIT = :exit
+  end
+  
   class Shell
-    
+        
     @workers = []
     @password = nil
     
@@ -26,10 +35,6 @@ module Octosh
       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
@@ -44,13 +49,42 @@ module Octosh
     end
     
     def start
+      
+      puts "Starting Octoshell connected to #{@workers.length} hosts"
+      @workers.each do |worker|
+        puts worker.host.colorize(worker.options[:color].to_sym)
+      end
+      
       while true
         print ">> "
-        command = gets
+        command = ""
+        begin
+          command = gets.chomp!
+        rescue Interrupt
+          disconnect
+          exit
+        end
+        preprocess_command(command || "")
         Parallel.each(@workers, :in_threads => @workers.length) do |worker|
-          print colorize(worker.exec(command), worker.options[:color])
+          output = worker.exec(command) || ""
+          print output.colorize(worker.options[:color].to_sym)
         end
       end
     end
+    
+    def preprocess_command(command)
+      if command.downcase == "exit"
+        disconnect
+        exit
+      end
+    end
+    
+    def disconnect
+      @workers.each do |worker|
+        print "Closing connection to #{worker.host} . . . ".colorize(worker.options[:color].to_sym)
+        worker.disconnect
+        puts "OK".colorize(worker.options[:color].to_sym)
+      end
+    end
   end
 end

data/lib/octosh/version.rb

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

data/lib/octosh/worker/worker.rb

@@ -32,7 +32,21 @@ module Octosh
         forward_agent = @options[:forward_agent] || false
         @ssh = Net::SSH.start(@host, @user, :password => @password, :forward_agent => forward_agent)
         @connected = true
+        return true
       end
+      
+      return false
+    end
+    
+    def disconnect
+      if connected?
+        @ssh.close
+        @ssh = nil
+        @connected = false
+        return true
+      end
+      
+      return false
     end
     
     def exec(command)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octosh
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -50,7 +50,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 806447710594273081
+      hash: 3656941387445534681
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: