hotdog 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffbad3cddd1c8a203564a0a72f76f4afcdeedb31
-  data.tar.gz: 0b2a720a116b8a7744cfe91e83145106f6841bb6
+  metadata.gz: 4c464a62cf28997e088dd57a9e0ede3f2983f274
+  data.tar.gz: 85ad0d5644e20a84eaa99fee56c86ad8ead5de21
 SHA512:
-  metadata.gz: e460694b774e72633795116768078474b89e3ff5196b1fd6081102264bd29f496b0b1e7addf9742c8912eeb6ec9fb0e1d8592220db10d4fa25e27a94a4fb4a91
-  data.tar.gz: 898f4efe04b91dff88a420d257c839391162354e5d985599940199c6afa91b37a3efba0f3c99fc48208241e5fa4ec72edbd48cacfef078932b18066a66145739
+  metadata.gz: b1ae715a85cc4ad9531cbbb23a965df3c0dede59a5c2fdaf4b09fd3bf24b4e4eb2f98863357924d88feff3729c4f89bf54c484311c9a2c7152ddb59e85db2101
+  data.tar.gz: d79aa608eecf509fc7838f2ab3682eeea5f7009bea8479f334a7194f875b9b8b05572f16dbbdaa1788f818c3f04ba002e64a12ec931bfc856c631f34ec9f37e3

data/README.md

@@ -105,6 +105,7 @@ expression: expression0
 
 expression0: expression1 "and" expression
            | expression1 "or" expression
+           | expression1 "xor" expression
            | expression1
            ;
 
@@ -118,6 +119,9 @@ expression2: expression3 expression
 
 expression3: expression4 "&&" expression
            | expression4 "||" expression
+           | expression4 '&' expression
+           | expression4 '^' expression
+           | expression4 '|' expression
            | expression4
            ;
 

data/lib/hotdog/application.rb

@@ -28,6 +28,7 @@ module Hotdog
           logger.level = Logger::INFO
         },
         max_time: 5,
+        offline: false,
         print0: false,
         print1: true,
         primary_tag: nil,
@@ -50,25 +51,27 @@ module Hotdog
       end
       args = @optparse.order(argv)
 
-      unless options[:api_key]
-        raise("DATADOG_API_KEY is not set")
-      end
+      begin
+        command = ( args.shift || "help" )
+        get_command(command).new(self).tap do |cmd|
+          cmd.define_options(@optparse)
+          args = cmd.parse_options(@optparse, args)
+          unless options[:api_key]
+            raise("DATADOG_API_KEY is not set")
+          end
 
-      unless options[:application_key]
-        raise("DATADOG_APPLICATION_KEY is not set")
-      end
+          unless options[:application_key]
+            raise("DATADOG_APPLICATION_KEY is not set")
+          end
 
-      options[:formatter] = get_formatter(options[:format]).new
+          options[:formatter] = get_formatter(options[:format]).new
 
-      if options[:debug] or options[:verbose]
-        options[:logger].level = Logger::DEBUG
-      else
-        options[:logger].level = Logger::INFO
-      end
+          if options[:debug] or options[:verbose]
+            options[:logger].level = Logger::DEBUG
+          else
+            options[:logger].level = Logger::INFO
+          end
 
-      begin
-        command = ( args.shift || "help" )
-        get_command(command).new(self).tap do |cmd|
           cmd.run(args)
         end
       rescue Errno::EPIPE
@@ -120,6 +123,9 @@ module Hotdog
       @optparse.on("-V", "--[no-]verbose", "Enable verbose mode") do |v|
         options[:verbose] = v
       end
+      @optparse.on("--[no-]offline", "Enable offline mode") do |v|
+        options[:offline] = v
+      end
     end
 
     def const_name(name)

data/lib/hotdog/commands/down.rb

@@ -5,24 +5,26 @@ require "fileutils"
 module Hotdog
   module Commands
     class Down < BaseCommand
-      def run(args=[])
-        downtime = 86400
-        start = Time.new
+      def define_options(optparse)
+        @downtime = 86400
+        @start = Time.new
         optparse.on("--downtime DURATION") do |v|
-          downtime = v.to_i
+          @downtime = v.to_i
         end
         optparse.on("--start TIME") do |v|
-          start = Time.parse(v)
+          @start = Time.parse(v)
         end
-        args = optparse.parse(args)
+      end
+
+      def run(args=[])
         args.each do |arg|
           if arg.index(":").nil?
             scope = "host:#{arg}"
           else
             scope = arg
           end
-          code, schedule = @dog.schedule_downtime(scope, :start => start.to_i, :end => (start+downtime).to_i)
-          logger.debug("dog.schedule_donwtime(%s, :start => %s, :end => %s) #==> [%s, %s]" % [scope.inspect, start.to_i, (start+downtime).to_i, code.inspect, schedule.inspect])
+          code, schedule = @dog.schedule_downtime(scope, :start => @start.to_i, :end => (@start+@downtime).to_i)
+          logger.debug("dog.schedule_donwtime(%s, :start => %s, :end => %s) #==> [%s, %s]" % [scope.inspect, @start.to_i, (@start+@downtime).to_i, code.inspect, schedule.inspect])
           if code.to_i / 100 != 2
             raise("dog.schedule_downtime(%s, ...) returns [%s, %s]" % [scope.inspect, code.inspect, schedule.inspect])
           end

data/lib/hotdog/commands/hosts.rb

@@ -4,7 +4,6 @@ module Hotdog
   module Commands
     class Hosts < BaseCommand
       def run(args=[])
-        args = optparse.parse(args)
         if args.empty?
           result = execute("SELECT id FROM hosts").to_a.reduce(:+)
           show_hosts(result)

data/lib/hotdog/commands/pssh.rb

@@ -9,36 +9,39 @@ require "parallel"
 module Hotdog
   module Commands
     class Pssh < Search
-      def run(args=[])
-        ssh_option = {
+      def define_options(optparse)
+        @ssh_options = @options.merge({
           options: [],
           user: nil,
           port: nil,
           identity_file: nil,
           max_parallelism: nil,
-        }
+        })
 
         optparse.on("-o SSH_OPTION", "Passes this string to ssh command through shell. This option may be given multiple times") do |option|
-          ssh_option[:options] += [option]
+          @ssh_options[:options] += [option]
         end
         optparse.on("-i SSH_IDENTITY_FILE", "SSH identity file path") do |path|
-          ssh_option[:identity_file] = path
+          @ssh_options[:identity_file] = path
         end
         optparse.on("-p PORT", "Port of the remote host", Integer) do |port|
-          ssh_option[:port] = port
+          @ssh_options[:port] = port
         end
         optparse.on("-u SSH_USER", "SSH login user name") do |user|
-          ssh_option[:user] = user
+          @ssh_options[:user] = user
         end
         optparse.on("-P PARALLELISM", "Max parallelism", Integer) do |n|
-          ssh_option[:max_parallelism] = n
+          @ssh_options[:max_parallelism] = n
         end
+      end
 
-        use_color = STDOUT.tty?
+      def parse_options(optparse, args=[])
+        optparse.order(args)
+      end
 
-        search_args = []
-        optparse.order!(args) {|search_arg| search_args.push(search_arg) }
-        expression = search_args.join(" ").strip
+      def run(args=[])
+        use_color = STDOUT.tty?
+        expression = args.join(" ").strip
         if expression.empty? || args.empty?
           exit(1)
         end
@@ -62,25 +65,25 @@ module Hotdog
 
         # build ssh command
         cmdline = ["ssh"]
-        ssh_option[:options].each do |option|
+        @ssh_options[:options].each do |option|
           cmdline << "-o" << option
         end
-        if path = ssh_option[:identity_file]
+        if path = @ssh_options[:identity_file]
           cmdline << "-i" << Shellwords.escape(path)
         end
-        if port = ssh_option[:port]
+        if port = @ssh_options[:port]
           cmdline << "-p" << port.to_s
         end
-        if ssh_option[:forward_agent]
+        if @ssh_options[:forward_agent]
           cmdline << "-A"
         end
 
         cmdline << "-o" << "BatchMode=yes"
 
-        user = ssh_option[:user]
+        user = @ssh_options[:user]
 
-        threads = ssh_option[:max_parallelism] || addresses.size
-        stats = Parallel.map(addresses, in_threads: threads) do |address,name|
+        threads = @ssh_options[:max_parallelism] || addresses.size
+        stats = Parallel.map(addresses, in_threads: threads) { |address,name|
           if use_color
             header = "\e[0;36m#{name}\e[00m"
           else
@@ -97,14 +100,14 @@ module Hotdog
           c.concat(args)
 
           IO.popen([*c, in: :close, err: [:child, :out]]) do |io|
-            io.each_line {|line|
+            io.each_line do |line|
               STDOUT.write "#{header}: #{line}"
-            }
+            end
           end
-          $?.success?  # $? is thread-local variable
-        end
+          $?.success? # $? is thread-local variable
+        }
 
-        unless stats.all? {|success| success }
+        unless stats.all?
           exit(1)
         end
       end