hotdog 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4fb9028929d4aa082b3fce15dc07c0027b27bfc
-  data.tar.gz: 6f2130f9703ac12a68ccbe5e6689e9fb3eb031fc
+  metadata.gz: 6ba5e711471dbce8fac64967560afa8b2904e7e1
+  data.tar.gz: 0830641057b9783f128fd820011b7f9a81225917
 SHA512:
-  metadata.gz: d089ed09d65c01eb076751d1ac0d83f977eb933ba0ee3af907bb7e7865d7cc73754fff88bd0798fa726b0c4e88e5ddac17b9cf9e0efb19c8f15324e04bfc994a
-  data.tar.gz: f2f37b92ee3b1c8ee7dc503cd434c5ce07fb0345eab67d1d901b16f9d5a37b5df8533577bd7c103a231aabd2f917ac9e79ef374eb92a0e6b3013990adc83c2b4
+  metadata.gz: d0bd65901e52513e7bbbd1f3ca94b40fcb84c040ce0322f7228272c9eb4df04a70101b67fa00f43cb71d27013e7a3d55e35c0f6d6dea85a33f39eb9102c9eac6
+  data.tar.gz: 7dc374d284be65129be03043c2b8cbf1d1b8b238c7473c4b54d1af7b563dc4168eb84bfbd939c7fa54f166595f0f039f8390c2427c2d859489ce54bbe41ddd78

data/lib/hotdog/commands/search.rb

@@ -108,9 +108,12 @@ module Hotdog
           | 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) >> 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 >> attribute_glob.as(:attribute_glob) >> spacing.maybe \
+          | spacing.maybe >> identifier.as(:identifier) >> separator >> attribute.as(:attribute) >> spacing.maybe \
           | spacing.maybe >> identifier.as(:identifier) >> 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 \
           )
         }
         rule(:identifier_regexp) {
@@ -182,6 +185,15 @@ module Hotdog
         rule(:identifier => simple(:identifier)) {
           TagExpressionNode.new(identifier.to_s, nil)
         }
+        rule(:attribute_regexp => simple(:attribute_regexp)) {
+          TagRegexpExpressionNode.new(nil, attribute_regexp.to_s)
+        }
+        rule(:attribute_glob => simple(:attribute_glob)) {
+          TagGlobExpressionNode.new(nil, attribute_glob.to_s)
+        }
+        rule(:attribute => simple(:attribute)) {
+          TagExpressionNode.new(nil, attribute.to_s)
+        }
       end
 
       class ExpressionNode
@@ -247,44 +259,58 @@ module Hotdog
 
       class TagExpressionNode < ExpressionNode
         def initialize(identifier, attribute)
-          if identifier == "host"
-            @identifier = attribute
-          else
-            @identifier = identifier
-            @attribute = attribute
-          end
+          @identifier = identifier
+          @attribute = attribute
         end
         attr_reader :identifier
         attr_reader :attribute
+        def identifier?
+          !identifier.nil?
+        end
         def attribute?
           !attribute.nil?
         end
         def evaluate(environment)
-          if attribute?
-            values = environment.execute(<<-EOS, identifier, attribute).map { |row| row.first }
-              SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
-                INNER JOIN tags ON hosts_tags.tag_id = tags.id
-                  WHERE LOWER(tags.name) = LOWER(?) AND LOWER(tags.value) = LOWER(?);
-            EOS
+          if identifier?
+            if attribute?
+              case identifier
+              when /\Ahost\z/i
+                values = environment.execute(<<-EOS, attribute).map { |row| row.first }
+                  SELECT hosts_tags.id FROM hosts
+                    WHERE LOWER(hosts.name) = LOWER(?);
+                EOS
+              else
+                values = environment.execute(<<-EOS, identifier, attribute).map { |row| row.first }
+                  SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
+                    INNER JOIN tags ON hosts_tags.tag_id = tags.id
+                      WHERE LOWER(tags.name) = LOWER(?) AND LOWER(tags.value) = LOWER(?);
+                EOS
+              end
+            else
+              values = environment.execute(<<-EOS, identifier, identifier, identifier).map { |row| row.first }
+                SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
+                  INNER JOIN hosts ON hosts_tags.host_id = hosts.id
+                  INNER JOIN tags ON hosts_tags.tag_id = tags.id
+                    WHERE LOWER(hosts.name) = LOWER(?) OR LOWER(tags.name) = LOWER(?) OR LOWER(tags.value) = LOWER(?);
+              EOS
+            end
           else
-            values = environment.execute(<<-EOS, identifier, identifier, identifier).map { |row| row.first }
-              SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
-                INNER JOIN hosts ON hosts_tags.host_id = hosts.id
-                INNER JOIN tags ON hosts_tags.tag_id = tags.id
-                  WHERE LOWER(hosts.name) = LOWER(?) OR LOWER(tags.name) = LOWER(?) OR LOWER(tags.value) = LOWER(?);
-            EOS
+            if attribute?
+              values = environment.execute(<<-EOS, attribute).map { |row| row.first }
+                SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
+                  INNER JOIN tags ON hosts_tags.tag_id = tags.id
+                    WHERE LOWER(tags.value) = LOWER(?);
+              EOS
+            else
+              values = []
+            end
           end
           if not environment.fixed_string? and values.empty?
             # fallback to glob expression
-            identifier_glob = identifier.gsub(/[-.\/_]/, "?")
-            if identifier != identifier_glob
-              if attribute?
-                attribute_glob = attribute.gsub(/[-.\/:_]/, "?")
-                environment.logger.info("fallback to glob expression: %s:%s" % [identifier_glob, attribute_glob])
-              else
-                attribute_glob = nil
-                environment.logger.info("fallback to glob expression: %s" % [identifier_glob])
-              end
+            identifier_glob = identifier.gsub(/[-.\/_]/, "?") if identifier?
+            attribute_glob = attribute.gsub(/[-.\/_]/, "?") if attribute?
+            if (identifier? and identifier != identifier_glob) or (attribute? and attribute != attribute_glob)
+              environment.logger.info("fallback to glob expression: %s:%s" % [identifier_glob, attribute_glob])
               values = TagGlobExpressionNode.new(identifier_glob, attribute_glob).evaluate(environment)
             end
           end
@@ -294,31 +320,46 @@ module Hotdog
 
       class TagGlobExpressionNode < TagExpressionNode
         def evaluate(environment)
-          if attribute?
-            values = environment.execute(<<-EOS, identifier, attribute).map { |row| row.first }
-              SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
-                INNER JOIN tags ON hosts_tags.tag_id = tags.id
-                  WHERE LOWER(tags.name) GLOB LOWER(?) AND LOWER(tags.value) GLOB LOWER(?);
-            EOS
+          if identifier?
+            if attribute?
+              case identifier
+              when /\Ahost\z/i
+                values = environment.execute(<<-EOS, attribute).map { |row| row.first }
+                  SELECT hosts.id FROM hosts
+                    WHERE LOWER(hosts.name) GLOB LOWER(?);
+                EOS
+              else
+                values = environment.execute(<<-EOS, identifier, attribute).map { |row| row.first }
+                  SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
+                    INNER JOIN tags ON hosts_tags.tag_id = tags.id
+                      WHERE LOWER(tags.name) GLOB LOWER(?) AND LOWER(tags.value) GLOB LOWER(?);
+                EOS
+              end
+            else
+              values = environment.execute(<<-EOS, identifier, identifier, identifier).map { |row| row.first }
+                SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
+                  INNER JOIN hosts ON hosts_tags.host_id = hosts.id
+                  INNER JOIN tags ON hosts_tags.tag_id = tags.id
+                    WHERE LOWER(hosts.name) GLOB LOWER(?) OR LOWER(tags.name) GLOB LOWER(?) OR LOWER(tags.value) GLOB LOWER(?);
+              EOS
+            end
           else
-            values = environment.execute(<<-EOS, identifier, identifier, identifier).map { |row| row.first }
-              SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
-                INNER JOIN hosts ON hosts_tags.host_id = hosts.id
-                INNER JOIN tags ON hosts_tags.tag_id = tags.id
-                  WHERE LOWER(hosts.name) GLOB LOWER(?) OR LOWER(tags.name) GLOB LOWER(?) OR LOWER(tags.value) GLOB LOWER(?);
-            EOS
+            if attribute?
+              values = environment.execute(<<-EOS, attribute).map { |row| row.first }
+                SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
+                  INNER JOIN tags ON hosts_tags.tag_id = tags.id
+                    WHERE LOWER(tags.value) GLOB LOWER(?);
+              EOS
+            else
+              values = []
+            end
           end
           if not environment.fixed_string? and values.empty?
             # fallback to glob expression
-            identifier_glob = identifier.gsub(/[-.\/_]/, "?")
-            if identifier != identifier_glob
-              if attribute?
-                attribute_glob = attribute.gsub(/[-.\/:_]/, "?")
-                environment.logger.info("fallback to glob expression: %s:%s" % [identifier_glob, attribute_glob])
-              else
-                attribute_glob = nil
-                environment.logger.info("fallback to glob expression: %s" % [identifier_glob])
-              end
+            identifier_glob = identifier.gsub(/[-.\/_]/, "?") if identifier?
+            attribute_glob = attribute.gsub(/[-.\/:_]/, "?") if attribute?
+            if (identifier? and identifier != identifier_glob) or (attribute? and attribute != attribute_glob)
+              environment.logger.info("fallback to glob expression: %s:%s" % [identifier_glob, attribute_glob])
               values = TagGlobExpressionNode.new(identifier_glob, attribute_glob).evaluate(environment)
             end
           end
@@ -333,20 +374,41 @@ module Hotdog
           super(identifier, attribute)
         end
         def evaluate(environment)
-          if attribute?
-            environment.execute(<<-EOS, identifier, attribute).map { |row| row.first }
-              SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
-                INNER JOIN tags ON hosts_tags.tag_id = tags.id
-                  WHERE LOWER(tags.name) REGEXP LOWER(?) AND LOWER(tags.value) REGEXP LOWER(?);
-            EOS
+          if identifier?
+            if attribute?
+              case identifier
+              when /\Ahost\z/i
+                values = environment.execute(<<-EOS, attribute).map { |row| row.first }
+                  SELECT hosts_tags.id FROM hosts
+                    WHERE LOWER(hosts.name) REGEXP LOWER(?);
+                EOS
+              else
+                environment.execute(<<-EOS, identifier, attribute).map { |row| row.first }
+                  SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
+                    INNER JOIN tags ON hosts_tags.tag_id = tags.id
+                      WHERE LOWER(tags.name) REGEXP LOWER(?) AND LOWER(tags.value) REGEXP LOWER(?);
+                EOS
+              end
+            else
+              environment.execute(<<-EOS, identifier, identifier, identifier).map { |row| row.first }
+                SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
+                  INNER JOIN hosts ON hosts_tags.host_id = hosts.id
+                  INNER JOIN tags ON hosts_tags.tag_id = tags.id
+                    WHERE LOWER(hosts.name) REGEXP LOWER(?) OR LOWER(tags.name) REGEXP LOWER(?) OR LOWER(tags.value) REGEXP LOWER(?);
+              EOS
+            end
           else
-            environment.execute(<<-EOS, identifier, identifier, identifier).map { |row| row.first }
-              SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
-                INNER JOIN hosts ON hosts_tags.host_id = hosts.id
-                INNER JOIN tags ON hosts_tags.tag_id = tags.id
-                  WHERE LOWER(hosts.name) REGEXP LOWER(?) OR LOWER(tags.name) REGEXP LOWER(?) OR LOWER(tags.value) REGEXP LOWER(?);
-            EOS
+            if attribute?
+              values = environment.execute(<<-EOS, attribute).map { |row| row.first }
+                SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
+                  INNER JOIN tags ON hosts_tags.tag_id = tags.id
+                    WHERE LOWER(tags.value) REGEXP LOWER(?);
+              EOS
+            else
+              values = []
+            end
           end
+          values
         end
       end
     end

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

metadata

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