hotdog 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1b8937e6ed17779e09622476dae786c9f7e04a4
-  data.tar.gz: 59d5cf9204f2b3cf7a272734ca62253f09b01347
+  metadata.gz: e5b7de644e20c6baece23e0cfb092c648f450e86
+  data.tar.gz: 5e12b97c01d76aa8b9a7d5ede0cf5fe3371dda3a
 SHA512:
-  metadata.gz: c763c88d2083cb10007195b7962edd980a47f0145a613081b1a5c9713da91ffed3350daa7bdd1317f7e9d00b928141f69a5005e6fa2026deb127a6e6a1b71173
-  data.tar.gz: 796c96d4b2c954690fc9bbf97339d8ebe4213fc7c3c92fafc5c5a67b90914c208ad4eea7c3a2b21f5c871dc4562c002ff561b443321d949c24038b3491743caf
+  metadata.gz: 390fcdb204d802c1ed9a49e7657233d6d2581d7b910c22d5370ffa722d934ba9dc4aacc1b199a525694962bc435c2ded7d9bf7d9056c3e51ed6ad959cb58366c
+  data.tar.gz: 42fe7102b0c6cb9564fbdc1acb3f7dd739bacc1d59d7b7e82c7ad8391d71bb46007ea4386d76a228adc163b5fdc40ac0ef58e8422e3ac541d4e6b5fb30163cc2

data/lib/hotdog/commands/pssh.rb

@@ -11,10 +11,9 @@ module Hotdog
     class Pssh < SshAlike
       private
       def run_main(hosts, options={})
-        use_color_p = use_color?
-        stats = Parallel.map(hosts, in_threads: parallelism(hosts)) { |host|
+        stats = Parallel.map(hosts.each_with_index.to_a, in_threads: parallelism(hosts)) { |host, i|
           cmdline = build_command_string(host, @remote_command, options)
-          exec_command(host, cmdline, true, use_color_p)
+          exec_command(host, cmdline, index: i, output: true)
         }
         if stats.all?
           exit(0)

data/lib/hotdog/commands/ssh.rb

@@ -74,10 +74,9 @@ module Hotdog
 
       def filter_hosts(hosts)
         if options[:filter_command]
-          use_color_p = use_color?
           filtered_hosts = Parallel.map(hosts, in_threads: parallelism(hosts)) { |host|
             cmdline = build_command_string(host, options[:filter_command], options)
-            [host, exec_command(host, cmdline, false, use_color_p)]
+            [host, exec_command(host, cmdline, output: false)]
           }.select { |host, stat|
             stat
           }.map { |host, stat|
@@ -148,15 +147,32 @@ module Hotdog
         end
       end
 
-      def exec_command(identifier, cmdline, output=true, colorize=false)
+      def exec_command(identifier, cmdline, options={})
+        output = options.fetch(:output, true)
         logger.debug("execute: #{cmdline}")
+        if use_color?
+          if options.key?(:index)
+            color = 31 + (options[:index] % 6)
+          else
+            color = 36
+          end
+        else
+          color = nil
+        end
         IO.popen(cmdline, in: :close, err: [:child, :out]) do |io|
           io.each_with_index do |s, i|
             if output
-              STDOUT.write("\e[0;36m") if colorize
-              STDOUT.write("#{identifier}:#{i}:")
-              STDOUT.write("\e[0m") if colorize
-              STDOUT.write(s)
+              if color
+                STDOUT.write("\e[0;#{color}m")
+              end
+              STDOUT.write(identifier)
+              STDOUT.write(":")
+              STDOUT.write(i.to_s)
+              STDOUT.write(":")
+              if color
+                STDOUT.write("\e[0m")
+              end
+              STDOUT.puts(s)
             end
           end
         end

data/lib/hotdog/commands/version.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require "rbconfig"
+
+module Hotdog
+  module Commands
+    class Version < BaseCommand
+      def run(args=[], options={})
+        ruby = File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["ruby_install_name"])
+        exit(system(ruby, $0, "--version") ? 0 : 1)
+      end
+    end
+  end
+end
+
+# vim:set ft=ruby :

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -163,6 +163,7 @@ files:
 - lib/hotdog/commands/ssh.rb
 - lib/hotdog/commands/tags.rb
 - lib/hotdog/commands/up.rb
+- lib/hotdog/commands/version.rb
 - lib/hotdog/formatters.rb
 - lib/hotdog/formatters/csv.rb
 - lib/hotdog/formatters/json.rb
@@ -213,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Yet another command-line tool for Datadog
@@ -239,4 +240,3 @@ test_files:
 - spec/parser/regexp_expression_spec.rb
 - spec/parser/string_expression_spec.rb
 - spec/spec_helper.rb
-has_rdoc: