fog-aliyun 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b3239804802fddbe8b34af2bd07865c504cd75644b8ffd345afc3c6032ffa05
-  data.tar.gz: e72e6d448071244c1c5ee3c453e010840f77af32ca25f390b7bd6c371adcde15
+  metadata.gz: c2f14d1d42f366b42d05bb045478ba66ef8aab6a596826b65acba26ac5bd13ed
+  data.tar.gz: a3dc9fbeadc7f311e202892fe48ee7b5c1647faca657370aa1af4345646b0f98
 SHA512:
-  metadata.gz: 9f2df310bb9c3ee8a03e772631f24e5552599749f40b22a13b96fa1533978d8c117d1a91871f3e88a6951a45b62945cb381f95cda8dc92d94f8099ebeb61a809
-  data.tar.gz: 619a3e800919cb95b6ee6ab7f6f91177eff9434a2a9d7fe0f32568611f587938397830bb81086d7406a49de80bc8804a355bbef1f9557cb84d9b72b0f5c5d279
+  metadata.gz: bebef15bc6fc524dd8a050068aa5ebcf75b76341a721b9372cc43b3c6e78ba0c78125086159da7c0dcba3197d56d2e97fb6424c2c4ad87956a66b52ad927b64a
+  data.tar.gz: 548d10c215516f737afd32a1b99b776878265a1cedcdc5adcac07327554d65f882b30c2f478c888effe91df2a34a6bf4a792e2c54d860e06008051e10db08d9d

data/.gitignore

@@ -1,10 +1,23 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*~
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log
+gemfiles/*.lock

data/.rubocop.yml

@@ -1,5 +1,32 @@
-AllCops:
-  Exclude:
-    - bin/**/*
+inherit_from: .rubocop_todo.yml
 
-# inherit_from: .rubocop_todo.yml
+Style/Documentation:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/BlockLength:
+  Enabled: false
+
+Layout/ExtraSpacing:
+  AllowForAlignment: false
+  ForceEqualSignAlignment: false
+
+Style/ExpandPathArguments:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Naming/VariableName:
+  Enabled: false
+
+Lint/UnderscorePrefixedVariableName:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,11 +1,30 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-05-12 13:44:44 +0800 using RuboCop version 0.40.0.
+# on 2018-06-22 19:29:12 -0300 using RuboCop version 0.57.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleAlignWith, AutoCorrect, Severity.
+# SupportedStylesAlignWith: start_of_line, def
+Layout/DefEndAlignment:
+  Exclude:
+    - 'lib/fog/aliyun/requests/storage/put_object.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleAlignWith, AutoCorrect, Severity.
+# SupportedStylesAlignWith: keyword, variable, start_of_line
+Layout/EndAlignment:
+  Exclude:
+    - 'lib/fog/aliyun/compute.rb'
+    - 'lib/fog/aliyun/models/storage/file.rb'
+    - 'lib/fog/aliyun/requests/compute/create_server.rb'
+    - 'lib/fog/aliyun/storage.rb'
+
 # Offense count: 4
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
@@ -13,20 +32,6 @@ Lint/AssignmentInCondition:
     - 'lib/fog/aliyun/requests/compute/create_server.rb'
     - 'lib/fog/aliyun/requests/compute/delete_server.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AlignWith, SupportedStyles, AutoCorrect.
-# SupportedStyles: start_of_line, def
-Lint/DefEndAlignment:
-  Enabled: false
-
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: AlignWith, SupportedStyles, AutoCorrect.
-# SupportedStyles: keyword, variable, start_of_line
-Lint/EndAlignment:
-  Enabled: false
-
 # Offense count: 4
 Lint/RandOne:
   Exclude:
@@ -35,19 +40,19 @@ Lint/RandOne:
     - 'lib/fog/aliyun/requests/compute/list_servers.rb'
     - 'lib/fog/aliyun/requests/compute/list_vrouters.rb'
 
-# Offense count: 127
-Lint/UnderscorePrefixedVariableName:
-  Enabled: false
-
 # Offense count: 1
 Lint/UnreachableCode:
   Exclude:
     - 'lib/fog/aliyun/models/storage/directory.rb'
 
-# Offense count: 38
+# Offense count: 26
+Lint/UriEscapeUnescape:
+  Enabled: false
+
+# Offense count: 37
 Lint/UselessAssignment:
   Exclude:
-    - 'lib/fog/aliyun.rb'
+    - 'lib/fog/aliyun/requests/compute/create_server.rb'
     - 'lib/fog/aliyun/requests/compute/list_disks.rb'
     - 'lib/fog/aliyun/requests/compute/list_security_groups.rb'
     - 'lib/fog/aliyun/requests/storage/delete_object.rb'
@@ -62,30 +67,17 @@ Lint/UselessAssignment:
     - 'lib/fog/aliyun/requests/storage/put_object.rb'
     - 'lib/fog/aliyun/storage.rb'
 
-# Offense count: 78
-Metrics/AbcSize:
-  Max: 100
-
-# Offense count: 5
+# Offense count: 7
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
   Max: 154
 
-# Offense count: 18
-Metrics/CyclomaticComplexity:
-  Max: 15
-
-# Offense count: 257
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# Offense count: 87
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 247
 
-# Offense count: 110
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 97
-
 # Offense count: 1
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
@@ -95,20 +87,45 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Max: 19
 
+# Offense count: 7
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: snake_case, camelCase
+Naming/MethodName:
+  Exclude:
+    - 'lib/fog/aliyun/compute.rb'
+    - 'lib/fog/aliyun/requests/storage/get_bucket.rb'
+
+# Offense count: 48
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: io, id, to, by, on, in, at
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+
+# Offense count: 5
+Performance/Caller:
+  Exclude:
+    - 'lib/fog/aliyun/models/compute/images.rb'
+    - 'lib/fog/aliyun/models/compute/snapshots.rb'
+    - 'lib/fog/aliyun/models/compute/volumes.rb'
+    - 'lib/fog/aliyun/models/compute/vpcs.rb'
+    - 'lib/fog/aliyun/models/compute/vrouters.rb'
+
 # Offense count: 1
 Style/ClassVars:
   Exclude:
     - 'lib/fog/bin/aliyun.rb'
 
-# Offense count: 138
-Style/Documentation:
-  Enabled: false
-
 # Offense count: 7
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: for, each
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: each, for
 Style/For:
-  Enabled: false
+  Exclude:
+    - 'lib/fog/aliyun/models/storage/files.rb'
+    - 'lib/fog/aliyun/requests/compute/list_images.rb'
+    - 'lib/fog/aliyun/requests/compute/list_route_tables.rb'
+    - 'lib/fog/aliyun/requests/compute/list_servers.rb'
+    - 'lib/fog/aliyun/requests/compute/list_vrouters.rb'
+    - 'lib/fog/aliyun/requests/storage/put_object.rb'
 
 # Offense count: 4
 # Configuration parameters: AllowedVariables.
@@ -119,12 +136,21 @@ Style/GlobalVars:
     - 'lib/fog/aliyun/models/compute/vrouter.rb'
     - 'lib/fog/aliyun/models/compute/vswitch.rb'
 
-# Offense count: 2
+# Offense count: 11
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
+    - 'lib/fog/aliyun/models/compute/security_groups.rb'
+    - 'lib/fog/aliyun/models/compute/snapshots.rb'
+    - 'lib/fog/aliyun/models/compute/volumes.rb'
+    - 'lib/fog/aliyun/models/storage/file.rb'
+    - 'lib/fog/aliyun/requests/compute/delete_security_group.rb'
+    - 'lib/fog/aliyun/requests/compute/delete_server.rb'
     - 'lib/fog/aliyun/requests/compute/delete_vpc.rb'
+    - 'lib/fog/aliyun/requests/compute/delete_vpn_connection.rb'
+    - 'lib/fog/aliyun/requests/compute/delete_vpn_customergateway.rb'
     - 'lib/fog/aliyun/requests/compute/delete_vswitch.rb'
+    - 'lib/fog/aliyun/requests/compute/list_security_group_rules.rb'
 
 # Offense count: 2
 Style/IdenticalConditionalBranches:
@@ -136,14 +162,16 @@ Style/IfInsideElse:
   Exclude:
     - 'lib/fog/aliyun/models/compute/security_group_rule.rb'
 
-# Offense count: 4
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: snake_case, camelCase
-Style/MethodName:
-  Enabled: false
+# Offense count: 2
+Style/MultipleComparison:
+  Exclude:
+    - 'lib/fog/aliyun/requests/storage/get_object_http_url.rb'
+    - 'lib/fog/aliyun/requests/storage/get_object_https_url.rb'
 
-# Offense count: 741
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: snake_case, camelCase
-Style/VariableName:
-  Enabled: false
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
+Style/RegexpLiteral:
+  Exclude:
+    - 'lib/fog/aliyun/models/storage/files.rb'

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in fog-aliyun.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "fog/aliyun"
+require 'bundler/setup'
+require 'fog/aliyun'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "fog/aliyun"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/fog-aliyun.gemspec

@@ -1,33 +1,34 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'fog/aliyun/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'fog-aliyun'
-  spec.version       = Fog::Aliyun::VERSION
-  spec.authors       = ['Qinsi Deng, Jianxun Li, Jane Han']
-  spec.email         = ['dengqinsi@sina.com']
+  spec.name = 'fog-aliyun'
+  spec.version = Fog::Aliyun::VERSION
+  spec.authors = ['Qinsi Deng, Jianxun Li, Jane Han']
+  spec.email = ['dengqinsi@sina.com']
 
-  spec.summary       = 'Fog provider for Aliyun Web Services.'
-  spec.description   = 'As a FOG provider, fog-aliyun support aliyun OSS/ECS. It will support more aliyun services later.'
-  spec.homepage      = 'https://github.com/fog/fog-aliyun'
-  spec.license       = 'MIT'
+  spec.summary = 'Fog provider for Aliyun Web Services.'
+  spec.description = 'As a FOG provider, fog-aliyun support aliyun OSS/ECS. It will support more aliyun services later.'
+  spec.homepage = 'https://github.com/fog/fog-aliyun'
+  spec.license = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.10'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.3'
-  spec.add_development_dependency 'rubocop', '~> 0.49.0'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'mime-types', '~> 2.6', '>= 2.6.2'
   spec.add_development_dependency 'pry-nav'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
 
-  spec.add_dependency 'fog-core',  '~> 1.27'
-  spec.add_dependency 'fog-json',  '~> 1.0'
+  spec.add_dependency 'fog-core'
+  spec.add_dependency 'fog-json'
   spec.add_dependency 'ipaddress', '~> 0.8'
   spec.add_dependency 'xml-simple', '~> 1.1'
 end

data/lib/fog/aliyun.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require 'fog/core'
 require 'fog/json'
 require 'fog/aliyun/version'
 
 module Fog
   module Compute
-    ret = autoload :Aliyun, 'fog/aliyun/compute'
+    autoload :Aliyun, 'fog/aliyun/compute'
   end
 
   module Storage
-    ret = autoload :Aliyun, 'fog/aliyun/storage'
+    autoload :Aliyun, 'fog/aliyun/storage'
   end
 
   module Aliyun

data/lib/fog/aliyun/compute.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun < Fog::Service
@@ -10,30 +12,30 @@ module Fog
       ## MODELS
       #
       model_path 'fog/aliyun/models/compute'
-      model       :server
-      collection  :servers
-      model       :image
-      collection  :images
-      model       :eip_address
-      collection  :eip_addresses
-      model       :security_group
-      collection  :security_groups
-      model       :security_group_rule
-      collection  :security_group_rules
-      model       :volume
-      collection  :volumes
-      model       :snapshot
-      collection  :snapshots
-      model       :vpc
-      collection  :vpcs
-      model       :vswitch
-      collection  :vswitches
-      model       :vrouter
-      collection  :vrouters
-      model       :route_table
-      collection  :route_tables
-      model       :route_entry
-      collection  :route_entrys
+      model :server
+      collection :servers
+      model :image
+      collection :images
+      model :eip_address
+      collection :eip_addresses
+      model :security_group
+      collection :security_groups
+      model :security_group_rule
+      collection :security_group_rules
+      model :volume
+      collection :volumes
+      model :snapshot
+      collection :snapshots
+      model :vpc
+      collection :vpcs
+      model :vswitch
+      collection :vswitches
+      model :vrouter
+      collection :vrouters
+      model :route_table
+      collection :route_tables
+      model :route_entry
+      collection :route_entrys
 
       ## REQUESTS
       #
@@ -194,7 +196,7 @@ module Fog
           @aliyun_user_domain = options[:aliyun_user_domain] || options[:aliyun_domain]
           @aliyun_project_domain = options[:aliyun_project_domain] || options[:aliyun_domain] || 'Default'
 
-          raise ArgumentError, "Missing required arguments: :aliyun_auth_url" unless options.key?[:aliyun_auth_url]
+          raise ArgumentError, 'Missing required arguments: :aliyun_auth_url' unless options.key?[:aliyun_auth_url]
           @aliyun_auth_uri = URI.parse(options[:aliyun_auth_url])
 
           @current_tenant = options[:aliyun_tenant]
@@ -257,11 +259,11 @@ module Fog
 
         def initialize(options = {})
           # initialize the parameters
-          @aliyun_url              = options[:aliyun_url]
-          @aliyun_accesskey_id     = options[:aliyun_accesskey_id]
+          @aliyun_url = options[:aliyun_url]
+          @aliyun_accesskey_id = options[:aliyun_accesskey_id]
           @aliyun_accesskey_secret = options[:aliyun_accesskey_secret]
-          @aliyun_region_id        = options[:aliyun_region_id]
-          @aliyun_zone_id          = options[:aliyun_zone_id]
+          @aliyun_region_id = options[:aliyun_region_id]
+          @aliyun_zone_id = options[:aliyun_zone_id]
 
           # check for the parameters
           missing_credentials = []
@@ -275,17 +277,17 @@ module Fog
           @connection_options = options[:connection_options] || {}
 
           uri = URI.parse(@aliyun_url)
-          @host   = uri.host
-          @path   = uri.path
-          @port   = uri.port
+          @host = uri.host
+          @path = uri.path
+          @port = uri.port
           @scheme = uri.scheme
-          
-          vpcuri = URI.parse("https://vpc.aliyuncs.com")
-          @vpchost   = vpcuri.host
-          @vpcpath   = vpcuri.path
-          @vpcport   = vpcuri.port
-          @vpcscheme = vpcuri.scheme          
-          
+
+          vpcuri = URI.parse('https://vpc.aliyuncs.com')
+          @vpchost = vpcuri.host
+          @vpcpath = vpcuri.path
+          @vpcport = vpcuri.port
+          @vpcscheme = vpcuri.scheme
+
           @persistent = options[:persistent] || false
           @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
           @VPCconnection = Fog::Core::Connection.new("#{@vpcscheme}://#{@vpchost}:#{@vpcport}", @persistent, @connection_options)
@@ -328,8 +330,8 @@ module Fog
               'Accept' => 'application/json',
               'X-Auth-Token' => @auth_token
             }.merge!(params[:headers] || {}),
-                                                        path: "#{@path}/#{params[:path]}",
-                                                        query: params[:query]))
+                                                           path: "#{@path}/#{params[:path]}",
+                                                           query: params[:query]))
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
                   when Excon::Errors::NotFound
@@ -412,8 +414,8 @@ module Fog
           stringToSign = 'GET&%2F&' + URI.encode(canonicalizedQueryString, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
           key = accessKeySecret + '&'
 
-          digVer =  OpenSSL::Digest.new('sha1')
-          digest =  OpenSSL::HMAC.digest(digVer, key, stringToSign)
+          digVer = OpenSSL::Digest.new('sha1')
+          digest = OpenSSL::HMAC.digest(digVer, key, stringToSign)
           signature = Base64.encode64(digest)
           signature[-1] = ''
           encodedSig = URI.encode(signature, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')