hotdog 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e018bd515522f3f7d9b0406076de76e413775e2
-  data.tar.gz: c5500bd55b75ebe3911ed3c4ab7edb224f9385c8
+  metadata.gz: 620323cd9db295c0d65d974f1161550aa8f3f5e0
+  data.tar.gz: 6ea419f4716a1b4672d4576e25185eeb54586f05
 SHA512:
-  metadata.gz: 10840357532b1e1df159a154b39a9791392bc1ddee1bb63267fd9322e4afa17b5e07ac48278d5e3f5246905aa14368227644674f18985b0cbfeec26742efa452
-  data.tar.gz: 98d740416958f1b36993faad3804ca0c1a542c15d7c5f4db829e0adce60c1f1295bfa4d04a7a00bd0bb1f88f5248a2c5edce58db1a3157c651fe256a673ecc57
+  metadata.gz: b3d6b14d0ba95834736734681fcdc40df1b5579b05818fd6324eacb2c8655771d6a5516a71e317f56fca6aa83b2920be0e1ad082308506a0515a98b274b8d32e
+  data.tar.gz: b2e2a01aa4dbdaf7095504c1ce3be093d8d1ef4ea70629f1118b301464040058ac51d74d5e7a201b91719d560b6fdf536f652fdf7fd8ffb809896679d17acd4f

data/lib/hotdog/commands/pssh.rb

@@ -89,16 +89,13 @@ module Hotdog
           else
             header = name
           end
-
           c = cmdline.dup
           if user
             c << (user + "@" + address)
           else
             c << address
           end
-
-          c.concat(args)
-
+          logger.debug("execute: #{Shellwords.join(c)}")
           IO.popen([*c, in: :close, err: [:child, :out]]) do |io|
             io.each_line do |line|
               STDOUT.write "#{header}: #{line}"

data/lib/hotdog/commands/search.rb

@@ -622,15 +622,17 @@ module Hotdog
           case @op
           when :OR
             if expressions.all? { |expression| TagExpressionNode === expression }
-              if query_without_condition = expressions.first.maybe_query_without_condition(options)
-                q = query_without_condition.sub(/\s*;\s*\z/, "") + " WHERE " + expressions.map { |expression| "( %s )" % expression.condition(options) }.join(" OR ") + ";"
-                condition_length = expressions.first.condition_values(options).length
-                values = expressions.each_slice(SQLITE_LIMIT_COMPOUND_SELECT / condition_length).flat_map { |expressions|
-                  environment.execute(q, expressions.flat_map { |expression| expression.condition_values(options) }).map { |row| row.first }
-                }
-              else
-                values = []
-              end
+              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
+                  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 }
+                  }
+                else
+                  []
+                end
+              }
             else
               values = []
             end
@@ -648,7 +650,7 @@ module Hotdog
           end
         end
 
-        def dump(optinos={})
+        def dump(options={})
           {multinary_op: @op.to_s, expressions: expressions.map { |expression| expression.dump(options) }}
         end
 

data/lib/hotdog/commands/ssh.rb

@@ -43,6 +43,7 @@ module Hotdog
       end
 
       def parse_options(optparse, args=[])
+        optparse.order(args)
       end
 
       def run(args=[])
@@ -106,8 +107,7 @@ module Hotdog
         else
           cmdline << address
         end
-        cmdline.concat(args)
-
+        logger.debug("execute: #{Shellwords.join(cmdline)}")
         exec(*cmdline)
         exit(127)
       end

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Yamashita Yuu