hotdog 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c464a62cf28997e088dd57a9e0ede3f2983f274
-  data.tar.gz: 85ad0d5644e20a84eaa99fee56c86ad8ead5de21
+  metadata.gz: 0e018bd515522f3f7d9b0406076de76e413775e2
+  data.tar.gz: c5500bd55b75ebe3911ed3c4ab7edb224f9385c8
 SHA512:
-  metadata.gz: b1ae715a85cc4ad9531cbbb23a965df3c0dede59a5c2fdaf4b09fd3bf24b4e4eb2f98863357924d88feff3729c4f89bf54c484311c9a2c7152ddb59e85db2101
-  data.tar.gz: d79aa608eecf509fc7838f2ab3682eeea5f7009bea8479f334a7194f875b9b8b05572f16dbbdaa1788f818c3f04ba002e64a12ec931bfc856c631f34ec9f37e3
+  metadata.gz: 10840357532b1e1df159a154b39a9791392bc1ddee1bb63267fd9322e4afa17b5e07ac48278d5e3f5246905aa14368227644674f18985b0cbfeec26742efa452
+  data.tar.gz: 98d740416958f1b36993faad3804ca0c1a542c15d7c5f4db829e0adce60c1f1295bfa4d04a7a00bd0bb1f88f5248a2c5edce58db1a3157c651fe256a673ecc57

data/lib/hotdog/application.rb

@@ -64,6 +64,10 @@ module Hotdog
             raise("DATADOG_APPLICATION_KEY is not set")
           end
 
+          if options[:format] == "ltsv"
+            options[:headers] = true
+          end
+
           options[:formatter] = get_formatter(options[:format]).new
 
           if options[:debug] or options[:verbose]

data/lib/hotdog/commands/search.rb

@@ -282,7 +282,7 @@ module Hotdog
 
       class ExpressionNode
         def evaluate(environment, options={})
-          raise(NotImplementedError)
+          raise(NotImplementedError.new("must be overridden"))
         end
 
         def optimize(options={})
@@ -649,7 +649,7 @@ module Hotdog
         end
 
         def dump(optinos={})
-          {multinary_op: @op.to_s, expressions: expressions.map { |expression| expression.dump }}
+          {multinary_op: @op.to_s, expressions: expressions.map { |expression| expression.dump(options) }}
         end
 
         def intermediates()
@@ -724,7 +724,7 @@ module Hotdog
           if tables.empty?
             nil
           else
-            case tables.sort
+            case tables
             when [:hosts]
               "SELECT hosts.id AS host_id FROM hosts;"
             when [:hosts, :tags]
@@ -738,15 +738,15 @@ module Hotdog
         end
 
         def condition(options={})
-          raise NotImplementedError
+          raise(NotImplementedError.new("must be overridden"))
         end
 
         def condition_tables(options={})
-          raise NotImplementedError
+          raise(NotImplementedError.new("must be overridden"))
         end
 
         def condition_values(options={})
-          raise NotImplementedError
+          raise(NotImplementedError.new("must be overridden"))
         end
 
         def evaluate(environment, options={})
@@ -857,7 +857,12 @@ module Hotdog
         end
 
         def maybe_fallback(options={})
-          GlobHostNode.new(maybe_glob(attribute), separator)
+          fallback = GlobHostNode.new(maybe_glob(attribute), separator)
+          if query = fallback.maybe_query(options)
+            QueryExpressionNode.new(query, fallback.condition_values(options))
+          else
+            nil
+          end
         end
       end
 
@@ -879,7 +884,12 @@ module Hotdog
         end
 
         def maybe_fallback(options={})
-          GlobTagNode.new(maybe_glob(identifier), maybe_glob(attribute), separator)
+          fallback = GlobTagNode.new(maybe_glob(identifier), maybe_glob(attribute), separator)
+          if query = fallback.maybe_query(options)
+            QueryExpressionNode.new(query, fallback.condition_values(options))
+          else
+            nil
+          end
         end
       end
 
@@ -901,7 +911,12 @@ module Hotdog
         end
 
         def maybe_fallback(options={})
-          GlobTagNameNode.new(maybe_glob(identifier), separator)
+          fallback = GlobTagNameNode.new(maybe_glob(identifier), separator)
+          if query = fallback.maybe_query(options)
+            QueryExpressionNode.new(query, fallback.condition_values(options))
+          else
+            nil
+          end
         end
       end
 
@@ -923,7 +938,12 @@ module Hotdog
         end
 
         def maybe_fallback(options={})
-          GlobTagValueNode.new(maybe_glob(attribute), separator)
+          fallback = GlobTagValueNode.new(maybe_glob(attribute), separator)
+          if query = fallback.maybe_query(options)
+            QueryExpressionNode.new(query, fallback.condition_values(options))
+          else
+            nil
+          end
         end
       end
 
@@ -945,7 +965,12 @@ module Hotdog
         end
 
         def maybe_fallback(options={})
-          GlobNode.new(maybe_glob(identifier), separator)
+          fallback = GlobNode.new(maybe_glob(identifier), separator)
+          if query = fallback.maybe_query(options)
+            QueryExpressionNode.new(query, fallback.condition_values(options))
+          else
+            nil
+          end
         end
       end
 
@@ -978,7 +1003,12 @@ module Hotdog
         end
 
         def maybe_fallback(options={})
-          GlobHostNode.new(maybe_glob(attribute), separator)
+          fallback = GlobHostNode.new(maybe_glob(attribute), separator)
+          if query = fallback.maybe_query(options)
+            QueryExpressionNode.new(query, fallback.condition_values(options))
+          else
+            nil
+          end
         end
       end
 
@@ -1000,7 +1030,12 @@ module Hotdog
         end
 
         def maybe_fallback(options={})
-          GlobTagNode.new(maybe_glob(identifier), maybe_glob(attribute), separator)
+          fallback = GlobTagNode.new(maybe_glob(identifier), maybe_glob(attribute), separator)
+          if query = fallback.maybe_query(options)
+            QueryExpressionNode.new(query, fallback.condition_values(options))
+          else
+            nil
+          end
         end
       end
 
@@ -1022,7 +1057,12 @@ module Hotdog
         end
 
         def maybe_fallback(options={})
-          GlobTagNameNode.new(maybe_glob(identifier), separator)
+          fallback = GlobTagNameNode.new(maybe_glob(identifier), separator)
+          if query = fallback.maybe_query(options)
+            QueryExpressionNode.new(query, fallback.condition_values(options))
+          else
+            nil
+          end
         end
       end
 
@@ -1044,7 +1084,12 @@ module Hotdog
         end
 
         def maybe_fallback(options={})
-          GlobTagValueNode.new(maybe_glob(attribute), separator)
+          fallback = GlobTagValueNode.new(maybe_glob(attribute), separator)
+          if query = fallback.maybe_query(options)
+            QueryExpressionNode.new(query, fallback.condition_values(options))
+          else
+            nil
+          end
         end
       end
 
@@ -1066,7 +1111,12 @@ module Hotdog
         end
 
         def maybe_fallback(options={})
-          GlobNode.new(maybe_glob(identifier), separator)
+          fallback = GlobNode.new(maybe_glob(identifier), separator).maybe_query(options)
+          if query = fallback.maybe_query(options)
+            QueryExpressionNode.new(query, fallback.condition_values(options))
+          else
+            nil
+          end
         end
       end
 

data/lib/hotdog/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-26 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler