hotdog 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87916b1a0fd595019d2e97021bd753cc95ea39ad
-  data.tar.gz: 7f525b438a8ea90084f1a22b6277e863f32061be
+  metadata.gz: 7300d7cfb838327013fb49f3012e15a606cb7af4
+  data.tar.gz: 38666c025172a7873a7746027d64d6a388cd38b5
 SHA512:
-  metadata.gz: dbc182c9a25be6d3116065930968379095b0248cbd4bc386f26f6c4860d9e3ed73322ae298e44192e5a16a3cbb5401ec08490fe2f7c717fa480d321e75011df6
-  data.tar.gz: 3a8d9bc7ce921d4f9fbd2ffde40ae2468119a5d082c32551ae4aa494df969dca4757f00ac9fa25a6e339deb1ca8d2fe060ae8a174420b124fe569ba757e8f650
+  metadata.gz: c3e9cd9dff9174e95ba9343f4af840437b721b2ad3e0c46e4bf03ab3433f54d66ea2676c0600f5f30b5278315aa48d3943480a7f40b0e5b43737be7fbb70acb3
+  data.tar.gz: 86870002dea94e2cefc19ac9c3f028f394d001bab658bb875ee2bbb86a68e5feb2e47bb7cbd59e5465f5416da1f88f0336ce14799a122d9e3f600a1ccf6c6f20

data/README.md

@@ -22,13 +22,30 @@ Or install it yourself as:
 $ gem install hotdog
 ```
 
+Then, setup API key and application key of Datadog. The keys can be configured in environment variables or configuration file.
+
+```sh
+export DATADOG_API_KEY="abcdefghijklmnopqrstuvwxyzabcdef"
+export DATADOG_APPLICATION_KEY="abcdefghijklmnopqrstuvwxyzabcdefghijklmn"
+```
+
+Or,
+
+```
+$ mkdir ~/.hotdog
+$ cat <<EOF
+---
+api_key: abcdefghijklmnopqrstuvwxyzabcdef
+application_key: abcdefghijklmnopqrstuvwxyzabcdefghijklmn
+EOF
+```
+
 ## Usage
 
-Setup environment variables of `DATADOG_API_KEY` and `DATADOG_APPLICATION_KEY`.
-Then, create and initialize host information. This may take several minutes.
+Initialize host information. This may take several minutes.
 
 ```sh
-$ hotdog init
+$ hotdog update
 ```
 
 List all registered hosts.

data/lib/hotdog/application.rb

@@ -4,21 +4,23 @@ require "logger"
 require "optparse"
 require "shellwords"
 require "sqlite3"
+require "yaml"
 require "hotdog/commands"
 require "hotdog/formatters"
 
 module Hotdog
   class Application
     def initialize()
-      @confdir = File.join(ENV["HOME"], ".hotdog")
+      @confdir = find_confdir(File.expand_path("."))
       @optparse = OptionParser.new
       @options = {
+        debug: false,
         environment: "default",
         minimum_expiry: 3600, # 1 hour
         random_expiry: 604800, # 7 days
         fixed_string: false,
         force: false,
-        formatter: get_formatter("plain").new,
+        format: "plain",
         headers: false,
         listing: false,
         logger: Logger.new(STDERR),
@@ -28,6 +30,7 @@ module Hotdog
         print0: false,
         print1: true,
         tags: [],
+        verbose: false,
       }
       @options[:logger].level = Logger::INFO
       define_options
@@ -37,7 +40,10 @@ module Hotdog
     def main(argv=[])
       config = File.join(@confdir, "config.yml")
       if File.file?(config)
-        @options = @options.merge(YAML.load(File.read(config)))
+        loaded = YAML.load(File.read(config))
+        if Hash === loaded
+          @options = @options.merge(Hash[loaded.map { |key, value| [Symbol === key ? key : key.to_s.to_sym, value] }])
+        end
       end
       args = @optparse.parse(argv)
 
@@ -49,6 +55,14 @@ module Hotdog
         raise("DATADOG_APPLICATION_KEY is not set")
       end
 
+      options[:formatter] = get_formatter(options[:format]).new
+
+      if options[:debug] or options[:verbose]
+        options[:logger].level = Logger::DEBUG
+      else
+        options[:logger].level = Logger::INFO
+      end
+
       sqlite = File.expand_path(File.join(@confdir, "#{options[:environment]}.db"))
       FileUtils.mkdir_p(File.dirname(sqlite))
       @db = SQLite3::Database.new(sqlite)
@@ -85,8 +99,11 @@ module Hotdog
       @optparse.on("-1", "Use newline as separator") do |v|
         options[:print1] = v
       end
+      @optparse.on("-B", "--blocking", "Enable blocking mode") do
+        options[:max_time] = -1
+      end
       @optparse.on("-d", "--[no-]debug", "Enable debug mode") do |v|
-        options[:logger].level = v ? Logger::DEBUG : Logger::INFO
+        options[:debug] = v
       end
       @optparse.on("-E ENVIRONMENT", "--environment ENVIRONMENT", "Specify environment") do |environment|
         options[:environment] = environment
@@ -98,7 +115,7 @@ module Hotdog
         options[:force] = v
       end
       @optparse.on("-F FORMAT", "--format FORMAT", "Specify output format") do |format|
-        options[:formatter] = get_formatter(format).new
+        options[:format] = format
       end
       @optparse.on("-h", "--[no-]headers", "Display headeres for each columns") do |v|
         options[:headers] = v
@@ -113,7 +130,7 @@ module Hotdog
         options[:max_time] = seconds
       end
       @optparse.on("-V", "--[no-]verbose", "Enable verbose mode") do |v|
-        options[:logger].level = v ? Logger::DEBUG : Logger::INFO
+        options[:verbose] = v
       end
     end
 
@@ -162,6 +179,24 @@ module Hotdog
         end
       end
     end
+
+    def find_confdir(path)
+      if path == "/"
+        # default
+        if ENV.has_key?("HOTDOG_CONFDIR")
+          ENV["HOTDOG_CONFDIR"]
+        else
+          File.join(ENV["HOME"], ".hotdog")
+        end
+      else
+        confdir = File.join(path, ".hotdog")
+        if File.directory?(confdir)
+          confdir
+        else
+          find_confdir(File.dirname(path))
+        end
+      end
+    end
   end
 end
 

data/lib/hotdog/commands.rb

@@ -168,7 +168,7 @@ module Hotdog
               ( SELECT id FROM hosts WHERE LOWER(name) IN ( %s ) );
           EOS
 
-          result["results"]["hosts"].each do |host_name|
+          result["results"]["hosts"].each_with_index do |host_name, i|
             @update_hosts_q2 ||= @db.prepare("INSERT OR IGNORE INTO hosts (name) VALUES (?);")
             logger.debug("update_hosts_q2(%s)" % [host_name.inspect])
             @update_hosts_q2.execute(host_name)
@@ -176,7 +176,8 @@ module Hotdog
 
             elapsed_time = Time.new - @started_at
             if 0 < options[:max_time] and options[:max_time] < elapsed_time
-              logger.info("update host tags exceeded the maximum time (#{options[:max_time]} < #{elapsed_time}). will resume on next run.")
+              length = result["results"]["hosts"].length
+              logger.info("update_host_tags: exceeded maximum time (#{options[:max_time]} < #{elapsed_time}) after #{i+1}/#{length}. will resume on next run.")
               suspend_host_tags
               break
             end
@@ -205,7 +206,7 @@ module Hotdog
             logger.debug("update_tags_q2()")
             hosts = @update_tags_q2.execute(Time.new.to_i)
           end
-          hosts.each do |host_id|
+          hosts.each_with_index do |host_id, i|
             @update_tags_q3 ||= @db.prepare("DELETE FROM hosts_tags WHERE host_id = ? AND hosts_tags.expires_at < ?;")
             logger.debug("update_tags_q3(%s, %s)" % [host_id.inspect, Time.new.to_i])
             @update_tags_q3.execute(host_id, Time.new.to_i)
@@ -214,7 +215,8 @@ module Hotdog
 
             elapsed_time = Time.new - @started_at
             if 0 < options[:max_time] and options[:max_time] < elapsed_time
-              logger.info("update host tags exceeded the maximum time (#{options[:max_time]} < #{elapsed_time}). will resume on next run.")
+              length = hosts.length
+              logger.info("update_host_tags: exceeded maximum time (#{options[:max_time]} < #{elapsed_time}) after #{i+1}/#{length}. will resume on next run.")
               suspend_host_tags
               break
             end

data/lib/hotdog/commands/gc.rb

@@ -4,6 +4,7 @@ module Hotdog
   module Commands
     class Gc < BaseCommand
       def run(args=[])
+        application.run_command("init")
         execute(<<-EOS)
           DELETE FROM hosts WHERE id NOT IN ( SELECT DISTINCT host_id FROM hosts_tags );
         EOS

data/lib/hotdog/commands/hosts.rb

@@ -4,6 +4,7 @@ module Hotdog
   module Commands
     class Hosts < BaseCommand
       def run(args=[])
+        application.run_command("init")
         update_hosts(@options.dup)
 
         if args.empty?
@@ -36,6 +37,7 @@ module Hotdog
         if 0 < result.length
           result, fields = get_hosts(result)
           STDOUT.print(format(result, fields: fields))
+          logger.info("found %d host(s)." % result.length)
         else
           STDERR.puts("no match found: #{args.join(" ")}")
           exit(1)

data/lib/hotdog/commands/init.rb

@@ -39,7 +39,6 @@ module Hotdog
         execute(<<-EOS)
           CREATE INDEX IF NOT EXISTS hosts_tags_host_id_expires_at ON hosts_tags ( host_id, expires_at );
         EOS
-        application.run_command("update")
       end
     end
   end

data/lib/hotdog/commands/search.rb

@@ -7,6 +7,7 @@ module Hotdog
   module Commands
     class Search < BaseCommand
       def run(args=[])
+        application.run_command("init")
         expression = args.join(" ").strip
         if expression.empty?
           exit(1)
@@ -24,6 +25,7 @@ module Hotdog
         if 0 < result.length
           result, fields = get_hosts(result)
           STDOUT.print(format(result, fields: fields))
+          logger.info("found %d host(s)." % result.length)
         else
           STDERR.puts("no match found: #{args.join(" ")}")
           exit(1)

data/lib/hotdog/commands/tags.rb

@@ -4,6 +4,7 @@ module Hotdog
   module Commands
     class Tags < BaseCommand
       def run(args=[])
+        application.run_command("init")
         update_tags(@options.dup)
         if 0 < tags.length
           fields = tags.map { |tag|
@@ -43,6 +44,7 @@ module Hotdog
         end
         if 0 < result.length
           STDOUT.print(format(result, fields: fields))
+          logger.info("found %d tag(s)." % result.length)
         end
       end
     end

data/lib/hotdog/commands/update.rb

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

data/lib/hotdog/formatters/json.rb

@@ -6,6 +6,10 @@ module Hotdog
   module Formatters
     class Json < BaseFormatter
       def format(result, options={})
+        result = result.dup
+        if options[:headers] and options[:fields]
+          result.unshift(options[:fields])
+        end
         JSON.pretty_generate(result) + "\n"
       end
     end

data/lib/hotdog/formatters/yaml.rb

@@ -6,6 +6,10 @@ module Hotdog
   module Formatters
     class Yaml < BaseFormatter
       def format(result, options={})
+        result = result.dup
+        if options[:headers] and options[:fields]
+          result.unshift(options[:fields])
+        end
         result.to_yaml
       end
     end

data/lib/hotdog/version.rb

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

metadata

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