hotdog 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd9ee4784a5a2ae1305938dad9acffbda27344f5
-  data.tar.gz: ab2ae3bdce389ba30f9bb20f11b9ab5952edc19a
+  metadata.gz: 704ccd17864c284a1daa3550e9c955469e718ee4
+  data.tar.gz: 0d5e59e8c274f25ebd179e92123380c5336d7cec
 SHA512:
-  metadata.gz: 21a810b1448b94c8678e02bccf635a3716b796b2846d317cd493b092f707bc2111a1787dee5c7f6db4df8ad9d56cde2a9d95926cf177f771fec37e61bb4b2c91
-  data.tar.gz: b1bfbba8629422bb3ede7dee2c5b2f65c0ea1029723ab92d60b4a997656af6bc13a7bf6436600a7c72436d25d4b1ebc2eb59d0ba33052645cc1a770ca5f02781
+  metadata.gz: 03d9ceb9147a75449c9b7542f3deecdb331cd0736d902603101508fbd1ef87881c82503b223dcd2c710f5f69c8408b173b95b1a17c57bbb08b5ca27857bfcc14
+  data.tar.gz: 5d32974bbbb07110a678538b5275ca792a1d76eb5ae086ad1b9831ff434d1937d4eae8f0ae4048df393bec2f81664223da444ba9aeee3467224b78bf4e0d375d

data/lib/hotdog/application.rb

@@ -163,6 +163,17 @@ module Hotdog
       options.fetch(:status, STATUS_RUNNING)
     end
 
+    def status_name()
+      {
+        STATUS_PENDING       => "pending",
+        STATUS_RUNNING       => "running",
+        STATUS_SHUTTING_DOWN => "shutting-down",
+        STATUS_TERMINATED    => "terminated",
+        STATUS_STOPPING      => "stopping",
+        STATUS_STOPPED       => "stopped",
+      }.fetch(self.status, "unknown")
+    end
+
     private
     def define_options
       @optparse.on("--endpoint ENDPOINT", "Datadog API endpoint") do |endpoint|

data/lib/hotdog/commands/down.rb

@@ -10,7 +10,26 @@ module Hotdog
         default_option(options, :retry, 5)
         default_option(options, :start, Time.new)
         optparse.on("--downtime DURATION") do |v|
-          options[:downtime] = v.to_i
+          case v
+          when /\A\s*(\d+)\s*(?:seconds?|sec|S)\s*\z/
+            options[:downtime] = $1.to_i
+          when /\A\s*(\d+)\s*(?:minutes?|min|M)\s*\z/
+            options[:downtime] = $1.to_i * 60
+          when /\A\s*(\d+)\s*(?:hours?|H)\s*\z/
+            options[:downtime] = $1.to_i * 60 * 60
+          when /\A\s*(\d+)\s*(?:days?|d)\s*\z/
+            options[:downtime] = $1.to_i * 60 * 60 * 24
+          when /\A\s*(\d+)\s*(?:weeks?|w)\s*\z/
+            options[:downtime] = $1.to_i * 60 * 60 * 24 * 7
+          when /\A\s*(\d+)\s*(?:months?|m)\s*\z/i
+            options[:downtime] = $1.to_i * 60 * 60 * 24 * 30
+          when /\A\s*(\d+)\s*(?:years?|y)\s*\z/i
+            options[:downtime] = $1.to_i * 60 * 60 * 24 * 365
+          when /\A\s*(\d+)\s*\z/
+            options[:downtime] = $1.to_i
+          else
+            raise(OptionParser::InvalidArgument.new("downtime argument value is invalid: #{v}"))
+          end
         end
         optparse.on("--retry NUM") do |v|
           options[:retry] = v.to_i

data/lib/hotdog/commands/ssh.rb

@@ -236,17 +236,17 @@ module Hotdog
       end
 
       private
-      def rewrite_expression(expression)
-        expression = super(expression)
-        if options[:index]
-          expression = "SLICE((#{expression}), #{options[:index]}, 1)"
-        end
-        expression
-      end
-
+      # rewriting `options[:index]` as SLICE expression won't work as expected with hosts' status
+      # since the result may be filtered again with using the status,
+      # the filtering needs to be done after the `evaluate()`.
+      #
+      # for now we need to keep using `filter_hosts()` in favor of `rewrite_expression() to do
+      # the filtering based on status filtering.
       def filter_hosts(tuples)
         tuples = super
         if options[:index] and options[:index] < tuples.length
+          filtered_tuples = tuples.reject.with_index { |tuple, i| i == options[:index] }
+          logger.warn("filtered host(s): #{filtered_tuples.map { |tuple| tuple.first }.inspect}")
           [tuples[options[:index]]]
         else
           tuples

data/lib/hotdog/commands.rb

@@ -81,10 +81,15 @@ module Hotdog
       end
 
       def get_hosts(host_ids, tags=nil)
-        status = application.status || STATUS_RUNNING
+        status = application.status
+        n = Array(host_ids).length
         host_ids = Array(host_ids).each_slice(SQLITE_LIMIT_COMPOUND_SELECT).flat_map { |host_ids|
           execute("SELECT id FROM hosts WHERE status = ? AND id IN (%s);" % host_ids.map { "?" }.join(", "), [status] + host_ids).map { |row| row[0] }
         }
+        m = host_ids.length
+        if n != m
+          logger.warn("filtered out #{n - m} host(s) out of #{n} due to status != #{application.status_name}.")
+        end
         tags ||= @options[:tags]
         update_db
         if host_ids.empty?
@@ -139,7 +144,7 @@ module Hotdog
         when 1
           get_hosts_field(host_ids, fields.first, options)
         else
-          [host_ids.sort.map { |host_id| get_host_fields(host_id, fields, options) }.map { |result, fields| result }, fields]
+          [host_ids.map { |host_id| get_host_fields(host_id, fields, options) }.map { |result, fields| result }, fields]
         end
       end
 

data/lib/hotdog/expression/semantics.rb

@@ -229,9 +229,13 @@ module Hotdog
                 range = (((sqlite_limit_compound_select - 2) / 2) * i)...(((sqlite_limit_compound_select - 2) / 2) * (i + 1))
                 left_selected = left_values.select { |n| range === n }
                 right_selected = right_values.select { |n| range === n }
-                q = "SELECT id FROM hosts " \
-                      "WHERE ? <= id AND id < ? AND ( id IN (%s) OR id IN (%s) );"
-                environment.execute(q % [left_selected.map { "?" }.join(", "), right_selected.map { "?" }.join(", ")], [range.first, range.last] + left_selected + right_selected).map { |row| row.first }
+                if 0 < left_selected.length or 0 < right_selected.length
+                  q = "SELECT id FROM hosts " \
+                        "WHERE ? <= id AND id < ? AND ( id IN (%s) OR id IN (%s) );"
+                  environment.execute(q % [left_selected.map { "?" }.join(", "), right_selected.map { "?" }.join(", ")], [range.first, range.last] + left_selected + right_selected).map { |row| row.first }
+                else
+                  []
+                end
               }.tap do |values|
                 environment.logger.debug("lhs(#{left_values.length}) OR rhs(#{right_values.length}) => #{values.length}")
               end
@@ -257,11 +261,15 @@ module Hotdog
                 range = (((sqlite_limit_compound_select - 2) / 4) * i)...(((sqlite_limit_compound_select - 2) / 4) * (i + 1))
                 left_selected = left_values.select { |n| range === n }
                 right_selected = right_values.select { |n| range === n }
-                q = "SELECT id FROM hosts " \
-                      "WHERE ? <= id AND id < ? AND NOT (id IN (%s) AND id IN (%s)) AND ( id IN (%s) OR id IN (%s) );"
-                lq = left_selected.map { "?" }.join(", ")
-                rq = right_selected.map { "?" }.join(", ")
-                environment.execute(q % [lq, rq, lq, rq], [range.first, range.last] + left_selected + right_selected + left_selected + right_selected).map { |row| row.first }
+                if 0 < left_selected.length or 0 < right_selected.length
+                  q = "SELECT id FROM hosts " \
+                        "WHERE ? <= id AND id < ? AND NOT (id IN (%s) AND id IN (%s)) AND ( id IN (%s) OR id IN (%s) );"
+                  lq = left_selected.map { "?" }.join(", ")
+                  rq = right_selected.map { "?" }.join(", ")
+                  environment.execute(q % [lq, rq, lq, rq], [range.first, range.last] + left_selected + right_selected + left_selected + right_selected).map { |row| row.first }
+                else
+                  []
+                end
               }.tap do |values|
                 environment.logger.debug("lhs(#{left_values.length}) XOR rhs(#{right_values.length}) => #{values.length}")
               end

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.29.0"
+  VERSION = "0.30.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler