fog-aliyun 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2f14d1d42f366b42d05bb045478ba66ef8aab6a596826b65acba26ac5bd13ed
-  data.tar.gz: a3dc9fbeadc7f311e202892fe48ee7b5c1647faca657370aa1af4345646b0f98
+  metadata.gz: f08037e2cb10948b237c66efcb1a9f3a125512c54fc2c62c9ca24dfb315bd214
+  data.tar.gz: d016945f6e23fdcdd331a4344253af808611971f29d8fc7a9cfe989b92823f14
 SHA512:
-  metadata.gz: bebef15bc6fc524dd8a050068aa5ebcf75b76341a721b9372cc43b3c6e78ba0c78125086159da7c0dcba3197d56d2e97fb6424c2c4ad87956a66b52ad927b64a
-  data.tar.gz: 548d10c215516f737afd32a1b99b776878265a1cedcdc5adcac07327554d65f882b30c2f478c888effe91df2a34a6bf4a792e2c54d860e06008051e10db08d9d
+  metadata.gz: 042efe491c541db521d0612b2e3db782b4e32d70a9df255661f65b0ea3bfc4e775ee981dc75c524c1c0dbcc5ae043fe29d3d91df0620fe599e1b8effd5177f30
+  data.tar.gz: 67287cf23649648869c2161cc3702c244c1cff0788c6162ea179e37d798a64ae6124fc2294846744b5d6f1ed1420f1cd1107a521d351c9fcf1c32f0fa0e5cbba

data/.rubocop.yml

@@ -29,4 +29,7 @@ Naming/VariableName:
   Enabled: false
 
 Lint/UnderscorePrefixedVariableName:
+  Enabled: false
+
+Metrics/LineLength:
   Enabled: false

data/.rubocop_todo.yml

@@ -6,25 +6,6 @@
 # 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:
@@ -167,11 +148,3 @@ 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: 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/lib/fog/aliyun/compute.rb

@@ -313,12 +313,10 @@ module Fog
                     Fog::Compute::Aliyun::NotFound.slurp(error)
                   else
                     error
-              end
+                  end
           end
 
-          if !response.body.empty? && response.get_header('Content-Type') == 'application/json'
-            response.body = Fog::JSON.decode(response.body)
-          end
+          response.body = Fog::JSON.decode(response.body) if !response.body.empty? && response.get_header('Content-Type') == 'application/json'
 
           response
         end
@@ -338,12 +336,10 @@ module Fog
                     Fog::Compute::Aliyun::NotFound.slurp(error)
                   else
                     error
-              end
+                  end
           end
 
-          if !response.body.empty? && response.get_header('Content-Type') == 'application/json'
-            response.body = Fog::JSON.decode(response.body)
-          end
+          response.body = Fog::JSON.decode(response.body) if !response.body.empty? && response.get_header('Content-Type') == 'application/json'
 
           response
         end

data/lib/fog/aliyun/models/storage/file.rb

@@ -19,11 +19,12 @@ module Fog
         attribute :object_type, aliases: 'x-oss-object-type'
 
         def body
-          attributes[:body] ||= if last_modified
-                                  collection.get(identity).body
-                                else
-                                  ''
-          end
+          attributes[:body] ||=
+            if last_modified
+              collection.get(identity).body
+            else
+              ''
+            end
         end
 
         def body=(new_body)

data/lib/fog/aliyun/models/storage/files.rb

@@ -68,7 +68,7 @@ module Fog
             data = service.get_object(object)
           rescue StandardError => error
             case error.response.body
-            when /<Code>NoSuchKey<\/Code>/
+            when %r{<Code>NoSuchKey</Code>}
               nil
             else
               raise(error)

data/lib/fog/aliyun/requests/compute/create_server.rb

@@ -105,14 +105,18 @@ module Fog
             u.name == @openstack_username
           end
 
-          user_id = if user
-                      user.id
-                    else
-                      response = identity.create_user(@openstack_username,
-                                                      'password',
-                                                      "#{@openstack_username}@example.com")
-                      response.body['user']['id']
-          end
+          user_id =
+            if user
+              user.id
+            else
+              response =
+                identity.create_user(
+                  @openstack_username,
+                  'password',
+                  "#{@openstack_username}@example.com"
+                )
+              response.body['user']['id']
+            end
 
           mock_data = {
             'addresses'    => { 'Private' => [{ 'addr' => Fog::Mock.random_ip }] },

data/lib/fog/aliyun/requests/compute/join_security_group.rb

@@ -29,14 +29,6 @@ module Fog
           )
         end
       end
-
-      class Mock
-        def join_security_group(_server_id, _group_id)
-          response = Excon::Response.new
-          response.status = 200
-          response
-        end
-      end
     end
   end
 end

data/lib/fog/aliyun/requests/compute/leave_security_group.rb

@@ -29,14 +29,6 @@ module Fog
           )
         end
       end
-
-      class Mock
-        def add_security_group(_server_id, _group_name)
-          response = Excon::Response.new
-          response.status = 200
-          response
-        end
-      end
     end
   end
 end

data/lib/fog/aliyun/requests/compute/list_server_types.rb

@@ -21,14 +21,7 @@ module Fog
             method: 'GET',
             path: _pathURL
           )
-
-          # _InstanceType = Hash.new
-          # _InstanceTypeList =  Fog::JSON.decode(response.body)["InstanceTypes"]["InstanceType"]
-          # _InstanceTypeList.each do |instanceType|
-          #  _InstanceType[[instanceType["CpuCoreCount"], instanceType["MemorySize"]]] = instanceType["InstanceTypeId"]
-          # end
-          # _InstanceType
-        end list_server_types
+        end
 
         def get_instance_type(cpuCount, memorySize)
           _action = 'DescribeInstanceTypes'
@@ -49,31 +42,15 @@ module Fog
 
           _InstanceTypeId = nil
           _InstanceTypeList = Fog::JSON.decode(response.body)['InstanceTypes']['InstanceType']
-          _InstanceTypeList.each do |instanceType|
-            next unless (instanceType['CpuCoreCount'] == cpuCount) && (instanceType['MemorySize'] == memorySize)
-            _InstanceTypeId = instanceType['InstanceTypeId']
+          _InstanceTypeList.each do |instance_type|
+            next unless (instance_type['CpuCoreCount'] == cpuCount) && (instance_type['MemorySize'] == memorySize)
+            _InstanceTypeId = instance_type['InstanceTypeId']
             puts '_instanceTypeId: ' + _InstanceTypeId
             break
-            # end if
-          end each
+          end
           _InstanceTypeId
-        end get_instance_type
-      end class Real
-
-      #      class Mock
-      #        def list_servers(options = {})
-      #          response = Excon::Response.new
-      #          data = list_servers_detail.body['servers']
-      #          servers = []
-      #          for server in data
-      #            servers << server.reject { |key, value| !['id', 'name', 'links'].include?(key) }
-      #          end
-      #          response.status = [200, 203][rand(1)]
-      #          response.body = { 'servers' => servers }
-      #          response
-      #        end
-      #      end
-    end class Aliyun
-  end module Compute
-  # end module Fog
+        end
+      end
+    end
+  end
 end

data/lib/fog/aliyun/requests/compute/reboot_server.rb

@@ -32,14 +32,6 @@ module Fog
           )
         end
       end
-
-      class Mock
-        def reboot_server(_server_id, _type = 'SOFT')
-          response = Excon::Response.new
-          response.status = 202
-          response
-        end
-      end
     end
   end
 end

data/lib/fog/aliyun/requests/compute/start_server.rb

@@ -30,14 +30,8 @@ module Fog
             method: 'GET',
             path: _pathURL
           )
-        end start_server
-      end Real
-
-      class Mock
-        def start_server(_server_id)
-          true
-        end start_server
-      end Mock
-    end aliyun
-  end Compute
-end Fog
+        end
+      end
+    end
+  end
+end

data/lib/fog/aliyun/requests/compute/stop_server.rb

@@ -30,14 +30,8 @@ module Fog
             method: 'GET',
             path: _pathURL
           )
-        end stop_server
-      end Real
-
-      class Mock
-        def stop_server(_server_id)
-          true
-        end stop_server
-      end Mock
-    end aliyun
-  end Compute
-end Fog
+        end
+      end
+    end
+  end
+end

data/lib/fog/aliyun/requests/storage/copy_object.rb

@@ -31,10 +31,6 @@ module Fog
                   endpoint: endpoint)
         end
       end
-
-      class Mock
-        def copy_object(source_bucket, source_object, target_bucket, target_object); end
-      end
     end
   end
 end

data/lib/fog/aliyun/requests/storage/delete_bucket.rb

@@ -22,10 +22,6 @@ module Fog
           )
         end
       end
-
-      class Mock
-        def delete_bucket(bucket); end
-      end
     end
   end
 end

data/lib/fog/aliyun/requests/storage/delete_container.rb

@@ -28,9 +28,6 @@ module Fog
           )
         end
       end
-      class Mock
-        def delete_container(container, options = {}); end
-      end
     end
   end
 end

data/lib/fog/aliyun/requests/storage/delete_object.rb

@@ -43,10 +43,6 @@ module Fog
           )
         end
       end
-
-      class Mock
-        def delete_object(object, options = {}); end
-      end
     end
   end
 end

data/lib/fog/aliyun/requests/storage/get_bucket.rb

@@ -16,7 +16,7 @@ module Fog
             endpoint: endpoint
           )
           xml = ret.data[:body]
-          result = XmlSimple.xml_in(xml)
+          XmlSimple.xml_in(xml)
         end
 
         def get_bucket_location(bucket)
@@ -29,7 +29,7 @@ module Fog
             bucket: bucket,
             resource: resource
           )
-          location = XmlSimple.xml_in(ret.data[:body])
+          XmlSimple.xml_in(ret.data[:body])
         end
 
         def get_bucket_acl(bucket)
@@ -45,7 +45,7 @@ module Fog
             resource: resource,
             endpoint: endpoint
           )
-          acl = XmlSimple.xml_in(ret.data[:body])['AccessControlList'][0]['Grant'][0]
+          XmlSimple.xml_in(ret.data[:body])['AccessControlList'][0]['Grant'][0]
         end
 
         def get_bucket_CORSRules(bucket)
@@ -61,7 +61,7 @@ module Fog
             resource: resource,
             endpoint: endpoint
           )
-          cors = XmlSimple.xml_in(ret.data[:body])['CORSRule'][0] if ret.data[:status] != 404
+          XmlSimple.xml_in(ret.data[:body])['CORSRule'][0] if ret.data[:status] != 404
         end
 
         def get_bucket_lifecycle(bucket)
@@ -77,7 +77,7 @@ module Fog
             resource: resource,
             endpoint: endpoint
           )
-          lifecycle = XmlSimple.xml_in(ret.data[:body])['Rule'][0] if ret.data[:status] != 404
+          XmlSimple.xml_in(ret.data[:body])['Rule'][0] if ret.data[:status] != 404
         end
 
         def get_bucket_logging(bucket)
@@ -93,7 +93,7 @@ module Fog
             resource: resource,
             endpoint: endpoint
           )
-          logging = XmlSimple.xml_in(ret.data[:body])['LoggingEnabled'][0]['TargetPrefix']
+          XmlSimple.xml_in(ret.data[:body])['LoggingEnabled'][0]['TargetPrefix']
         end
 
         def get_bucket_referer(bucket)
@@ -109,7 +109,7 @@ module Fog
             resource: resource,
             endpoint: endpoint
           )
-          referer = XmlSimple.xml_in(ret.data[:body])
+          XmlSimple.xml_in(ret.data[:body])
         end
 
         def get_bucket_website(bucket)
@@ -125,12 +125,9 @@ module Fog
             resource: resource,
             endpoint: endpoint
           )
-          website = XmlSimple.xml_in(ret.data[:body]) if ret.data[:status] != 404
+          XmlSimple.xml_in(ret.data[:body]) if ret.data[:status] != 404
         end
       end
-      class Mock
-        def get_bucket(bucket); end
-      end
     end
   end
 end

data/lib/fog/aliyun/requests/storage/get_container.rb

@@ -39,7 +39,6 @@ module Fog
           end
 
           location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           resource = bucket + '/'
           ret = request(
             expects: [200, 203, 400],
@@ -49,13 +48,9 @@ module Fog
             bucket: bucket
           )
           xml = ret.data[:body]
-          result = XmlSimple.xml_in(xml)['CommonPrefixes']
+          XmlSimple.xml_in(xml)['CommonPrefixes']
         end
       end
-
-      class Mock
-        def get_container(container, options = {}); end
-      end
     end
   end
 end

data/lib/fog/aliyun/requests/storage/get_containers.rb

@@ -43,7 +43,6 @@ module Fog
           end
 
           location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           resource = bucket + '/'
           ret = request(
             expects: [200, 203, 400],
@@ -53,13 +52,9 @@ module Fog
             bucket: bucket
           )
           xml = ret.data[:body]
-          result = XmlSimple.xml_in(xml)['CommonPrefixes']
+          XmlSimple.xml_in(xml)['CommonPrefixes']
         end
       end
-
-      class Mock
-        def get_containers(options = {}); end
-      end
     end
   end
 end

data/lib/fog/aliyun/requests/storage/get_object.rb

@@ -37,10 +37,6 @@ module Fog
           response.data
         end
       end
-
-      class Mock
-        def get_object(object, range = nil, options = {}); end
-      end
     end
   end
 end

data/lib/fog/aliyun/requests/storage/get_object_http_url.rb

@@ -25,20 +25,16 @@ module Fog
             expires_time = (Time.now.to_i + expires).to_s
             resource = bucket + '/' + object
             signature = sign('GET', expires_time, nil, resource)
-            url = 'http://' + bucket + '.' + location + '.aliyuncs.com/' + object +
-                  '?OSSAccessKeyId=' + @aliyun_accesskey_id + '&Expires=' + expires_time +
-                  '&Signature=' + URI.encode(signature, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+            'http://' + bucket + '.' + location + '.aliyuncs.com/' + object +
+              '?OSSAccessKeyId=' + @aliyun_accesskey_id + '&Expires=' + expires_time +
+              '&Signature=' + URI.encode(signature, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
           elsif acl == 'public-read' || acl == 'public-read-write'
-            url = 'http://' + bucket + '.' + location + '.aliyuncs.com/' + object
+            'http://' + bucket + '.' + location + '.aliyuncs.com/' + object
           else
-            url = 'acl is wrong with value:' + acl
+            'acl is wrong with value:' + acl
           end
         end
       end
-
-      class Mock
-        def get_object_http_url_public(object, expires, options = {}); end
-      end
     end
   end
 end

data/lib/fog/aliyun/requests/storage/get_object_https_url.rb

@@ -25,20 +25,16 @@ module Fog
             expires_time = (Time.now.to_i + expires).to_s
             resource = bucket + '/' + object
             signature = sign('GET', expires_time, nil, resource)
-            url = 'https://' + bucket + '.' + location + '.aliyuncs.com/' + object +
-                  '?OSSAccessKeyId=' + @aliyun_accesskey_id + '&Expires=' + expires_time +
-                  '&Signature=' + URI.encode(signature, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+            'https://' + bucket + '.' + location + '.aliyuncs.com/' + object +
+              '?OSSAccessKeyId=' + @aliyun_accesskey_id + '&Expires=' + expires_time +
+              '&Signature=' + URI.encode(signature, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
           elsif acl == 'public-read' || acl == 'public-read-write'
-            url = 'https://' + bucket + '.' + location + '.aliyuncs.com/' + object
+            'https://' + bucket + '.' + location + '.aliyuncs.com/' + object
           else
-            url = 'acl is wrong with value:' + acl
+            'acl is wrong with value:' + acl
           end
         end
       end
-
-      class Mock
-        def get_object_https_url_public(object, expires, options = {}); end
-      end
     end
   end
 end

data/lib/fog/aliyun/requests/storage/head_object.rb

@@ -26,10 +26,6 @@ module Fog
           ret
         end
       end
-
-      class Mock
-        def head_object(object, options = {}); end
-      end
     end
   end
 end

data/lib/fog/aliyun/requests/storage/list_buckets.rb

@@ -29,13 +29,9 @@ module Fog
             path: path
           )
           xml = ret.data[:body]
-          result = XmlSimple.xml_in(xml)['Buckets'][0]
+          XmlSimple.xml_in(xml)['Buckets'][0]
         end
       end
-
-      class Mock
-        def list_buckets(options = {}); end
-      end
     end
   end
 end

data/lib/fog/aliyun/requests/storage/list_objects.rb

@@ -31,8 +31,6 @@ module Fog
             path += '?delimiter=' + delimiter
           end
 
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           resource = bucket + '/'
           ret = request(
             expects: [200, 203, 400],
@@ -42,7 +40,7 @@ module Fog
             bucket: bucket
           )
           xml = ret.data[:body]
-          result = XmlSimple.xml_in(xml)
+          XmlSimple.xml_in(xml)
         end
 
         def list_multipart_uploads(bucket, endpoint, _options = {})
@@ -61,7 +59,7 @@ module Fog
             resource: resource,
             endpoint: endpoint
           )
-          uploadid = XmlSimple.xml_in(ret.data[:body])['Upload']
+          XmlSimple.xml_in(ret.data[:body])['Upload']
         end
 
         def list_parts(bucket, object, endpoint, uploadid, _options = {})
@@ -80,13 +78,9 @@ module Fog
             resource: resource,
             endpoint: endpoint
           )
-          parts = XmlSimple.xml_in(ret.data[:body])['Part']
+          XmlSimple.xml_in(ret.data[:body])['Part']
         end
       end
-
-      class Mock
-        def list_objects(options = {}); end
-      end
     end
   end
 end

data/lib/fog/aliyun/requests/storage/put_bucket.rb

@@ -6,7 +6,7 @@ module Fog
       class Real
         def put_bucket(bucketName)
           resource = bucketName + '/'
-          ret = request(
+          request(
             expects: [200, 203],
             method: 'PUT',
             resource: resource,
@@ -14,10 +14,6 @@ module Fog
           )
         end
       end
-
-      class Mock
-        def put_bucket(bucketName); end
-      end
     end
   end
 end

data/lib/fog/aliyun/requests/storage/put_container.rb

@@ -27,10 +27,6 @@ module Fog
           )
         end
       end
-
-      class Mock
-        def put_container(name, options = {}); end
-      end
     end
   end
 end

data/lib/fog/aliyun/requests/storage/put_object.rb

@@ -22,7 +22,7 @@ module Fog
           body = file.read
 
           resource = bucket + '/' + object
-          ret = request(
+          request(
             expects: [200, 203],
             method: 'PUT',
             path: object,
@@ -40,7 +40,7 @@ module Fog
           endpoint = 'http://' + location + '.aliyuncs.com'
 
           resource = bucket + '/' + object
-          ret = request(
+          request(
             expects: [200, 203],
             method: 'PUT',
             path: object,
@@ -49,7 +49,7 @@ module Fog
             body: body,
             endpoint: endpoint
           )
-      end
+        end
 
         def put_folder(bucket, folder, endpoint)
           if endpoint.nil?
@@ -58,7 +58,7 @@ module Fog
           end
           path = folder + '/'
           resource = bucket + '/' + folder + '/'
-          ret = request(
+          request(
             expects: [200, 203],
             method: 'PUT',
             path: path,
@@ -76,7 +76,6 @@ module Fog
           uploads = list_multipart_uploads(bucket, endpoint)
           upload = (uploads&.find { |tmpupload| tmpupload['Key'][0] == object })
 
-          parts = nil
           uploadedSize = 0
           start_partNumber = 1
           if !upload.nil?
@@ -127,7 +126,7 @@ module Fog
             resource: resource,
             endpoint: endpoint
           )
-          uploadid = XmlSimple.xml_in(ret.data[:body])['UploadId'][0]
+          XmlSimple.xml_in(ret.data[:body])['UploadId'][0]
         end
 
         def upload_part(bucket, object, endpoint, partNumber, uploadId, body)
@@ -137,7 +136,7 @@ module Fog
           end
           path = object + '?partNumber=' + partNumber + '&uploadId=' + uploadId
           resource = bucket + '/' + path
-          ret = request(
+          request(
             expects: [200, 203],
             method: 'PUT',
             path: path,
@@ -164,7 +163,7 @@ module Fog
 
           path = object + '?uploadId=' + uploadId
           resource = bucket + '/' + path
-          ret = request(
+          request(
             expects: 200,
             method: 'POST',
             path: path,
@@ -175,10 +174,6 @@ module Fog
           )
         end
       end
-
-      class Mock
-        def put_object(object, file = nil, options = {}); end
-      end
     end
   end
 end

data/lib/fog/aliyun/storage.rb

@@ -160,7 +160,7 @@ module Fog
                     Fog::Storage::Aliyun::NotFound.slurp(error)
                   else
                     error
-              end
+                  end
           end
 
           response
@@ -199,22 +199,7 @@ module Fog
           @aliyun_accesskey_secret = options[:aliyun_accesskey_secret]
           @aliyun_oss_bucket = options[:aliyun_oss_bucket]
 
-          # missing_credentials = Array.new
-          # missing_credentials << :aliyun_oss_endpoint unless @aliyun_oss_endpoint
-          # missing_credentials << :aliyun_region_id unless @aliyun_region_id
-          # missing_credentials << :aliyun_accesskey_id  unless @aliyun_accesskey_id
-          # missing_credentials << :aliyun_accesskey_secret unless @aliyun_accesskey_secret
-          # raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" unless missing_credentials.empty?
-
           @connection_options = options[:connection_options] || {}
-
-          # uri = URI.parse(@aliyun_oss_endpoint)
-          # @host   = uri.host
-          # @path   = uri.path
-          # @port   = uri.port
-          # @scheme = uri.scheme
-
-          # @persistent = options[:persistent] || false
         end
       end
     end

data/lib/fog/aliyun/version.rb

@@ -2,6 +2,6 @@
 
 module Fog
   module Aliyun
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Qinsi Deng, Jianxun Li, Jane Han