Fix some rubocop issues

Author: plribeiro3000

.rubocop.yml

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

.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'

lib/fog/aliyun/compute.rb

@@ -313,12 +313,10 @@ def request(params)
                     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 @@ def VPCrequest(params)
                     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

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

@@ -19,11 +19,12 @@ class File < Fog::Model
         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)

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

@@ -68,7 +68,7 @@ def get(key)
             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)

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

@@ -105,14 +105,18 @@ def create_server(name, image_ref, flavor_ref, options = {})
             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 }] },

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

@@ -29,14 +29,6 @@ def join_security_group(server_id, group_id)
           )
         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

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

@@ -29,14 +29,6 @@ def leave_security_group(server_id, group_id)
           )
         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

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

@@ -21,14 +21,7 @@ def list_server_types
             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 @@ def get_instance_type(cpuCount, memorySize)
 
           _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

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

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