idcfcloud 1.0.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6941bbdef01e10485802468bf365d7d105146ba1
-  data.tar.gz: a32b22a5411de149cf8fd792e5b79c0df512ec89
+SHA256:
+  metadata.gz: c426a591993dc4f91689733ed42dd7b74fa318997b7bd10e2aed2e79419de34b
+  data.tar.gz: cbb9b32e9562df3117435d076667ca8900c07f1916f6d68fb970f8f48ca44696
 SHA512:
-  metadata.gz: 18b046b27be00e1770388bd6067b5d37748a5ed56862e27a5e68cc995fd944a1d15649a5a6206695708f5f61b360b439e1d9c82f210f71c21f892cd78d86e00e
-  data.tar.gz: b1af470e7aac83d807b319e7308851e513541207b9993f65a4cf1ec5bd2047c7640d7bbde2b68c86596ed1731c13afb3a15c5f7726cbda7977ad3b1c91356fa3
+  metadata.gz: 8cc9e4688089eba3db58999522f1d1020b3c95ef42ae202f2633b263dd2b7b44ebff927c27a761f721d569e4abfa7951f19cdaf9f3ba0958d5739a349b59c66e
+  data.tar.gz: 9f7265ea8993df575d658e336ae13dab0afebf02fd092e048f2deb5eae370f9a50896edb10aa3013ca037d3543def691b7f23ed458dc9fae018547dba86ea06e

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Changelog
+
+## 1.1.2
+
+* Add the `jp-east-3` region as an option for: `ilb` and `compute`

data/README.md

@@ -70,8 +70,6 @@ idcfcloud your list_billing_history --json-path '$.data[?(@.month=="2017-10")]'
 
 [ILB](#ilb)
 
-[CDN](#cdn)
-
 [DNS](#dns)
 
 [Your](#your)
@@ -80,7 +78,7 @@ idcfcloud your list_billing_history --json-path '$.data[?(@.month=="2017-10")]'
 
 versions
 
-Get a supported API version. 
+Get a supported API version.
 
 ```code
 $ idcfcloud your versions
@@ -126,10 +124,6 @@ sslalgorithms_ids
 $ idcfcloud ilb sslalgorithms_ids
 ```
 
-### CDN<a name="cdn"></a>
-
-https://www.idcf.jp/help/cache/docs/pdf/cache_api.pdf?cl=rd_0046
-
 ### DNS<a name="dns"></a>
 
 http://docs.idcf.jp/cloud/dns/#s_fid=4FEB16B56007BA5C-0BFB42ABA668ADA8
@@ -138,16 +132,29 @@ http://docs.idcf.jp/cloud/dns/#s_fid=4FEB16B56007BA5C-0BFB42ABA668ADA8
 
 http://docs.idcf.jp/cloud/billing/
 
-## Development
+## Development && Test
 
 Running the following test code is possible, but not recommended nor supported.  Run only a code of a target.
 
+🚨NOTE 🚨
+
+- Be sure to specify `test/run_test.rb` before the test target.
+- The test environment is not standalone. You need to apply for services and prepare your own environment.
+  At least an [ILB](https://www.idcf.jp/cloud/ilb/) is required to pass all tests.
+- If you do not specify the region properly with the environment variable `TEST_REGION (default: jp-east)`, the test will not pass.
+
 ```code
-$ bundle exec ruby test/run_test.rb idcf/cli/controller/test_your.rb
+$ TEST_REGION=your_region bundle exec ruby test/run_test.rb idcf/cli/controller/test_your.rb
 ```
 
 In order to avoid collapsed setting in ILB, make sure you understand how things work before running a code.
 
+#### environments
+
+|name|description|
+|----|-----------|
+|`TEST_REGION`|Region used in the test. (jp-east・jp-east-2・jp-west)|
+
 ## Contributing
 
 1. Fork it ( https://github.com/idcf/idcfcloud-cli/fork )

data/idcfcloud.gemspec

@@ -22,19 +22,20 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.5.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '>= 1.14'
+  spec.add_development_dependency 'rake', '>= 10.0'
   spec.add_development_dependency 'test-unit', '~> 3.2', '>= 3.2.5'
   spec.add_development_dependency 'test-unit-notify', '~> 1.0', '>= 1.0.4'
 
-  spec.add_dependency 'activemodel', '~> 4.2', '>= 4.2.3'
-  spec.add_dependency 'activesupport', '~> 4.2', '>= 4.2.3'
+  spec.add_dependency 'activemodel', '>= 5.2.4.1'
+  spec.add_dependency 'activesupport', '>= 5.2.4.1'
   spec.add_dependency 'builder', '~> 3.1'
   spec.add_dependency 'CFPropertyList', '~> 2.3.5'
   spec.add_dependency 'facter', '~> 2.5.1'
   spec.add_dependency 'idcf-faraday_middleware', '~> 0.0.2'
-  spec.add_dependency 'idcf-json_hyper_schema', '~> 0.2.0'
+  spec.add_dependency 'idcf-json_hyper_schema', '~> 0.3.1'
   spec.add_dependency 'inifile', '~> 3.0', '>= 3.0.0'
   spec.add_dependency 'jsonpath', '~> 0.8.10'
   spec.add_dependency 'kosi', '~> 1.0', '>= 1.0.0'

data/lib/idcf/cli/conf/conf.yml

@@ -9,6 +9,9 @@ ilb:
       jp-east-2:
         schema: https://ilb.jp-east-2.idcfcloud.com/api/v1/schema
         host: ilb.jp-east-2.idcfcloud.com
+      jp-east-3:
+        schema: https://ilb.jp-east-3.idcfcloud.com/api/v1/schema
+        host: ilb.jp-east-3.idcfcloud.com
       jp-west:
         schema: https://ilb.jp-west.idcfcloud.com/api/v1/schema
         host: ilb.jp-west.idcfcloud.com
@@ -18,12 +21,6 @@ your:
       default:
         schema: https://your.idcfcloud.com/api/v1/schema
         host: your.idcfcloud.com
-cdn:
-  v0:
-    region:
-      default:
-        schema: https://cdn.idcfcloud.com/api/v1/schema
-        host: cdn.idcfcloud.com
 dns:
   v1:
     region:
@@ -39,6 +36,9 @@ compute:
       jp-east-2:
         schema: https://compute.jp-east-2.idcfcloud.com/api/v1/schema
         host: compute.jp-east-2.idcfcloud.com
+      jp-east-3:
+        schema: https://compute.jp-east-3.idcfcloud.com/api/v1/schema
+        host: compute.jp-east-3.idcfcloud.com
       jp-west:
         schema: https://compute.jp-west.idcfcloud.com/api/v1/schema
         host: compute.jp-west.idcfcloud.com

data/lib/idcf/cli/conf/const.rb

@@ -5,10 +5,10 @@ module Idcf
     module Conf
       # const
       class Const
-        DOCUMENT_URL              = 'https://www.idcf.jp/api-docs/'.freeze
-        DOCUMENT_ID_PREFIX        = 'reference'.freeze
+        DOCUMENT_URL              = 'https://www.idcf.jp/api-docs/apis/'.freeze
         DOCUMENT_ID_SEP           = '_'.freeze
         DOCUMENT_SPACE_CONVERSION = '-'.freeze
+        DOCUMENT_ID_PREFIX_FORMAT = 'docs_%<service>s_reference%<version>s'.freeze
         VERSION_STR               = "idcfcloud version #{Idcf::Cli::VERSION}".freeze
         now                       = Time.now.strftime('%Y%m%d%H%M%S%6N')
         dir_path                  = File.dirname(__FILE__)
@@ -23,7 +23,7 @@ module Idcf
         CODE_CONF_PATH            = "#{BASE_PATH}/idcf/cli/conf/conf.yml".freeze
         USER_CONF_PATH            = "#{USER_DIR_PATH}/config.ini".freeze
         USER_CONF_GLOBAL          = "#{BASE_PATH}/../config/config.ini".freeze
-        REGIONS                   = %w[jp-east jp-east-2 jp-west].freeze
+        REGIONS                   = %w[jp-east jp-east-2 jp-east-3 jp-west].freeze
         GLOBAL_CONF_ITEMS         =
           {
             output_log: {

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

@@ -1,5 +1,4 @@
 require_relative './base'
-require 'idcf/faraday_middleware/cdn_signature'
 
 module Idcf
   module Cli
@@ -12,7 +11,7 @@ module Idcf
                      type:    :string,
                      aliases: '-r',
                      require: true,
-                     desc:    'region: jp-east/jp-east-2/jp-west'
+                     desc:    'region: jp-east/jp-east-2/jp-east-3/jp-west'
 
         class << self
           def description

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

@@ -11,7 +11,7 @@ module Idcf
                      type:    :string,
                      aliases: '-r',
                      require: true,
-                     desc:    'region: jp-east/jp-east-2/jp-west'
+                     desc:    'region: jp-east/jp-east-2/jp-east-3/jp-west'
 
         class << self
           def description

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

@@ -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
 

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
 
@@ -51,13 +60,13 @@ module Idcf
           analyst.schema_links(j)
         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
+          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/lib/document.rb

@@ -27,10 +27,13 @@ module Idcf
           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)
+            titles      = link.parent_titles
+            service_str = titles.shift.downcase
+            version_str = "#{Idcf::Cli::Conf::Const::DOCUMENT_SPACE_CONVERSION}#{@version}"
+            version_str = (@region.present? && @region != 'default' ? '' : version_str)
+            id_format   = Idcf::Cli::Conf::Const::DOCUMENT_ID_PREFIX_FORMAT
+            prefix      = format(id_format, service: service_str, version: version_str)
+            results     = [prefix]
             results.concat(titles)
             result = results.join(Idcf::Cli::Conf::Const::DOCUMENT_ID_SEP)
             result.gsub(/ /, Idcf::Cli::Conf::Const::DOCUMENT_SPACE_CONVERSION)

data/lib/idcf/cli/version.rb

@@ -1,5 +1,5 @@
 module Idcf
   module Cli
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.1.2'.freeze
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: idcfcloud
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.2
 platform: ruby
 authors:
 - IDC Frontier Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2020-09-23 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,42 +82,30 @@ 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: builder
   requirement: !ruby/object:Gem::Requirement
@@ -180,14 +168,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -280,6 +268,7 @@ files:
 - ".codeclimate.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -292,7 +281,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
@@ -364,16 +352,15 @@ 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
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: IDCF Cli tools
 test_files: []

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

@@ -1,40 +0,0 @@
-require_relative './base'
-require 'idcf/faraday_middleware/cdn_signature'
-
-module Idcf
-  module Cli
-    module Controller
-      # CDN
-      class Cdn < Base
-        default_command :help
-
-        class_option :version,
-                     desc: 'API Version'
-
-        class << self
-          def description
-            'Contents Cache Service'
-          end
-        end
-
-        protected
-
-        # signeture
-        #
-        # @return String
-        def signature
-          Idcf::FaradayMiddleware::CdnSignature
-        end
-
-        # raise api error msg
-        #
-        # @param res [Faraday::Responce]
-        # @return [String]
-        def raise_api_error_msg(res)
-          "HTTP status code: #{res.status}, " \
-            "Error message: #{res.body['messages']}, "
-        end
-      end
-    end
-  end
-end