idcfcloud 0.2.2 → 1.0.0

data/lib/idcf/cli/extend/update.rb

@@ -37,7 +37,7 @@ module Idcf
         def output_default_schema(service, version, regions)
           return nil if regions.keys.include?('default')
           latist = latest_schema(regions.values)
-          path   = make_schema_file_path(service, version, 'default')
+          path = make_schema_file_path(service, version, 'default')
           output_complement_file(JSON.pretty_generate(latist), path)
         end
 
@@ -47,11 +47,11 @@ module Idcf
         # @return Hash or nil
         def latest_schema(schemas)
           result = nil
-          v_str  = '$version'
+          v_str = '$version'
           schemas.each do |data|
             result ||= data
-            v1     = Gem::Version.create(data[v_str])
-            v2     = Gem::Version.create(result[v_str])
+            v1 = Gem::Version.create(data[v_str])
+            v2 = Gem::Version.create(result[v_str])
             next unless v1 > v2
             result = data
           end
@@ -62,9 +62,9 @@ module Idcf
           view = Idcf::Cli::Lib::Util::Template.new
           view.set('variables', make_script_variables)
           paths = {}
-          Idcf::Cli::Conf::Const::COMP_PATHS.each do |k, _v|
-            str      = view.fetch("#{k}/#{COMP_N}.erb")
-            path     = "#{Idcf::Cli::Conf::Const::OUT_DIR}/#{COMP_N}.#{k}"
+          Idcf::Cli::Conf::Const::COMP_PATHS.each_key do |k|
+            str = view.fetch("#{k}/#{COMP_N}.erb")
+            path = "#{Idcf::Cli::Conf::Const::OUT_DIR}/#{COMP_N}.#{k}"
             paths[k] = File.expand_path(path)
             output_complement_file(str, paths[k])
           end
@@ -82,7 +82,7 @@ module Idcf
         end
 
         def startup_script_qa(paths, script)
-          list = %w(y N)
+          list = %w[y N]
           puts "Do you want to edit the startup script?(#{list.join('/')})"
           puts "[#{startup_script_path(script)}]"
           ans = Idcf::Cli::Lib::Util::Input.qa_answer_input(list)
@@ -106,7 +106,7 @@ module Idcf
         # @param paths [Hash]
         def output_startup_script(script, paths)
           s_script_path = startup_script_path(script)
-          write_str     = "source #{paths[script]}"
+          write_str = "source #{paths[script]}"
 
           if write_path?(s_script_path, write_str)
             File.open(s_script_path, 'a') do |f|
@@ -169,20 +169,20 @@ module Idcf
         # @param names [Array]
         # @return Hash
         def make_flat_variables(list, names = [])
-          {}.tap do |result|
-            name         = names.empty? ? 'top' : names.join('_')
-            result[name] = list.keys
-            list.each do |k, v|
-              next unless v.class == Hash
-              names << k
-              result.merge!(make_flat_variables(v, names))
-              names.pop
-            end
+          result = {}
+          name = names.empty? ? 'top' : names.join('_')
+          result[name] = list.keys
+          list.each do |k, v|
+            next unless v.class == Hash
+            names << k
+            result.merge!(make_flat_variables(v, names))
+            names.pop
           end
+          result
         end
 
         def extract_commands(thor_class, commands)
-          thor_class.commands.keys.each do |k_c|
+          thor_class.commands.each_key do |k_c|
             commands << k_c if commands.index(k_c).nil?
           end
 
@@ -192,7 +192,7 @@ module Idcf
         def extract_command_infos(t_class, s_name, infos)
           commands = []
           return extract_commands(t_class, commands) if infos[s_name].nil?
-          infos[s_name].keys.each do |name|
+          infos[s_name].each_key do |name|
             commands << name.to_s
           end
           extract_commands(t_class, commands)

data/lib/idcf/cli/extend/update_file.rb

@@ -36,7 +36,7 @@ module Idcf
         def download_schema_file(path)
           d = file_load(path)
           JSON.parse(d)
-        rescue
+        rescue StandardError => _e
           Idcf::Cli::Lib::Util::CliLogger.info("json format error:#{path}")
           raise Idcf::Cli::Error::CliError, BROKEN_UPDATE_FILE
         end
@@ -49,7 +49,7 @@ module Idcf
         def check_json_schema(j)
           analyst = Idcf::JsonHyperSchema::Analyst.new
           analyst.schema_links(j)
-        rescue => e
+        rescue StandardError => e
           Idcf::Cli::Lib::Util::CliLogger.info('json-schema format error')
           log_msg = "#{BROKEN_UPDATE_FILE}:#{e.message}"
           Idcf::Cli::Lib::Util::CliLogger.error(log_msg)
@@ -58,7 +58,7 @@ module Idcf
 
         def file_load(path)
           open(path).read
-        rescue
+        rescue StandardError => _e
           nil
         end
 

data/lib/idcf/cli/gem_ext/idcf/json_hyper_schema/expands/link_info_base_extension.rb

@@ -45,6 +45,22 @@ module Idcf
           make_params(args[url_param_names.size])
         end
 
+        def parent_titles(schema = nil)
+          result = []
+          if schema.present?
+            parent_schema = schema.parent
+            if parent_schema.present?
+              result << parent_schema.title if parent_schema.title.present?
+              result.concat(parent_titles(parent_schema))
+            end
+          else
+            result << title
+            result.concat(parent_titles(@data))
+            result.reverse!
+          end
+          result
+        end
+
         protected
 
         def make_result_api_params(target, args, api_result, resource_id)
@@ -79,7 +95,7 @@ module Idcf
         def result_api_str(target, args, api_result, resource_id)
           return resource_id if target == '#{resource_id}'
           result_api_str_regexp(target, args, api_result)
-        rescue => e
+        rescue Standarderror => e
           raise Idcf::Cli::Error::CliError, e.message
         end
 
@@ -109,16 +125,16 @@ module Idcf
         end
 
         def make_query_params(param)
-          {}.tap do |result|
-            next unless param.class == Hash
-            query_param_names.each do |k|
-              result[k] = param[k] if param.key?(k)
-              reg = Regexp.new("#{k}[\\.\\[].+")
-              param.keys.each do |pk|
-                result[pk] = param[pk] if (reg =~ pk).present?
-              end
+          result = {}
+          return result unless param.class == Hash
+          query_param_names.each do |k|
+            result[k] = param[k] if param.key?(k)
+            reg       = Regexp.new("#{k}[\\.\\[].+")
+            param.each_key do |pk|
+              result[pk] = param[pk] if (reg =~ pk).present?
             end
           end
+          result
         end
       end
     end

data/lib/idcf/cli/gem_ext/thor/init_util.rb

@@ -33,7 +33,8 @@ class Thor
         file_name = File.basename(f, '.*')
         next if file_name == 'base'
 
-        command_regist file_name, "#{b_path}/#{under_path}/#{file_name}", arg
+        require_path = "#{b_path}/#{under_path}/#{file_name}"
+        command_regist(file_name, require_path, arg)
       end
     end
 
@@ -46,7 +47,8 @@ class Thor
       require require_path
 
       class_const = require_path.classify.constantize
-      class_const.init(arg)
+      class_const.init(arg) if arg.include?(command) || map.values.include?(command.to_sym)
+
       register class_const,
                command,
                "#{command_help_string(command)} [OPTION]",
@@ -72,7 +74,7 @@ class Thor
 
     def subcommand_structure
       {}.tap do |result|
-        commands.each do |k, _v|
+        commands.each_key do |k|
           result[k.to_s] = nil
         end
         result = subcommand_class_structure(result)
@@ -95,6 +97,7 @@ class Thor
 
     def subcommand_class_structure(result)
       subcommand_classes.each do |k, v|
+        v.init({})
         commands       = v.subcommand_structure
         result[k.to_s] = nil
         result[k.to_s] = commands unless commands.empty?

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,42 @@
+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)
+            results = [Idcf::Cli::Conf::Const::DOCUMENT_ID_PREFIX]
+            titles  = link.parent_titles
+            results << titles.shift.downcase
+            results << (@region.present? && @region != 'default' ? @region : @version)
+            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