idcfcloud 0.1.4 → 0.2.0

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

@@ -5,14 +5,7 @@ module Idcf
         # override methods
         module Override
           def description
-            raise Idcf::Cli::CliError, 'Require override'
-          end
-
-          # blank client
-          #
-          # @return Mixed
-          def make_blank_client
-            # blank client
+            raise Idcf::Cli::Error::CliError, 'Require override'
           end
         end
       end

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

@@ -22,6 +22,8 @@ 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
               result[fn] = path.classify.constantize
@@ -30,6 +32,18 @@ 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
           def make_service_paths
             s_name    = make_model_name
             base_path = Idcf::Cli::Conf::Const::BASE_PATH

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

@@ -1,5 +1,4 @@
 require_relative './base'
-require 'idcf/ilb'
 
 module Idcf
   module Cli
@@ -12,49 +11,21 @@ module Idcf
                      type:    :string,
                      aliases: '-r',
                      require: true,
-                     desc:    "region: #{Idcf::Cli::Conf::Const::REGIONS.join('/')}"
+                     desc:    'region: jp-east/jp-east-2/jp-west'
 
         class << self
           def description
             'ILB Service'
           end
-
-          def make_blank_client
-            Idcf::Ilb::Client.new(
-              api_key:    '',
-              secret_key: ''
-            )
-          end
         end
 
         protected
 
-        def resource_classes
-          [
-            Idcf::Ilb::Response,
-            Idcf::Ilb::Resources::Base
-          ]
-        end
-
-        def responce_classes
-          [
-            Idcf::Ilb::Response
-          ]
-        end
-
-        # Create a new client
-        # @param o [Hash] other options
-        # @return [Response] Idcf::Ilb::Client
-        def make_client(o)
-          region = get_region(o)
-          option = {
-            host:       get_code_conf("ilb.v1.host.#{region}", o),
-            ssl:        o.key?(:no_ssl) ? false : true,
-            verify_ssl: o.key?(:no_vssl) ? false : true
-          }
-          option.merge!(base_options(o))
+        def do_async(_api, api_result, o, _executed_link)
+          job_id = api_result['job_id']
+          return nil unless do_command('check_job', job_id, o)
 
-          Idcf::Ilb::Client.new(option)
+          do_command('get_job', job_id, o)
         end
       end
     end

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

@@ -1,4 +1,5 @@
 require 'idcf/cli/conf/const'
+require 'uri'
 module Idcf
   module Cli
     module Controller
@@ -9,96 +10,22 @@ module Idcf
 
           protected
 
+          # convert arg json
+          # json string to Hash
+          #
+          # @param args [Array]
+          # @return Array
           def convert_arg_json(*args)
             result = []
             args.each do |v|
               begin
-                result << JSON.parse(v, symbolize_names: true)
+                result << JSON.parse(v, symbolize_names: false)
               rescue
                 result << v
               end
             end
             result
           end
-
-          # check params
-          #
-          # @param mcs [Array] module classes
-          # @option mcs [Object] not namespace class name => model class object
-          # @param command [String]
-          # @param *args [Array]
-          # @raise
-          def check_params(mcs, command, *args)
-            m_class = nil
-            mcs.each do |k, v|
-              m_class = v if k == command.to_s
-            end
-            if m_class.nil?
-              settings = load_command_setting(command)
-              between_param?(settings[:params], args.size)
-            else
-              between_param?(m_class.params, args.size)
-            end
-          end
-
-          def load_command_setting(command)
-            fn   = self.class.to_s.underscore.split('/').pop
-            cm   = command.to_sym
-            dir  = Idcf::Cli::Conf::Const::CMD_FILE_DIR
-            ext  = Idcf::Cli::Conf::Const::CMD_FILE_EXT
-            path = "#{dir}/#{fn}.#{ext}"
-            Idcf::Cli::Lib::Util::YmlConf.new(path).find(cm)
-          end
-
-          # between params
-          #
-          # @param params [Array]
-          # @param arg_size [int]
-          # @raise
-          def between_param?(params, arg_size)
-            p_cnt = params.nil? ? 0 : params.size
-            return true if method_rest?(params)
-            opt_cnt = method_option_cnt(params)
-
-            min     = p_cnt - opt_cnt
-            msg     = format('Argument: %s', self.class.make_param_s(params))
-
-            return if arg_size.between?(min, p_cnt)
-            raise Idcf::Cli::CliError, msg
-          end
-
-          # is rest
-          #
-          # @param params [Array]
-          # @return Boolean
-          def method_rest?(params)
-            unless params.nil?
-              params.each do |param|
-                case param[:arg_type]
-                when 'rest'
-                  return true
-                end
-              end
-            end
-            false
-          end
-
-          # option count
-          #
-          # @param params [Array]
-          # @return int
-          def method_option_cnt(params)
-            result = 0
-            unless params.nil?
-              params.each do |param|
-                case param[:arg_type]
-                when 'opt'
-                  result += 1
-                end
-              end
-            end
-            result
-          end
         end
       end
     end

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

@@ -1,19 +1,17 @@
-require_relative './override'
 require_relative './validate'
 require_relative './command'
 require_relative './util'
-require_relative './sdk'
+require_relative './client'
 module Idcf
   module Cli
     module Controller
       module Include
         # init load
         module Init
-          include Override
           include Validate
           include Command
           include Util
-          include Sdk
+          include Client
         end
       end
     end

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

@@ -6,68 +6,6 @@ module Idcf
         module Util
           protected
 
-          # get user config value
-          #
-          # @param name [String]
-          # @param profile [String]
-          # @return String or Hash
-          # @raise
-          def get_user_conf(name, profile = 'default')
-            return @config.find(name, profile) if @config
-            @config = make_user_conf
-            msg     = 'Run the command `configure`'
-            raise Idcf::Cli::CliError, msg unless @config
-
-            @config.find(name, profile)
-          end
-
-          def make_user_conf
-            [
-              Idcf::Cli::Conf::Const::USER_CONF_PATH,
-              Idcf::Cli::Conf::Const::USER_CONF_GLOBAL
-            ].each do |v|
-              result = Idcf::Cli::Lib::Util::IniConf.new(v)
-              return result unless result.load_error?
-            end
-            nil
-          end
-
-          # get code setting value
-          #
-          # @param path [String]
-          # @return String or Hash
-          # @raise
-          def get_code_conf(path, o)
-            profile = get_profile(o)
-
-            return get_user_conf(path, profile)
-          rescue
-            return @code_conf.find(path) if @code_conf
-            f_path     = Idcf::Cli::Conf::Const::CODE_CONF_PATH
-            @code_conf = Idcf::Cli::Lib::Util::YmlConf.new(f_path)
-            @code_conf.find(path)
-          end
-
-          # get profile
-          #
-          # @param o [Hash] options
-          # @return String
-          def get_profile(o)
-            o[:profile] || 'default'
-          end
-
-          # get region
-          #
-          # @param o [Hash] options
-          # @return String
-          def get_region(o)
-            return o[:region] if o[:region]
-            region = get_user_conf('region')
-            region.empty? ? 'default' : region
-          rescue
-            'default'
-          end
-
           # make result string
           #
           # @param data [Hash]
@@ -86,7 +24,7 @@ module Idcf
           # @param message [Hash] Validate Hash
           # @return String
           def output_format(o, message)
-            default_output = get_code_conf('output', o)
+            default_output = Idcf::Cli::Lib::Configure.get_code_conf('output', o)
             if message.class == Hash && !message[:output].nil?
               return default_output
             end
@@ -94,6 +32,25 @@ module Idcf
             f = o[:output]
             f.nil? ? default_output : f
           end
+
+          # cli error
+          #
+          # @param msg [Strring]
+          # @raise
+          def cli_error(msg)
+            raise Idcf::Cli::Error::CliError, msg
+          end
+
+          # make response base data
+          #
+          # @return Hash
+          def make_base_response
+            {
+              status:  200,
+              message: '',
+              data:    []
+            }
+          end
         end
       end
     end

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

@@ -45,6 +45,12 @@ module Idcf
             load_validate(paths, o)
           end
 
+          # load validate
+          #
+          # @param paths [Array]
+          # @param o [Hash] Validator
+          # @return class
+          # @raise
           def load_validate(paths, o)
             paths.each do |path|
               begin
@@ -54,7 +60,7 @@ module Idcf
                 next
               end
             end
-            raise Idcf::Cli::CliError, 'Validate load error'
+            cli_error 'Validate load error'
           end
 
           # make validation error

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

@@ -1,5 +1,4 @@
 require_relative './base'
-require 'idcf/your'
 
 module Idcf
   module Cli
@@ -12,13 +11,6 @@ module Idcf
           def description
             'Your Service'
           end
-
-          def make_blank_client
-            Idcf::Your::Client.new(
-              api_key:    '',
-              secret_key: ''
-            )
-          end
         end
 
         protected
@@ -26,31 +18,6 @@ module Idcf
         def make_table_data(data)
           data['data']
         end
-
-        def resource_classes
-          [
-            Idcf::Your::Response
-          ]
-        end
-
-        def responce_classes
-          [
-            Idcf::Your::Response
-          ]
-        end
-
-        # Create a new client
-        # @param o [Hash] other options
-        # @return [Response] Idcf::Ilb::Client
-        def make_client(o)
-          option = {
-            host:       get_code_conf('your.v1.host', o),
-            verify_ssl: o.key?(:no_vssl) ? false : true
-          }
-          option.merge!(base_options(o))
-
-          Idcf::Your::Client.new(option)
-        end
       end
     end
   end

data/lib/idcf/cli/error/cli_error.rb

@@ -1,10 +1,12 @@
 module Idcf
   module Cli
-    # cli custom error
-    class CliError < StandardError
-      def message
-        msg = super
-        "#{Idcf::Cli::Conf::Const::LOCAL_ERROR_PREFIX}#{msg}"
+    module Error
+      # cli custom error
+      class CliError < StandardError
+        def message
+          msg = super
+          "#{Idcf::Cli::Conf::Const::LOCAL_ERROR_PREFIX}#{msg}"
+        end
       end
     end
   end

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

@@ -8,22 +8,28 @@ module Idcf
       module Configure
         protected
 
-        def do_configure(o)
+        # configure settings
+        #
+        # @param o [Hash]
+        # @param init_f [Boolean]
+        def do_configure(o, init_f = false)
           path     = configure_path(o)
           config   = Idcf::Cli::Lib::Util::IniConf.new(path)
-          profiles = []
-          if o[:profile] != 'default' && !check_profile?(config, 'default')
-            profiles << 'default'
-          end
-          profiles << o[:profile]
-          config = configure_input(config, profiles)
-          config.write(path)
+          profiles = make_profiles(config, o)
+          cls      = Idcf::Cli::Conf::Const
+          prefix   = o[:global] ? 'global' : 'local'
+          configure_input(config, profiles, cls::USER_CONF_ITEMS, prefix).write(path)
+
+          global_setting if init_f
         end
 
-        def configure_path(o)
-          cls    = Idcf::Cli::Conf::Const
-          result = o[:global] ? cls::USER_CONF_GLOBAL : cls::USER_CONF_PATH
-          File.expand_path(result)
+        def make_profiles(config, o)
+          [].tap do |result|
+            if o[:profile] != 'default' && !check_profile?(config, 'default')
+              result << 'default'
+            end
+            result << o[:profile]
+          end
         end
 
         def check_profile?(config, name)
@@ -32,38 +38,37 @@ module Idcf
           Idcf::Cli::Conf::Const::USER_CONF_ITEMS.each do |k, _v|
             return false if conf[k.to_s].strip.empty?
           end
-
           true
         end
 
-        def configure_input(config, profiles)
+        def global_setting
+          cls    = Idcf::Cli::Conf::Const
+          path   = cls::USER_CONF_GLOBAL
+          config = Idcf::Cli::Lib::Util::IniConf.new(File.expand_path(path))
+          configure_input(config, ['default'], cls::GLOBAL_CONF_ITEMS).write(path)
+        end
+
+        def configure_path(o)
+          cls    = Idcf::Cli::Conf::Const
+          result = o[:global] ? cls::USER_CONF_GLOBAL : cls::USER_CONF_PATH
+          File.expand_path(result)
+        end
+
+        def configure_input(config, profiles, items, prefix = 'global')
           profiles.each do |profile|
             dt = config[profile] || {}
-            Idcf::Cli::Conf::Const::USER_CONF_ITEMS.each do |k, v|
-              nd         = dt[k.to_s].nil? ? '' : dt[k.to_s]
-              msg        = "#{profile}:#{k}[#{nd.empty? ? 'NONE' : nd}] : "
-              dt[k.to_s] = configure_qa_dialog(msg, nd, v)
+            items.each do |k, v|
+              key_s     = k.to_s
+              nd        = dt[key_s].nil? ? setting_extraction(v, :default).to_s : dt[key_s]
+              dt[key_s] = Idcf::Cli::Lib::Util::Input.qa("#{prefix}[#{profile}]:#{k}", v, nd)
             end
             config[profile] = dt
           end
           config
         end
 
-        def configure_qa_dialog(msg, nd, setting)
-          loop do
-            puts msg
-            res = STDIN.gets.strip
-            next unless !res.empty? || !nd.empty?
-            result = res.empty? ? nd : res
-            return result if confirmation_at_qa_preference?(result, setting)
-            puts "from this [#{setting.join('/')}]"
-          end
-        end
-
-        def confirmation_at_qa_preference?(val, setting)
-          return true if setting.nil?
-          return true if Regexp.new("\\A(#{setting.join('|')})\\Z") =~ val
-          false
+        def setting_extraction(setting, key)
+          setting.class == Hash ? setting[key] : nil
         end
       end
     end