hotdog 0.1.18 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8deb5895caacf3aa169eaeb03aec5beb9a71a4d0
-  data.tar.gz: 9f26224eff745ee809401e997040509eea818d10
+  metadata.gz: 017715f50e986cf3c0f61cb4834859c296ddf6f7
+  data.tar.gz: 137f2e8504b9c9908635b8dfe7db6d2b1541be9b
 SHA512:
-  metadata.gz: 5b77afe9612c45e00862544ae90c2d01dfa8dd5f4eeff755ec2c431ae17d98ac702df9e655b26819f771978a7b4e3a75ec8403230c863f932251aa9225697c19
-  data.tar.gz: 14e5e13f1d5f0e4532b5ca7b7cd981cb2eda765b24af1575bf5448acaf07426402dcebc3f774c611e746f99d8a70950cddb44ab9643ec85bcf65307a47a0e711
+  metadata.gz: 3b406633a8f174b328dca17c976b4585d6e187f8cefc2dfe7c19ca094f2469faf292a1335d8aaea75f8e440c7d24f1878782710ac9b4c8456cea65466ced87cc
+  data.tar.gz: a1f2843dd806045110b64c915c8fda049f1a228654e8fc1282f5aa057280e129ecd5da06ca88a80db37b0f35c3c3054ec6e57338fb20d0e9ca176169fb17811c

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+    - 2.1.6
+    - 2.2.3
+script: rspec spec
+sudo: false

data/README.md

@@ -1,5 +1,7 @@
 # Hotdog
 
+[![Build Status](https://travis-ci.org/yyuu/hotdog.svg)](https://travis-ci.org/yyuu/hotdog)
+
 Yet another command-line tools for [Datadog](https://www.datadoghq.com/).
 
 ## Installation

data/hotdog.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.3.0"
 
   spec.add_dependency "dogapi", ">= 1.13.0"
   spec.add_dependency "parslet", "~> 1.6.2"

data/lib/hotdog/commands/down.rb

@@ -29,9 +29,9 @@ module Hotdog
         end
 
         # Remove persistent.db to schedule update on next invocation
-        if not @db.nil?
-          @db.close
-          FileUtils.rm_f(File.join(@options[:confdir], PERSISTENT_DB))
+        if @db
+          close_db(@db)
+          FileUtils.rm_f(File.join(options[:confdir], PERSISTENT_DB))
         end
       end
     end

data/lib/hotdog/commands/hosts.rb

@@ -6,21 +6,13 @@ module Hotdog
       def run(args=[])
         args = optparse.parse(args)
         if args.empty?
-          result = execute("SELECT DISTINCT host_id FROM hosts_tags").to_a.reduce(:+)
+          result = execute("SELECT id FROM hosts").to_a.reduce(:+)
         else
           result = args.map { |host_name|
             if glob?(host_name)
-              execute(<<-EOS, host_name).map { |row| row.first }
-                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
+              execute("SELECT id FROM hosts WHERE name GLOB ?", [host_name]).to_a.reduce(:+)
             else
-              execute(<<-EOS, host_name).map { |row| row.first }
-                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
+              execute("SELECT id FROM hosts WHERE name = ?", [host_name]).to_a.reduce(:+)
             end
           }.reduce(:+)
         end

data/lib/hotdog/commands/search.rb

@@ -15,7 +15,8 @@ module Hotdog
         args = optparse.parse(args)
         expression = args.join(" ").strip
         if expression.empty?
-          exit(1)
+          # return everything if given expression is empty
+          expression = "*"
         end
 
         begin
@@ -70,9 +71,9 @@ module Hotdog
         end
       end
 
-      def evaluate(node, environment)
-        node = ExpressionTransformer.new.apply(node)
-        node.evaluate(environment)
+      def evaluate(data, environment)
+        node = ExpressionTransformer.new.apply(data)
+        node.optimize.evaluate(environment)
       end
 
       class ExpressionParser < Parslet::Parser
@@ -82,18 +83,27 @@ module Hotdog
           | term \
           )
         }
+        rule(:binary_op) {
+          ( str('&') >> str('&').maybe \
+          | str('|') >> str('|').maybe \
+          | match('[Aa]') >> match('[Nn]') >> match('[Dd]') \
+          | match('[Oo]') >> match('[Rr]') \
+          )
+        }
         rule(:binary_expression) {
-          ( term.as(:left) >> spacing.maybe >> (str('&') >> str('&').maybe).as(:binary_op) >> spacing.maybe >> expression.as(:right) \
-          | term.as(:left) >> spacing.maybe >> (str('|') >> str('|').maybe).as(:binary_op) >> spacing.maybe >> expression.as(:right) \
-          | term.as(:left) >> spacing.maybe >> (match('[Aa]') >> match('[Nn]') >> match('[Dd]')).as(:binary_op) >> spacing.maybe >> expression.as(:right) \
-          | term.as(:left) >> spacing.maybe >> (match('[Oo]') >> match('[Rr]')).as(:binary_op) >> spacing.maybe >> expression.as(:right) \
+          ( term.as(:left) >> spacing.maybe >> binary_op.as(:binary_op) >> spacing.maybe >> expression.as(:right) \
           | term.as(:left) >> spacing.maybe.as(:binary_op) >> expression.as(:right) \
           )
         }
+        rule(:unary_op) {
+          ( str('!') \
+          | str('~') \
+          | match('[Nn]') >> match('[Oo]') >> match('[Tt]') \
+          )
+        }
         rule(:unary_expression) {
-          ( spacing.maybe >> str('!').as(:unary_op) >> atom.as(:expression) \
-          | spacing.maybe >> str('~').as(:unary_op) >> atom.as(:expression) \
-          | spacing.maybe >> (match('[Nn]') >> match('[Oo]') >> match('[Tt]')).as(:unary_op) >> atom.as(:expression) \
+          ( spacing.maybe >> unary_op.as(:unary_op) >> term.as(:expression) \
+          | spacing.maybe >> unary_op.as(:unary_op) >> expression.as(:expression) \
           )
         }
         rule(:term) {
@@ -114,8 +124,9 @@ module Hotdog
           | 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_regexp.as(:attribute_regexp) >> spacing.maybe \
           | spacing.maybe >> separator >> attribute_glob.as(:attribute_glob) >> spacing.maybe \
-          | spacing.maybe >> separator >> attribute.as(:attribute_glob) >> spacing.maybe \
+          | spacing.maybe >> separator >> attribute.as(:attribute) >> 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 \
@@ -126,11 +137,11 @@ module Hotdog
           )
         }
         rule(:identifier_glob) {
-          ( identifier.repeat(0) >> (glob >> identifier.maybe).repeat(1) \
+          ( unary_op.absent? >> binary_op.absent? >> identifier.repeat(0) >> (glob >> identifier.maybe).repeat(1) \
           )
         }
         rule(:identifier) {
-          ( match('[A-Za-z]') >> match('[-./0-9A-Z_a-z]').repeat(0) \
+          ( unary_op.absent? >> binary_op.absent? >> match('[A-Za-z]') >> match('[-./0-9A-Z_a-z]').repeat(0) \
           )
         }
         rule(:separator) {
@@ -143,11 +154,11 @@ module Hotdog
           )
         }
         rule(:attribute_glob) {
-          ( attribute.repeat(0) >> (glob >> attribute.maybe).repeat(1) \
+          ( unary_op.absent? >> binary_op.absent? >> attribute.repeat(0) >> (glob >> attribute.maybe).repeat(1) \
           )
         }
         rule(:attribute) {
-          ( match('[-./0-9:A-Z_a-z]').repeat(1) \
+          ( unary_op.absent? >> binary_op.absent? >> match('[-./0-9:A-Z_a-z]').repeat(1) \
           )
         }
         rule(:glob) {
@@ -205,20 +216,31 @@ module Hotdog
         def evaluate(environment, options={})
           raise(NotImplementedError)
         end
+
+        def optimize(options={})
+          self
+        end
       end
 
       class BinaryExpressionNode < ExpressionNode
-        attr_reader :left, :right
+        attr_reader :op, :left, :right
 
         def initialize(op, left, right)
-          @op = op
-          @op ||= "or" # use OR expression by default
+          case op || "or"
+          when "&&", "&", /\Aand\z/i
+            @op = :AND
+          when "||", "|", /\Aor\z/i
+            @op = :OR
+          else
+            raise(SyntaxError.new("unknown binary operator: #{op.inspect}"))
+          end
           @left = left
           @right = right
         end
+
         def evaluate(environment, options={})
           case @op
-          when "&&", "&", /\Aand\z/i
+          when :AND
             left_values = @left.evaluate(environment)
             if left_values.empty?
               []
@@ -226,40 +248,73 @@ module Hotdog
               right_values = @right.evaluate(environment)
               (left_values & right_values)
             end
-          when "||", "|", /\Aor\z/i
+          when :OR
             left_values = @left.evaluate(environment)
             right_values = @right.evaluate(environment)
             (left_values | right_values).uniq
           else
-            raise(SyntaxError.new("unknown binary operator: #{@op.inspect}"))
+            []
           end
         end
+
+        def optimize(options={})
+          @left = @left.optimize(options)
+          @right = @right.optimize(options)
+          if @left == @right
+            @left
+          else
+            self
+          end
+        end
+
+        def ==(other)
+          self.class === other and @op == other.op and @left == other.left and @right == other.right
+        end
       end
 
       class UnaryExpressionNode < ExpressionNode
-        attr_reader :expression
+        attr_reader :op, :expression
 
         def initialize(op, expression)
-          @op = op
+          case op
+          when "!", "~", /\Anot\z/i
+            @op = :NOT
+          else
+            raise(SyntaxError.new("unknown unary operator: #{@op.inspect}"))
+          end
           @expression = expression
         end
+
         def evaluate(environment, options={})
           case @op
-          when "!", "~", /\Anot\z/i
+          when :NOT
             values = @expression.evaluate(environment)
             if values.empty?
-              environment.execute(<<-EOS).map { |row| row.first }
-                SELECT DISTINCT host_id FROM hosts_tags;
-              EOS
+              environment.execute("SELECT DISTINCT host_id FROM hosts_tags").map { |row| row.first }
             else
-              environment.execute(<<-EOS % values.map { "?" }.join(", "), values).map { |row| row.first }
-                SELECT DISTINCT host_id FROM hosts_tags WHERE host_id NOT IN (%s);
-              EOS
+              environment.execute("SELECT DISTINCT host_id FROM hosts_tags WHERE host_id NOT IN (%s)" % values.map { "?" }.join(", "), values).map { |row| row.first }
             end
           else
-            raise(SyntaxError.new("unknown unary operator: #{@op.inspect}"))
+            []
           end
         end
+
+        def optimize(options={})
+          @expression = @expression.optimize(options)
+          if UnaryExpressionNode === @expression
+            if @op == :NOT and @expression.op == :NOT
+              @expression.expression
+            else
+              self
+            end
+          else
+            self
+          end
+        end
+
+        def ==(other)
+          self.class === other and @op == other.op and @expression == other.expression
+        end
       end
 
       class TagExpressionNode < ExpressionNode
@@ -269,43 +324,43 @@ module Hotdog
         end
         attr_reader :identifier
         attr_reader :attribute
+
         def identifier?
           !(identifier.nil? or identifier.to_s.empty?)
         end
+
         def attribute?
           !(attribute.nil? or attribute.to_s.empty?)
         end
+
         def evaluate(environment, options={})
+          q = []
           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) = LOWER(?);
-                EOS
+                q << "SELECT hosts.id FROM hosts"
+                q <<   "WHERE hosts.name = ?;"
+                values = environment.execute(q.join(" "), [attribute]).map { |row| row.first }
               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
+                q << "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags"
+                q <<   "INNER JOIN tags ON hosts_tags.tag_id = tags.id"
+                q <<     "WHERE tags.name = ? AND tags.value = ?;"
+                values = environment.execute(q.join(" "), [identifier, attribute]).map { |row| row.first }
               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
+              q << "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags"
+              q <<   "INNER JOIN hosts ON hosts_tags.host_id = hosts.id"
+              q <<   "INNER JOIN tags ON hosts_tags.tag_id = tags.id"
+              q <<     "WHERE hosts.name = ? OR tags.name = ? OR tags.value = ?;"
+              values = environment.execute(q.join(" "), [identifier, identifier, identifier]).map { |row| row.first }
             end
           else
             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
+               q << "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags"
+               q <<   "INNER JOIN tags ON hosts_tags.tag_id = tags.id"
+               q <<     "WHERE tags.value = ?;"
+              values = environment.execute(q.join(" "), [attribute]).map { |row| row.first }
             else
               return []
             end
@@ -317,6 +372,10 @@ module Hotdog
           end
         end
 
+        def ==(other)
+          self.class == other.class and @identifier == other.identifier and @attribute == other.attribute
+        end
+
         def fallback(environment, options={})
           if environment.fixed_string?
             []
@@ -352,36 +411,33 @@ module Hotdog
 
       class TagGlobExpressionNode < TagExpressionNode
         def evaluate(environment, options={})
+          q = []
           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
+                q << "SELECT hosts.id FROM hosts"
+                q <<   "WHERE hosts.name GLOB ?;"
+                values = environment.execute(q.join(" "), [attribute]).map { |row| row.first }
               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
+                q << "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags"
+                q <<   "INNER JOIN tags ON hosts_tags.tag_id = tags.id"
+                q <<     "WHERE tags.name GLOB ? AND tags.value GLOB ?;"
+                values = environment.execute(q.join(" "), [identifier, attribute]).map { |row| row.first }
               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
+              q << "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags"
+              q <<   "INNER JOIN hosts ON hosts_tags.host_id = hosts.id"
+              q <<   "INNER JOIN tags ON hosts_tags.tag_id = tags.id"
+              q <<     "WHERE hosts.name GLOB ? OR tags.name GLOB ? OR tags.value GLOB ?;"
+              values = environment.execute(q.join(" "), [identifier, identifier, identifier]).map { |row| row.first }
             end
           else
             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
+              q << "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags"
+              q <<   "INNER JOIN tags ON hosts_tags.tag_id = tags.id"
+              q <<     "WHERE tags.value GLOB ?;"
+              values = environment.execute(q.join(" "), [attribute]).map { |row| row.first }
             else
               return []
             end
@@ -400,37 +456,35 @@ module Hotdog
           attribute = attribute.sub(%r{\A/(.*)/\z}) { $1 } if attribute
           super(identifier, attribute)
         end
+
         def evaluate(environment, options={})
+          q = []
           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) REGEXP LOWER(?);
-                EOS
+                q << "SELECT hosts.id FROM hosts"
+                q <<   "WHERE hosts.name REGEXP ?;"
+                values = environment.execute(q.join(" "), [attribute]).map { |row| row.first }
               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) REGEXP LOWER(?) AND LOWER(tags.value) REGEXP LOWER(?);
-                EOS
+                q << "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags"
+                q <<   "INNER JOIN tags ON hosts_tags.tag_id = tags.id"
+                q <<     "WHERE tags.name REGEXP ? AND tags.value REGEXP ?;"
+                values = environment.execute(q.join(" "), [identifier, attribute]).map { |row| row.first }
               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) REGEXP LOWER(?) OR LOWER(tags.name) REGEXP LOWER(?) OR LOWER(tags.value) REGEXP LOWER(?);
-              EOS
+              q << "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags"
+              q <<   "INNER JOIN hosts ON hosts_tags.host_id = hosts.id"
+              q <<   "INNER JOIN tags ON hosts_tags.tag_id = tags.id"
+              q <<     "WHERE hosts.name REGEXP ? OR tags.name REGEXP ? OR tags.value REGEXP ?;"
+              values = environment.execute(q.join(" "), [identifier, identifier, identifier]).map { |row| row.first }
             end
           else
             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
+              q << "SELECT DISTINCT hosts_tags.host_id FROM hosts_tags"
+              q <<   "INNER JOIN tags ON hosts_tags.tag_id = tags.id"
+              q <<     "WHERE tags.value REGEXP ?;"
+              values = environment.execute(q.join(" "), [attribute]).map { |row| row.first }
             else
               return []
             end

data/lib/hotdog/commands/tags.rb

@@ -7,22 +7,31 @@ module Hotdog
         args = optparse.parse(args)
         if 0 < args.length
           fields = args.map { |tag|
-            tag_name, tag_value = tag.split(":", 2)
+            tag_name, tag_value = split_tag(tag)
             tag_name
           }
-          result1 = fields.map { |tag_name|
-            if not glob?(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
+          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
-              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 GLOB LOWER(?);
-              EOS
+              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|
@@ -30,10 +39,7 @@ module Hotdog
           }
         else
           fields = ["tag"]
-          result = execute(<<-EOS).map { |name, value| [0 < value.length ? "#{name}:#{value}" : name] }
-            SELECT DISTINCT tags.name, tags.value FROM hosts_tags
-              INNER JOIN tags ON hosts_tags.tag_id = tags.id;
-          EOS
+          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))

data/lib/hotdog/commands/up.rb

@@ -31,9 +31,9 @@ module Hotdog
         end
 
         # Remove persistent.db to schedule update on next invocation
-        if not @db.nil?
-          @db.close
-          FileUtils.rm_f(File.join(@options[:confdir], PERSISTENT_DB))
+        if @db
+          close_db(@db)
+          FileUtils.rm_f(File.join(options[:confdir], PERSISTENT_DB))
         end
       end
     end