idcfcloud 0.1.4 → 0.2.0

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

@@ -6,7 +6,7 @@ module Idcf
       module Util
         # ini conf
         class IniConf
-          attr_reader :load_data, :tmp_data
+          attr_reader :load_data, :tmp_data, :read_only
 
           # initialize
           #
@@ -14,6 +14,7 @@ module Idcf
           def initialize(*path)
             @tmp_data  = {}
             @load_data = IniFile.load(path[0])
+            @read_only = false
           end
 
           def load_error?
@@ -44,22 +45,43 @@ module Idcf
             end
           rescue
             msg = "Error: could not read #{profile}:#{name}"
-            raise Idcf::Cli::CliError, msg
+            raise Idcf::Cli::Error::CliError, msg
           end
 
+          # write
+          #
+          # @param path [String]
           def write(path)
-            unless File.exist?(path)
-              dir_path = File.dirname(path)
-              FileUtils.mkdir_p(dir_path) unless Dir.exist?(dir_path)
-              File.open(path, 'w').close
-              @load_data = IniFile.load(path)
-            end
+            raise Idcf::Cli::Error::CliError, 'read only object' if @read_only
+            @load_data = load_create_file(path) unless File.exist?(path)
 
             @tmp_data.each do |k, v|
               @load_data[k] = v
             end
             @load_data.write(filename: path)
           end
+
+          # inifile object merge
+          #
+          # @param value [Idcf::Cli::Lib::Util::IniConf]
+          # @return self
+          def merge!(value)
+            raise Idcf::Cli::Error::CliError, 'merge error' unless value.class == self.class
+            v_data = value.load_data
+            return self if v_data.nil?
+            @load_data.merge!(v_data)
+            @read_only = true
+            self
+          end
+
+          protected
+
+          def load_create_file(path)
+            dir_path = File.dirname(path)
+            FileUtils.mkdir_p(dir_path) unless Dir.exist?(dir_path)
+            File.open(path, 'w').close
+            IniFile.load(path)
+          end
         end
       end
     end

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

@@ -5,7 +5,17 @@ module Idcf
       module Util
         # yml conf
         class YmlConf
-          @load_data = nil
+          attr_reader :load_data
+
+          class << self
+            attr_reader :data
+            def load(path)
+              @data ||= {}
+              return @data[path] unless @data[path].nil?
+              @data[path] = name.constantize.new(path)
+              @data[path]
+            end
+          end
 
           # initialize
           #
@@ -17,6 +27,7 @@ module Idcf
           # get config value
           #
           # @param path [String]
+          # @param section [String]
           # @return String or Hash
           # @raise
           def find(path)
@@ -28,7 +39,7 @@ module Idcf
 
             result
           rescue
-            raise Idcf::Cli::CliError, "Error: could not read '#{path}'"
+            raise Idcf::Cli::Error::CliError, "Error: could not read '#{path}'"
           end
         end
       end

data/lib/idcf/cli/service/base.rb

@@ -1,14 +1,29 @@
+require 'idcf/cli/lib/include/recurring_calling'
 module Idcf
   module Cli
     module Service
       # model base
       class Base
-        ARG_TYPE_REQ   = :req
-        ARG_TYPE_OPT   = :opt
-        ARG_TYPE_REST  = :rest
-        ARG_TYPE_BLOCK = :block
+        ARG_TYPE_REQ  = :req
+        ARG_TYPE_OPT  = :opt
+        ARG_TYPE_REST = :rest
+        HELP_FORMAT   = {
+          ARG_TYPE_REQ  => '<%s>',
+          ARG_TYPE_OPT  => '[%s]',
+          ARG_TYPE_REST => '[%s ...]'
+        }.freeze
+        attr_reader :last_command, :last_command_args
+        include Idcf::Cli::Lib::Include::RecurringCalling
+
         class << self
-          attr_reader :options, :params
+          attr_reader :options
+
+          # reset
+          # setting reset
+          def reset
+            @options = {}
+          end
+
           # option
           #
           # @param name [String]
@@ -16,39 +31,124 @@ module Idcf
           # @option attr [String] :type
           # @option attr [Boolean] :required
           # @option attr [String] :desc
-          def option(name, *attr)
+          def option(name, attr)
             @options ||= {}
             @options[name] = attr
           end
 
-          # params
+          # descritpion
           #
-          # @param values [String]
-          # @param arg_type [String]
-          def param(name, arg_type = ARG_TYPE_REQ)
-            @params ||= []
-            s = @params.select do |v|
-              v[:name] == name
+          # @return String
+          def description
+            ''
+          end
+
+          # make param string
+          #
+          # @return String
+          def make_param_s
+            cp = []
+            valid_params.each do |param|
+              f = HELP_FORMAT[param[0]]
+              next if f.nil?
+              cp << format(f, param[1])
+            end
+            cp.join(' ')
+          end
+
+          def valid_params
+            [].tap do |result|
+              new.method(:do).parameters.each do |param|
+                result << param if target_param?(param[1])
+              end
             end
+          end
 
-            param = {
-              name:     name,
-              arg_type: arg_type
-            }
+          protected
 
-            @params << param if s.size.zero?
+          # target param?
+          #
+          # @param name [String]
+          # @return Boolean
+          def target_param?(name)
+            val            = name.to_s
+            exclusion_list = %w(api o)
+            return false if exclusion_list.include?(val)
+            return false if val[0] == '_'
+            true
           end
         end
 
+        def initialize
+          @last_command      = ''
+          @last_command_args = []
+        end
+
         # do
         #
         # @param _client [Mixed]
-        # @param *_args [Array]
         # @param _o [Hash] options
+        # @param *_args [Array]
         # @return Hash
         # @raise
-        def do(_client, *_args, _o)
-          raise Idcf::Cli::CliError, 'Require override'
+        def do(_client, _o, *_args)
+          cli_error 'Require override'
+        end
+
+        # between params
+        #
+        # @param params [Array]
+        # @param arg_size [int]
+        # @raise
+        def between_param?(arg_size)
+          param = self.class.valid_params
+          p_cnt = param.size
+          return true if method_rest?(param)
+          opt_cnt = method_option_cnt(param)
+
+          min = p_cnt - opt_cnt
+          msg = format('Argument: %s', self.class.make_param_s)
+          cli_error msg unless arg_size.between?(min, p_cnt)
+          true
+        end
+
+        # is rest
+        #
+        # @param params [Array]
+        # @return Boolean
+        def method_rest?(params)
+          return false if params.nil?
+          params.each do |param|
+            case param[0]
+            when ARG_TYPE_REST
+              return true
+            end
+          end
+          false
+        end
+
+        # option count
+        #
+        # @param params [Array]
+        # @return int
+        def method_option_cnt(params)
+          result = 0
+          return result if params.nil?
+          params.each do |param|
+            case param[0]
+            when ARG_TYPE_OPT
+              result += 1
+            end
+          end
+          result
+        end
+
+        # cli error
+        #
+        # @param msg [String]
+        # @raise
+        def cli_error(msg)
+          raise Idcf::Cli::Error::CliError, msg
         end
       end
     end

data/lib/idcf/cli/service/ilb/add_server_for_protocol.rb

@@ -6,12 +6,17 @@ module Idcf
       module Ilb
         # add server
         class AddServerForProtocol < BaseServerForProtocol
-          init
+          class << self
+            def description
+              "Add a loadbalancer config's server."
+            end
+          end
 
           protected
 
-          def do_command(lb_id, config, target)
-            client.add_server(lb_id, config['id'], target)
+          def set_last_command(lb_id, config, target)
+            @last_command      = :add_server
+            @last_command_args = [lb_id, config['id'], target]
           end
         end
       end

data/lib/idcf/cli/service/ilb/base_server_for_protocol.rb

@@ -6,58 +6,43 @@ module Idcf
       module Ilb
         # [add/delete] server for protocol
         class BaseServerForProtocol < Idcf::Cli::Service::Base
-          class << self
-            def init
-              param :lb_id
-              param :protocol
-              param :protocol_port
-              param :data, Base::ARG_TYPE_REQ
-            end
-          end
-
-          attr_reader :client
+          attr_reader :api, :options
 
           # do
           #
-          # @param client [Idcf::Ilb::Client]
-          # @param args [Array]
-          # @option args [String] lb id
-          # @option args [Stirng] configure protocol
-          # @option args [int] configure port
-          # @option args [Hash] server info {ipaddress: '0.0.0.0', port: 80}
+          # @param api [Idcf::Ilb::Lib::Api]
           # @param o [Hash] options
-          def do(client, *args, o)
-            @client = client
-            lb_id   = args[0]
-            lb      = search_lb(lbs, lb_id)
-            config  = search_config(lb, args[1], args[2])
+          # @option lb_id [String]
+          # @option protocol [Stirng] http
+          # @option protocol_port [int] 80
+          # @option params [Hash] {ipaddress: '0.0.0.0', port: 80}
+          def do(api, o, lb_id, protocol, protocol_port, params)
+            @api     = api
+            @options = o
+            lb       = search_lb(lbs, lb_id)
+            config   = search_config(lb, protocol, protocol_port)
 
             if config.nil?
               not_param = o[:protocol].nil? ? 'conf_id' : 'protocol'
-              raise Idcf::Cli::CliError, "Target not found (#{not_param})"
+              cli_error "A target isn't found(#{not_param})"
             end
 
-            do_command(lb_id, config, args[3])
-            client.list_servers(lb_id, config['id'])
+            set_last_command(lb_id, config, params)
+            config['servers']
           end
 
           protected
 
-          def do_command(_lb_id, _config, _target)
-            raise Idcf::Cli::CliError, 'override required'
+          def set_last_command(_lb_id, _config, _target)
+            cli_error 'override required'
           end
 
-          # get lb list [Idcf::Ilb::Client]
+          # get lb list
           #
-          # @param client
           # @return Array in Hash
           # @raise
           def lbs
-            lb  = client.get(:loadbalancers)
-            msg = "Status: #{lb.status}"
-            raise Idcf::Cli::CliError, msg if !lb.success? || lb.status != 200
-
-            lb.body
+            @api.do(:list_loadbalancers)
           end
 
           # search lb target
@@ -72,7 +57,7 @@ module Idcf
             end
 
             msg = "Target lb_id not found ( #{id} )"
-            raise Idcf::Cli::CliError, msg if lbs.empty?
+            cli_error msg if lbs.empty?
 
             lbs[0]
           end
@@ -88,10 +73,11 @@ module Idcf
               next unless target_config?(v, protocol, p_port)
               unless v['state'].casecmp('running').zero?
                 msg = 'The operation is impossible because the target is currently being processed'
-                raise Idcf::Cli::CliError, msg
+                cli_error msg
               end
               return v
             end
+            nil
           end
 
           # is target config

data/lib/idcf/cli/service/ilb/delete_server_for_protocol.rb

@@ -6,13 +6,18 @@ module Idcf
       module Ilb
         # delete server
         class DeleteServerForProtocol < BaseServerForProtocol
-          init
+          class << self
+            def description
+              "Delete a [loadbalancer's config server]"
+            end
+          end
 
           protected
 
-          def do_command(lb_id, config, target)
-            server_id = search_server_id(config['servers'], target)
-            client.delete_server(lb_id, config['id'], server_id)
+          def set_last_command(lb_id, config, target)
+            server_id          = search_server_id(config['servers'], target)
+            @last_command      = :delete_server
+            @last_command_args = [lb_id, config['id'], server_id]
           end
 
           def search_server_id(servers, target)

data/lib/idcf/cli/validate/define/base.rb

@@ -14,7 +14,9 @@ module Idcf
                         :api_key,
                         :secret_key,
                         :no_ssl,
-                        :no_vssl
+                        :no_vssl,
+                        :json_path,
+                        :fields
 
           validates :output,
                     allow_blank: true,

data/lib/idcf/cli/validate/define/ilb/base.rb

@@ -1,5 +1,3 @@
-require 'active_model'
-require 'active_model/model'
 require_relative '../base'
 module Idcf
   module Cli
@@ -8,9 +6,6 @@ module Idcf
         module Ilb
           # Base Validate
           class Base < Idcf::Cli::Validate::Define::Base
-            include ActiveModel::Model
-            include Idcf::Cli::Validate::Custom
-
             attr_accessor :region
 
             validates :region,

data/lib/idcf/cli/version.rb

@@ -1,5 +1,5 @@
 module Idcf
   module Cli
-    VERSION = '0.1.4'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: idcfcloud
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - IDC Frontier Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -48,7 +48,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.5
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -68,7 +68,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.4
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -79,7 +79,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.4
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -187,47 +187,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: idcf-your
+  name: open_uri_redirections
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: idcf-json_hyper_schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: idcf-faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
-  name: idcf-ilb
+  name: jsonpath
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.8.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.10
+- !ruby/object:Gem::Dependency
+  name: facter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.1
+- !ruby/object:Gem::Dependency
+  name: CFPropertyList
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 2.3.5
 description: IDCF Cli
 email: []
 executables:
@@ -248,7 +290,6 @@ files:
 - idcfcloud.gemspec
 - lib/idcf/cli/conf/conf.yml
 - lib/idcf/cli/conf/const.rb
-- lib/idcf/cli/conf/service/.gitkeep
 - lib/idcf/cli/controller/base.rb
 - lib/idcf/cli/controller/extend/command.rb
 - lib/idcf/cli/controller/extend/init.rb
@@ -257,8 +298,6 @@ files:
 - lib/idcf/cli/controller/ilb.rb
 - lib/idcf/cli/controller/include/command.rb
 - lib/idcf/cli/controller/include/init.rb
-- lib/idcf/cli/controller/include/override.rb
-- lib/idcf/cli/controller/include/sdk.rb
 - lib/idcf/cli/controller/include/util.rb
 - lib/idcf/cli/controller/include/validate.rb
 - lib/idcf/cli/controller/your.rb
@@ -310,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: IDCF Cli tools

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

@@ -1,30 +0,0 @@
-module Idcf
-  module Cli
-    module Controller
-      module Include
-        # override methods
-        module Override
-          protected
-
-          # Create a new client
-          #
-          # @param _o [Hash] other options
-          # @return [Response] Mixed
-          def make_client(_o)
-            raise Idcf::Cli::CliError, 'Required override'
-          end
-
-          # sdk do
-          #
-          # @param _command [String]
-          # @param *_args [Array]
-          # @param o [Hash] options
-          # @return String
-          def do_sdk(_command, *_args, _o)
-            raise Idcf::Cli::CliError, 'Requre override'
-          end
-        end
-      end
-    end
-  end
-end