rutty 1.0.1 → 1.1.2

data/README.md

@@ -28,6 +28,7 @@ TODO
 * Implement delete_node command
 * Make better printouts
 * Documentation
+* Tests
 
 Copyright
 ---------

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.2

data/bin/rutty

@@ -4,7 +4,7 @@
 CONF_DIR = File.join(ENV['HOME'], '.rutty')
 GENERAL_CONF = File.join(CONF_DIR, 'defaults.yaml')
 NODES_CONF = File.join(CONF_DIR, 'nodes.yaml')
-
+ 
 # Gems
 require 'rubygems'
 require 'bundler/setup'
@@ -65,10 +65,21 @@ def options_for_node node
   hash
 end
 
+def get_version
+  Gem.path.each do |path|
+    file = Dir.glob(File.join(path, 'gems', 'rutty-*', 'VERSION')).sort
+    next if file.empty?
+  
+    return File.open(file.pop, 'r').read.chomp
+  end
+  
+  return false
+end
+
 # Commander config
 program :name, 'rutty'
 program :description, 'A DSH implementation in Ruby'
-program :version, '1.0.0'
+program :version, get_version
 program :help_formatter, Commander::HelpFormatter::TerminalCompact
 
 default_command :dsh
@@ -180,10 +191,11 @@ command :dsh do |c|
   
   c.option('--tags TAG1[,TAG2,...]', Array, 'Comma-separated list of tags to run the command on')
   c.option('-a', 'Run the command on ALL nodes')
+  c.option('-d', '--debug', 'Enable debug output')
   
   c.when_called do |args, options|
     # TODO: Clean this up, it's pretty hard to read and follow
-    
+
     check_installed!
     raise "Must supply a command to run. See `rutty help dsh' for usage" if args.empty?
     raise "One of -a or --tags must be passed" if options.a.nil? and options.tags.nil?
@@ -237,9 +249,18 @@ command :dsh do |c|
     nodes.each do |node|
       params = options_for_node(node)
       @returns[node[:host]] = { :out => '' }
-      connections << Net::SSH.start(params[:host], params[:user], :port => params[:port], :paranoid => false, 
-        :user_known_hosts_file => '/dev/null', :keys => [params[:keypath]], :logger => Logger.new($stderr),
-        :verbose => Logger::FATAL)
+      begin
+        connections << Net::SSH.start(params[:host], params[:user], :port => params[:port], :paranoid => false, 
+        :user_known_hosts_file => '/dev/null', :keys => [params[:keypath]], 
+        :logger => Logger.new(options.debug.nil? ? $stderr : $stdout),
+        :verbose => (options.debug.nil? ? Logger::FATAL : Logger::DEBUG))
+      rescue Errno::ECONNREFUSED
+        $stderr.puts "ERROR: Connection refused on #{node[:host]}"
+        @returns.delete node[:host]
+      rescue SocketError
+        $stderr.puts "ERROR: nodename nor servname provided, or not known for #{node[:host]}"
+        @returns.delete node[:host]
+      end
     end
     
     connections.each { |ssh| exec_command.call(ssh) }
@@ -263,6 +284,7 @@ command :scp do |c|
   
   c.option('--tags TAG1[,TAG2,...]', Array, 'Comma-separated list of tags to run the command on')
   c.option('-a', 'Run the command on ALL nodes')
+  c.option('-d', '--debug', 'Enable debug output')
   
   c.when_called do |args, options|
     check_installed!
@@ -284,9 +306,16 @@ command :scp do |c|
     
     nodes.each do |node|
       params = options_for_node(node)
-      connections << Net::SSH.start(params[:host], params[:user], :port => params[:port], :paranoid => false, 
-        :user_known_hosts_file => '/dev/null', :keys => [params[:keypath]], :logger => Logger.new($stderr),
-        :verbose => Logger::FATAL)
+      begin
+        connections << Net::SSH.start(params[:host], params[:user], :port => params[:port], :paranoid => false, 
+          :user_known_hosts_file => '/dev/null', :keys => [params[:keypath]], 
+          :logger => Logger.new(options.debug.nil? ? $stderr : $stdout),
+          :verbose => (options.debug.nil? ? Logger::FATAL : Logger::DEBUG))
+      rescue Errno::ECONNREFUSED
+        $stderr.puts "ERROR: Connection refused on #{node[:host]}"
+      rescue SocketError
+        $stderr.puts "ERROR: nodename nor servname provided, or not known for #{node[:host]}"
+      end
     end
     
     connections.each { |ssh| ssh.scp.upload! local_path, remote_path }

data/rutty.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rutty}
-  s.version = "1.0.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Lindsey"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rutty
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 23
   prerelease: false
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Josh Lindsey