hotdog 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79e4334fc2d2f63537cbaa32bc44c2e5d069b4f5
-  data.tar.gz: bc9fdf8a14f3ab1a8ab02caa22e9841bfbff5181
+  metadata.gz: 8deb5895caacf3aa169eaeb03aec5beb9a71a4d0
+  data.tar.gz: 9f26224eff745ee809401e997040509eea818d10
 SHA512:
-  metadata.gz: e4e0aacb47ea09c873bbc7f39ee0b003d004716b619a5983eeb7c994a6c57ad4fd3f1286e2b9d1db89819cbf967745289d4e15a7d78109cf880f128173212227
-  data.tar.gz: e3f328b83968a36e98bedf91ced0e68e2f89a2edec886c1a6f2377a7e44d42d7158fdc76201ef53a27ddcd8a8176ae8be7a4db0e8771c7b47c75183e7092ec9b
+  metadata.gz: 5b77afe9612c45e00862544ae90c2d01dfa8dd5f4eeff755ec2c431ae17d98ac702df9e655b26819f771978a7b4e3a75ec8403230c863f932251aa9225697c19
+  data.tar.gz: 14e5e13f1d5f0e4532b5ca7b7cd981cb2eda765b24af1575bf5448acaf07426402dcebc3f774c611e746f99d8a70950cddb44ab9643ec85bcf65307a47a0e711

data/lib/hotdog/application.rb

@@ -18,7 +18,7 @@ module Hotdog
         application: self,
         confdir: find_confdir(File.expand_path(".")),
         debug: false,
-        expiry: 300,
+        expiry: 1800,
         fixed_string: false,
         force: false,
         format: "plain",

data/lib/hotdog/commands/search.rb

@@ -202,7 +202,7 @@ module Hotdog
       end
 
       class ExpressionNode
-        def evaluate(environment)
+        def evaluate(environment, options={})
           raise(NotImplementedError)
         end
       end
@@ -216,7 +216,7 @@ module Hotdog
           @left = left
           @right = right
         end
-        def evaluate(environment)
+        def evaluate(environment, options={})
           case @op
           when "&&", "&", /\Aand\z/i
             left_values = @left.evaluate(environment)
@@ -243,7 +243,7 @@ module Hotdog
           @op = op
           @expression = expression
         end
-        def evaluate(environment)
+        def evaluate(environment, options={})
           case @op
           when "!", "~", /\Anot\z/i
             values = @expression.evaluate(environment)
@@ -275,7 +275,7 @@ module Hotdog
         def attribute?
           !(attribute.nil? or attribute.to_s.empty?)
         end
-        def evaluate(environment)
+        def evaluate(environment, options={})
           if identifier?
             if attribute?
               case identifier
@@ -307,24 +307,51 @@ module Hotdog
                     WHERE LOWER(tags.value) = LOWER(?);
               EOS
             else
-              values = []
+              return []
             end
           end
-          if not environment.fixed_string? and values.empty?
+          if values.empty?
+            fallback(environment, options)
+          else
+            values
+          end
+        end
+
+        def fallback(environment, options={})
+          if environment.fixed_string?
+            []
+          else
             # fallback to glob expression
             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)
+              values = TagGlobExpressionNode.new(identifier_glob, attribute_glob).evaluate(environment, options)
+              if values.empty?
+                reload(environment, options)
+              else
+                values
+              end
+            else
+              []
             end
           end
-          values
+        end
+
+        def reload(environment, options={})
+          ttl = options.fetch(:ttl, 1)
+          if 0 < ttl
+            environment.logger.info("force reloading all hosts and tags.")
+            environment.reload(force: true)
+            self.class.new(identifier, attribute).evaluate(environment, options.merge(ttl: ttl-1))
+          else
+            []
+          end
         end
       end
 
       class TagGlobExpressionNode < TagExpressionNode
-        def evaluate(environment)
+        def evaluate(environment, options={})
           if identifier?
             if attribute?
               case identifier
@@ -356,19 +383,14 @@ module Hotdog
                     WHERE LOWER(tags.value) GLOB LOWER(?);
               EOS
             else
-              values = []
+              return []
             end
           end
-          if not environment.fixed_string? and values.empty?
-            # fallback to glob expression
-            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
+          if values.empty?
+            fallback(environment, options)
+          else
+            values
           end
-          values
         end
       end
 
@@ -378,7 +400,7 @@ module Hotdog
           attribute = attribute.sub(%r{\A/(.*)/\z}) { $1 } if attribute
           super(identifier, attribute)
         end
-        def evaluate(environment)
+        def evaluate(environment, options={})
           if identifier?
             if attribute?
               case identifier
@@ -388,14 +410,14 @@ module Hotdog
                     WHERE LOWER(hosts.name) REGEXP LOWER(?);
                 EOS
               else
-                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) REGEXP LOWER(?) AND LOWER(tags.value) REGEXP LOWER(?);
                 EOS
               end
             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
@@ -410,10 +432,14 @@ module Hotdog
                     WHERE LOWER(tags.value) REGEXP LOWER(?);
               EOS
             else
-              values = []
+              return []
             end
           end
-          values
+          if values.empty?
+            reload(environment)
+          else
+            values
+          end
         end
       end
     end

data/lib/hotdog/commands.rb

@@ -9,12 +9,15 @@ module Hotdog
   module Commands
     class BaseCommand
       PERSISTENT_DB = "persistent.db"
+      MASK_DATABASE = 0xffff0000
+      MASK_QUERY = 0x0000ffff
 
       def initialize(application)
         @application = application
         @logger = application.options[:logger]
         @options = application.options
         @dog = Dogapi::Client.new(options[:api_key], options[:application_key])
+        @prepared_statements = {}
       end
       attr_reader :application
       attr_reader :logger
@@ -31,14 +34,27 @@ module Hotdog
           q += " -- VALUES (#{args.map { |arg| Array === arg ? "(#{arg.join(", ")})" : arg.inspect }.join(", ")})"
         end
         logger.debug(q)
-        @db.execute(query, args)
+        prepare(@db, query).execute(args)
       end
 
       def fixed_string?()
         @options[:fixed_string]
       end
 
+      def reload(options={})
+        if @db
+          close_db(@db)
+          @db = nil
+        end
+        update_db(options)
+      end
+
       private
+      def prepare(db, query)
+        k = (db.hash & MASK_DATABASE) | (query.hash & MASK_QUERY)
+        @prepared_statements[k] ||= db.prepare(query)
+      end
+
       def format(result, options={})
         @options[:formatter].format(result, @options.merge(options))
       end
@@ -120,12 +136,22 @@ module Hotdog
         [result, fields]
       end
 
+      def close_db(db, options={})
+        @prepared_statements = @prepared_statements.reject { |k, statement|
+          (db.hash & MASK_DATABASE == k & MASK_DATABASE).tap do |delete_p|
+            statement.close() if delete_p
+          end
+        }
+        db.close()
+      end
+
       def update_db(options={})
+        options = @options.merge(options)
         if @db.nil?
-          FileUtils.mkdir_p(@options[:confdir])
-          persistent = File.join(@options[:confdir], PERSISTENT_DB)
+          FileUtils.mkdir_p(options[:confdir])
+          persistent = File.join(options[:confdir], PERSISTENT_DB)
 
-          if not @options[:force] and File.exist?(persistent) and Time.new < File.mtime(persistent) + @options[:expiry]
+          if not options[:force] and File.exist?(persistent) and Time.new < File.mtime(persistent) + options[:expiry]
             begin
               persistent_db = SQLite3::Database.new(persistent)
               persistent_db.execute("SELECT id, name FROM hosts LIMIT 1")
@@ -191,7 +217,7 @@ module Hotdog
           FileUtils.rm_f(persistent)
           persistent_db = SQLite3::Database.new(persistent)
           copy_db(memory_db, persistent_db)
-          persistent_db.close
+          close_db(persistent_db)
           @db = memory_db
         else
           @db
@@ -223,17 +249,17 @@ module Hotdog
 
       def select_from_hosts(db)
         logger.debug("select_from_hosts()")
-        db.execute("SELECT id, name FROM hosts")
+        prepare(db, "SELECT id, name FROM hosts").execute()
       end
 
       def select_from_tags(db)
         logger.debug("select_from_tags()")
-        db.execute("SELECT id, name, value FROM tags")
+        prepare(db, "SELECT id, name, value FROM tags").execute()
       end
 
       def select_from_hosts_tags(db)
         logger.debug("select_from_hosts_tags()")
-        db.execute("SELECT host_id, tag_id FROM hosts_tags")
+        prepare(db, "SELECT host_id, tag_id FROM hosts_tags").execute()
       end
 
       def create_table_hosts(db)
@@ -284,32 +310,32 @@ module Hotdog
 
       def insert_into_tags(db, tag_id, tag_name, tag_value)
         logger.debug("insert_into_tags(%s, %s, %s)" % [tag_id.inspect, tag_name.inspect, tag_value.inspect])
-        db.execute("INSERT INTO tags (id, name, value) VALUES (?, ?, ?)", tag_id, tag_name, tag_value)
+        prepare(db, "INSERT INTO tags (id, name, value) VALUES (?, ?, ?)").execute(tag_id, tag_name, tag_value)
       end
 
       def insert_or_ignore_into_tags(db, tag_name, tag_value)
         logger.debug("insert_or_ignore_into_tags(%s, %s)" % [tag_name.inspect, tag_value.inspect])
-        db.execute("INSERT OR IGNORE INTO tags (name, value) VALUES (?, ?)", tag_name, tag_value)
+        prepare(db, "INSERT OR IGNORE INTO tags (name, value) VALUES (?, ?)").execute(tag_name, tag_value)
       end
 
       def insert_into_hosts(db, host_id, host_name)
         logger.debug("insert_into_hosts(%s, %s)" % [host_id.inspect, host_name.inspect])
-        db.execute("INSERT INTO hosts (id, name) VALUES (?, ?)", host_id, host_name)
+        prepare(db, "INSERT INTO hosts (id, name) VALUES (?, ?)").execute(host_id, host_name)
       end
 
       def insert_or_ignore_into_hosts(db, host_name)
         logger.debug("insert_or_ignore_into_hosts(%s)" % [host_name.inspect])
-        db.execute("INSERT OR IGNORE INTO hosts (name) VALUES (?)", host_name)
+        prepare(db, "INSERT OR IGNORE INTO hosts (name) VALUES (?)").execute(host_name)
       end
 
       def insert_into_hosts_tags(db, host_id, tag_id)
         logger.debug("insert_into_hosts_tags(%s, %s)" % [host_id.inspect, tag_id.inspect])
-        db.execute("INSERT INTO hosts_tags (host_id, tag_id) VALUES (?, ?)", host_id, tag_id)
+        prepare(db, "INSERT INTO hosts_tags (host_id, tag_id) VALUES (?, ?)").execute(host_id, tag_id)
       end
 
       def insert_or_replace_into_hosts_tags(db, host_name, tag_name, tag_value)
         logger.debug("insert_or_replace_into_hosts_tags(%s, %s, %s)" % [host_name.inspect, tag_name.inspect, tag_value.inspect])
-        db.execute(<<-EOS, host_name, tag_name, tag_value)
+        prepare(db, <<-EOS).execute(host_name, tag_name, tag_value)
           INSERT OR REPLACE INTO hosts_tags (host_id, tag_id)
             SELECT host.id, tag.id FROM
               ( SELECT id FROM hosts WHERE LOWER(name) = LOWER(?) ) AS host,
@@ -319,12 +345,12 @@ module Hotdog
 
       def select_name_from_hosts_by_id(db, host_id)
         logger.debug("select_name_from_hosts_by_id(%s)" % [host_id.inspect])
-        db.execute("SELECT name FROM hosts WHERE id = ? LIMIT 1", host_id).map { |row| row.first }.first
+        prepare(db, "SELECT name FROM hosts WHERE id = ? LIMIT 1").execute(host_id).map { |row| row.first }.first
       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])
-        db.execute(<<-EOS, host_id, tag_name).map { |row| row.first }.join(",")
+        prepare(db, <<-EOS).execute(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
               WHERE hosts_tags.host_id = ? AND LOWER(tags.name) GLOB LOWER(?);
@@ -333,7 +359,7 @@ module Hotdog
 
       def select_tag_values_from_hosts_tags_by_host_id_and_tag_name(db, host_id, tag_name)
         logger.debug("select_tag_values_from_hosts_tags_by_host_id_and_tag_name(%s, %s)" % [host_id.inspect, tag_name.inspect])
-        db.execute(<<-EOS, host_id, tag_name).map { |row| row.first }.join(",")
+        prepare(db, <<-EOS).execute(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
               WHERE hosts_tags.host_id = ? AND LOWER(tags.name) = LOWER(?);
@@ -342,7 +368,7 @@ module Hotdog
 
       def select_tag_names_from_hosts_tags_by_host_id(db, host_id)
         logger.debug("select_tag_names_from_hosts_tags_by_host_id(%s)" % [host_id.inspect])
-        db.execute(<<-EOS, host_id).map { |row| row.first }
+        prepare(db, <<-EOS).execute(host_id).map { |row| row.first }
           SELECT DISTINCT tags.name FROM hosts_tags
             INNER JOIN tags ON hosts_tags.tag_id = tags.id
               WHERE hosts_tags.host_id = ?;

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.1.17"
+  VERSION = "0.1.18"
 end

metadata

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