hotdog 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 994ffc110fca456fa2aafe2c680b5336fb469989
-  data.tar.gz: 2a68fa27a1dab929c0b9ff5e63d031bd7747dbef
+  metadata.gz: dad54741d7b612af34df19f0ae934c938411a941
+  data.tar.gz: 951a0d2bafcf5edbc3262e9f1552b4aade13fc0c
 SHA512:
-  metadata.gz: 5afa560d648757a26676dadce8fb39aac67e43ae92aa707467b1bb681e1465b1303a7937a86ba8e9f64e1a5b07a6570715704aab9dfd8db02f25b064c47093ad
-  data.tar.gz: 1f747ae6f4e3cd107484c09372051e2dcc60e837c9c5faa00479acef6895a4cca791730d0349e4341f915469753e217f8dffa5a213ad229a8e3db99da72dda2e
+  metadata.gz: 9c4fdc6b65e2caa37150c2e47bf207cacfec32d775e7f23b9e7b79298935853b5c34dc094d75ee21b48187d9440b3d4d9ae787a212387a5ae3415e1e5caac7df
+  data.tar.gz: 8e71095cbea2abee8f03173cfda463b289326a4a2a0fa187bd45040856e32e287f8ab84c270bacaa785f15ec6dddb052e126941438c6a353ed9d5e417b74140c

data/lib/hotdog/application.rb

@@ -54,7 +54,8 @@ module Hotdog
       begin
         command = ( args.shift || "help" )
         get_command(command).new(self).tap do |cmd|
-          cmd.define_options(@optparse)
+          @optparse.banner = "Usage: hotdog #{command} [options]"
+          cmd.define_options(@optparse, @options)
           args = cmd.parse_options(@optparse, args)
           unless options[:api_key]
             raise("DATADOG_API_KEY is not set")
@@ -76,7 +77,7 @@ module Hotdog
             options[:logger].level = Logger::INFO
           end
 
-          cmd.run(args)
+          cmd.run(args, @options)
         end
       rescue Errno::EPIPE
         # nop

data/lib/hotdog/commands/down.rb

@@ -5,7 +5,7 @@ require "fileutils"
 module Hotdog
   module Commands
     class Down < BaseCommand
-      def define_options(optparse)
+      def define_options(optparse, options={})
         @downtime = 86400
         @start = Time.new
         optparse.on("--downtime DURATION") do |v|
@@ -16,7 +16,7 @@ module Hotdog
         end
       end
 
-      def run(args=[])
+      def run(args=[], options={})
         args.each do |arg|
           if arg.index(":").nil?
             scope = "host:#{arg}"

data/lib/hotdog/commands/help.rb

@@ -5,7 +5,7 @@ require "rbconfig"
 module Hotdog
   module Commands
     class Help < BaseCommand
-      def run(args=[])
+      def run(args=[], options={})
         ruby = File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["ruby_install_name"])
         exit(system(ruby, $0, "--help") ? 0 : 1)
       end

data/lib/hotdog/commands/hosts.rb

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

data/lib/hotdog/commands/pssh.rb

@@ -9,37 +9,31 @@ require "parallel"
 module Hotdog
   module Commands
     class Pssh < Search
-      def define_options(optparse)
-        @ssh_options = @options.merge({
-          options: [],
-          user: nil,
-          port: nil,
-          identity_file: nil,
-          max_parallelism: nil,
-        })
+      def define_options(optparse, options={})
+        options[:options] = []
+        options[:user] = nil
+        options[:port] = nil
+        options[:identity_file] = nil
+        options[: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_options[:options] += [option]
+          options[:options] += [option]
         end
         optparse.on("-i SSH_IDENTITY_FILE", "SSH identity file path") do |path|
-          @ssh_options[:identity_file] = path
+          options[:identity_file] = path
         end
         optparse.on("-p PORT", "Port of the remote host", Integer) do |port|
-          @ssh_options[:port] = port
+          options[:port] = port
         end
         optparse.on("-u SSH_USER", "SSH login user name") do |user|
-          @ssh_options[:user] = user
+          options[:user] = user
         end
         optparse.on("-P PARALLELISM", "Max parallelism", Integer) do |n|
-          @ssh_options[:max_parallelism] = n
+          options[:max_parallelism] = n
         end
       end
 
-      def parse_options(optparse, args=[])
-        optparse.order(args)
-      end
-
-      def run(args=[])
+      def run(args=[], options={})
         use_color = STDOUT.tty?
         expression = args.join(" ").strip
         if expression.empty? || args.empty?
@@ -65,24 +59,24 @@ module Hotdog
 
         # build ssh command
         cmdline = ["ssh"]
-        @ssh_options[:options].each do |option|
+        options[:options].each do |option|
           cmdline << "-o" << option
         end
-        if path = @ssh_options[:identity_file]
+        if path = options[:identity_file]
           cmdline << "-i" << Shellwords.escape(path)
         end
-        if port = @ssh_options[:port]
+        if port = options[:port]
           cmdline << "-p" << port.to_s
         end
-        if @ssh_options[:forward_agent]
+        if options[:forward_agent]
           cmdline << "-A"
         end
 
         cmdline << "-o" << "BatchMode=yes"
 
-        user = @ssh_options[:user]
+        user = options[:user]
 
-        threads = @ssh_options[:max_parallelism] || addresses.size
+        threads = options[:max_parallelism] || addresses.size
         stats = Parallel.map(addresses, in_threads: threads) { |address,name|
           if use_color
             header = "\e[0;36m#{name}\e[00m"

data/lib/hotdog/commands/search.rb

@@ -6,15 +6,13 @@ require "parslet"
 module Hotdog
   module Commands
     class Search < BaseCommand
-      def define_options(optparse)
-        @search_options = @options.merge({
-        })
+      def define_options(optparse, options={})
         optparse.on("-n", "--limit LIMIT", "Limit result set to specified size at most", Integer) do |limit|
-          @search_options[:limit] = limit
+          options[:limit] = limit
         end
       end
 
-      def run(args=[])
+      def run(args=[], options={})
         expression = args.join(" ").strip
         if expression.empty?
           # return everything if given expression is empty
@@ -31,7 +29,7 @@ module Hotdog
         result = evaluate(node, self)
         if 0 < result.length
           _result, fields = get_hosts_with_search_tags(result, node)
-          result = _result.take(@search_options.fetch(:limit, _result.size))
+          result = _result.take(options.fetch(:limit, _result.size))
           STDOUT.print(format(result, fields: fields))
           if _result.length == result.length
             logger.info("found %d host(s)." % result.length)
@@ -53,10 +51,10 @@ module Hotdog
           else []
           end
         }
-        if @options[:display_search_tags]
+        if options[:display_search_tags]
           identifiers = drilldown.call(node).map(&:to_s)
-          if @options[:primary_tag]
-            tags = [@options[:primary_tag]] + identifiers
+          if options[:primary_tag]
+            tags = [options[:primary_tag]] + identifiers
           else
             tags = identifiers
           end

data/lib/hotdog/commands/ssh.rb

@@ -8,45 +8,39 @@ require "shellwords"
 module Hotdog
   module Commands
     class Ssh < Search
-      def define_options(optparse)
-        @ssh_options = @options.merge({
-          index: nil,
-          options: [],
-          user: nil,
-          port: nil,
-          identity_file: nil,
-          forward_agent: false,
-          verbose: false,
-        })
+      def define_options(optparse, options={})
+        options[:index] = nil
+        options[:options] = []
+        options[:user] = nil
+        options[:port] = nil
+        options[:identity_file] = nil
+        options[:forward_agent] = false
+        options[:verbose] = false
 
         optparse.on("-n", "--index INDEX", "Use this index of host if multiple servers are found", Integer) do |index|
-          @ssh_options[:index] = index
+          options[:index] = index
         end
         optparse.on("-o SSH_OPTION", "Passes this string to ssh command through shell. This option may be given multiple times") do |option|
-          @ssh_options[:options] += [option]
+          options[:options] += [option]
         end
         optparse.on("-i SSH_IDENTITY_FILE", "SSH identity file path") do |path|
-          @ssh_options[:identity_file] = path
+          options[:identity_file] = path
         end
         optparse.on("-A", "Enable agent forwarding", TrueClass) do |b|
-          @ssh_options[:forward_agent] = b
+          options[:forward_agent] = b
         end
         optparse.on("-p PORT", "Port of the remote host", Integer) do |port|
-          @ssh_options[:port] = port
+          options[:port] = port
         end
         optparse.on("-u SSH_USER", "SSH login user name") do |user|
-          @ssh_options[:user] = user
+          options[:user] = user
         end
         optparse.on("-v", "--verbose", "Enable verbose ode") do |v|
-          @ssh_options[:verbose] = v
+          options[:verbose] = v
         end
       end
 
-      def parse_options(optparse, args=[])
-        optparse.order(args)
-      end
-
-      def run(args=[])
+      def run(args=[], options={})
         expression = args.join(" ").strip
         if expression.empty?
           exit(1)
@@ -67,8 +61,8 @@ module Hotdog
           STDERR.puts("no match found: #{search_args.join(" ")}")
           exit(1)
         else
-          if @ssh_options[:index] && result.length > @ssh_options[:index]
-            host = result[@ssh_options[:index]]
+          if options[:index] && result.length > options[:index]
+            host = result[options[:index]]
           else
             result, fields = get_hosts_with_search_tags(result, node)
 
@@ -87,22 +81,22 @@ module Hotdog
 
         # build ssh command
         cmdline = ["ssh"]
-        @ssh_options[:options].each do |option|
+        options[:options].each do |option|
           cmdline << "-o" << option
         end
-        if path = @ssh_options[:identity_file]
+        if path = options[:identity_file]
           cmdline << "-i" << Shellwords.escape(path)
         end
-        if port = @ssh_options[:port]
+        if port = options[:port]
           cmdline << "-p" << port.to_s
         end
-        if @ssh_options[:forward_agent]
+        if options[:forward_agent]
           cmdline << "-A"
         end
-        if @ssh_options[:verbose]
+        if options[:verbose]
           cmdline << "-v"
         end
-        if user = @ssh_options[:user]
+        if user = options[:user]
           cmdline << (user + "@" + address)
         else
           cmdline << address

data/lib/hotdog/commands/tags.rb

@@ -3,7 +3,7 @@
 module Hotdog
   module Commands
     class Tags < BaseCommand
-      def run(args=[])
+      def run(args=[], options={})
         if args.empty?
           result = execute("SELECT name, value FROM tags").map { |name, value| [join_tag(name, value)] }
           show_tags(result)

data/lib/hotdog/commands/up.rb

@@ -5,7 +5,7 @@ require "fileutils"
 module Hotdog
   module Commands
     class Up < BaseCommand
-      def run(args=[])
+      def run(args=[], options={})
         scopes = args.map { |arg|
           if arg.index(":").nil?
             "host:#{arg}"

data/lib/hotdog/commands.rb

@@ -25,7 +25,7 @@ module Hotdog
       attr_reader :logger
       attr_reader :options
 
-      def run(args=[])
+      def run(args=[], options={})
         raise(NotImplementedError)
       end
 
@@ -52,7 +52,7 @@ module Hotdog
         update_db(options)
       end
 
-      def define_options(optparse)
+      def define_options(optparse, options={})
         # nop
       end
 

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,10 +153,10 @@ files:
 - spec/formatter/text_spec.rb
 - spec/formatter/tsv_spec.rb
 - spec/formatter/yaml_spec.rb
+- spec/parser/glob_expression_spec.rb
 - spec/parser/parser_spec.rb
-- spec/parser/tag_expression_spec.rb
-- spec/parser/tag_glob_expression_spec.rb
-- spec/parser/tag_regexp_expression_spec.rb
+- spec/parser/regexp_expression_spec.rb
+- spec/parser/string_expression_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/yyuu/hotdog
 licenses:
@@ -192,9 +192,9 @@ test_files:
 - spec/formatter/text_spec.rb
 - spec/formatter/tsv_spec.rb
 - spec/formatter/yaml_spec.rb
+- spec/parser/glob_expression_spec.rb
 - spec/parser/parser_spec.rb
-- spec/parser/tag_expression_spec.rb
-- spec/parser/tag_glob_expression_spec.rb
-- spec/parser/tag_regexp_expression_spec.rb
+- spec/parser/regexp_expression_spec.rb
+- spec/parser/string_expression_spec.rb
 - spec/spec_helper.rb
 has_rdoc: