idcfcloud 0.2.2 → 1.1.1

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

@@ -38,7 +38,7 @@ module Idcf
             end
 
             result
-          rescue
+          rescue StandardError => _e
             raise Idcf::Cli::Error::CliError, "Error: could not read '#{path}'"
           end
         end

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

@@ -8,9 +8,9 @@ module Idcf
         ARG_TYPE_OPT  = :opt
         ARG_TYPE_REST = :rest
         HELP_FORMAT   = {
-          ARG_TYPE_REQ  => '<%s>',
-          ARG_TYPE_OPT  => '[%s]',
-          ARG_TYPE_REST => '[%s ...]'
+          ARG_TYPE_REQ  => '<%<name>s>',
+          ARG_TYPE_OPT  => '[%<name>s]',
+          ARG_TYPE_REST => '[%<name>s ...]'
         }.freeze
         attr_reader :last_command, :last_command_args
         include Idcf::Cli::Lib::Include::RecurringCalling
@@ -51,7 +51,7 @@ module Idcf
             valid_params.each do |param|
               f = HELP_FORMAT[param[0]]
               next if f.nil?
-              cp << format(f, param[1])
+              cp << format(f, name: param[1])
             end
             cp.join(' ')
           end
@@ -72,7 +72,7 @@ module Idcf
           # @return Boolean
           def target_param?(name)
             val            = name.to_s
-            exclusion_list = %w(api o)
+            exclusion_list = %w[api o]
             return false if exclusion_list.include?(val)
             return false if val[0] == '_'
             true
@@ -107,7 +107,7 @@ module Idcf
           opt_cnt = method_option_cnt(param)
 
           min = p_cnt - opt_cnt
-          msg = format('Argument: %s', self.class.make_param_s)
+          msg = format('Argument: %<arg>s', arg: self.class.make_param_s)
           cli_error msg unless arg_size.between?(min, p_cnt)
           true
         end

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

@@ -12,15 +12,15 @@ module Idcf
           #
           # @param api [Idcf::Ilb::Lib::Api]
           # @param o [Hash] options
-          # @option lb_id [String]
-          # @option protocol [Stirng] http
-          # @option protocol_port [int] 80
-          # @option params [Hash] {ipaddress: '0.0.0.0', port: 80}
+          # @param lb_id [String]
+          # @param protocol [Stirng] http
+          # @param protocol_port [int] 80
+          # @param 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)
+            config   = search_config(lb['configs'], protocol, protocol_port)
 
             if config.nil?
               not_param = o[:protocol].nil? ? 'conf_id' : 'protocol'
@@ -64,20 +64,19 @@ module Idcf
 
           # config search
           #
-          # @param lb_info [Hash]
-          # @param o [Hash]
+          # @param configs [Hash]
+          # @param protocol [String]
+          # @param p_port [String]
           # @return Hash
           # @raise
-          def search_config(lb_info, protocol, p_port)
-            lb_info['configs'].each do |v|
+          def search_config(configs, protocol, p_port)
+            result = nil
+            configs.each do |v|
               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'
-                cli_error msg
-              end
-              return v
+              result = v
+              break
             end
-            nil
+            result
           end
 
           # is target config
@@ -86,9 +85,14 @@ module Idcf
           # @param protocol [String]
           # @param p_port [String]
           # @return boolean
-          def target_config?(config, purotocol, p_port)
-            config['frontend_protocol'] == purotocol &&
-              config['port'].to_s == p_port.to_s
+          # @raise
+          def target_config?(config, protocol, p_port)
+            unless config['frontend_protocol'] == protocol && config['port'].to_s == p_port.to_s
+              return false
+            end
+            return true if config['state'].casecmp('running').zero?
+            msg = 'The operation is impossible because the target is currently being processed'
+            cli_error msg
           end
         end
       end

data/lib/idcf/cli/validate/custom/month_check_validator.rb

@@ -29,7 +29,7 @@ module Idcf
           def valid?(val)
             Date.parse("#{val}-01")
             true
-          rescue
+          rescue StandardError => _e
             false
           end
         end

data/lib/idcf/cli/validate/custom/require_relation_validator.rb

@@ -7,7 +7,7 @@ module Idcf
         # require relation validator
         class RequireRelationValidator < ActiveModel::EachValidator
           MESSAGES = {
-            message: 'A related parameter isn\'t input. (%s)'
+            message: 'A related parameter isn\'t input. (%<msg>s)'
           }.freeze
 
           def validate(record)
@@ -16,7 +16,7 @@ module Idcf
             nones = make_nones(record)
             return if nones.empty?
 
-            msg = MESSAGES[:message] % nones.join('/')
+            msg = format(MESSAGES[:message], msg: nones.join('/'))
             record.errors.add(nones.first, msg, {})
           end
 

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

@@ -16,12 +16,13 @@ module Idcf
                         :no_ssl,
                         :no_vssl,
                         :json_path,
-                        :fields
+                        :fields,
+                        :version
 
           validates :output,
                     allow_blank: true,
                     inclusion:   {
-                      in:      %w(table json xml csv),
+                      in:      %w[table json xml csv],
                       message: 'from this [table/json/xml/csv]'
                     }
 

data/lib/idcf/cli/version.rb

@@ -1,5 +1,5 @@
 module Idcf
   module Cli
-    VERSION = '0.2.2'.freeze
+    VERSION = '1.1.1'.freeze
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: idcfcloud
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.1.1
 platform: ruby
 authors:
 - IDC Frontier Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -82,194 +82,182 @@ dependencies:
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 5.2.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 5.2.4.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 5.2.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 5.2.4.1
 - !ruby/object:Gem::Dependency
-  name: inifile
+  name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: 2.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: 2.3.5
 - !ruby/object:Gem::Dependency
-  name: builder
+  name: facter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
-  name: kosi
+  name: idcf-faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
-  name: open_uri_redirections
+  name: idcf-json_hyper_schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
-  name: idcf-json_hyper_schema
+  name: inifile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: idcf-faraday_middleware
+  name: jsonpath
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.8.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.8.10
 - !ruby/object:Gem::Dependency
-  name: jsonpath
+  name: kosi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.10
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.10
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: facter
+  name: open_uri_redirections
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
-  name: CFPropertyList
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: 0.19.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: 0.19.4
 description: IDCF Cli
 email: []
 executables:
@@ -292,7 +280,6 @@ files:
 - lib/idcf/cli/conf/conf.yml
 - lib/idcf/cli/conf/const.rb
 - lib/idcf/cli/controller/base.rb
-- lib/idcf/cli/controller/cdn.rb
 - lib/idcf/cli/controller/compute.rb
 - lib/idcf/cli/controller/dns.rb
 - lib/idcf/cli/controller/extend/command.rb
@@ -328,6 +315,7 @@ files:
 - lib/idcf/cli/lib/convert/formatter/table_format.rb
 - lib/idcf/cli/lib/convert/formatter/xml_format.rb
 - lib/idcf/cli/lib/convert/helper.rb
+- lib/idcf/cli/lib/document.rb
 - lib/idcf/cli/lib/include/recurring_calling.rb
 - lib/idcf/cli/lib/util/cli_file.rb
 - lib/idcf/cli/lib/util/cli_logger.rb
@@ -363,15 +351,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: IDCF Cli tools