hotdog 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52dcd14a86fb66237bcb18755f02fde4109a2c22
-  data.tar.gz: dcca4b54617bfb3dac88bff53db1605f26535984
+  metadata.gz: 81c8f88ce41f3d20b7099237e335f0baa453ad3a
+  data.tar.gz: 3aa663a263433092de26f1d5ec33cffb871e1b2e
 SHA512:
-  metadata.gz: 2b5a34f103669cdca02a4233d1af3cff3c57b827a8b6b97b87bd9c54bb8fd71e411800540655597825cc3ba23e5753c49e0f0bc465f1354ddf047fa7b1e86c23
-  data.tar.gz: 4b1d29a2ce4ddc458dc3a6d6a63d7ceff460bb24139e7083a282edaef3a7d3f08cf36fcd989fb4cc93c8723f9d381a588d60267f0861ed5f1d551689cef7cce3
+  metadata.gz: 04dfbc1dc88f135b680ee989ac02b708d2adf86a7cab3e315f3c0875eb5071b618ed97064ebefdc48d0b1bf991ee4f6c5bd9d623c7af13f0e5b555e40ecdea2e
+  data.tar.gz: 74a9fc5f60194286c07926a199f5e6a51064b62cce8057159d84195352686fbaa3dacdc42ed5e7a6f5d09508dbd4cb824ee741df34ed02be6afd2486dfa7a26a

data/lib/hotdog/application.rb

@@ -95,8 +95,13 @@ module Hotdog
         end
 
         command.run(args, @options)
+      rescue Interrupt
+        STDERR.puts("Interrupt")
       rescue Errno::EPIPE => error
         STDERR.puts(error)
+      rescue => error
+        STDERR.puts(error)
+        exit(1)
       end
     end
 

data/lib/hotdog/commands/search.rb

@@ -352,14 +352,6 @@ module Hotdog
         def dump(options={})
           {}
         end
-
-        def intermediates()
-          []
-        end
-
-        def leafs()
-          [self]
-        end
       end
 
       class UnaryExpressionNode < ExpressionNode
@@ -428,14 +420,6 @@ module Hotdog
           {unary_op: @op.to_s, expression: @expression.dump(options)}
         end
 
-        def intermediates()
-          [self] + @expression.intermediates
-        end
-
-        def leafs()
-          @expression.leafs
-        end
-
         private
         def optimize1(options={})
           case op
@@ -600,7 +584,7 @@ module Hotdog
             when EverythingNode
               left
             when NothingNode
-              left
+              right
             else
               if left == right
                 left
@@ -643,14 +627,6 @@ module Hotdog
           {left: @left.dump(options), binary_op: @op.to_s, right: @right.dump(options)}
         end
 
-        def intermediates()
-          [self] + @left.intermediates + @right.intermediates
-        end
-
-        def leafs()
-          @left.leafs + @right.leafs
-        end
-
         private
         def optimize1(options)
           if TagExpressionNode === left and TagExpressionNode === right
@@ -744,14 +720,6 @@ module Hotdog
         def dump(options={})
           {multinary_op: @op.to_s, expressions: expressions.map { |expression| expression.dump(options) }}
         end
-
-        def intermediates()
-          [self] + @expression.flat_map { |expression| expression.intermediates }
-        end
-
-        def leafs()
-          @expressions.flat_map { |expression| expression.leafs }
-        end
       end
 
       class QueryExpressionNode < ExpressionNode

data/lib/hotdog/commands/ssh.rb

@@ -60,10 +60,10 @@ module Hotdog
         end
 
         result0 = evaluate(node, self)
-        result, _fields = get_hosts_with_search_tags(result0, node)
-        hosts = filter_hosts(result.flatten)
-        validate_hosts!(hosts)
-        run_main(hosts, options)
+        tuples, fields = get_hosts_with_search_tags(result0, node)
+        tuples = filter_hosts(tuples)
+        validate_hosts!(tuples, fields)
+        run_main(tuples.map {|tuple| tuple.first }, options)
       end
 
       private
@@ -71,29 +71,29 @@ module Hotdog
         options[:max_parallelism] || hosts.size
       end
 
-      def filter_hosts(hosts)
+      def filter_hosts(tuples)
         if options[:filter_command]
-          filtered_hosts = Parallel.map(hosts, in_threads: parallelism(hosts)) { |host|
-            cmdline = build_command_string(host, options[:filter_command], options)
-            [host, exec_command(host, cmdline, output: false)]
+          filtered_tuples = Parallel.map(tuples, in_threads: parallelism(tuples)) { |tuple|
+            cmdline = build_command_string(tuple.first, options[:filter_command], options)
+            [tuple, exec_command(tuple.first, cmdline, output: false)]
           }.select { |_host, stat|
             stat
-          }.map { |host, _stat|
-            host
+          }.map { |tuple, _stat|
+            tuple
           }
-          if hosts == filtered_hosts
-            hosts
+          if tuples == filtered_tuples
+            tuples
           else
-            logger.info("filtered host(s): #{(hosts - filtered_hosts).inspect}")
-            filtered_hosts
+            logger.info("filtered host(s): #{(tuples - filtered_tuples).map {|tuple| tuple.first }.inspect}")
+            filtered_tuples
           end
         else
-          hosts
+          tuples
         end
       end
 
-      def validate_hosts!(hosts)
-        if hosts.length < 1
+      def validate_hosts!(tuples, fields)
+        if tuples.length < 1
           STDERR.puts("no match found")
           exit(1)
         end
@@ -196,21 +196,21 @@ module Hotdog
       end
 
       private
-      def filter_hosts(hosts)
-        hosts = super
-        if options[:index] and options[:index] < hosts.length
-          [hosts[options[:index]]]
+      def filter_hosts(tuples)
+        tuples = super
+        if options[:index] and options[:index] < tuples.length
+          [tuples[options[:index]]]
         else
-          hosts
+          tuples
         end
       end
 
-      def validate_hosts!(hosts)
+      def validate_hosts!(tuples, fields)
         super
-        if hosts.length != 1
-          result = hosts.each_with_index.map { |host, i| [i, host] }
-          STDERR.print(format(result, fields: ["index", "host"]))
-          logger.error("found %d candidates." % result.length)
+        if tuples.length != 1
+          result = tuples.each_with_index.map { |tuple, i| [i] + tuple }
+          STDERR.print(format(result, fields: ["index"] + fields))
+          logger.error("found %d candidates. use '-n INDEX' option to select one." % result.length)
           exit(1)
         end
       end

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler