octosh 0.0.1 → 0.0.2

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
 gem 'net-ssh', '2.6.1'
+gem 'highline', '1.6.15'
 
 group :test do
   gem 'rake', '0.9.2.2'

data/Gemfile.lock

@@ -2,6 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
+    highline (1.6.15)
     net-ssh (2.6.1)
     rake (0.9.2.2)
     rspec (2.12.0)
@@ -17,6 +18,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  highline (= 1.6.15)
   net-ssh (= 2.6.1)
   rake (= 0.9.2.2)
   rspec (= 2.12.0)

data/lib/octosh/cli.rb

@@ -38,14 +38,22 @@ module Octosh
           options.default_user = user
         end
         
+        options.password_prompt = false
+        opts.on('-p', '--password', 'Prompt for password') do
+          options.password_prompt = true
+        end
+        
+        options.uniform_password = false
+        opts.on('-a', '--uniform-password', 'Use the same password for all hosts') do
+          options.uniform_password = true
+        end
+        
         opts.on_tail('-h', '--help', 'Display this screen' ) do
           puts opts
           exit
         end
       end.parse!
       
-      puts options.config
-      
       if not ARGV.empty? and not options.config
         options.config = ARGV[0]
         options.mode = Octosh::CLI::MODE::CONFIG
@@ -57,12 +65,48 @@ module Octosh
       elsif (options.bash or options.script) and options.hosts
         puts "Using inline execution"
         options.mode = Octosh::CLI::MODE::INLINE
+        
+        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
+          self.inline_bash(options.hosts, options.bash, options.password_prompt, options.uniform_password)
+        elsif options.script
+          pass
+        else
+          "Error -- Something broke"
+          exit
+        end
+          
       else
         puts "Error -- Must either provide an Octo config file or arguments for inline execution (--hosts along with -b or -s)"
         exit
       end
+
+    end
+    
+    def self.inline_bash(hosts, bash, password_prompt=true, uniform_password=false)
       
-      puts options.inspect
+      password = nil
+      
+      hosts.each do |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
+          user,hostname = host.split("@")
+          worker = Octosh::Worker.new(hostname, user, password)
+          puts worker.exec(bash)
+        else
+          # Identify file authentication
+        end
+      end
     end
+    
   end
 end

data/lib/octosh/helper.rb

@@ -0,0 +1,12 @@
+module Octosh
+  class Helper
+    
+    def self.password_prompt(prompt="Password: ")
+      require 'highline/import'
+      ask(prompt) do |p|
+        p.echo = false
+      end
+    end
+    
+  end
+end

data/lib/octosh/version.rb

@@ -1,3 +1,3 @@
 module Octosh
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/octosh/worker/worker.rb

@@ -1,3 +1,5 @@
+require 'net/ssh'
+
 module Octosh
   class Worker
     

data/lib/octosh.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octosh
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -28,6 +28,7 @@ files:
 - bin/octoch
 - lib/octosh.rb
 - lib/octosh/cli.rb
+- lib/octosh/helper.rb
 - lib/octosh/version.rb
 - lib/octosh/worker.rb
 - lib/octosh/worker/worker.rb