hotdog 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5b53511f20a525f2baeb0c2c197e9516d5e4a36
-  data.tar.gz: 47575d0d13c97ad14f8aa5177f75b8da418b0ab8
+  metadata.gz: b815e449286ca6604e3f3b04fdd18c5588dd07ee
+  data.tar.gz: e022e85d07a01c4738861a85f3285937949a5390
 SHA512:
-  metadata.gz: 45c616efb98546a29fd48b3738547ef7b86d4342aa27eef7c9f50807e3ec7d5cb5f7a567f25e1ba5441e37660b5a3e97e98055ceb7e1b7eef36a04ebac4a4e37
-  data.tar.gz: 3ebfd7e79f4840b404b9b80092bff089f3b06ad092f4dbcc37d080371d9f7a257d703f0e1ebc3ad829935b1edeedeb5556fa03f8acfc4cc9d3ac6d1c4e889852
+  metadata.gz: 5c6f2faf19be1bb5350abf82b119fcf80ba2ae30a608a58bf387d8a3fec849de226559d4434f335bbdceab98305c9880d952d8df3e6fe56896dc3c458efcf5fc
+  data.tar.gz: 4d75ceaba7bef826c9e86ecd68d51230325f7353960ac91a251b1152a84e2673e0c01fc7d458fd4b5e801847652ff85fe97d5fa3ab56731140b12286535ac126

data/lib/hotdog/commands.rb

@@ -344,6 +344,18 @@ module Hotdog
         backup.step(-1)
         backup.finish
       end
+
+      def with_retry(options={}, &block)
+        (options[:retry] || 1).times do |i|
+          begin
+            return yield
+          rescue => error
+            logger.warn(error.to_s)
+            sleep(options[:retry_delay] || (1<<i))
+          end
+        end
+        raise("retry count exceeded")
+      end
     end
   end
 end

data/lib/hotdog/commands/down.rb

@@ -7,8 +7,8 @@ module Hotdog
     class Down < BaseCommand
       def define_options(optparse, options={})
         default_option(options, :downtime, 86400)
-        default_option(options, :start, Time.new)
         default_option(options, :retry, 5)
+        default_option(options, :start, Time.new)
         optparse.on("--downtime DURATION") do |v|
           options[:downtime] = v.to_i
         end
@@ -30,17 +30,7 @@ module Hotdog
           else
             scope = arg
           end
-          if 0 < options[:retry]
-            options[:retry].times do |i|
-              begin
-                schedule_downtime(scope, options)
-                break
-              rescue => error
-                logger.warn(error.to_s)
-                sleep(options[:retry_delay] || (1<<i))
-              end
-            end
-          else
+          with_retry(options) do
             schedule_downtime(scope, options)
           end
         end

data/lib/hotdog/commands/scp.rb

@@ -19,6 +19,9 @@ module Hotdog
         if options[:forward_agent]
           # nop
         end
+        if options[:ssh_config]
+          cmdline << "-F" << options[:ssh_config]
+        end
         if options[:identity_file]
           arguments << "-i" << options[:identity_file]
         end

data/lib/hotdog/commands/sftp.rb

@@ -21,6 +21,9 @@ module Hotdog
         if options[:forward_agent]
           # nop
         end
+        if options[:ssh_config]
+          cmdline << "-F" << options[:ssh_config]
+        end
         if options[:identity_file]
           arguments << "-i" << options[:identity_file]
         end

data/lib/hotdog/commands/ssh.rb

@@ -17,6 +17,10 @@ module Hotdog
         default_option(options, :color, :auto)
         default_option(options, :max_parallelism, Parallel.processor_count)
         default_option(options, :shuffle, false)
+        default_option(options, :ssh_config, nil)
+        optparse.on("-F SSH_CONFIG", "Specifies an alternative per-user SSH configuration file.") do |configfile|
+          options[:ssh_config] = configfile
+        end
         optparse.on("-o SSH_OPTION", "Passes this string to ssh command through shell. This option may be given multiple times") do |option|
           options[:options] += [option]
         end
@@ -115,6 +119,9 @@ module Hotdog
         if options[:forward_agent]
           cmdline << "-A"
         end
+        if options[:ssh_config]
+          cmdline << "-F" << options[:ssh_config]
+        end
         if options[:identity_file]
           cmdline << "-i" << options[:identity_file]
         end

data/lib/hotdog/commands/tag.rb

@@ -6,12 +6,19 @@ module Hotdog
   module Commands
     class Tag < BaseCommand
       def define_options(optparse, options={})
+        default_option(options, :retry, 5)
         default_option(options, :tag_source, "user")
         default_option(options, :tags, [])
+        optparse.on("--retry NUM") do |v|
+          options[:retry] = v.to_i
+        end
+        optparse.on("--retry-delay SECONDS") do |v|
+          options[:retry_delay] = v.to_i
+        end
         optparse.on("--source SOURCE") do |v|
           options[:tag_source] = v
         end
-        optparse.on("--tag TAG") do |v|
+        optparse.on("-a TAG", "-t TAG", "--tag TAG", "Use specified tag name/value") do |v|
           options[:tags] << v
         end
       end
@@ -24,9 +31,8 @@ module Hotdog
             # nop
           else
             # add all as user tags
-            code, add_tags = dog.add_tags(host_name, options[:tags], source=options[:tag_source])
-            if code.to_i / 100 != 2
-              raise("dog.add_tags(#{host_name.inspect}, #{options[:tags].inspect}, source=#{options[:tag_source].inspect}) returns [#{code.inspect}, #{add_tags.inspect}]")
+            with_retry(options) do
+              add_tags(host_name, options[:tags], source=options[:tag_source])
             end
           end
         end
@@ -37,6 +43,15 @@ module Hotdog
         end
         FileUtils.rm_f(File.join(options[:confdir], PERSISTENT_DB))
       end
+
+      private
+      def add_tags(host_name, tags, options={})
+        code, resp = dog.add_tags(host_name, tags, options)
+        if code.to_i / 100 != 2
+          raise("dog.add_tags(#{host_name.inspect}, #{tags.inspect}, #{options.inspect}) returns [#{code.inspect}, #{resp.inspect}]")
+        end
+        resp
+      end
     end
   end
 end

data/lib/hotdog/commands/untag.rb

@@ -6,12 +6,19 @@ module Hotdog
   module Commands
     class Untag < BaseCommand
       def define_options(optparse, options={})
+        default_option(options, :retry, 5)
         default_option(options, :tag_source, "user")
         default_option(options, :tags, [])
+        optparse.on("--retry NUM") do |v|
+          options[:retry] = v.to_i
+        end
+        optparse.on("--retry-delay SECONDS") do |v|
+          options[:retry_delay] = v.to_i
+        end
         optparse.on("--source SOURCE") do |v|
           options[:tag_source] = v
         end
-        optparse.on("--tag TAG") do |v|
+        optparse.on("-a TAG", "-t TAG", "--tag TAG", "Use specified tag name/value") do |v|
           options[:tags] << v
         end
       end
@@ -22,23 +29,18 @@ module Hotdog
 
           if options[:tags].empty?
             # delete all user tags
-            code, detach_tags = dog.detach_tags(host_name, source=options[:tag_source])
-            if code.to_i / 100 != 2
-              raise("dog.detach_tags(#{host_name.inspect}, source=#{options[:tag_source].inspect}) returns [#{code.inspect}, #{detach_tags.inspect}]")
+            with_retry do
+              detach_tags(host_name, source=options[:tag_source])
             end
           else
-            code, host_tags = dog.host_tags(host_name, source=options[:tag_source])
-            if code.to_i / 100 != 2
-              raise("dog.host_tags(#{host_name.inspect}, source=#{options[:tag_source].inspect}) returns [#{code.inspect}, #{host_tags.inspect}]")
-            end
+            host_tags = with_retry { host_tags(host_name, source=options[:tag_source]) }
             old_tags = host_tags["tags"]
             new_tags = old_tags - options[:tags]
             if old_tags == new_tags
               # nop
             else
-              code, update_tags = dog.update_tags(host_name, new_tags, source=options[:tag_source])
-              if code.to_i / 100 != 2
-                raise("dog.update_tags(#{host_name.inspect}, #{new_tags.inspect}, source=#{options[:tag_source].inspect}) returns [#{code.inspect}, #{update_tags.inspect}]")
+              with_retry do
+                update_tags(host_name, new_tags, source=options[:tag_source])
               end
             end
           end
@@ -50,6 +52,31 @@ module Hotdog
         end
         FileUtils.rm_f(File.join(options[:confdir], PERSISTENT_DB))
       end
+
+      private
+      def detach_tags(host_name, options={})
+        code, detach_tags = dog.detach_tags(host_name, options)
+        if code.to_i / 100 != 2
+          raise("dog.detach_tags(#{host_name.inspect}, #{options.inspect}) returns [#{code.inspect}, #{detach_tags.inspect}]")
+        end
+        detach_tags
+      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
+
+      def update_tags(host_name, tags, options={})
+        code, update_tags = dog.update_tags(host_name, tags, options)
+        if code.to_i / 100 != 2
+          raise("dog.update_tags(#{host_name.inspect}, #{tags.inspect}, #{options.inspect}) returns [#{code.inspect}, #{update_tags.inspect}]")
+        end
+        update_tags
+      end
     end
   end
 end

data/lib/hotdog/commands/up.rb

@@ -24,17 +24,7 @@ module Hotdog
           end
         }
         all_downtimes = nil
-        if 0 < options[:retry]
-          options[:retry].times do |i|
-            begin
-              all_downtimes = get_all_downtimes(options)
-              break
-            rescue => error
-              logger.warn(error.to_s)
-              sleep(options[:retry_delay] || (1<<i))
-            end
-          end
-        else
+        with_retry(options) do
           all_downtimes = get_all_downtimes(options)
         end
 
@@ -43,17 +33,7 @@ module Hotdog
         }
 
         cancel_downtimes.each do |downtime|
-          if 0 < options[:retry]
-            options[:retry].times do |i|
-              begin
-                cancel_downtime(downtime["id"], options)
-                break
-              rescue => error
-                logger.warn(error.to_s)
-                sleep(options[:retry_delay] || (1<<i))
-              end
-            end
-          else
+          with_retry(options) do
             cancel_downtime(downtime["id"], options)
           end
         end

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.15.1"
+  VERSION = "0.16.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -263,3 +263,4 @@ test_files:
 - spec/parser/regexp_expression_spec.rb
 - spec/parser/string_expression_spec.rb
 - spec/spec_helper.rb
+has_rdoc: