idcfcloud 0.2.2 → 1.1.1

data/lib/idcf/cli/index.rb

@@ -28,12 +28,24 @@ module Idcf
         # @param arg [Hash] options
         def init(arg)
           map COMMAND_MAPS
+          add_classify_rule
           sub_command_regist('controller', File.dirname(__FILE__), arg)
         rescue Idcf::Cli::Error::CliError => e
           error_exit(e)
-        rescue => e
+        rescue StandardError => e
           error_exit(Idcf::Cli::Error::CliError.new(e.message))
         end
+
+        protected
+
+        # add classify rule
+        def add_classify_rule
+          Idcf::Cli::Conf::Const::CLASSIFY_RULE.each do |rule|
+            ActiveSupport::Inflector.inflections do |inflect|
+              inflect.irregular(*rule)
+            end
+          end
+        end
       end
 
       def initialize(*args)
@@ -48,7 +60,7 @@ module Idcf
       def init
         configure
         update
-      rescue => e
+      rescue StandardError => e
         self.class.error_exit(e)
       end
 
@@ -56,7 +68,7 @@ module Idcf
 
       def update
         do_update(options)
-      rescue => e
+      rescue StandardError => e
         self.class.error_exit(e)
       end
 
@@ -67,7 +79,7 @@ module Idcf
       def configure
         init_f = ARGV[0] == 'init'
         do_configure(options, init_f)
-      rescue => e
+      rescue StandardError => e
         self.class.error_exit(e)
       end
 
@@ -75,7 +87,7 @@ module Idcf
 
       def version
         puts Idcf::Cli::Conf::Const::VERSION_STR
-      rescue => e
+      rescue StandardError => e
         self.class.error_exit(e)
       end
     end

data/lib/idcf/cli/lib/api.rb

@@ -1,4 +1,5 @@
 require 'idcf/cli/lib/util/cli_logger'
+require 'idcf/cli/lib/document'
 module Idcf
   module Cli
     module Lib
@@ -113,16 +114,16 @@ module Idcf
           min    = link.url_param_names.size + offset
           max    = between_max(min, link)
 
-          msg = format('Argument: %s', self.class.command_param_str(link))
+          msg = format('Argument: %<arg>s', arg: self.class.command_param_str(link))
+          msg = "#{msg}\n#{Idcf::Cli::Lib::Document.make_document_desc(link)}"
           cli_error msg unless args.size.between?(min, max)
         end
 
         def between_max(min, link)
           offset     = 0
           required_f = self.class.param_required?(link)
-          if !required_f && (link.properties.present? || link.query_param_names.present?)
-            offset = 1
-          end
+          offset = 1 if !required_f && (link.properties.present? || link.query_param_names.present?)
+
           min + offset
         end
 

data/lib/idcf/cli/lib/configure.rb

@@ -40,7 +40,7 @@ module Idcf
             profile = get_profile(o)
 
             return get_user_conf(path, profile)
-          rescue
+          rescue StandardError => _e
             return code_config.find(path) if code_config
             f_path       = Idcf::Cli::Conf::Const::CODE_CONF_PATH
             @code_config = Idcf::Cli::Lib::Util::YmlConf.new(f_path)
@@ -65,7 +65,7 @@ module Idcf
             region = ''
             region = get_user_conf('region', get_profile(o)) if read_conf
             region.empty? ? 'default' : region
-          rescue
+          rescue StandardError => _e
             'default'
           end
 

data/lib/idcf/cli/lib/convert/filter/field_filter.rb

@@ -6,7 +6,7 @@ module Idcf
         module Filter
           # filter fields
           class FieldFilter < Base
-            MSG_NO_TARGETS = '[fields][%s] is not found.'.freeze
+            MSG_NO_TARGETS = '[fields][%<field>s] is not found.'.freeze
 
             # filter
             #
@@ -41,18 +41,15 @@ module Idcf
 
             def extraction(data, condition)
               check_extraction(data, condition)
-              {}.tap do |result|
-                condition.split(',').each do |key|
-                  next if key.empty?
+              result = {}
+              condition.split(',').each do |key|
+                next if key.blank?
 
-                  val = data[key]
-                  if @options[:table_flag]
-                    result[key] = [Array, Hash].include?(val.class) ? val.to_s : val
-                    next
-                  end
-                  result[key] = val
-                end
+                val         = data[key]
+                flg         = @options[:table_flag] && [Array, Hash].include?(val.class)
+                result[key] = flg ? val.to_s : val
               end
+              result
             end
 
             def check_extraction(data, condition)
@@ -63,7 +60,7 @@ module Idcf
               end
 
               return nil if no_targets.empty?
-              cli_error(MSG_NO_TARGETS % no_targets.join(','))
+              cli_error(format(MSG_NO_TARGETS, field: no_targets.join(',')))
             end
           end
         end

data/lib/idcf/cli/lib/convert/filter/json_path_filter.rb

@@ -19,7 +19,7 @@ module Idcf
               end
               path = JsonPath.new(condition)
               path.on(data.to_json)
-            rescue => e
+            rescue StandardError => e
               cli_error("[json-path]#{e.message}")
             end
           end

data/lib/idcf/cli/lib/convert/formatter/base.rb

@@ -8,9 +8,8 @@ module Idcf
             # format
             #
             # @param _data [Hash]
-            # @param _err_f [Boolean]
             # @return String
-            def format(_data, _err_f)
+            def format(_data)
               raise Idcf::Cli::Error::CliError, 'override'
             end
           end

data/lib/idcf/cli/lib/convert/formatter/csv_format.rb

@@ -8,9 +8,9 @@ module Idcf
         module Formatter
           # csv formatter
           class CsvFormat < Base
-            def format(data, err_f)
-              result = CSV.generate do |csv|
-                scrape_line(data, err_f).each do |v|
+            def format(data)
+              result = CSV.generate(force_quotes: true) do |csv|
+                scrape_line(data).each do |v|
                   csv << v
                 end
               end
@@ -20,11 +20,11 @@ module Idcf
 
             protected
 
-            def scrape_line(data, err_f)
-              list = scrape(data, err_f)
+            def scrape_line(data)
+              list = scrape(data)
               return [] if list.size.zero?
 
-              result  = []
+              result = []
               headers = make_header(list.first)
               result << headers
               push_list(list, headers, result)
@@ -33,7 +33,7 @@ module Idcf
             def make_header(first_list)
               result = []
               if first_list.class == Hash
-                first_list.each do |k, _v|
+                first_list.each_key do |k|
                   result << k
                 end
               else
@@ -56,10 +56,8 @@ module Idcf
 
             # scrape
             # @param data [Hash]
-            # @param err_f [Boolean]
             # @return Array in Hash
-            def scrape(data, err_f)
-              return [flat_hash(data)] if err_f
+            def scrape(data)
               return [flat_hash(data)] if data.class == Hash
               return [[data]] unless data.class == Array
 
@@ -83,29 +81,14 @@ module Idcf
             end
 
             def flat_hash(data)
-              {}.tap do |result|
-                return {} unless data.class == Hash
-                data.each do |k, v|
-                  value = v
-                  arr_f = v.class == Array || v.class == Hash
-                  next if k != :message && arr_f
-                  value            = flat(value) if arr_f
-                  result[k.to_sym] = value
-                end
+              result = {}
+              return result unless data.class == Hash
+              data.each do |k, v|
+                value = v
+                value = JSON.generate(value) if v.class == Array || v.class == Hash
+                result[k.to_sym] = value
               end
-            end
-
-            def flat(list)
-              result = []
-              list.each do |k, v|
-                if list.class == Hash
-                  result << "#{k}:#{v.join('/')}"
-                  next
-                end
-                result << (v.nil? ? k : v)
-              end
-
-              result.join("\n")
+              result
             end
           end
         end

data/lib/idcf/cli/lib/convert/formatter/json_format.rb

@@ -8,7 +8,7 @@ module Idcf
         module Formatter
           # json formatter
           class JsonFormat < Base
-            def format(data, _err_f)
+            def format(data)
               JSON.pretty_generate(data)
             end
           end

data/lib/idcf/cli/lib/convert/formatter/table_format.rb

@@ -7,9 +7,9 @@ module Idcf
         module Formatter
           # table formatter
           class TableFormat < CsvFormat
-            def format(data, err_f)
+            def format(data)
               require 'kosi'
-              Kosi::Table.new.render(scrape_line(data, err_f))
+              Kosi::Table.new.render(scrape_line(data))
             end
           end
         end

data/lib/idcf/cli/lib/convert/formatter/xml_format.rb

@@ -10,7 +10,7 @@ module Idcf
         module Formatter
           # xml formatter
           class XmlFormat < Base
-            def format(data, _err_f)
+            def format(data)
               data.to_xml(dasherize: false)
             end
           end

data/lib/idcf/cli/lib/convert/helper.rb

@@ -9,16 +9,15 @@ module Idcf
       module Convert
         # format helper
         class Helper
-          FILTER_OPTION = [:json_path, :fields].freeze
+          FILTER_OPTION = %i[json_path fields].freeze
 
           # data convert
           #
           # @param data [Hash]
-          # @param err_f [Boolean]
           # @param f [String] format
           # @return String
-          def format(data, err_f, f)
-            cls_load("Formatter::#{f.classify}Format").new.format(data, err_f)
+          def format(data, f)
+            cls_load("Formatter::#{f.classify}Format").new.format(data)
           end
 
           # is filter target
@@ -31,6 +30,19 @@ module Idcf
             false
           end
 
+          # only filter
+          #
+          # @param o [Hash]
+          # @return Boolean
+          def only_filter_fields?(o)
+            return false if o[:fields].nil?
+            list = []
+            FILTER_OPTION.each do |k|
+              list << k if o[k].present?
+            end
+            list.count == 1
+          end
+
           # data convert
           #
           # @param data [Hash]
@@ -38,7 +50,6 @@ module Idcf
           # @param table_flag [Boolean]
           # @return Hash
           def filter(data, o, table_flag)
-            return data unless [Hash, Array].include?(data.class)
             result = data.deep_dup
             FILTER_OPTION.each do |k|
               next if o[k].nil? || o[k].empty?

data/lib/idcf/cli/lib/document.rb

@@ -0,0 +1,45 @@
+require 'idcf/cli/conf/const'
+
+module Idcf
+  module Cli
+    module Lib
+      # document
+      class Document
+        class << self
+          attr_reader :region, :version
+
+          def init(region: '', version: '')
+            @region  = region
+            @version = version
+          end
+
+          def make_document_desc(link)
+            "reference : #{make_document_url(link)}"
+          end
+
+          def make_document_url(link)
+            result       = URI(Idcf::Cli::Conf::Const::DOCUMENT_URL)
+            add_params   = {
+              'id' => make_document_id(link)
+            }.to_param
+            result.query = result.query ? "#{result.query}&#{add_params}" : add_params
+            result.to_s
+          end
+
+          def make_document_id(link)
+            titles      = link.parent_titles
+            service_str = titles.shift.downcase
+            version_str = "#{Idcf::Cli::Conf::Const::DOCUMENT_SPACE_CONVERSION}#{@version}"
+            version_str = (@region.present? && @region != 'default' ? '' : version_str)
+            id_format   = Idcf::Cli::Conf::Const::DOCUMENT_ID_PREFIX_FORMAT
+            prefix      = format(id_format, service: service_str, version: version_str)
+            results     = [prefix]
+            results.concat(titles)
+            result = results.join(Idcf::Cli::Conf::Const::DOCUMENT_ID_SEP)
+            result.gsub(/ /, Idcf::Cli::Conf::Const::DOCUMENT_SPACE_CONVERSION)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/idcf/cli/lib/util/cli_file.rb

@@ -12,7 +12,7 @@ module Idcf
             def mkdir(path)
               target = file?(path) ? File.dirname(path) : path
               FileUtils.mkdir_p(target, mode: 0o755)
-            rescue => e
+            rescue StandardError => e
               raise Idcf::Cli::Error::CliError, e.message
             end
 

data/lib/idcf/cli/lib/util/cli_logger.rb

@@ -12,7 +12,7 @@ module Idcf
         class CliLogger
           class << self
             attr_reader :logger, :current_path
-            LOG_METHODS = %w(debug error fatal info unknown warn).freeze
+            LOG_METHODS = %w[debug error fatal info unknown warn].freeze
 
             def log_instance
               return nil unless output_log?
@@ -68,7 +68,7 @@ module Idcf
               return false unless conf.get_user_conf('output_log').casecmp('y').zero?
               path = conf.get_user_conf('log_path')
               path.present?
-            rescue => _e
+            rescue StandardError => _e
               false
             end
 
@@ -77,7 +77,7 @@ module Idcf
 
               path = "#{base_path}/#{Idcf::Cli::Conf::Const::LOG_FILE_NAME}"
               File.expand_path(path)
-            rescue => _e
+            rescue StandardError => _e
               nil
             end
 

data/lib/idcf/cli/lib/util/ini_conf.rb

@@ -40,10 +40,10 @@ module Idcf
           def find(name, profile)
             begin
               @load_data[profile].fetch(name)
-            rescue
+            rescue StandardError => _e
               @load_data['default'].fetch(name)
             end
-          rescue
+          rescue StandardError => _e
             msg = "Error: could not read #{profile}:#{name}"
             raise Idcf::Cli::Error::CliError, msg
           end

data/lib/idcf/cli/lib/util/input.rb

@@ -5,20 +5,29 @@ module Idcf
         # input
         class Input
           class << self
+            # qa
+            #
+            # @param title [String]
+            # @param setting [Hash]
+            # @param nd [String]
+            # @return [String]
             def qa(title, setting, nd = '')
               loop do
-                v     = setting.class == Hash ? setting[:list] : nil
-                v     = v.nil? ? [] : v
-                set_s = v.empty? ? '' : "(#{v.join('/')})"
-                puts "#{title}#{set_s}[#{nd.empty? ? 'NONE' : nd}]"
+                v = qa_setting_list(setting)
+                qa_puts_question(title, nd, v)
                 result = qa_answer_input(v, nd)
                 return result unless result.empty?
               end
             end
 
+            # qa_answer_input
+            #
+            # @param list [Array]
+            # @param nd [String]
+            # @return [String]
             def qa_answer_input(list, nd = '')
               loop do
-                res = STDIN.gets.strip
+                res    = STDIN.gets.strip
                 result = res.empty? ? nd : res
                 return result if qa_answer?(result, list)
                 puts "from this [#{list.join('/')}]"
@@ -28,6 +37,32 @@ module Idcf
 
             protected
 
+            # qa_puts_question
+            #
+            # @param title [String]
+            # @param nd [String]
+            # @param set_list [Array]
+            # @return nil
+            def qa_puts_question(title, nd, set_list)
+              set_s = set_list.blank? ? '' : "(#{set_list.join('/')})"
+              puts "#{title}#{set_s}[#{nd.empty? ? 'NONE' : nd}]"
+              nil
+            end
+
+            # qa_setting_list
+            #
+            # @param setting [Hash]
+            # @return [Array]
+            def qa_setting_list(setting)
+              v = setting.class == Hash ? setting[:list] : nil
+              v.nil? ? [] : v
+            end
+
+            # qa_answer?
+            #
+            # @param val [String]
+            # @param list [Array]
+            # @return [Boolean]
             def qa_answer?(val, list)
               return true if list.nil? || list.empty?
               return true if Regexp.new("\\A(#{list.join('|')})\\Z") =~ val