hotdog 0.36.0 → 1.20190725.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcecc952d1506d37d5b5c76ab31b6c9eb4d4e06e85adafefda6d4864299c6fb8
-  data.tar.gz: 042be0d1b27868b9b2e6bee9d452d33ffc2076718904547c9258435c8eebc84d
+  metadata.gz: '0699880ef57158626ee7638e7cc6266a878006b482254017d13788ce08cf310e'
+  data.tar.gz: a4ac76092f199b6f375c5331ebee107b61f76659a03d101d40c8647989599223
 SHA512:
-  metadata.gz: d9eef4e808bc465c320e7738696a8a6e08f160db09835af6759e3a3ad0cf8788d041668b588be956f487e69c53baaf3398ffe36b239e9f69825729ee478c1469
-  data.tar.gz: 24eef7efe179079b9f862022f827594038954c23f04b7ebf4da7322d5b07ddd77470e4f4de76e1536dcff6f3cb9f38d07e3cc325ae2d513eaf650f503bb16668
+  metadata.gz: 71d16dc1aabe0256baa77e107392b97a8e54a10f95859ef50067c7feb3c6004b24bc21cc4b33b87f54718123422d6fcf4c8d413f3b203e794adf566736a64491
+  data.tar.gz: 47d88afa02e2558b7de9b16446a18c0d64d80870fe1bb3f8daa20c5914d485c0dcc13352b2e0512e002d1e58fe0c62bfe783e776f0408c1c663b4e05df49ecd9

data/lib/hotdog/application.rb

@@ -3,6 +3,7 @@
 require "erb"
 require "logger"
 require "optparse"
+require "shellwords"
 require "yaml"
 require "hotdog/commands"
 require "hotdog/formatters"
@@ -94,14 +95,30 @@ module Hotdog
       args = @optparse.order(argv)
 
       begin
-        @source_provider = get_source(@options[:source])
+        if Hash === @options[:source_alias]
+          source_name = @options[:source_alias].fetch(@options[:source], @options[:source])
+        else
+          source_name = @options[:source]
+        end
+        @source_provider = get_source(source_name)
       rescue NameError
-        STDERR.puts("hotdog: '#{@options[:source]}' is not a valid hotdog source.")
+        STDERR.puts("hotdog: '#{source_name}' is not a valid hotdog source.")
         exit(1)
       end
 
       begin
-        command_name = ( args.shift || "help" )
+        given_command_name = ( args.shift || "help" )
+        if Hash === @options[:command_alias]
+          command_alias = @options[:command_alias].fetch(given_command_name, given_command_name)
+          if Array === command_alias
+            command_name, *command_args = command_alias
+          else
+            command_name, *command_args = Shellwords.shellsplit(command_alias)
+          end
+        else
+          command_name = given_command_name
+          command_args = []
+        end
         begin
           command = get_command(command_name)
         rescue NameError
@@ -114,7 +131,7 @@ module Hotdog
         command.define_options(@optparse, @options)
 
         begin
-          args = command.parse_options(@optparse, args)
+          args = command.parse_options(@optparse, command_args + args)
         rescue OptionParser::ParseError => error
           STDERR.puts("hotdog: #{error.message}")
           command.parse_options(@optparse, ["--help"])
@@ -125,7 +142,12 @@ module Hotdog
           options[:headers] = true
         end
 
-        options[:formatter] = get_formatter(options[:format])
+        if Hash === @options[:format_alias]
+          format_name = @options[:format_alias].fetch(@options[:format], @options[:format])
+        else
+          format_name = @options[:format]
+        end
+        options[:formatter] = get_formatter(format_name)
 
         if ( options[:debug] or options[:verbose] ) and ( options[:verbosity] < VERBOSITY_DEBUG )
           options[:verbosity] = VERBOSITY_DEBUG
@@ -260,19 +282,13 @@ module Hotdog
     end
 
     def get_formatter(name)
-      begin
-        require "hotdog/formatters/#{name}"
-      rescue LoadError => error
-        @logger.info("failed to load library file: #{error}")
-      end
       begin
         klass = Hotdog::Formatters.const_get(const_name(name))
       rescue NameError
-        library = find_library("hotdog/formatters", name)
-        if library
-          load library
-          klass = Hotdog::Formatters.const_get(const_name(File.basename(library, ".rb")))
-        else
+        begin
+          require "hotdog/formatters/#{name}"
+          klass = Hotdog::Formatters.const_get(const_name(name))
+        rescue LoadError
           raise(NameError.new("unknown format: #{name}"))
         end
       end
@@ -280,19 +296,13 @@ module Hotdog
     end
 
     def get_command(name)
-      begin
-        require "hotdog/commands/#{name}"
-      rescue LoadError => error
-        @logger.info("failed to load library file: #{error}")
-      end
       begin
         klass = Hotdog::Commands.const_get(const_name(name))
       rescue NameError
-        library = find_library("hotdog/commands", name)
-        if library
-          load library
-          klass = Hotdog::Commands.const_get(const_name(File.basename(library, ".rb")))
-        else
+        begin
+          require "hotdog/commands/#{name}"
+          klass = Hotdog::Commands.const_get(const_name(name))
+        rescue LoadError
           raise(NameError.new("unknown command: #{name}"))
         end
       end
@@ -300,19 +310,13 @@ module Hotdog
     end
 
     def get_source(name)
-      begin
-        require "hotdog/sources/#{name}"
-      rescue LoadError => error
-        @logger.info("failed to load library file: #{error}")
-      end
       begin
         klass = Hotdog::Sources.const_get(const_name(name))
       rescue NameError
-        library = find_library("hotdog/sources", name)
-        if library
-          load library
-          klass = Hotdog::Sources.const_get(const_name(File.basename(library, ".rb")))
-        else
+        begin
+          require "hotdog/sources/#{name}"
+          klass = Hotdog::Sources.const_get(const_name(name))
+        rescue LoadError
           raise(NameError.new("unknown source: #{name}"))
         end
       end

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.36.0"
+  VERSION = "1.20190725.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 1.20190725.0
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-22 00:00:00.000000000 Z
+date: 2019-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -227,8 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Yet another command-line tool for Datadog