hotdog 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 953ecab33a4f48f426c3df8b0dcca49e861e5113
-  data.tar.gz: 81868bd92db6fddf876fd7eae71c54a2dd841bad
+  metadata.gz: c0f33496f07a7069e8a6fab90cf456a98f80e986
+  data.tar.gz: d7bfd8130aa345ff212cabb30f06ddb83b286a46
 SHA512:
-  metadata.gz: 2763f5fa563fef343b799514436bde84dd886494577b42269118c4e82d999d1c8b3c289e50e3c2a02ba4fb8806c00fbd2a2f8abe4054abc90a9457684daad7d1
-  data.tar.gz: bc471b4a441f275d7fbbf6b2df8d706016de004c80a949fa86499db0d09ad174b708d5864248332d4c540d00731e146e6039f97d61c090422ac7125ea229504e
+  metadata.gz: 5c3aa62c94710e8bd3e1c738489782cfce401a3942d46be03128c4fc427719bba81f74d4cdf108c3cb9c3382ad83bdc2ba4085ca4f554ec2496fcdcb2b6a3b39
+  data.tar.gz: 19fce13c8757dd1fb0437abd99027d0d10ecbea68ca2db57808da119745fafbb0c704b588480f75682de5b7a12509829e2fe27c572ae1f09da5192ca5d2ace41

data/README.md

@@ -29,7 +29,6 @@ Then, create and initialize host information. This may take several minutes.
 
 ```sh
 $ hotdog init
-$ hotdot update
 ```
 
 List all registered hosts.
@@ -59,7 +58,7 @@ i-069e282c sg-89bfe710    worker-staging    us-east-1a        t2.micro      ami-
 Display hosts with specific attributes.
 
 ```sh
-$ hotdog ls -a host -a name
+$ hotdog ls -h -a host -a name
 host       name             
 ---------- -----------------
 i-02605a79 web-staging      

data/lib/hotdog/application.rb

@@ -66,40 +66,40 @@ module Hotdog
 
     private
     def define_options
-      @optparse.on("--api-key API_KEY") do |api_key|
+      @optparse.on("--api-key API_KEY", "Datadog API key") do |api_key|
         options[:api_key] = api_key
       end
-      @optparse.on("--application-key APP_KEY") do |app_key|
+      @optparse.on("--application-key APP_KEY", "Datadog application key") do |app_key|
         options[:application_key] = app_key
       end
-      @optparse.on("-0", "--null") do
+      @optparse.on("-0", "--null", "Use null character as separator") do
         options[:print0] = true
       end
-      @optparse.on("-1") do
+      @optparse.on("-1", "Use newline as separator") do
         options[:print1] = true
       end
-      @optparse.on("-d", "--debug") do
+      @optparse.on("-d", "--debug", "Enable debug mode") do
         options[:logger].level = Logger::DEBUG
       end
-      @optparse.on("-E ENVIRONMENT", "--environment ENVIRONMENT") do |environment|
+      @optparse.on("-E ENVIRONMENT", "--environment ENVIRONMENT", "Specify environment") do |environment|
         options[:environment] = environment
       end
-      @optparse.on("-f", "--force") do
+      @optparse.on("-f", "--force", "Enable force mode") do
         options[:force] = true
       end
-      @optparse.on("-F FORMAT", "--format FORMAT") do |format|
+      @optparse.on("-F FORMAT", "--format FORMAT", "Specify output format") do |format|
         options[:formatter] = get_formatter(format).new
       end
-      @optparse.on("-h", "--headers") do |headers|
+      @optparse.on("-h", "--headers", "Display headeres for each columns") do |headers|
         options[:headers] = headers
       end
-      @optparse.on("-l") do
+      @optparse.on("-l", "Use listing format") do
         options[:listing] = true
       end
-      @optparse.on("-a TAG", "-t TAG", "--tag TAG") do |tag|
+      @optparse.on("-a TAG", "-t TAG", "--tag TAG", "Use specified tag name/value") do |tag|
         options[:tags] += [tag]
       end
-      @optparse.on("-V", "--verbose") do |tag|
+      @optparse.on("-V", "--verbose", "Enable verbose mode") do |tag|
         options[:logger].level = Logger::DEBUG
       end
     end

data/lib/hotdog/commands/init.rb

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

data/lib/hotdog/commands/update.rb

@@ -4,13 +4,12 @@ module Hotdog
   module Commands
     class Update < BaseCommand
       def run(args=[])
-        application.run_command("init")
         if 0 < args.length
           args.each do |host_name|
             update_host_tags(host_name, @options.dup)
           end
         else
-          update_tags(@options.dup)
+          update_hosts(@options.dup)
         end
       end
     end

data/lib/hotdog/commands.rb

@@ -127,13 +127,13 @@ module Hotdog
           result["results"]["hosts"].each do |host_name|
             @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("INSERT OR IGNORE INTO hosts (name) VALUES (?);", host_name)
+            @update_hosts_q2.execute(host_name)
             update_host_tags(host_name, options)
           end
 
           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 name IN ( %s ) );
+              ( SELECT id FROM hosts WHERE LOWER(name) IN ( %s ) );
           EOS
         end
       end
@@ -188,6 +188,11 @@ module Hotdog
 
         code, result = @dog.host_tags(host_name)
         if code.to_i / 100 != 2
+          case code.to_i
+          when 404 # host not found on datadog
+            @update_host_tags_q7 ||= @db.prepare("DELETE FROM hosts_tags WHERE host_id IN ( SELECT id FROM hosts WHERE LOWER(name) = LOWER(?) );")
+            @update_host_tags_q7.execute(host_name)
+          end
           raise("HTTP #{code}: #{result.inspect}")
         end
 

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

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