hotdog 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c762eea37cef48b1e77ad7ff752104eeb38082e3
-  data.tar.gz: ec51f5cdc67ec3112188438e6f24d40e9bae4624
+  metadata.gz: a23883464db0f7638a741072ace4c6251c99ccca
+  data.tar.gz: d09ef94c849e83df926a0b494bd4da4c02925e53
 SHA512:
-  metadata.gz: 5aae1f00e344f9328e033eef38e53dbcc5e3256ad4a594f3d15bf6674d6f52717f4361dc5e46c33693d7a4989044f2f66f16d139560203f18f150f1de5da4317
-  data.tar.gz: fc94018049aa90686ab51c81b63d8d3caebe547f57744d7bf4d3b4172af402875820b0bb0403f1762ddbfb8617e4be57e6b0e1f04775785036edc7e95b9a065e
+  metadata.gz: ccdef2dbf2a090258ae0c89d5a35ae18c45859a2842c2236989583a8cf9ffe9c6394f734fca5d5e510c67554267c09f97d1f395f65d645deab0c6ac442158728
+  data.tar.gz: 4ab9d3132fd5d7af46bcc57282f14fc76946a9c94acd077d40b1ee61045b528bde159aefb76f044bf574bfc6a4ec9fd9baea7a1dd53c3ebe010151828e230ab7

data/lib/hotdog/commands/search.rb

@@ -2,6 +2,7 @@
 
 require "json"
 require "parslet"
+require "shellwords"
 require "hotdog/expression"
 
 module Hotdog
@@ -15,7 +16,14 @@ module Hotdog
 
       def parse_options(optparse, args=[])
         if args.index("--")
-          @remote_command = args.slice(args.index("--") + 1, args.length).join(" ")
+          command_args = args.slice(args.index("--") + 1, args.length)
+          if command_args.length <= 1
+            # Use given argument as is if the remote command is specified as a quoted string
+            # e.g. 'for f in /tmp/foo*; do echo $f; done'
+            @remote_command = command_args.first
+          else
+            @remote_command = Shellwords.shelljoin(command_args)
+          end
           optparse.parse(args.slice(0, args.index("--")))
         else
           @remote_command = nil

data/lib/hotdog/expression/semantics.rb

@@ -458,21 +458,33 @@ module Hotdog
           args[0].evaluate(environment, options).take(args[1] || 1)
         when :GROUP_BY
           intermediate = args[0].evaluate(environment, options)
-          q = "SELECT hosts_tags.host_id FROM hosts_tags " \
+          q = "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags " \
                 "INNER JOIN tags ON hosts_tags.tag_id = tags.id " \
                 "WHERE tags.name = ? AND hosts_tags.host_id IN (%s) " \
                 "GROUP BY tags.value;" % intermediate.map { "?" }.join(", ")
-          QueryExpressionNode.new(q, [args[1]] + intermediate, fallback: nil).evaluate(environment, options)
+          if TagExpressionNode === args[1]
+            # workaround for expressions like `ORDER_BY((environment:development),role)`
+            args1 = args[1].tag_name
+          else
+            args1 = args[1]
+          end
+          QueryExpressionNode.new(q, [args1] + intermediate, fallback: nil).evaluate(environment, options)
         when :ORDER_BY
           intermediate = args[0].evaluate(environment, options)
           if args[1]
-            q = "SELECT hosts_tags.host_id FROM hosts_tags " \
+            if TagExpressionNode === args[1]
+              # workaround for expressions like `ORDER_BY((environment:development),role)`
+              args1 = args[1].tag_name
+            else
+              args1 = args[1]
+            end
+            q = "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags " \
                   "INNER JOIN tags ON hosts_tags.tag_id = tags.id " \
                   "WHERE tags.name = ? AND hosts_tags.host_id IN (%s) " \
                   "ORDER BY tags.value;" % intermediate.map { "?" }.join(", ")
-            QueryExpressionNode.new(q, [args[1]] + intermediate, fallback: nil).evaluate(environment, options)
+            QueryExpressionNode.new(q, [args1] + intermediate, fallback: nil).evaluate(environment, options)
           else
-            q = "SELECT hosts_tags.host_id FROM hosts_tags " \
+            q = "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags " \
                   "INNER JOIN tags ON hosts_tags.tag_id = tags.id " \
                   "WHERE hosts_tags.host_id IN (%s) " \
                   "ORDER BY hosts_tags.host_id;" % intermediate.map { "?" }.join(", ")

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.16.1"
+  VERSION = "0.17.0"
 end

metadata

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