idcfcloud 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9f986487dfb3ff47acc56240bc460299e52d033
-  data.tar.gz: 348870564693ad1dd4d18010248ac03fc7d5397f
+  metadata.gz: 4a3321422f5844f5854dde7ff528e58f4ffda585
+  data.tar.gz: 7061912c1a39b1f141673fbc7b56b0e81f9b7d84
 SHA512:
-  metadata.gz: 1be1810fe84896c0db62636764e848e361e6457563098882da75fcbf2a978735a100e36191d0c8b1e96dd4d3047aab6760759a4169b1241f2095fc9939b3083f
-  data.tar.gz: 60709df4f07f000059b18001fece33b075358d3ae2d57fd869d58196df37927a88f1140074db074c2c6b7dc2b55a54455a31914f04d4974a2ca8d35d940368fa
+  metadata.gz: a14919f258cd60e092fc8c1ef466301b505032f41078e1ce76864a19f392c33d569f14297d860d5f5501fb8297d1d0b54190f33b9638ddcc656925e7846b1e38
+  data.tar.gz: 644f7237434d2a3e0ff7d3e89c70a30695c13e2480ee4624a1bd9cc6dd04987e299df7a0523edc168ced200e2e651a91b2b09a0a50bf631946663f82aa933e2c

data/.codeclimate.yml

@@ -7,6 +7,7 @@ engines:
         - ruby
     exclude_paths:
       - 'test/**/*'
+      - 'lib/idcf/cli/validate/define/**/*'
   fixme:
     enabled: true
   rubocop:

data/.gitignore

@@ -12,6 +12,7 @@
 /output/
 /config/config.ini
 /lib/idcf/cli/conf/service/*.yml
+/lib/idcf/cli/conf/service/*.json
 
 .idea/*
 *.iml
@@ -38,7 +39,7 @@ build-iPhoneSimulator/
 ## Documentation cache and generated files:
 /.yardoc/
 /_yardoc/
-/doc/
+/doc/*
 /rdoc/
 
 ## Environment normalization:
@@ -48,9 +49,10 @@ build-iPhoneSimulator/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
+Gemfile.lock
+.ruby-version
 # .ruby-gemset
+.DS_Store
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc

data/.rubocop.yml

@@ -8,6 +8,7 @@ Metrics/LineLength:
   Exclude:
     - 'test/**/*'
 Metrics/MethodLength:
+  Max: 14
   Exclude:
     - 'test/**/*'
 Metrics/ClassLength:
@@ -23,4 +24,18 @@ Metrics/AbcSize:
   Exclude:
     - 'test/**/*'
 LineLength:
-  Max: 100
+  Max: 100
+  Exclude:
+    - 'test/**/*'
+Style/ClassLength:
+  Max: 130
+  Exclude:
+    - 'test/**/*'
+Style/ModuleLength:
+  Max: 150
+  Exclude:
+    - 'test/**/*'
+ParameterLists:
+  Max: 6
+Style/DoubleNegation:
+  Enabled: false

data/README.md

@@ -35,20 +35,56 @@ $ idcfcloud <serviceName> <command> [attributes] [option]
 
 If you want to set more than one attribute, use the json form.
 
-```ex)
+``` ex)
 '{"ipaddress": "0.0.0.0", "port": 80}'
 ```
 
+Or you can also define the GET or POST parameter in the JSON file and hand it using xargs.
+
+``` ex) xargs
+cat [attributes file path] | echo -e "'"$(cat)"'" | xargs -L1 idcfcloud <serviceName> <command> [option]
+```
+
+### Service Options
+
+| option | alias | default | note |
+|:---|:---|:---|:---|
+| output | o | json | Output formats (table/json/xml/csv) |
+| profile |  | default | Switching profiles |
+| api-key |  | [Configuration file description] | API Key |
+| secret-key |  | [Configuration file description] | Secret Key |
+| no-ssl |  |  | Not using SSL |
+| no-vssl |  |  | Not using Verify SSL |
+| json-path |  |  | Narrowing the data part of a return value using json-path<br/>https://github.com/joshbuddy/jsonpath |
+| fields |  |  | Limiting the return value to be displayed (applied only to the latest hash)<br/>Punctuation: comma (",") |
+
+
+#### How to Narrow Down (Examples)
+```
+idcfcloud your list_billing_history --json-path '$.data[?(@.month=="2017-10")]' --fields month,billing_amount
+```
+
 ## ServiceName
+[Compute](#compute)
+
 [ILB](#ilb)
 
+[CDN](#cdn)
+
+[DNS](#dns)
+
 [Your](#your)
 
-#### <a name="ilb"></a>ILB
+### Compute(Bata)<a name="compute"></a>
+\* If you encounter any problem, please contact us or file a pull request.
+
+http://docs.idcf.jp/cloud/api/
+
+### ILB<a name="ilb"></a>
 
 https://github.com/idcf/idcf-ilb-ruby
 
-##### ILB Extend Commands
+#### ILB Extend Commands
 
 add server
 
@@ -67,17 +103,36 @@ delete server
 $ idcfcloud ilb delete_server_for_protocol <lb_id> <protocol> <protocol_port> <data> [option]
 ```
 
-#### <a name="your"></a>Your
+check_job
 
-http://docs.idcf.jp/cloud/billing/
+``` code
+$ idcfcloud ilb check_job <job_id>
+```
+
+sslalgorithms_ids
+
+``` code
+$ 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
+
+### Your<a name="your"></a>
+
+http://docs.idcf.jp/cloud/billing/
 
 ## Development
 
 Running the following test code is possible, but not recommended nor supported.  Run only a code of a target.
 
 ```code
-$ bundle exec ruby test/run_test.rb idcf/cli/controller/test_billing.rb
+$ 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.

data/exe/idcfcloud

@@ -1,4 +1,12 @@
 require 'idcf/cli/index'
 
-Idcf::Cli::Index.init
+if ARGV[0] && %w(morio).include?(ARGV[0].downcase)
+  cls = "idcf/cli/command/#{ARGV[0].downcase}"
+  require cls
+  cls.classify.constantize.new.exec
+
+  exit
+end
+
+Idcf::Cli::Index.init(ARGV)
 Idcf::Cli::Index.start(ARGV)

data/idcfcloud.gemspec

@@ -26,18 +26,20 @@ Gem::Specification.new do |spec|
 
   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 'test-unit', '~> 3.2', '>= 3.2.5'
-  spec.add_dependency 'test-unit-notify', '~> 1.0', '>= 1.0.4'
-
-  spec.add_dependency 'activerecord', '~> 4.2', '>= 4.2.3'
+  spec.add_dependency 'activemodel', '~> 4.2', '>= 4.2.3'
   spec.add_dependency 'activesupport', '~> 4.2', '>= 4.2.3'
   spec.add_dependency 'inifile', '~> 3.0', '>= 3.0.0'
   spec.add_dependency 'thor', '~> 0.19.4'
   spec.add_dependency 'builder', '~> 3.1'
   spec.add_dependency 'kosi', '~> 1.0', '>= 1.0.0'
 
-  spec.add_dependency 'idcf-your'
-  spec.add_dependency 'idcf-faraday_middleware'
-  spec.add_dependency 'idcf-ilb', '>= 0.0.3'
+  spec.add_dependency 'open_uri_redirections', '~> 0.2.1'
+  spec.add_dependency 'idcf-json_hyper_schema', '~> 0.1.0'
+  spec.add_dependency 'idcf-faraday_middleware', '~> 0.0.2'
+  spec.add_dependency 'jsonpath', '~> 0.8.10'
+  spec.add_dependency 'facter', '~> 2.5.1'
+  spec.add_dependency 'CFPropertyList', '~> 2.3.5'
 end

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

@@ -1,10 +1,44 @@
 output: json #json xml csv table
+log_limit: 20
 ilb:
   v1:
-    host:
-      jp-east: ilb.jp-east.idcfcloud.com
-      jp-east-2: ilb.jp-east-2.idcfcloud.com
-      jp-west: ilb.jp-west.idcfcloud.com
+    region:
+      jp-east:
+        schema: https://ilb.jp-east.idcfcloud.com/api/v1/schema
+        host: ilb.jp-east.idcfcloud.com
+      jp-east-2:
+        schema: https://ilb.jp-east-2.idcfcloud.com/api/v1/schema
+        host: ilb.jp-east-2.idcfcloud.com
+      jp-west:
+        schema: https://ilb.jp-west.idcfcloud.com/api/v1/schema
+        host: ilb.jp-west.idcfcloud.com
 your:
   v1:
-    host: your.idcfcloud.com
+    region:
+      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:
+      default:
+        schema: https://dns.idcfcloud.com/api/v1/schema
+        host: dns.idcfcloud.com
+compute:
+  v1:
+    region:
+      jp-east:
+        schema: https://compute.jp-east.idcfcloud.com/api/v1/schema
+        host: compute.jp-east.idcfcloud.com
+      jp-east-2:
+        schema: https://compute.jp-east-2.idcfcloud.com/api/v1/schema
+        host: compute.jp-east-2.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

@@ -1,36 +1,61 @@
+require 'date'
+require 'logger'
+require 'idcf/cli/version'
 module Idcf
   module Cli
     module Conf
       # const
       class Const
+        VERSION_STR        = "idcfcloud version #{Idcf::Cli::VERSION}".freeze
+        now                = DateTime.now.strftime('%Y%m%d%H%M%S%6N')
         dir_path           = File.dirname(__FILE__)
         BASE_PATH          = File.expand_path("#{dir_path}/../../../")
         LOCAL_ERROR_PREFIX = '[idcfcli]'.freeze
-        HEADERS            = {
-          'User-Agent': "IDCF CLI v#{Idcf::Cli::VERSION}"
-        }.freeze
+        HEADERS            =
+          {
+            'User-Agent': "IDCF CLI v#{Idcf::Cli::VERSION}"
+          }.freeze
+        USER_DIR_PATH      = '~/.idcfcloud'.freeze
         VALIDATOR_DIR_PATH = 'idcf/cli/validate/define'.freeze
         CODE_CONF_PATH     = "#{BASE_PATH}/idcf/cli/conf/conf.yml".freeze
-        USER_CONF_PATH     = '~/.idcfcloud/config.ini'.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
-        USER_CONF_ITEMS    = {
-          api_key:    nil,
-          secret_key: nil,
-          region:     REGIONS
-        }.freeze
+        GLOBAL_CONF_ITEMS  =
+          {
+            output_log: {
+              default: 'Y',
+              list:    %w(Y n)
+            },
+            log_path:   {
+              default: '~/.idcfcloud/log'
+            }
+          }.freeze
+        USER_CONF_ITEMS    =
+          {
+            api_key:    nil,
+            secret_key: nil,
+            region:     {
+              list: REGIONS
+            }
+          }.freeze
+        FULL_HREF_REGEXP   = Regexp.new('\A[a-zA-Z]*:?//').freeze
         CMD_FILE_DIR       = "#{BASE_PATH}/idcf/cli/conf/service".freeze
-        CMD_FILE_EXT       = 'yml'.freeze
+        CMD_FILE_EXT       = 'json'.freeze
         SERVICE_PATH       = 'idcf/cli/service'.freeze
         TEMPLATE_DIR       = "#{BASE_PATH}/idcf/cli/templates".freeze
         OUT_DIR            = "#{BASE_PATH}/../output".freeze
-        COMP_NOTIFICATION  = <<EOT.freeze
-please write in
-~/.bash_profile
-source %s
-~/.zprofile
-source %s
-EOT
+        COMP_PATHS         = {
+          bash: '~/.bash_profile',
+          zsh:  '~/.zprofile'
+        }.freeze
+        LOG_FILE_PREFIX    = 'cli_log_'.freeze
+        LOG_FILE_NAME      = "#{LOG_FILE_PREFIX}#{now}.log".freeze
+        LOG_LEVEL          = Logger::INFO.freeze
+        CLASSIFY_RULE      = [
+          %w(sslalgorithms_ids SslalgorithmsIds),
+          %w(dns Dns)
+        ].freeze
       end
     end
   end

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

@@ -3,12 +3,14 @@ require 'json'
 require 'active_support'
 require 'active_support/core_ext'
 require 'idcf/cli/conf/const'
-require 'idcf/cli/lib/util/ini_conf'
-require 'idcf/cli/lib/util/yml_conf'
-require 'active_record'
 require 'idcf/cli/lib/convert/helper'
+require 'idcf/json_hyper_schema'
+require 'idcf/json_hyper_schema/expands/link_info_base'
+require 'idcf/cli/gem_ext/idcf/json_hyper_schema/expands/link_info_base_extension'
 require_relative './extend/init'
 require_relative './include/init'
+require 'jsonpath'
+require 'idcf/cli/lib/include/recurring_calling'
 
 module Idcf
   module Cli
@@ -32,105 +34,173 @@ module Idcf
                      desc: 'not use ssl'
         class_option :no_vssl,
                      desc: 'not use verify ssl'
+        class_option :json_path,
+                     desc: 'data filter json_path'
+        class_option :fields,
+                     desc: 'field filter'
 
         attr_reader :config, :code_conf, :cmd, :m_classes
 
         extend Idcf::Cli::Controller::Extend::Init
         include Idcf::Cli::Controller::Include::Init
+        include Idcf::Cli::Lib::Include::RecurringCalling
 
         class << self
-          def init
-            fn   = to_s.underscore.split('/').pop
-            dir  = Idcf::Cli::Conf::Const::CMD_FILE_DIR
-            ext  = Idcf::Cli::Conf::Const::CMD_FILE_EXT
-            path = "#{dir}/#{fn}.#{ext}"
-
-            if File.exist?(path)
-              cf = Idcf::Cli::Lib::Util::YmlConf.new(path)
-              register_sdk_method! cf.find('')
+          attr_accessor :links
+
+          def init(argv)
+            o = Thor::Options.new(class_options).parse(argv)
+            register_schema_method(o)
+
+            make_module_classes.each do |cn, c|
+              register_module_method!(cn, c)
             end
+          end
 
-            register_service_method!
+          def register_schema_method(o)
+            path = make_schema_path(o)
+
+            return nil unless File.exist?(path)
+
+            analyst = Idcf::JsonHyperSchema::Analyst.new
+            @links  = analyst.load(path).links
+            @links.each do |link|
+              register_schema_method_by_link!(link)
+            end
           end
 
-          # regist method
+          # service name
           #
-          # @param methods [Hash]
-          def register_sdk_method!(methods)
-            return unless methods
-            methods.each do |command, s|
-              register_method!(command, s[:params], s[:options])
-            end
+          # @return String
+          def service_name
+            name.underscore.split('/').last
           end
 
-          # regist service method
-          def register_service_method!
-            make_module_classes.each do |cn, c|
-              register_method!(cn, c.params, c.options)
-            end
+          # service version
+          #
+          # @param o [Hash]
+          # @return String
+          def service_version(o)
+            sn     = service_name
+            list   = Idcf::Cli::Lib::Configure.get_code_conf(sn, o)
+            result = o[:version].nil? ? list.keys.last : o[:version]
+            msg    = "not found input version[#{o[:version]}]"
+            raise Idcf::Cli::Error::CliError, msg unless list.keys.include?(result)
+            result
           end
         end
 
         protected
 
         def execute(cmd, *args)
-          data = run(cmd, args)
+          data = run(cmd, args, options)
           puts make_result_str(data, false, options)
+          Idcf::Cli::Lib::Util::CliLogger.delete
+          Idcf::Cli::Lib::Util::CliLogger.cleaning(options)
         rescue => e
-          STDERR.puts e.message
-          exit 1
+          self.class.error_exit(e)
         end
 
-        def run(cmd, args)
+        def run(cmd, args, o)
           @cmd = cmd
-          check_params(self.class.make_module_classes, cmd, *args)
-          o    = options
           data = do_validate(o)
-          if data
-            STDERR.puts data[:message].flatten
-            exit 1
-          end
+          raise Idcf::Cli::Error::CliError, data[:message].flatten if data
+
           data = make_result_data(do_command(cmd, *args, o), o)
           data
         end
 
+        # do command
+        #
+        # @param cmd [String]
+        # @param *args [Array]
+        # @param o [Hash]
+        # @return Mixed
+        # @raise
         def do_command(cmd, *args, o)
-          m_class = self.class.search_module_class(cmd)
+          self_class = self.class
+          s_class    = self_class.search_module_class(cmd)
 
           arg    = convert_arg_json(*args)
-          client = make_client(o)
-          return m_class.new.do(client, *arg, o) unless m_class.nil?
-          do_sdk(client, cmd, *arg, o)
+          client = make_client(o, self_class.get_region(o))
+          api    = Idcf::Cli::Lib::Api.new(links: self_class.links, client: client)
+          return do_service(s_class, api, o, arg) unless s_class.nil?
+          do_api(cmd, api, o, arg)
         end
 
-        # make response base data
+        # do service
         #
-        # @return Hash
-        def make_base_response
-          {
-            status:  200,
-            message: '',
-            data:    []
-          }
+        # @param service_class [Idcf::Cli::Service::Base]
+        # @param api [Idcf::Cli::Lib::Api]
+        # @param arg [Array]
+        # @param o [Hash]
+        # @return Mixed
+        # @raise
+        def do_service(service_class, api, o, arg)
+          obj = service_class.new
+          obj.between_param?(arg.size)
+          result = obj.do(api, o, *arg)
+          return result if obj.last_command.empty?
+          do_api(obj.last_command, api, o, obj.last_command_args)
         end
 
-        # make error result
+        # do api
         #
-        # @param error [Exception]
-        # @return Hash
-        def make_error(error)
-          error.to_s =~ /status code: ?(\d+)/
-          match            = Regexp.last_match(1)
-          result           = make_base_response
-          result[:status]  = match ? match.to_i : 400
-          result[:message] = error.message
-          result
+        # @param cmd [String]
+        # @param api [Idcf::Cli::Lib::Api]
+        # @param arg [Array]
+        # @param o [Hash]
+        # @return Mixed
+        # @raise
+        def do_api(cmd, api, o, arg)
+          result      = api_result(api.do(cmd, *arg))
+          link        = api.find_link(cmd)
+          resource    = link.async? ? do_async(api, result, o, link) : nil
+          sync_result = api.result_api(cmd, arg, result, async_id(resource))
+          return sync_result if sync_result
+          link.async? ? resource : result
+        rescue Idcf::Cli::Error::ApiError => e
+          raise e, raise_api_error_msg(e)
+        end
+
+        def api_result(val)
+          val
+        end
+
+        def async_id(resource)
+          return resource['resource_id'] if !resource.nil? && resource.class == Hash
+          nil
+        end
+
+        # do_async
+        #
+        # @param _api [Idcf::Cli::Lib::Api]
+        # @param _api_result [Mixed]
+        # @param _o [Hash]
+        # @param _executed_link [Idcf::JsonHyperSchema::Expands::LinkInfoBase]
+        # @result Mixed
+        def do_async(_api, _api_result, _o, _executed_link)
+          nil
+        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['message']}, " \
+            "Reference: #{res.body['reference']}"
         end
 
         def make_result_data(data, o)
-          result = data
-          format = output_format(o, '')
-          if format == 'csv' || format == 'table'
+          format     = output_format(o, '')
+          table_flag = %w(csv table).include?(format)
+          helper     = Idcf::Cli::Lib::Convert::Helper.new
+
+          if helper.filter_target?(o)
+            result = helper.filter(data, o, table_flag)
+          elsif table_flag
             result = make_table_data(data)
           else
             result        = make_base_response

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

@@ -1,38 +1,40 @@
 require 'idcf/cli/conf/const'
+require 'idcf/cli/lib/api'
 module Idcf
   module Cli
     module Controller
       module Extend
         # command
         module Command
-          def register_method!(name, params, options)
-            register_method_option! options
-            cp = make_param_s params
-            desc "#{name} #{cp}", ''
-            define_method name.to_sym do |*args|
+          # 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)
+            method_desc = "#{link.title} #{param_str}"
+            desc method_desc.strip, link.description
+            define_method link.title.to_sym do |*args|
               execute(__method__, *args)
             end
           end
 
-          # make param string
+          # register module mothod
           #
-          # @param params[Array]
-          # @return String
-          def make_param_s(params)
-            cp = []
-            return '' if params.nil?
-            params.each do |param|
-              f = param[:arg_type].to_s == 'req' ? '<%s>' : '[%s]'
-              cp << format(f, param[:name])
+          # @param name [String] command_name
+          # @param cls [Idcf::Cli::Service::Base]
+          def register_module_method!(name, cls)
+            register_method_option! cls.options
+            desc "#{name} #{cls.make_param_s}", cls.description
+            define_method name.to_sym do |*args|
+              execute(__method__, *args)
             end
-            cp.join(' ')
           end
 
           # regist method option
           #
           # @param values [Hash] name => desc
           def register_method_option!(values)
-            return if values.nil?
+            return nil if values.nil?
             values.each do |opn, op|
               option = {}
               op.each do |ok, ov|

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

@@ -1,6 +1,7 @@
 require_relative './override'
 require_relative './search_module'
 require_relative './command'
+require_relative './util'
 module Idcf
   module Cli
     module Controller
@@ -10,6 +11,7 @@ module Idcf
           include Override
           include SearchModule
           include Command
+          include Util
         end
       end
     end