idcfcloud 0.2.2 → 1.1.1

data/lib/idcf/cli/controller/compute.rb

@@ -1,5 +1,4 @@
 require_relative './base'
-require 'idcf/faraday_middleware/cdn_signature'
 
 module Idcf
   module Cli
@@ -16,7 +15,7 @@ module Idcf
 
         class << self
           def description
-            'Computeing Service(beta)'
+            'Computeing Service'
           end
         end
 
@@ -38,6 +37,20 @@ module Idcf
           faraday
         end
 
+        def make_table_data(data)
+          return data unless data.class == Hash
+          keys = data.keys
+          return data unless keys.count == 2 && keys.include?('count')
+          data.each do |k, v|
+            return v unless k == 'count'
+          end
+          data
+        end
+
+        def make_field_data(data)
+          make_table_data(data)
+        end
+
         # raise api error msg
         #
         # @param res [Faraday::Responce]

data/lib/idcf/cli/controller/extend/command.rb

@@ -1,18 +1,24 @@
 require 'idcf/cli/conf/const'
 require 'idcf/cli/lib/api'
+require 'idcf/cli/lib/document'
 module Idcf
   module Cli
     module Controller
       module Extend
         # command
         module Command
+          attr_reader :public_commands
+
           # register schema method by link
           #
           # @param link [Idcf::JsonHyperSchema::Expands::LinkInfoBase]
           def register_schema_method_by_link!(link)
-            param_str = Idcf::Cli::Lib::Api.command_param_str(link)
+            param_str   = Idcf::Cli::Lib::Api.command_param_str(link)
             method_desc = "#{link.title} #{param_str}"
-            desc method_desc.strip, link.description
+            description = link.description
+            desc method_desc.strip, description
+            description = "#{description}\n\n#{Idcf::Cli::Lib::Document.make_document_desc(link)}"
+            long_desc description
             define_method link.title.to_sym do |*args|
               execute(__method__, *args)
             end
@@ -43,6 +49,23 @@ module Idcf
               method_option opn, option
             end
           end
+
+          def desc(usage, description, options = {})
+            super(usage, description, options)
+            @public_commands ||= []
+            cmd = usage.split(' ').shift
+            @public_commands << cmd unless @public_commands.include?(cmd)
+          end
+
+          def subcommand_structure
+            result = super
+            list = @public_commands
+            list.concat(superclass.public_commands) if superclass.respond_to?(:public_commands)
+            list.each do |cmd|
+              result[cmd] = nil unless result.key?(cmd)
+            end
+            result
+          end
         end
       end
     end

data/lib/idcf/cli/controller/extend/search_module.rb

@@ -22,7 +22,6 @@ module Idcf
           def make_module_classes
             return @m_classes if @m_classes
             result = {}
-            add_classify_rule
 
             make_service_paths.each do |fn, path|
               require path
@@ -32,15 +31,6 @@ module Idcf
             @m_classes = result
           end
 
-          # 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
-
           # make service paths
           #
           # @return Hash

data/lib/idcf/cli/controller/extend/util.rb

@@ -27,6 +27,18 @@ module Idcf
             v      = service_version(o)
             "#{dir}/#{fn}_#{v}_#{region}.#{ext}"
           end
+
+          # service version
+          #
+          # @param o [Hash]
+          # @return String
+          def service_version(o)
+            versions = service_versions(get_region(o))
+            result   = o[:version].nil? ? versions.last : o[:version]
+            msg      = "not found input version[#{o[:version]}]"
+            raise Idcf::Cli::Error::CliError, msg unless versions.include?(result)
+            result
+          end
         end
       end
     end

data/lib/idcf/cli/controller/include/client.rb

@@ -54,7 +54,7 @@ module Idcf
           def faraday_setting(faraday, o)
             prof = Idcf::Cli::Lib::Configure.get_profile(o)
             op   = {}
-            [:api_key, :secret_key].each do |v|
+            %i[api_key secret_key].each do |v|
               op[v] = o.key?(v) ? o[v] : Idcf::Cli::Lib::Configure.get_user_conf(v.to_s, prof)
             end
             faraday.request(faraday_request)

data/lib/idcf/cli/controller/include/command.rb

@@ -20,7 +20,7 @@ module Idcf
             args.each do |v|
               begin
                 result << JSON.parse(v, symbolize_names: false)
-              rescue
+              rescue StandardError => _e
                 result << v
               end
             end

data/lib/idcf/cli/controller/include/util.rb

@@ -12,10 +12,10 @@ module Idcf
           # @param err_f [Boolean]
           # @param o [Hash]
           # @return Stirng
-          def make_result_str(data, err_f, o)
+          def make_result_str(data, o)
             message = data.class == Hash ? data[:message] : {}
             f       = output_format(o, message)
-            Idcf::Cli::Lib::Convert::Helper.new.format(data, err_f, f)
+            Idcf::Cli::Lib::Convert::Helper.new.format(data, f)
           end
 
           # output format
@@ -25,9 +25,7 @@ module Idcf
           # @return String
           def output_format(o, message)
             default_output = Idcf::Cli::Lib::Configure.get_code_conf('output', o)
-            if message.class == Hash && !message[:output].nil?
-              return default_output
-            end
+            return default_output if message.class == Hash && !message[:output].nil?
 
             f = o[:output]
             f.nil? ? default_output : f

data/lib/idcf/cli/controller/include/validate.rb

@@ -60,7 +60,7 @@ module Idcf
                 next
               end
             end
-            cli_error 'Validate load error'
+            cli_error('Validate load error')
           end
 
           # make validation error

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

@@ -25,9 +25,7 @@ module Idcf
 
         def make_profiles(config, o)
           [].tap do |result|
-            if o[:profile] != 'default' && !check_profile?(config, 'default')
-              result << 'default'
-            end
+            result << 'default' if o[:profile] != 'default' && !check_profile?(config, 'default')
             result << o[:profile]
           end
         end
@@ -35,7 +33,7 @@ module Idcf
         def check_profile?(config, name)
           conf = config[name]
           return false if conf.nil?
-          Idcf::Cli::Conf::Const::USER_CONF_ITEMS.each do |k, _v|
+          Idcf::Cli::Conf::Const::USER_CONF_ITEMS.each_key do |k|
             return false if conf[k.to_s].strip.empty?
           end
           true

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|
@@ -154,7 +154,7 @@ module Idcf
         def output_manual_writing(paths)
           puts 'please write in'
           Idcf::Cli::Conf::Const::COMP_PATHS.each do |k, v|
-            puts v, paths[k]
+            puts v, "source #{paths[k]}"
           end
         end
 
@@ -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

@@ -7,8 +7,17 @@ module Idcf
     module Extend
       # update file
       module UpdateFile
-        BROKEN_UPDATE_FILE = 'The update file is damaged. '\
-                             'Please consult with the administrator.'.freeze
+        BROKEN_UPDATE_FILE = <<-TEXT.strip_heredoc.freeze
+          The update file is damaged.
+          Please consult with the administrator.
+        TEXT
+        BROKEN_JSON_SCHEMA = <<-TEXT.strip_heredoc.freeze
+          Failed to verify the update file.
+          Use the following commands to try updating the gem.
+
+          # gem update idcfcloud
+          # idcfcloud init
+        TEXT
 
         protected
 
@@ -36,7 +45,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,16 +58,16 @@ 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}"
+          log_msg = "#{BROKEN_JSON_SCHEMA}:#{e.message}"
           Idcf::Cli::Lib::Util::CliLogger.error(log_msg)
-          raise Idcf::Cli::Error::CliError, BROKEN_UPDATE_FILE
+          raise Idcf::Cli::Error::CliError, BROKEN_JSON_SCHEMA
         end
 
         def file_load(path)
-          open(path).read
-        rescue
+          URI.open(path).read
+        rescue StandardError => _e
           nil
         end
 
@@ -66,8 +75,10 @@ module Idcf
           {}.tap do |result|
             Idcf::Cli::Lib::Configure.get_code_conf(cls.service_name).each do |k, v|
               regions = {}
-              v['region'].each do |region, info|
-                regions[region] = create_schema_url(info['schema'])
+              v['region'].each_key do |region|
+                target          = "#{cls.service_name}.#{k}.region.#{region}.schema"
+                url             = Idcf::Cli::Lib::Configure.get_code_conf(target)
+                regions[region] = create_schema_url(url)
               end
 
               result[k] = regions

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?