hotdog 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 933d32781a29b749befc75434934913bc85ca09a
-  data.tar.gz: ae79146d62e2da1110246485559571d8d43475a4
+  metadata.gz: 87916b1a0fd595019d2e97021bd753cc95ea39ad
+  data.tar.gz: 7f525b438a8ea90084f1a22b6277e863f32061be
 SHA512:
-  metadata.gz: f5c3b0eb31180b6057bb3a6da9c077fbef40d79eb28ab46215b5ae60471df254c73011003f5795e07d2dbda1594326db25c8acdacad4e8e4425dbf54fef855ab
-  data.tar.gz: 7791194153534266e7768c0a1cd96d391fd274aab72a4e93b9ea6776515e0fa1b45b628f4e65ac84c8b9fab5d3b3d6fe73341f8b8ec47c054c1c3f61c88ef4a3
+  metadata.gz: dbc182c9a25be6d3116065930968379095b0248cbd4bc386f26f6c4860d9e3ed73322ae298e44192e5a16a3cbb5401ec08490fe2f7c717fa480d321e75011df6
+  data.tar.gz: 3a8d9bc7ce921d4f9fbd2ffde40ae2468119a5d082c32551ae4aa494df969dca4757f00ac9fa25a6e339deb1ca8d2fe060ae8a174420b124fe569ba757e8f650

data/README.md

@@ -75,6 +75,36 @@ $ hotdog search availability-zone:us-east-1b and 'name:web-*'
 i-03cb56ed
 ```
 
+
+## Expression
+
+Acceptable expressions in pseudo BNF.
+
+```
+expression: binary_expression
+          | term
+
+binary_expression: term "&&" term
+                 | term "||" term
+                 | term "and" term
+                 | term "or" term
+
+unary_expression: '!' expression
+                | '~' expression
+                | "not" expression
+
+term: unary_expression
+    | atom
+
+atom: '(' expression ')'
+    | IDENTIFIER separator ATTRIBUTE
+    | IDENTIFIER
+
+separator: ':'
+         | '='
+```
+
+
 ## Contributing
 
 1. Fork it ( https://github.com/yyuu/hotdog/fork )

data/lib/hotdog/application.rb

@@ -14,7 +14,7 @@ module Hotdog
       @optparse = OptionParser.new
       @options = {
         environment: "default",
-        minimum_expiry: 28800, # 8 hours
+        minimum_expiry: 3600, # 1 hour
         random_expiry: 604800, # 7 days
         fixed_string: false,
         force: false,
@@ -22,7 +22,7 @@ module Hotdog
         headers: false,
         listing: false,
         logger: Logger.new(STDERR),
-        max_time: 30,
+        max_time: 10,
         api_key: ENV["DATADOG_API_KEY"],
         application_key: ENV["DATADOG_APPLICATION_KEY"],
         print0: false,

data/lib/hotdog/commands.rb

@@ -104,12 +104,12 @@ module Hotdog
             EOS
             result = hosts.map { |host_id, host_name|
               update_host_tags(host_name, @options.dup)
-              logger.debug("get_hosts_q3()")
               @get_hosts_q3 ||= @db.prepare(<<-EOS)
                 SELECT DISTINCT tags.name FROM hosts_tags
                   INNER JOIN tags ON hosts_tags.tag_id = tags.id
                     WHERE hosts_tags.host_id = ?;
               EOS
+              logger.debug("get_hosts_q3()")
               tag_names = @get_hosts_q3.execute(host_id).map { |row| row.first }
               tag_names.each do |tag_name|
                 fields << tag_name unless fields.index(tag_name)
@@ -136,6 +136,9 @@ module Hotdog
       end
 
       def update_hosts(options={})
+        if suspended?
+          return
+        end
         @db.transaction do
           if not options[:force]
             # Update host list on every expirations to update frequently.
@@ -159,6 +162,7 @@ module Hotdog
             raise("dog.search(%s) returns (%s: %s)" % ["hosts:".inspect, code.inspect, result.inspect])
           end
 
+          resume_host_tags
           execute(<<-EOS % result["results"]["hosts"].map { "LOWER(?)" }.join(", "), result["results"]["hosts"])
             DELETE FROM hosts_tags WHERE host_id NOT IN
               ( SELECT id FROM hosts WHERE LOWER(name) IN ( %s ) );
@@ -181,6 +185,9 @@ module Hotdog
       end
 
       def update_tags(options={})
+        if suspended?
+          return
+        end
         @db.transaction do
           resume_host_tags
 
@@ -191,11 +198,11 @@ module Hotdog
             logger.debug("update_tags_q1()")
             hosts = @update_tags_q1.execute().map { |row| row.first }
           else
-            logger.debug("update_tags_q2()")
             @update_tags_q2 ||= @db.prepare(<<-EOS)
               SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
                 WHERE hosts_tags.expires_at < ?;
             EOS
+            logger.debug("update_tags_q2()")
             hosts = @update_tags_q2.execute(Time.new.to_i)
           end
           hosts.each do |host_id|
@@ -224,8 +231,10 @@ module Hotdog
       def suspend_host_tags()
         @suspended = true
         @suspend_host_tags_q1 ||= @db.prepare("INSERT OR IGNORE INTO hosts (name) VALUES (?);")
+        logger.debug("suspend_host_tags_q1(%s)" % [EMPTY_HOST_NAME.inspect])
         @suspend_host_tags_q1.execute(EMPTY_HOST_NAME)
         @suspend_host_tags_q2 ||= @db.prepare("INSERT OR IGNORE INTO tags (name, value) VALUES (?, ?);")
+        logger.debug("suspend_host_tags_q2(%s, %s)" % [EMPTY_TAG_NAME.inspect, EMPTY_TAG_VALUE.inspect])
         @suspend_host_tags_q2.execute(EMPTY_TAG_NAME, EMPTY_TAG_VALUE)
         @suspend_host_tags_q3 ||= @db.prepare(<<-EOS)
           INSERT OR REPLACE INTO hosts_tags (host_id, tag_id, expires_at)
@@ -233,6 +242,7 @@ module Hotdog
               ( SELECT id FROM hosts WHERE name = ?) AS host,
               ( SELECT id FROM tags WHERE name = ? AND value = ? ) AS tag;
         EOS
+        logger.debug("suspend_host_tags_q3(%s, %s, %s, %s)" % [EMPTY_EXPIRES_AT.inspect, EMPTY_HOST_NAME.inspect, EMPTY_TAG_NAME.inspect, EMPTY_TAG_VALUE.inspect])
         @suspend_host_tags_q3.execute(EMPTY_EXPIRES_AT, EMPTY_HOST_NAME, EMPTY_TAG_NAME, EMPTY_TAG_VALUE)
       end
 
@@ -241,10 +251,15 @@ module Hotdog
           DELETE FROM hosts_tags
             WHERE host_id IN ( SELECT id FROM hosts WHERE name = ? ) AND tag_id IN ( SELECT id FROM tags WHERE name = ? AND value = ? );
         EOS
+        logger.debug("resume_host_tags_q1(%s, %s, %s)" % [EMPTY_HOST_NAME.inspect, EMPTY_TAG_NAME.inspect, EMPTY_TAG_VALUE.inspect])
         @resume_host_tags_q1.execute(EMPTY_HOST_NAME, EMPTY_TAG_NAME, EMPTY_TAG_VALUE)
       end
 
       def update_host_tags(host_name, options={})
+        if suspended?
+          # stop updating if the `update_host_tags` has already been suspended
+          return
+        end
         if Integer === host_name
           host_id = host_name
           @update_host_tags_q1 ||= @db.prepare("SELECT name FROM hosts WHERE id = ? LIMIT 1;")

data/lib/hotdog/commands/search.rb

@@ -169,11 +169,13 @@ module Hotdog
             if left_values.empty?
               []
             else
-              (left_values & @right.evaluate(environment)).uniq
+              right_values = @right.evaluate(environment)
+              (left_values & right_values)
             end
           when "||", "|", /\Aor\z/i
             left_values = @left.evaluate(environment)
-            (left_values | @right.evaluate(environment)).uniq
+            right_values = @right.evaluate(environment)
+            (left_values | right_values).uniq
           else
             raise(SyntaxError.new("unknown binary operator: #{@op}"))
           end

data/lib/hotdog/commands/update.rb

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

data/lib/hotdog/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler