octosh 0.0.3 → 0.0.4

data/Gemfile

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

data/Gemfile.lock

@@ -3,6 +3,8 @@ GEM
   specs:
     diff-lcs (1.1.3)
     highline (1.6.15)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
     net-ssh (2.6.1)
     rake (0.9.2.2)
     rspec (2.12.0)
@@ -19,6 +21,7 @@ PLATFORMS
 
 DEPENDENCIES
   highline (= 1.6.15)
+  net-scp (= 1.0.4)
   net-ssh (= 2.6.1)
   rake (= 0.9.2.2)
   rspec (= 2.12.0)

data/lib/octosh/cli.rb

@@ -12,6 +12,8 @@ module Octosh
       INLINE = :inline
     end
     
+    @password = nil
+    
     def self.start
       options = OpenStruct.new
 
@@ -34,7 +36,8 @@ module Octosh
           options.hosts = list
         end
         
-        opts.on('-u', '--user', 'User to use when a user isn\'t defined in the --hosts list (ie. just IP address)') do |user|
+        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
         end
         
@@ -54,10 +57,14 @@ module Octosh
         end
       end.parse!
       
+      puts options.inspect
+      
       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
+        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})"
@@ -70,9 +77,11 @@ module Octosh
           "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)
+          puts "Inline bash"
+          self.inline_bash(options.hosts, options.bash, options.default_user, options.password_prompt, options.uniform_password)
         elsif options.script
-          pass
+          puts "Call script on each server"
+          self.exec_script(options.hosts, options.script, options.default_user, options.password_prompt, options.uniform_password)
         else
           "Error -- Something broke"
           exit
@@ -85,26 +94,49 @@ module Octosh
 
     end
     
-    def self.inline_bash(hosts, bash, password_prompt=true, uniform_password=false)
-      
-      password = nil
-      
+    def self.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 self.inline_bash(hosts, bash, user, password_prompt=true, uniform_password=false)
+      hosts.each do |host|
+        prompt_for_password(password_prompt, uniform_password)
+        exec_user,hostname = ""
+        if host.include? '@'
+          # USer defined with host, override provided user
+          exec_user,hostname = host.split('@')
+        else
+          exec_user = user
+          hostname = host
+        end
+        worker = Octosh::Worker.new(hostname, exec_user, @password)
+        
+        puts "#{host} -- #{worker.exec(bash)}"
+      end
+    end
+    
+    def self.exec_script(hosts, script, user, password_prompt=true, uniform_password=false)
       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)
+        prompt_for_password(password_prompt, uniform_password)
+        exec_user,hostname = ""
+        if host.include? '@'
+          # USer defined with host, override provided user
+          exec_user,hostname = host.split('@')
         else
-          # Identify file authentication
+          exec_user = user
+          hostname = host
         end
+        worker = Octosh::Worker.new(hostname, exec_user, @password)
+        puts "#{host} -- #{worker.exec_script(script)}"
       end
     end
     

data/lib/octosh/version.rb

@@ -1,3 +1,3 @@
 module Octosh
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/octosh/worker/worker.rb

@@ -1,23 +1,42 @@
 require 'net/ssh'
+require 'net/scp'
+require 'uuid'
+require 'pathname'
 
 module Octosh
   class Worker
     
-    attr_reader :host, :user, :password
+    attr_reader :host, :user, :password, :ssh
     
     def initialize(host, user, pass)
       @host = host
       @user = user
       @password = pass
+      
+      @ssh = Net::SSH.start(@host, @user, :password => @password)
     end
     
     def exec(command)
-      output = ""
-      Net::SSH.start(@host, @user, :password => @password) do |ssh|
-        output = ssh.exec!(command)
-      end
-      
-      return output
+      return @ssh.exec!(command)
+    end
+    
+    def put(local_path, remote_path)
+      @ssh.scp.upload!(local_path, remote_path)
+    end
+    
+    def get(remote_path, local_path)
+      @ssh.scp.download!(remote_path, local_path)
+    end
+    
+    def read(remote_path)
+      return @ssh.scp.download!(remote_path)
+    end
+    
+    def exec_script(script_path)
+      tmp_script_name = "octosh-#{Pathname.new(script_path).basename.to_s}-#{UUID.new.generate}"
+      self.put(script_path, "/tmp/#{tmp_script_name}")
+      self.exec("chmod +x /tmp/#{tmp_script_name}")
+      return self.exec("/tmp/#{tmp_script_name}")
     end
   end
 end

data/spec/worker_spec.rb

@@ -3,12 +3,13 @@ require 'spec_helper'
 describe Octosh::Worker do
   
   it "should instantiate" do
-    worker = Octosh::Worker.new('127.0.0.1', 'bob', 'password')
+    # Removed until we setup mocking for the SSH communication
+    #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
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octosh
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies: []
 description: Octosh
 email: