hotdog 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ec9c646216c6e398de74ef323b24368fb50ebb9
-  data.tar.gz: afbfbb8ae6fde51f3eb651385263c9294c22c864
+  metadata.gz: 933d32781a29b749befc75434934913bc85ca09a
+  data.tar.gz: ae79146d62e2da1110246485559571d8d43475a4
 SHA512:
-  metadata.gz: c2ac8c3bb3d161d8f3ce102ce4a61c022d55b7dc165df776d5b8be31c85d3b103d88516bf60206efac7dbeabe7e26a4a2054d65a0728fff56fc5d2116a26dafc
-  data.tar.gz: 55df8e863c2b6234bd593073ea958fdb25d6232de94fd9f499ec6a6530abc5b1b26ac5f6b6f6e7237be16136743016b981a0854b2c6f77ac128aaa9039465627
+  metadata.gz: f5c3b0eb31180b6057bb3a6da9c077fbef40d79eb28ab46215b5ae60471df254c73011003f5795e07d2dbda1594326db25c8acdacad4e8e4425dbf54fef855ab
+  data.tar.gz: 7791194153534266e7768c0a1cd96d391fd274aab72a4e93b9ea6776515e0fa1b45b628f4e65ac84c8b9fab5d3b3d6fe73341f8b8ec47c054c1c3f61c88ef4a3

data/lib/hotdog/application.rb

@@ -16,6 +16,7 @@ module Hotdog
         environment: "default",
         minimum_expiry: 28800, # 8 hours
         random_expiry: 604800, # 7 days
+        fixed_string: false,
         force: false,
         formatter: get_formatter("plain").new,
         headers: false,
@@ -90,6 +91,9 @@ module Hotdog
       @optparse.on("-E ENVIRONMENT", "--environment ENVIRONMENT", "Specify environment") do |environment|
         options[:environment] = environment
       end
+      @optparse.on("--fixed-string", "Interpret pattern as fixed string") do |v|
+        options[:fixed_string] = v
+      end
       @optparse.on("-f", "--[no-]force", "Enable force mode") do |v|
         options[:force] = v
       end

data/lib/hotdog/commands/hosts.rb

@@ -7,29 +7,35 @@ module Hotdog
         update_hosts(@options.dup)
 
         if args.empty?
-          result = execute(<<-EOS).map { |row| row.first }
+          @hosts_q1 ||= @db.prepare(<<-EOS)
             SELECT DISTINCT host_id FROM hosts_tags;
           EOS
+          logger.debug("hosts_q1()")
+          result = @hosts_q1.execute().to_a.reduce(:+)
         else
           result = args.map { |host_name|
             if host_name.index("*")
-              execute(<<-EOS, host_name).map { |row| row.first }
+              @hosts_q2 ||= @db.prepare(<<-EOS)
                 SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
                   INNER JOIN hosts ON hosts_tags.host_id = hosts.id
                     WHERE LOWER(hosts.name) GLOB LOWER(?);
               EOS
+              logger.debug("hosts_q2(%s)" % [host_name.inspect])
+              @hosts_q2.execute(host_name).map { |row| row.first }
             else
-              execute(<<-EOS, host_name).map { |row| row.first }
+              @hosts_q3 ||= @db.prepare(<<-EOS)
                 SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
                   INNER JOIN hosts ON hosts_tags.host_id = hosts.id
                     WHERE LOWER(hosts.name) = LOWER(?);
               EOS
+              logger.debug("hosts_q3(%s)" % [host_name.inspect])
+              @hosts_q3.execute(host_name).map { |row| row.first }
             end
           }.reduce(:+)
         end
         if 0 < result.length
           result, fields = get_hosts(result)
-          STDOUT.puts(format(result, fields: fields))
+          STDOUT.print(format(result, fields: fields))
         else
           STDERR.puts("no match found: #{args.join(" ")}")
           exit(1)

data/lib/hotdog/commands/search.rb

@@ -13,7 +13,6 @@ module Hotdog
         end
 
         update_hosts(@options.dup)
-#       update_tags(@options.dup)
 
         begin
           node = parse(expression)
@@ -24,7 +23,7 @@ module Hotdog
         result = evaluate(node, self).sort
         if 0 < result.length
           result, fields = get_hosts(result)
-          STDOUT.puts(format(result, fields: fields))
+          STDOUT.print(format(result, fields: fields))
         else
           STDERR.puts("no match found: #{args.join(" ")}")
           exit(1)
@@ -70,13 +69,13 @@ module Hotdog
         }
         rule(:atom) {
           ( spacing.maybe >> str('(') >> expression >> str(')') >> spacing.maybe \
-          | spacing.maybe >> identifier_regexp.as(:identifier_regexp) >> str(':') >> attribute_regexp.as(:attribute_regexp) >> spacing.maybe \
+          | spacing.maybe >> identifier_regexp.as(:identifier_regexp) >> separator >> attribute_regexp.as(:attribute_regexp) >> spacing.maybe \
           | spacing.maybe >> identifier_regexp.as(:identifier_regexp) >> spacing.maybe \
-          | spacing.maybe >> identifier_glob.as(:identifier_glob) >> str(':') >> attribute_glob.as(:attribute_glob) >> spacing.maybe \
-          | spacing.maybe >> identifier_glob.as(:identifier_glob) >> str(':') >> attribute.as(:attribute) >> 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) >> spacing.maybe \
-          | spacing.maybe >> identifier.as(:identifier)>> str(':') >> attribute_glob.as(:attribute_glob) >> spacing.maybe \
-          | spacing.maybe >> identifier.as(:identifier)>> str(':') >> 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 \
           )
         }
@@ -92,6 +91,11 @@ module Hotdog
           ( match('[A-Za-z]') >> match('[-./0-9A-Z_a-z]').repeat(0) \
           )
         }
+        rule(:separator) {
+          ( str(':') \
+          | str('=') \
+          )
+        }
         rule(:attribute_regexp) {
           ( str('/') >> (str('/').absent? >> any).repeat(0) >> str('/') \
           )
@@ -212,32 +216,47 @@ module Hotdog
         end
         def evaluate(environment)
           if attribute?
-            environment.execute(<<-EOS, identifier, attribute).map { |row| row.first }
+            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
           else
-            environment.execute(<<-EOS, identifier, identifier, identifier).map { |row| row.first }
+            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
+          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
+              values = TagGlobExpressionNode.new(identifier_glob, attribute_glob).evaluate(environment)
+            end
+          end
+          values
         end
       end
 
       class TagGlobExpressionNode < TagExpressionNode
         def evaluate(environment)
           if attribute?
-            environment.execute(<<-EOS, identifier, attribute).map { |row| row.first }
+            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
           else
-            environment.execute(<<-EOS, identifier, identifier, identifier).map { |row| row.first }
+            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
@@ -245,6 +264,21 @@ module Hotdog
 
             EOS
           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
+              values = TagGlobExpressionNode.new(identifier_glob, attribute_glob).evaluate(environment)
+            end
+          end
+          values
         end
       end
 

data/lib/hotdog/commands/tags.rb

@@ -11,24 +11,38 @@ module Hotdog
             tag_name
           }
           result1 = fields.map { |tag_name|
-            execute(<<-EOS, tag_name).map { |row| row.join(",") }
-              SELECT DISTINCT tags.value FROM hosts_tags
-                INNER JOIN tags ON hosts_tags.tag_id = tags.id
-                  WHERE tags.name = LOWER(?);
-            EOS
+            if not glob?(tag_name)
+              @tags_q1 ||= @db.prepare(<<-EOS)
+                SELECT DISTINCT tags.value FROM hosts_tags
+                  INNER JOIN tags ON hosts_tags.tag_id = tags.id
+                    WHERE tags.name = LOWER(?);
+              EOS
+              logger.debug("tags_q1(%s)" % [tag_name.inspect])
+              @tags_q1.execute(tag_name).map { |row| row.join(",") }
+            else
+              @tags_q2 ||= @db.prepare(<<-EOS)
+                SELECT DISTINCT tags.value FROM hosts_tags
+                  INNER JOIN tags ON hosts_tags.tag_id = tags.id
+                    WHERE tags.name GLOB LOWER(?);
+              EOS
+              logger.debug("tags_q2(%s)" % [tag_name.inspect])
+              @tags_q2.execute(tag_name).map { |row| row.join(",") }
+            end
           }
           result = (0..result1.reduce(0) { |max, values| [max, values.length].max }).map { |field_index|
             result1.map { |values| values[field_index] }
           }
         else
           fields = ["tag"]
-          result = execute(<<-EOS).map { |name, value| [0 < value.length ? "#{name}:#{value}" : name] }
+          @tags_q3 ||= @db.prepare(<<-EOS)
             SELECT tags.name, tags.value FROM hosts_tags
               INNER JOIN tags ON hosts_tags.tag_id = tags.id;
           EOS
+          logger.debug("tags_q3()")
+          result = @tags_q3.execute().map { |name, value| [0 < value.length ? "#{name}:#{value}" : name] }
         end
         if 0 < result.length
-          STDOUT.puts(format(result, fields: fields))
+          STDOUT.print(format(result, fields: fields))
         end
       end
     end

data/lib/hotdog/commands/update.rb

@@ -4,6 +4,7 @@ module Hotdog
   module Commands
     class Update < BaseCommand
       def run(args=[])
+        options[:force] = true
         if 0 < args.length
           args.each do |host_name|
             update_host_tags(host_name, @options.dup)

data/lib/hotdog/commands.rb

@@ -8,6 +8,7 @@ module Hotdog
     class BaseCommand
       def initialize(db, options={})
         @db = db
+        @fixed_string = options[:fixed_string]
         @formatter = options[:formatter]
         @logger = options[:logger]
         @tags = options[:tags]
@@ -36,6 +37,10 @@ module Hotdog
         @db.execute(query, args)
       end
 
+      def fixed_string?()
+        @fixed_string
+      end
+
       def suspended?()
         @suspended
       end
@@ -45,26 +50,47 @@ module Hotdog
         @formatter.format(result, @options.merge(options))
       end
 
+      def glob?(s)
+        s.index('*') or s.index('?') or s.index('[') or s.index(']')
+      end
+
       def get_hosts(hosts=[])
         if 0 < tags.length
           result = hosts.map { |host_id|
             update_host_tags(host_id, @options.merge(tags: tags))
             tags.map { |tag|
               tag_name, tag_value = tag.split(":", 2)
-              if tag_name == "host"
-                logger.debug("get_hosts_q1()")
+              case tag_name
+              when "expires_at"
+                @get_hosts_q6 ||= @db.prepare(<<-EOS)
+                  SELECT expires_at FROM hosts_tags WHERE host_id = ? LIMIT 1;
+                EOS
+                logger.debug("get_hosts_q6()")
+                @get_hosts_q6.execute(host_id).map { |row| Time.at(row.first).strftime("%Y-%m-%dT%H:%M:%S") }.first
+              when "host"
                 @get_hosts_q1 ||= @db.prepare(<<-EOS)
                   SELECT name FROM hosts WHERE id = ? LIMIT 1;
                 EOS
-                @get_hosts_q1.execute(host_id).map { |row| row.first }.join(",")
+                logger.debug("get_hosts_q1()")
+                @get_hosts_q1.execute(host_id).map { |row| row.first }.first
               else
-                logger.debug("get_hosts_q2()")
-                @get_hosts_q2 ||= @db.prepare(<<-EOS)
-                  SELECT tags.value FROM hosts_tags
-                    INNER JOIN tags ON hosts_tags.tag_id = tags.id
-                      WHERE hosts_tags.host_id = ? AND tags.name = ?;
-                EOS
-                @get_hosts_q2.execute(host_id, tag_name).map { |row| row.first }.join(",")
+                if not glob?(tag_name)
+                  @get_hosts_q2 ||= @db.prepare(<<-EOS)
+                    SELECT tags.value FROM hosts_tags
+                      INNER JOIN tags ON hosts_tags.tag_id = tags.id
+                        WHERE hosts_tags.host_id = ? AND tags.name = ?;
+                  EOS
+                  logger.debug("get_hosts_q2()")
+                  @get_hosts_q2.execute(host_id, tag_name).map { |row| row.first }.join(",")
+                else
+                  @get_hosts_q5 ||= @db.prepare(<<-EOS)
+                    SELECT tags.value FROM hosts_tags
+                      INNER JOIN tags ON hosts_tags.tag_id = tags.id
+                        WHERE hosts_tags.host_id = ? AND tags.name GLOB ?;
+                  EOS
+                  logger.debug("get_hosts_q5()")
+                  @get_hosts_q5.execute(host_id, tag_name).map { |row| row.first }.join(",")
+                end
               end
             }
           }
@@ -130,7 +156,7 @@ module Hotdog
           code, result = @dog.search("hosts:")
           logger.debug("dog.serarch(%s) #==> [%s, %s]" % ["hosts:".inspect, code.inspect, result.inspect])
           if code.to_i / 100 != 2
-            raise("HTTP #{code}: #{result.inspect}")
+            raise("dog.search(%s) returns (%s: %s)" % ["hosts:".inspect, code.inspect, result.inspect])
           end
 
           execute(<<-EOS % result["results"]["hosts"].map { "LOWER(?)" }.join(", "), result["results"]["hosts"])
@@ -225,9 +251,9 @@ module Hotdog
           logger.debug("update_host_tags_q1(%s)" % [host_id.inspect])
           host_name = @update_host_tags_q1.execute(host_id).map { |row| row.first }.first
         else
-          @update_host_tags_q2 ||= @db.prepare("SELECT id FROM hosts WHERE LOWER(name) = LOWER(?) LIMIT 1;")
+          @update_host_tags_q2 ||= @db.prepare("SELECT id, name FROM hosts WHERE LOWER(name) = LOWER(?) LIMIT 1;")
           logger.debug("update_host_tags_q2(%s)" % [host_name.inspect])
-          host_id = @update_host_tags_q2.execute(host_name).map { |row| row.first }.first
+          host_id, host_name = @update_host_tags_q2.execute(host_name).map { |row| row }.first
         end
 
         if not options[:force]
@@ -248,7 +274,7 @@ module Hotdog
         end
 
         code, result = @dog.host_tags(host_name)
-        logger.debug("dog.hosts_tags(%s) #==> [%s, %s]" % [host_name.inspect, code.inspect, result.inspect])
+        logger.debug("dog.host_tags(%s) #==> [%s, %s]" % [host_name.inspect, code.inspect, result.inspect])
         if code.to_i / 100 != 2
           case code.to_i
           when 404 # host not found on datadog
@@ -256,7 +282,7 @@ module Hotdog
             logger.debug("update_host_tags_q7(%s)" % [host_name.inspect])
             @update_host_tags_q7.execute(host_name)
           end
-          raise("HTTP #{code}: #{result.inspect}")
+          raise("dog.host_tags(%s) returns (%s: %s)" % [host_name.inspect, code.inspect, result.inspect])
         end
 
         expires_at = Time.new.to_i + (options[:minimum_expiry] + rand(options[:random_expiry]))

data/lib/hotdog/formatters/json.rb

@@ -6,7 +6,7 @@ module Hotdog
   module Formatters
     class Json < BaseFormatter
       def format(result, options={})
-        JSON.pretty_generate(result)
+        JSON.pretty_generate(result) + "\n"
       end
     end
   end

data/lib/hotdog/formatters/plain.rb

@@ -31,7 +31,12 @@ module Hotdog
             }
           }
         end
-        _format(result, sep, options)
+        s = _format(result, sep, options)
+        if s.empty? or options[:print0]
+          s
+        else
+          s + "\n"
+        end
       end
 
       def _format(result, sep, options={})

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Yamashita Yuu