hotdog 0.23.1 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cef7e3cd868e55667e5640709b2588c34b334c6
-  data.tar.gz: fb0420b231f90085e19fe1d8adab49232ebd8bd4
+  metadata.gz: 8498a1d399ef913b9d29a76bb4dcd3b934383d3a
+  data.tar.gz: 306372f50dbf1bb056f4668dab2e4877a10b5023
 SHA512:
-  metadata.gz: e9a76b4791ce74de74fad77873e1590b1ee12a516a13a746de5c4b35ad3569981675b74393cf0e7dac95845d05d5e97f7fad949e0daac150d451fb58fee43680
-  data.tar.gz: 21b9c513abdc8a3509f31cace6db57a6bae7e0cb8fa5406308ddf5c298e4ad6ff80a7cd31881f23360403295c6a6f3b649926320c0237002a423656b920b0bed
+  metadata.gz: 77f1c40c00c9ac3d1893eeeee77cf4be3b1ce7d10713a2336cf8a74a6a62e3823f4bebacec432737533984971bf279a1dea15f1f3be6c0c7ff13ddce7d496c16
+  data.tar.gz: 57f0780c11d1d3e2822f68adee9918ea630b153b9f1d33ad56bb6350323f92e9779fafbe69ddc93a25f1bd5d028a8b6d65e15b124a2083fd6ff4aa746a191237

data/lib/hotdog/application.rb

@@ -260,7 +260,12 @@ module Hotdog
     def update_api_key!()
       if options[:api_key_command]
         logger.info("api_key_command> #{options[:api_key_command]}")
-        options[:api_key] = IO.popen(options[:api_key_command]).read.strip
+        options[:api_key] = IO.popen(options[:api_key_command]) do |io|
+          io.read.strip
+        end
+        unless $?.success?
+          raise("failed: #{options[:api_key_command]}")
+        end
       else
         update_keys!
       end
@@ -269,7 +274,12 @@ module Hotdog
     def update_application_key!()
       if options[:application_key_command]
         logger.info("application_key_command> #{options[:application_key_command]}")
-        options[:application_key] = IO.popen(options[:application_key_command]).read.strip
+        options[:application_key] = IO.popen(options[:application_key_command]) do |io|
+          io.read.strip
+        end
+        unless $?.success?
+          raise("failed: #{options[:application_key_command]}")
+        end
       else
         update_keys!
       end
@@ -278,7 +288,12 @@ module Hotdog
     def update_keys!()
       if options[:key_command]
         logger.info("key_command> #{options[:key_command]}")
-        options[:api_key], options[:application_key] = IO.popen(options[:key_command]).read.strip.split(":", 2)
+        options[:api_key], options[:application_key] = IO.popen(options[:key_command]) do |io|
+          io.read.strip.split(":", 2)
+        end
+        unless $?.success?
+          raise("failed: #{options[:key_command]}")
+        end
       end
     end
   end

data/lib/hotdog/commands.rb

@@ -417,7 +417,7 @@ module Hotdog
       end
 
       def with_retry(options={}, &block)
-        (options[:retry] || 5).times do |i|
+        (options[:retry] || 10).times do |i|
           begin
             return yield
           rescue => error
@@ -428,7 +428,7 @@ module Hotdog
             error.backtrace.each do |frame|
               logger.info("\t#{frame}")
             end
-            wait = [options[:retry_delay] || (2<<i), options[:retry_max_delay] || 60].min
+            wait = [options[:retry_delay] || (1<<i), options[:retry_max_delay] || 60].min
             logger.info("will retry after #{wait} seconds....")
             sleep(wait)
           end

data/lib/hotdog/commands/scp.rb

@@ -7,6 +7,12 @@ require "hotdog/commands/ssh"
 module Hotdog
   module Commands
     class Scp < SingularSshAlike
+      def define_options(optparse, options={})
+        program_name = File.basename($0, '.*')
+        optparse.banner = "Usage: #{program_name} scp [options] pattern -- src @:dst"
+        super
+      end
+
       private
       def build_command_string(host, command=nil, options={})
         # replace "@:" by actual hostname

data/lib/hotdog/commands/tag.rb

@@ -33,14 +33,16 @@ module Hotdog
             @db.transaction do
               create_tags(@db, options[:tags])
               options[:tags].each do |tag|
-                associae_tag_hosts(@db, tag, hosts)
+                associate_tag_hosts(@db, tag, hosts)
               end
             end
           end
         end
         hosts.each do |host|
           if options[:tags].empty?
-            # nop
+            # nop; just show current tags
+            host_tags = with_retry { host_tags(host, source=options[:tag_source]) }
+            STDOUT.puts host_tags['tags'].inspect
           else
             # add all as user tags
             with_retry(options) do
@@ -58,6 +60,14 @@ module Hotdog
         end
         resp
       end
+
+      def host_tags(host_name, options={})
+        code, host_tags = dog.host_tags(host_name, options)
+        if code.to_i / 100 != 2
+          raise("dog.host_tags(#{host_name.inspect}, #{options.inspect}) returns [#{code.inspect}, #{host_tags.inspect}]")
+        end
+        host_tags
+      end
     end
   end
 end

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.23.1"
+  VERSION = "0.24.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.24.0
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Yet another command-line tool for Datadog