hotdog 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5814468d246a0a23d4258b4a371ebf2b5f59dc0
-  data.tar.gz: 3911eafd56a1e4b63d379cb3a252af932daf2b3d
+  metadata.gz: 4a8a2587c731d0636d060338297376ef857135d4
+  data.tar.gz: 4ec81a26bfa37aa4a2352a3879526d86aa023a60
 SHA512:
-  metadata.gz: 54d974364fc3fcf36157aa8caabdf88c86b77c2fb7e6ab7e91c7e911a31ea3d76f40fe11ae1d18b123a196a1070c0ed43a84b6f87c8e97d4f7360725db00fc89
-  data.tar.gz: a30026d51aa4fe2134ad8d3b392f3c7b4664c15abbbe90f6e384251cc7fbd79b49b8ed6b95b413929231b4208f0200b9923f92fee930177c6e4c701d4ab6e7cd
+  metadata.gz: c718fa212bd63300938cbfb78b624b24b4df25da7ee351f586f51e4b357d1fc2bf5ff8f7b2144b4d531804e61bb13c5cd4f20dc179b38b6bc5933bc296ba8975
+  data.tar.gz: 6cfaa906fc298e47913400612584eba9d94877ad7addc9f52ac5768229864ece0699387cff42d0022207e043fcb78a86e309d7001785c913c42fa6dd5a6f3fb3

data/lib/hotdog/application.rb

@@ -29,11 +29,13 @@ module Hotdog
         print0: false,
         print1: true,
         tags: [],
+        display_search_tags: false,
         verbose: false,
       }
       define_options
     end
     attr_reader :options
+    attr_reader :optparse
 
     def main(argv=[])
       config = File.join(options[:confdir], "config.yml")
@@ -43,7 +45,7 @@ module Hotdog
           @options = @options.merge(Hash[loaded.map { |key, value| [Symbol === key ? key : key.to_s.to_sym, value] }])
         end
       end
-      args = @optparse.parse(argv)
+      args = @optparse.order(argv)
 
       unless options[:api_key]
         raise("DATADOG_API_KEY is not set")
@@ -63,7 +65,7 @@ module Hotdog
 
       begin
         command = ( args.shift || "help" )
-        get_command(command).new(@options.dup).tap do |cmd|
+        get_command(command).new(self).tap do |cmd|
           cmd.run(args)
         end
       rescue Errno::EPIPE
@@ -106,6 +108,9 @@ module Hotdog
       @optparse.on("-a TAG", "-t TAG", "--tag TAG", "Use specified tag name/value") do |tag|
         options[:tags] += [tag]
       end
+      @optparse.on("-x", "--display-search-tags", "Show tags used in search expression") do |v|
+        options[:display_search_tags] = v
+      end
       @optparse.on("-V", "--[no-]verbose", "Enable verbose mode") do |v|
         options[:verbose] = v
       end

data/lib/hotdog/commands/down.rb

@@ -6,14 +6,25 @@ module Hotdog
   module Commands
     class Down < BaseCommand
       def run(args=[])
+        if args.index("--start").nil?
+          start = Time.new
+        else
+          start = Time.parse(args[args.index("--start") + 1])
+          args.slice!(args.index("--start"), 2)
+        end
+        if args.index("--downtime").nil?
+          downtime = 86400
+        else
+          downtime = args[args.index("--downtime") + 1].to_i
+          args.slice!(args.index("--downtime"), 2)
+        end
+
         args.each do |arg|
           if arg.index(":").nil?
             scope = "host:#{arg}"
           else
             scope = arg
           end
-          start = Time.new
-          downtime = 86400 # TODO: make configurable
           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
@@ -24,7 +35,7 @@ module Hotdog
         # Remove persistent.db to schedule update on next invocation
         if not @db.nil?
           @db.close
-          FileUtils.rm_f(File.join(confdir, PERSISTENT_DB))
+          FileUtils.rm_f(File.join(@options[:confdir], PERSISTENT_DB))
         end
       end
     end

data/lib/hotdog/commands/hosts.rb

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

data/lib/hotdog/commands/search.rb

@@ -7,6 +7,7 @@ module Hotdog
   module Commands
     class Search < BaseCommand
       def run(args=[])
+        args = optparse.parse(args)
         expression = args.join(" ").strip
         if expression.empty?
           exit(1)
@@ -19,9 +20,19 @@ module Hotdog
           exit(1)
         end
 
+        drilldown = ->(n){
+          case
+          when n[:left] && n[:right] then drilldown.(n[:left]) + drilldown.(n[:right])
+          when n[:expression] then drilldown.(n[:expression])
+          when n[:identifier] then [n[:identifier]]
+          else []
+          end
+        }
+        identifiers = drilldown.call(node).map(&:to_s)
+
         result = evaluate(node, self).sort
         if 0 < result.length
-          result, fields = get_hosts(result)
+          result, fields = get_hosts(result, @options[:display_search_tags] ? identifiers : [])
           STDOUT.print(format(result, fields: fields))
           logger.info("found %d host(s)." % result.length)
         else
@@ -59,7 +70,7 @@ module Hotdog
         rule(:unary_expression) {
           ( spacing.maybe >> str('!').as(:unary_op) >> atom.as(:expression) \
           | spacing.maybe >> str('~').as(:unary_op) >> atom.as(:expression) \
-          | spacing.maybe >> str('not').as(:unary_op) >> atom.as(:expression) \
+          | spacing.maybe >> (match('[Nn]') >> match('[Oo]') >> match('[Tt]')).as(:unary_op) >> atom.as(:expression) \
           )
         }
         rule(:term) {
@@ -157,6 +168,8 @@ module Hotdog
       end
 
       class BinaryExpressionNode < ExpressionNode
+        attr_reader :left, :right
+
         def initialize(op, left, right)
           @op = op
           @left = left
@@ -183,6 +196,8 @@ module Hotdog
       end
 
       class UnaryExpressionNode < ExpressionNode
+        attr_reader :expression
+
         def initialize(op, expression)
           @op = op
           @expression = expression

data/lib/hotdog/commands/tags.rb

@@ -4,6 +4,7 @@ module Hotdog
   module Commands
     class Tags < BaseCommand
       def run(args=[])
+        args = optparse.parse(args)
         if 0 < tags.length
           fields = tags.map { |tag|
             tag_name, tag_value = tag.split(":", 2)

data/lib/hotdog/commands/up.rb

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

data/lib/hotdog/commands.rb

@@ -10,27 +10,14 @@ module Hotdog
     class BaseCommand
       PERSISTENT_DB = "persistent.db"
 
-      def initialize(options={})
-        @application = options[:application]
-        @confdir = options[:confdir]
-        @expiry = options[:expiry]
-        @fixed_string = options[:fixed_string]
-        @force = options[:force]
-        @formatter = options[:formatter]
-        @listing = options[:listing]
-        @logger = options[:logger]
-        @tags = options[:tags]
-        @options = options
+      def initialize(application)
+        @application = application
+        @logger = application.options[:logger]
+        @options = application.options
         @dog = Dogapi::Client.new(options[:api_key], options[:application_key])
       end
       attr_reader :application
-      attr_reader :confdir
-      attr_reader :expiry
-      attr_reader :force
-      attr_reader :formatter
-      attr_reader :listing
       attr_reader :logger
-      attr_reader :tags
       attr_reader :options
 
       def run(args=[])
@@ -48,12 +35,16 @@ module Hotdog
       end
 
       def fixed_string?()
-        @fixed_string
+        @options[:fixed_string]
       end
 
       private
       def format(result, options={})
-        @formatter.format(result, @options.merge(options))
+        @options[:formatter].format(result, @options.merge(options))
+      end
+
+      def optparse()
+        @application.optparse
       end
 
       def glob?(s)
@@ -65,9 +56,14 @@ module Hotdog
         not host_id.nil?
       end
 
-      def get_hosts(hosts=[])
+      def get_hosts(hosts=[], identifiers=[])
         update_db
-        if 0 < tags.length
+        if 0 < @options[:tags].length || 0 < identifiers.length
+          tags = if 0 < @options[:tags].length
+                   @options[:tags] + identifiers
+                 else
+                   ["host"] + identifiers
+                 end
           result = hosts.map { |host_id|
             tags.map { |tag|
               tag_name, tag_value = tag.split(":", 2)
@@ -85,7 +81,7 @@ module Hotdog
           }
           fields = tags
         else
-          if @listing
+          if @options[:listing]
             fields = []
             hosts = execute("SELECT id, name FROM hosts WHERE id IN (%s)" % hosts.map { "?" }.join(", "), hosts)
             result = hosts.map { |host_id, host_name|
@@ -108,10 +104,10 @@ module Hotdog
 
       def update_db(options={})
         if @db.nil?
-          FileUtils.mkdir_p(confdir)
-          persistent = File.join(confdir, PERSISTENT_DB)
+          FileUtils.mkdir_p(@options[:confdir])
+          persistent = File.join(@options[:confdir], PERSISTENT_DB)
 
-          if not @force and File.exist?(persistent) and Time.new < File.mtime(persistent) + expiry
+          if not @options[:force] and File.exist?(persistent) and Time.new < File.mtime(persistent) + @options[:expiry]
             begin
               persistent_db = SQLite3::Database.new(persistent)
               persistent_db.execute("SELECT id, name FROM hosts LIMIT 1")

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Yet another command-line tool for Datadog