hotdog 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 004bbaba7b65fb0cc3fba2c01eb465ce997a61a2
-  data.tar.gz: 09dac6927faae3cc9c74b90ee8a078fec52f79cc
+  metadata.gz: 386ea5a2e53080113a7136e39a71a08465e087fa
+  data.tar.gz: c69190562efa14c594d20976025d1abd408b47b6
 SHA512:
-  metadata.gz: b1bc205cff0d6b97ea4acc5e488ca15df3814cc005366f19ff8fff3ed03b23ad369a077cbed09f02f9f2361d421493163af12622d78d94b180999d3d95c95fcf
-  data.tar.gz: 1a22434d7e7c906c826327f705935ff354b950c1c46f4f8515e12d16267adf004668c1df6ac549db57bfbc20543b68ed41e3c48279d08fb859433ee158084a02
+  metadata.gz: df1751d43d7c69edd34a6a1decb2a4b247a7993c0f0bc0a9277066d90a95364ca5582a3e5c2a30eb103e9fdfccf6d79a63029bbcb796862e766fb31897d74c33
+  data.tar.gz: 84178da6939e1066e18062e235caaa0c055e9bd5d28280aa5f60a4d648d8272ac1ae66ceaf1219e8930ea0d70dc78f4ca543d330a960db53d109dd2d8945a55d

data/lib/hotdog/application.rb

@@ -28,6 +28,7 @@ module Hotdog
         max_time: 5,
         print0: false,
         print1: true,
+        primary_tag: nil,
         tags: [],
         display_search_tags: false,
         verbose: false,
@@ -108,6 +109,9 @@ module Hotdog
       @optparse.on("-a TAG", "-t TAG", "--tag TAG", "Use specified tag name/value") do |tag|
         options[:tags] += [tag]
       end
+      @optparse.on("--primary-tag TAG", "Use specified tag as the primary tag") do |tag|
+        options[:primary_tag] = tag
+      end
       @optparse.on("-x", "--display-search-tags", "Show tags used in search expression") do |v|
         options[:display_search_tags] = v
       end

data/lib/hotdog/commands/search.rb

@@ -41,8 +41,8 @@ module Hotdog
           end
         }
         identifiers = drilldown.call(node).map(&:to_s)
-
-        get_hosts(result, @options[:display_search_tags] ? identifiers : [])
+        tags = @options[:display_search_tags] ? identifiers : nil
+        get_hosts(result, tags)
       end
 
       def parse(expression)

data/lib/hotdog/commands.rb

@@ -56,14 +56,10 @@ module Hotdog
         not host_id.nil?
       end
 
-      def get_hosts(hosts=[], identifiers=[])
+      def get_hosts(hosts, tags=nil)
+        tags ||= @options[:tags]
         update_db
-        if 0 < @options[:tags].length || 0 < identifiers.length
-          tags = if 0 < @options[:tags].length
-                   @options[:tags] + identifiers
-                 else
-                   ["host"] + identifiers
-                 end
+        if 0 < tags.length
           result = hosts.map { |host_id|
             tags.map { |tag|
               tag_name, tag_value = tag.split(":", 2)
@@ -82,6 +78,7 @@ module Hotdog
           fields = tags
         else
           if @options[:listing]
+            # TODO: should respect `:primary_tag`
             fields = []
             hosts = execute("SELECT id, name FROM hosts WHERE id IN (%s)" % hosts.map { "?" }.join(", "), hosts)
             result = hosts.map { |host_id, host_name|
@@ -95,8 +92,21 @@ module Hotdog
             }
             fields = ["host"] + fields
           else
-            fields = ["host"]
-            result = execute("SELECT name FROM hosts WHERE id IN (%s)" % hosts.map { "?" }.join(", "), hosts)
+            if @options[:primary_tag]
+              fields = [@options[:primary_tag]]
+              tag_name, tag_value = @options[:primary_tag].split(":", 2)
+              case tag_name
+              when "host"
+                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)]
+                }
+              end
+            else
+              fields = ["host"]
+              result = execute("SELECT name FROM hosts WHERE id IN (%s)" % hosts.map { "?" }.join(", "), hosts)
+            end
           end
         end
         [result, fields]
@@ -305,7 +315,7 @@ module Hotdog
       end
 
       def select_tag_values_from_hosts_tags_by_host_id_and_tag_name_glob(db, host_id, tag_name)
-        logger.debug("select_tag_values_from_hosts_tags_by_host_id_and_tag_name_glob(%s, %s)", host_id.inspect, tag_name.inspect)
+        logger.debug("select_tag_values_from_hosts_tags_by_host_id_and_tag_name_glob(%s, %s)" % [host_id.inspect, tag_name.inspect])
         db.execute(<<-EOS, host_id, tag_name).map { |row| row.first }.join(",")
           SELECT tags.value FROM hosts_tags
             INNER JOIN tags ON hosts_tags.tag_id = tags.id

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler