hotdog 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3112f9756593f481b584743e04f759c2917670e
-  data.tar.gz: 3d2abf90e0a720fb8830fbe86320847efea4dee7
+  metadata.gz: 79e4334fc2d2f63537cbaa32bc44c2e5d069b4f5
+  data.tar.gz: bc9fdf8a14f3ab1a8ab02caa22e9841bfbff5181
 SHA512:
-  metadata.gz: 886e645627302c4cf74486bd0729d0958eb411ccb164d66d71b0c099894a626639a0db68d2f0eb45d5a5460a3d293b8b7e4b80bc0a85cda12bf84a8eb3413766
-  data.tar.gz: 0a9628e5691a05e7d3f2ab910da7f8f15af0ab84f4ad6dea16270e9cd4c9bc3abf9130b41431a5078963037b6dd3a0cc979d4a119d29751c259cfc61e655f66b
+  metadata.gz: e4e0aacb47ea09c873bbc7f39ee0b003d004716b619a5983eeb7c994a6c57ad4fd3f1286e2b9d1db89819cbf967745289d4e15a7d78109cf880f128173212227
+  data.tar.gz: e3f328b83968a36e98bedf91ced0e68e2f89a2edec886c1a6f2377a7e44d42d7158fdc76201ef53a27ddcd8a8176ae8be7a4db0e8771c7b47c75183e7092ec9b

data/README.md

@@ -100,25 +100,34 @@ Acceptable expressions in pseudo BNF.
 ```
 expression: binary_expression
           | term
+          ;
 
 binary_expression: term "&&" term
                  | term "||" term
                  | term "and" term
                  | term "or" term
+                 ;
 
 unary_expression: '!' expression
                 | '~' expression
                 | "not" expression
+                ;
 
 term: unary_expression
     | atom
+    ;
 
 atom: '(' expression ')'
     | IDENTIFIER separator ATTRIBUTE
+    | IDENTIFIER separator
+    | separator ATTRIBUTE
     | IDENTIFIER
+    | ATTRIBUTE
+    ;
 
 separator: ':'
          | '='
+         ;
 ```
 
 

data/lib/hotdog/application.rb

@@ -18,7 +18,7 @@ module Hotdog
         application: self,
         confdir: find_confdir(File.expand_path(".")),
         debug: false,
-        expiry: 180,
+        expiry: 300,
         fixed_string: false,
         force: false,
         format: "plain",

data/lib/hotdog/commands/search.rb

@@ -104,13 +104,18 @@ module Hotdog
         rule(:atom) {
           ( spacing.maybe >> str('(') >> expression >> str(')') >> spacing.maybe \
           | spacing.maybe >> identifier_regexp.as(:identifier_regexp) >> separator >> attribute_regexp.as(:attribute_regexp) >> spacing.maybe \
+          | spacing.maybe >> identifier_regexp.as(:identifier_regexp) >> separator >> spacing.maybe \
           | spacing.maybe >> identifier_regexp.as(:identifier_regexp) >> spacing.maybe \
           | spacing.maybe >> identifier_glob.as(:identifier_glob) >> separator >> attribute_glob.as(:attribute_glob) >> spacing.maybe \
           | spacing.maybe >> identifier_glob.as(:identifier_glob) >> separator >> attribute.as(:attribute) >> spacing.maybe \
+          | spacing.maybe >> identifier_glob.as(:identifier_glob) >> separator >> spacing.maybe \
           | spacing.maybe >> identifier_glob.as(:identifier_glob) >> spacing.maybe \
           | spacing.maybe >> identifier.as(:identifier) >> separator >> attribute_glob.as(:attribute_glob) >> spacing.maybe \
           | spacing.maybe >> identifier.as(:identifier) >> separator >> attribute.as(:attribute) >> spacing.maybe \
+          | spacing.maybe >> identifier.as(:identifier) >> separator >> spacing.maybe \
           | spacing.maybe >> identifier.as(:identifier) >> spacing.maybe \
+          | spacing.maybe >> separator >> attribute_glob.as(:attribute_glob) >> spacing.maybe \
+          | spacing.maybe >> separator >> attribute.as(:attribute_glob) >> spacing.maybe \
           | spacing.maybe >> attribute_regexp.as(:attribute_regexp) >> spacing.maybe \
           | spacing.maybe >> attribute_glob.as(:attribute_glob) >> spacing.maybe \
           | spacing.maybe >> attribute.as(:attribute) >> spacing.maybe \
@@ -265,10 +270,10 @@ module Hotdog
         attr_reader :identifier
         attr_reader :attribute
         def identifier?
-          !identifier.nil?
+          !(identifier.nil? or identifier.to_s.empty?)
         end
         def attribute?
-          !attribute.nil?
+          !(attribute.nil? or attribute.to_s.empty?)
         end
         def evaluate(environment)
           if identifier?
@@ -276,7 +281,7 @@ module Hotdog
               case identifier
               when /\Ahost\z/i
                 values = environment.execute(<<-EOS, attribute).map { |row| row.first }
-                  SELECT hosts_tags.id FROM hosts
+                  SELECT hosts.id FROM hosts
                     WHERE LOWER(hosts.name) = LOWER(?);
                 EOS
               else
@@ -379,7 +384,7 @@ module Hotdog
               case identifier
               when /\Ahost\z/i
                 values = environment.execute(<<-EOS, attribute).map { |row| row.first }
-                  SELECT hosts_tags.id FROM hosts
+                  SELECT hosts.id FROM hosts
                     WHERE LOWER(hosts.name) REGEXP LOWER(?);
                 EOS
               else

data/lib/hotdog/commands.rb

@@ -87,7 +87,11 @@ module Hotdog
                 fields << tag_name unless fields.index(tag_name)
               end
               [host_name] + fields.map { |tag_name|
-                select_tag_values_from_hosts_tags_by_host_id_and_tag_name(@db, host_id, tag_name)
+                if glob?(tag_name)
+                  select_tag_values_from_hosts_tags_by_host_id_and_tag_name_glob(@db, host_id, tag_name)
+                else
+                  select_tag_values_from_hosts_tags_by_host_id_and_tag_name(@db, host_id, tag_name)
+                end
               }
             }
             fields = ["host"] + fields
@@ -100,7 +104,11 @@ module Hotdog
                 result = execute("SELECT name FROM hosts WHERE id IN (%s)" % hosts.map { "?" }.join(", "), hosts)
               else
                 result = hosts.map { |host_id|
-                  [select_tag_values_from_hosts_tags_by_host_id_and_tag_name_glob(@db, host_id, tag_name)]
+                  if glob?(tag_name)
+                    [select_tag_values_from_hosts_tags_by_host_id_and_tag_name_glob(@db, host_id, tag_name)]
+                  else
+                    [select_tag_values_from_hosts_tags_by_host_id_and_tag_name(@db, host_id, tag_name)]
+                  end
                 }
               end
             else

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

metadata

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