hotdog 0.6.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72dc15c8a8c3c455d56966dfc98939ff41c756c5
-  data.tar.gz: 391d7824e973ef9052b74b4f12147126d1e9d16d
+  metadata.gz: 5d906ae40a16258f5ad595603dd51cf64b503e46
+  data.tar.gz: 50186c1878f0de3534a4e7b8a502ce4380bbe2df
 SHA512:
-  metadata.gz: 2808053dc1e82f575acd539c47a3a5ef55aad0a205b53d58df352ec3d4fca4545a28add805c21be27d880aaa11eab2fa5e93f447ffcd9946b29687ee4886370f
-  data.tar.gz: 95179c55f323d9dd2d3fcacde85b63bb3ab57615e6940e6345d6089f7bed69b68cd9fe67652f104eedacf8860c37c65d2de102c9197a85307a3e232d421e6adc
+  metadata.gz: 84a3883786cf631e1874fb39ed08c6475ee4ca293c8bca4d80ca6852191b8e59facfdbb7bcd3ca5ff3ed41632dae89620776986e6e03e9868e029ac796ec003c
+  data.tar.gz: ee613ad02480b125061011cbd80e05e60ca1716abd48242659552b8b3865ee083fcafca7733bf75eceaf2d2281f2b96403fa6d9e3c63f4a8c24c18b7407365f3

data/Rakefile

@@ -1,2 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => [:spec]

data/lib/hotdog/commands.rb

@@ -277,7 +277,7 @@ module Hotdog
           logger.debug("execute: #{q} -- #{args.inspect}")
           prepare(db, q).execute(args)
         rescue
-          logger.error("failed: #{q} -- #{args.inspect}")
+          logger.warn("failed: #{q} -- #{args.inspect}")
           raise
         end
       end
@@ -287,7 +287,8 @@ module Hotdog
         requests = {all_downtime: "/api/v1/downtime", all_tags: "/api/v1/tags/hosts"}
         query = URI.encode_www_form(api_key: options[:api_key], application_key: options[:application_key])
         begin
-          responses = Hash[Parallel.map(requests) { |name, request_path|
+          parallelism = Parallel.processor_count
+          responses = Hash[Parallel.map(requests, in_threads: parallelism) { |name, request_path|
             uri = URI.join(endpoint, "#{request_path}?#{query}")
             begin
               response = uri.open("User-Agent" => "hotdog/#{Hotdog::VERSION}") { |fp| fp.read }
@@ -304,7 +305,7 @@ module Hotdog
         now = Time.new.to_i
         downtimes = responses.fetch(:all_downtime, []).select { |downtime|
           # active downtimes
-          downtime["active"] and ( downtime["start"].nil? or downtime["start"] < now ) and ( downtime["end"].nil? or now <= downtime["end"] )
+          downtime["active"] and ( downtime["start"].nil? or downtime["start"] < now ) and ( downtime["end"].nil? or now <= downtime["end"] ) and downtime["monitor_id"].nil?
         }.flat_map { |downtime|
           # find host scopes
           downtime["scope"].select { |scope| scope.start_with?("host:") }.map { |scope| scope.sub(/\Ahost:/, "") }

data/lib/hotdog/commands/down.rb

@@ -33,8 +33,8 @@ module Hotdog
         # Remove persistent.db to schedule update on next invocation
         if @db
           close_db(@db)
-          FileUtils.rm_f(File.join(options[:confdir], PERSISTENT_DB))
         end
+        FileUtils.rm_f(File.join(options[:confdir], PERSISTENT_DB))
       end
     end
   end

data/lib/hotdog/commands/pssh.rb

@@ -9,11 +9,20 @@ require "hotdog/commands/ssh"
 module Hotdog
   module Commands
     class Pssh < SshAlike
+      def define_options(optparse, options={})
+        super
+        options[:show_identifier] = true
+        optparse.on("--[no-]identifier", "Each output line will be prepended with identifier.") do |identifier|
+          options[:show_identifier] = identifier
+        end
+      end
+
       private
       def run_main(hosts, options={})
         stats = Parallel.map(hosts.each_with_index.to_a, in_threads: parallelism(hosts)) { |host, i|
           cmdline = build_command_string(host, @remote_command, options)
-          exec_command(host, cmdline, index: i, output: true)
+          identifier = options[:show_identifier] ? host : nil
+          exec_command(identifier, cmdline, index: i, output: true)
         }
         if stats.all?
           exit(0)

data/lib/hotdog/commands/ssh.rb

@@ -162,15 +162,17 @@ module Hotdog
         IO.popen(cmdline, in: :close, err: [:child, :out]) do |io|
           io.each_with_index do |s, i|
             if output
-              if color
-                STDOUT.write("\e[0;#{color}m")
-              end
-              STDOUT.write(identifier)
-              STDOUT.write(":")
-              STDOUT.write(i.to_s)
-              STDOUT.write(":")
-              if color
-                STDOUT.write("\e[0m")
+              if identifier
+                if color
+                  STDOUT.write("\e[0;#{color}m")
+                end
+                STDOUT.write(identifier)
+                STDOUT.write(":")
+                STDOUT.write(i.to_s)
+                STDOUT.write(":")
+                if color
+                  STDOUT.write("\e[0m")
+                end
               end
               STDOUT.puts(s)
             end

data/lib/hotdog/commands/up.rb

@@ -32,8 +32,8 @@ module Hotdog
         # Remove persistent.db to schedule update on next invocation
         if @db
           close_db(@db)
-          FileUtils.rm_f(File.join(options[:confdir], PERSISTENT_DB))
         end
+        FileUtils.rm_f(File.join(options[:confdir], PERSISTENT_DB))
       end
     end
   end

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.6.6"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler