hotdog 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fccd372d49246c2c85768c9244a29746fafcfb40
-  data.tar.gz: 9b4d490218a3d93af4806b12d47dfca28f8d90f8
+  metadata.gz: 4a7e366b9cd85e46e711e2ca82472a2d278db17a
+  data.tar.gz: 502752fef200c4abf66772c31dc0b8f6e19a3538
 SHA512:
-  metadata.gz: 8e21eb61e7ccfc2b533e005eb1f494ead1c16c12cd21e0384d46228e88f3a5d6771a62f9006fca59bc538e680e4a7370f1a1905c3e1aa314ea368e4b97146a92
-  data.tar.gz: 654ccf67781c3c1a7ebc1f59fac07a5dd6319231474e6ffadcd08309d32b062efe7e543c1db83f7d821bb054a6ea31c111b7c717f63f0692b3929a6fc79df971
+  metadata.gz: 28f25b9273cf877a5c7ee381733f5645eec06e8c40ddb743c6e07becca306bcf270fc4f85a1bc4eba691316cc7d11aac67a77dbab8ed421c11137042f3f03bfa
+  data.tar.gz: 587039692f3cc6cb5f7c7436487e8d1300dc54457468e6d19f2075bd9f1b0b6a3af21774ef6be44bf3bcb528749756531b5a490c17cb52f521b449a62fcb0373

data/lib/hotdog/commands/hosts.rb

@@ -7,24 +7,35 @@ module Hotdog
         args = optparse.parse(args)
         if args.empty?
           result = execute("SELECT id FROM hosts").to_a.reduce(:+)
+          show_hosts(result)
         else
-          result = args.flat_map { |host_name|
-            if glob?(host_name)
-              execute("SELECT id FROM hosts WHERE name GLOB ?", [host_name]).to_a.reduce(:+)
-            else
-              execute("SELECT id FROM hosts WHERE name = ?", [host_name]).to_a.reduce(:+)
+          if args.any? { |host_name| glob?(host_name) }
+            result = args.flat_map { |host_name|
+              execute("SELECT id FROM hosts WHERE name GLOB ?;", [host_name]).to_a.reduce(:+) || []
+            }
+          else
+            result = args.each_slice(SQLITE_LIMIT_COMPOUND_SELECT).flat_map { |args|
+              execute("SELECT id FROM hosts WHERE name IN (%s);" % args.map { "?" }.join(", "), args).to_a.reduce(:+) || []
+            }
+          end
+          if result.empty?
+            STDERR.puts("no match found: #{args.join(" ")}")
+            exit(1)
+          else
+            show_hosts(result)
+            logger.info("found %d host(s)." % result.length)
+            if result.length < args.length
+              STDERR.puts("insufficient result: #{args.join(" ")}")
+              exit(1)
             end
-          }
-        end
-        if result && (0 < result.length)
-          result, fields = get_hosts(result)
-          STDOUT.print(format(result, fields: fields))
-          logger.info("found %d host(s)." % result.length)
-        else
-          STDERR.puts("no match found: #{args.join(" ")}")
-          exit(1)
+          end
         end
       end
+
+      def show_hosts(hosts)
+        result, fields = get_hosts(hosts || [])
+        STDOUT.print(format(result, fields: fields))
+      end
     end
   end
 end

data/lib/hotdog/commands/search.rb

@@ -114,12 +114,15 @@ module Hotdog
           )
         }
         rule(:binary_op) {
-          ( str('and') \
+          ( str('AND') \
+          | str('OR') \
+          | str('and') \
           | str('or') \
           )
         }
         rule(:unary_op) {
-          ( str('not') \
+          ( str('NOT') \
+          | str('not') \
           )
         }
         rule(:atom) {

data/lib/hotdog/commands/tags.rb

@@ -5,47 +5,41 @@ module Hotdog
     class Tags < BaseCommand
       def run(args=[])
         args = optparse.parse(args)
-        if 0 < args.length
-          fields = args.map { |tag|
-            tag_name, tag_value = split_tag(tag)
-            tag_name
-          }
-          result1 = args.map { |tag|
-            tag_name, tag_value = split_tag(tag)
-            if glob?(tag_name)
-              if tag_value.empty?
-                execute("SELECT DISTINCT value FROM tags WHERE name GLOB ?", [tag_name]).map { |row| row.join(",") }
-              else
-                if glob?(tag_value)
-                  execute("SELECT DISTINCT value FROM tags WHERE name GLOB ? AND value GLOB ?", [tag_name, tag_value]).map { |row| row.join(",") }
-                else
-                  execute("SELECT DISTINCT value FROM tags WHERE name GLOB ? AND value = ?", [tag_name, tag_value]).map { |row| row.join(",") }
-                end
-              end
-            else
-              if tag_value.empty?
-                execute("SELECT DISTINCT value FROM tags WHERE name = ?", [tag_name]).map { |row| row.join(",") }
-              else
-                if glob?(tag_value)
-                  execute("SELECT DISTINCT value FROM tags WHERE name = ? AND value GLOB ?", [tag_name, tag_value]).map { |row| row.join(",") }
-                else
-                  execute("SELECT DISTINCT value FROM tags WHERE name = ? AND value = ?", [tag_name, tag_value]).map { |row| row.join(",") }
-                end
-              end
-            end
-          }
-          result = (0...result1.reduce(0) { |max, values| [max, values.length].max }).map { |field_index|
-            result1.map { |values| values[field_index] }
-          }
+        if args.empty?
+          result = execute("SELECT name, value FROM tags").map { |name, value| [join_tag(name, value)] }
+          show_tags(result)
         else
-          fields = ["tag"]
-          result = execute("SELECT DISTINCT name, value FROM tags").map { |name, value| [0 < value.length ? "#{name}:#{value}" : name] }
-        end
-        if 0 < result.length
-          STDOUT.print(format(result, fields: fields))
-          logger.info("found %d tag(s)." % result.length)
+          tags = args.map { |tag| split_tag(tag) }
+          if tags.all? { |tag_name, tag_value| tag_value.empty? }
+            result = tags.each_slice(SQLITE_LIMIT_COMPOUND_SELECT).flat_map { |tags|
+              q = "SELECT value FROM tags " \
+                    "WHERE %s;" % tags.map { |tag_name, tag_value| glob?(tag_name) ? "name GLOB ?" : "name = ?" }.join(" OR ")
+              execute(q, tags.map { |tag_name, tag_value| tag_name }).map { |value| [value] }
+            }
+          else
+            result = tags.each_slice(SQLITE_LIMIT_COMPOUND_SELECT / 2).flat_map { |tags|
+              q = "SELECT value FROM tags " \
+                    "WHERE %s;" % tags.map { |tag_name, tag_value| (glob?(tag_name) or glob?(tag_value)) ?  "( name GLOB ? AND value GLOB ? )" : "( name = ? AND value = ? )" }.join(" OR ")
+              execute(q, tags).map { |value| [value] }
+            }
+          end
+          if result.empty?
+            STDERR.puts("no match found: #{args.join(" ")}")
+            exit(1)
+          else
+            show_tags(result)
+            logger.info("found %d tag(s)." % result.length)
+            if result.length < args.length
+              STDERR.puts("insufficient result: #{args.join(" ")}")
+              exit(1)
+            end
+          end
         end
       end
+
+      def show_tags(tags)
+        STDOUT.print(format(tags, fields: ["tag"]))
+      end
     end
   end
 end

data/lib/hotdog/commands.rb

@@ -252,6 +252,14 @@ module Hotdog
         [tag_name, tag_value || ""]
       end
 
+      def join_tag(tag_name, tag_value)
+        if tag_value.to_s.empty?
+          tag_name
+        else
+          "#{tag_name}:#{tag_value}"
+        end
+      end
+
       def copy_db(src, dst)
         # create index later for better insert performance
         dst.transaction do

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

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