hotdog 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3bcc93be20391d227013b6c05bb9113d68bc404
-  data.tar.gz: 3a8bc479c3122dc4b18ecf37d575e7b49dd8c1f8
+  metadata.gz: 1b087123acdf59f344d374145bdf0915f57757f6
+  data.tar.gz: 0f22b57543b9b6d83e904d9f643eac3ccc3a6a52
 SHA512:
-  metadata.gz: 8c9646d739e72b331cdfdf145da4e93b0c44598b64618a20db48eff13185a9bc277550581f2288e20ee548c8001466c454d30d43df900d9cef8e773bcf5f4bef
-  data.tar.gz: d51c0697ca67251ded20b0c2807af26ead5d4f7ed87b3c189ee109ff464c2a5cfccc82efeff20ec8f6cdcd0a2a07ab4ee5c1f374d1df4c14cdf9d5b98994fe03
+  metadata.gz: 51f9b047b0bc2cf02ae5abb013d02e1c0c52e5e7530ec7b27e313663a5e2022214d578a7bb58531e1f8c6e7833de1f2b4205e8c78bd319659c4499b67eb5edf1
+  data.tar.gz: f6017f78210111e9bc19492b0a2b0724c15cfebe568e68d2902d71f5b2861428a3665caff8c25794d1ce07cbe057eb2ca05338a02a598b32b39611fd03514d9d

data/lib/hotdog/application.rb

@@ -80,6 +80,17 @@ module Hotdog
 
           cmd.run(args, @options)
         end
+      rescue OptionParser::ParseError => error
+        STDERR.puts("hotdog: #{error.message}")
+        require "hotdog/commands/help"
+        get_command(command).tap do |cmd|
+          if Hotdog::Commands::Help === cmd
+            STDERR.puts("hotdog: '#{command}' is not a hotdog command.")
+          else
+            cmd.parse_options(@optparse, ["--help"])
+          end
+        end
+        exit(1)
       rescue Errno::EPIPE
         # nop
       end

data/lib/hotdog/commands/pssh.rb

@@ -78,21 +78,21 @@ module Hotdog
         end
       end
 
+      private
       def exec_command(result0, options={})
         result, fields = get_hosts(result0)
         hosts = result.flatten
         threads = options[:max_parallelism] || hosts.size
+        use_color_p = use_color?
         stats = Parallel.map(hosts.zip(hosts), in_threads: threads) { |host, name|
-          if use_color?
-            header = "\e[0;36m#{name}\e[00m"
-          else
-            header = name
-          end
           cmdline = build_command_string(host, options)
           logger.debug("execute: #{cmdline}")
           IO.popen(cmdline, in: :close, err: [:child, :out]) do |io|
-            io.each_line do |line|
-              STDOUT.write("#{header}: #{line}")
+            io.each_with_index do |s, i|
+              STDOUT.write("\e[0;36m") if use_color_p
+              STDOUT.write("#{name}:#{i}:")
+              STDOUT.write("\e[0m") if use_color_p
+              STDOUT.write(s)
             end
           end
           $?.success? # $? is thread-local variable
@@ -128,7 +128,6 @@ module Hotdog
         Shellwords.join(cmdline)
       end
 
-      private
       def use_color?
         case options[:color]
         when :always

data/lib/hotdog/commands/search.rb

@@ -213,10 +213,18 @@ module Hotdog
           end
         }
         rule(identifier_regexp: simple(:identifier_regexp), separator: simple(:separator)) {
-          RegexpTagNameNode.new(identifier_regexp.to_s, separator)
+          if "host" == identifier_regexp
+            AnyHostNode.new(separator)
+          else
+            RegexpTagNameNode.new(identifier_regexp.to_s, separator)
+          end
         }
         rule(identifier_regexp: simple(:identifier_regexp)) {
-          RegexpNode.new(identifier_regexp.to_s)
+          if "host" == identifier_regexp
+            AnyHostNode.new(separator)
+          else
+            RegexpNode.new(identifier_regexp.to_s)
+          end
         }
         rule(identifier_glob: simple(:identifier_glob), separator: simple(:separator), attribute_glob: simple(:attribute_glob)) {
           if "host" == identifier_glob
@@ -233,10 +241,18 @@ module Hotdog
           end
         }
         rule(identifier_glob: simple(:identifier_glob), separator: simple(:separator)) {
-          GlobTagNameNode.new(identifier_glob.to_s, separator)
+          if "host" == identifier_glob
+            AnyHostNode.new(separator)
+          else
+            GlobTagNameNode.new(identifier_glob.to_s, separator)
+          end
         }
         rule(identifier_glob: simple(:identifier_glob)) {
-          GlobNode.new(identifier_glob.to_s)
+          if "host" == identifier_glob
+            AnyHostNode.new(separator)
+          else
+            GlobNode.new(identifier_glob.to_s)
+          end
         }
         rule(identifier: simple(:identifier), separator: simple(:separator), attribute_glob: simple(:attribute_glob)) {
           if "host" == identifier
@@ -253,10 +269,18 @@ module Hotdog
           end
         }
         rule(identifier: simple(:identifier), separator: simple(:separator)) {
-          StringTagNameNode.new(identifier.to_s, separator)
+          if "host" == identifier
+            AnyHostNode.new(separator)
+          else
+            StringTagNameNode.new(identifier.to_s, separator)
+          end
         }
         rule(identifier: simple(:identifier)) {
-          StringNode.new(identifier.to_s)
+          if "host" == identifier
+            AnyHostNode.new(separator)
+          else
+            StringNode.new(identifier.to_s)
+          end
         }
         rule(separator: simple(:separator), attribute_regexp: simple(:attribute_regexp)) {
           RegexpTagValueNode.new(attribute_regexp.to_s, separator)
@@ -622,7 +646,7 @@ module Hotdog
             if expressions.all? { |expression| TagExpressionNode === expression }
               values = expressions.group_by { |expression| expression.class }.values.flat_map { |expressions|
                 if query_without_condition = expressions.first.maybe_query_without_condition(options)
-                  condition_length = expressions.first.condition_values(options).length
+                  condition_length = expressions.map { |expression| expression.condition_values(options).length }.max
                   expressions.each_slice(SQLITE_LIMIT_COMPOUND_SELECT / condition_length).flat_map { |expressions|
                     q = query_without_condition.sub(/\s*;\s*\z/, "") + " WHERE " + expressions.map { |expression| "( %s )" % expression.condition(options) }.join(" OR ") + ";"
                     environment.execute(q, expressions.flat_map { |expression| expression.condition_values(options) }).map { |row| row.first }
@@ -836,6 +860,42 @@ module Hotdog
         end
       end
 
+      class AnyHostNode < TagExpressionNode
+        def initialize(separator=nil)
+          super("host", nil, separator)
+        end
+
+        def condition(options={})
+          "1"
+        end
+
+        def condition_tables(options={})
+          [:hosts]
+        end
+
+        def condition_values(options={})
+          []
+        end
+      end
+
+      class AnyTagNode < TagExpressionNode
+        def initialize(separator=nil)
+          super(nil, nil, separator)
+        end
+
+        def condition(options={})
+          "1"
+        end
+
+        def condition_tables(options={})
+          [:tags]
+        end
+
+        def condition_values(options={})
+          []
+        end
+      end
+
       class StringExpressionNode < TagExpressionNode
       end
 
@@ -857,7 +917,7 @@ module Hotdog
         end
 
         def maybe_fallback(options={})
-          fallback = GlobHostNode.new(maybe_glob(attribute), separator)
+          fallback = GlobHostNode.new(to_glob(attribute), separator)
           if query = fallback.maybe_query(options)
             QueryExpressionNode.new(query, fallback.condition_values(options))
           else
@@ -884,7 +944,7 @@ module Hotdog
         end
 
         def maybe_fallback(options={})
-          fallback = GlobTagNode.new(maybe_glob(identifier), maybe_glob(attribute), separator)
+          fallback = GlobTagNode.new(to_glob(identifier), to_glob(attribute), separator)
           if query = fallback.maybe_query(options)
             QueryExpressionNode.new(query, fallback.condition_values(options))
           else
@@ -911,7 +971,7 @@ module Hotdog
         end
 
         def maybe_fallback(options={})
-          fallback = GlobTagNameNode.new(maybe_glob(identifier), separator)
+          fallback = GlobTagNameNode.new(to_glob(identifier), separator)
           if query = fallback.maybe_query(options)
             QueryExpressionNode.new(query, fallback.condition_values(options))
           else
@@ -926,19 +986,19 @@ module Hotdog
         end
 
         def condition(options={})
-          "tags.value = ?"
+          "hosts.name = ? OR tags.value = ?"
         end
 
         def condition_tables(options={})
-          [:tags]
+          [:hosts, :tags]
         end
 
         def condition_values(options={})
-          [attribute]
+          [attribute, attribute]
         end
 
         def maybe_fallback(options={})
-          fallback = GlobTagValueNode.new(maybe_glob(attribute), separator)
+          fallback = GlobTagValueNode.new(to_glob(attribute), separator)
           if query = fallback.maybe_query(options)
             QueryExpressionNode.new(query, fallback.condition_values(options))
           else
@@ -965,7 +1025,7 @@ module Hotdog
         end
 
         def maybe_fallback(options={})
-          fallback = GlobNode.new(maybe_glob(identifier), separator)
+          fallback = GlobNode.new(to_glob(identifier), separator)
           if query = fallback.maybe_query(options)
             QueryExpressionNode.new(query, fallback.condition_values(options))
           else
@@ -1003,7 +1063,7 @@ module Hotdog
         end
 
         def maybe_fallback(options={})
-          fallback = GlobHostNode.new(maybe_glob(attribute), separator)
+          fallback = GlobHostNode.new(to_glob(attribute), separator)
           if query = fallback.maybe_query(options)
             QueryExpressionNode.new(query, fallback.condition_values(options))
           else
@@ -1030,7 +1090,7 @@ module Hotdog
         end
 
         def maybe_fallback(options={})
-          fallback = GlobTagNode.new(maybe_glob(identifier), maybe_glob(attribute), separator)
+          fallback = GlobTagNode.new(to_glob(identifier), to_glob(attribute), separator)
           if query = fallback.maybe_query(options)
             QueryExpressionNode.new(query, fallback.condition_values(options))
           else
@@ -1057,7 +1117,7 @@ module Hotdog
         end
 
         def maybe_fallback(options={})
-          fallback = GlobTagNameNode.new(maybe_glob(identifier), separator)
+          fallback = GlobTagNameNode.new(to_glob(identifier), separator)
           if query = fallback.maybe_query(options)
             QueryExpressionNode.new(query, fallback.condition_values(options))
           else
@@ -1072,19 +1132,19 @@ module Hotdog
         end
 
         def condition(options={})
-          "LOWER(tags.value) GLOB LOWER(?)"
+          "LOWER(hosts.name) GLOB LOWER(?) OR LOWER(tags.value) GLOB LOWER(?)"
         end
 
         def condition_tables(options={})
-          [:tags]
+          [:hosts, :tags]
         end
 
         def condition_values(options={})
-          [attribute]
+          [attribute, attribute]
         end
 
         def maybe_fallback(options={})
-          fallback = GlobTagValueNode.new(maybe_glob(attribute), separator)
+          fallback = GlobTagValueNode.new(to_glob(attribute), separator)
           if query = fallback.maybe_query(options)
             QueryExpressionNode.new(query, fallback.condition_values(options))
           else
@@ -1111,7 +1171,7 @@ module Hotdog
         end
 
         def maybe_fallback(options={})
-          fallback = GlobNode.new(maybe_glob(identifier), separator)
+          fallback = GlobNode.new(to_glob(identifier), separator)
           if query = fallback.maybe_query(options)
             QueryExpressionNode.new(query, fallback.condition_values(options))
           else
@@ -1191,15 +1251,15 @@ module Hotdog
         end
 
         def condition(options={})
-          "tags.value REGEXP ?"
+          "hosts.name REGEXP ? OR tags.value REGEXP ?"
         end
 
         def condition_tables(options={})
-          [:tags]
+          [:hosts, :tags]
         end
 
         def condition_values(options={})
-          [attribute]
+          [attribute, attribute]
         end
       end
 

data/lib/hotdog/commands/ssh.rb

@@ -90,6 +90,7 @@ module Hotdog
         exit(127)
       end
 
+      private
       def exec_command(result0, options={})
         result, fields = get_hosts(result0)
         hosts = result.flatten

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler