Merge e105daf into cb75e47

dnsimple · May 1, 2019 · 27e1ecc · 27e1ecc
2 parents cb75e47 + e105daf
commit 27e1ecc
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 27 deletions.
diff --git a/.rubocop_dnsimple.yml b/.rubocop_dnsimple.yml
@@ -19,6 +19,10 @@ Bundler/OrderedGems:
 Layout/AccessModifierIndentation:
   Enabled: false
 
+# It causes weird aligments, especially for specs.
+Layout/BlockEndNewline:
+  Enabled: false
+
 # Generally, the keyword style uses a lot of space. This is particularly true when
 # you use case/if statements, in combination with a long-name variable.
 #
@@ -105,6 +109,10 @@ Naming/MemoizedInstanceVariableName:
 Naming/PredicateName:
   Enabled: false
 
+# The team agreed decided to use exception
+Naming/RescuedExceptionsVariableName:
+  PreferredName: 'exception'
+
 # This cop triggers several false positives that make sense in our domain model.
 # For instance, ip is considered an uncommunicative parameter name:
 #
@@ -113,11 +121,6 @@ Naming/PredicateName:
 Naming/UncommunicativeMethodParamName:
   Enabled: false
 
-# [codesmell]
-# I don't really get the point of this cop.
-Performance/RedundantMerge:
-  Enabled: false
-
 # This cop returns false positive violations (as of rubocop 0.57.0)
 # https://github.com/rubocop-hq/rubocop/issues/5953
 Style/AccessModifierDeclarations:
@@ -343,18 +346,16 @@ Layout/EmptyLineBetweenDefs:
   Enabled: false
 
 # Multi-line differs from standard indentation, they are indented twice.
-Layout/FirstParameterIndentation:
+Layout/IndentFirstArgument:
   IndentationWidth: 4
 
-# Array indentation should be considered like MultilineMethodCallIndentation indentation
-# and use 4 spaces instead of 2.
-Layout/IndentArray:
-  IndentationWidth: 4
+# Array indentation should be consistent with method/variable definition.
+Layout/IndentFirstArrayElement:
+  EnforcedStyle: consistent
 
-# Hash indentation should be considered like MultilineMethodCallIndentation indentation
-# and use 4 spaces instead of 2.
-Layout/IndentHash:
-  IndentationWidth: 4
+# Hash indentation should be consistent with method/variable definition.
+Layout/IndentFirstHashElement:
+  EnforcedStyle: consistent
 
 # Multi-line differs from standard indentation, they are indented twice.
 Layout/MultilineMethodCallIndentation:
@@ -370,9 +371,9 @@ Layout/MultilineOperationIndentation:
 #
 #   %w( foo bar )
 #
-# looks better to me than
+# looks better than:
 #
-#   %w( foo bar )
+#   %w(foo bar)
 #
 Layout/SpaceInsidePercentLiteralDelimiters:
   Enabled: false
diff --git a/lib/dnsimple/client.rb b/lib/dnsimple/client.rb
@@ -204,10 +204,10 @@ def request_options(custom_options = {})
 
     def base_options
       {
-          format: :json,
-          headers: {
-              "Accept" => "application/json",
-          },
+        format: :json,
+        headers: {
+          "Accept" => "application/json",
+        },
       }
     end
 

diff --git a/lib/dnsimple/default.rb b/lib/dnsimple/default.rb
@@ -15,13 +15,13 @@ class << self
       # @return [Array] of option keys
       def keys
         @keys ||= [
-            :base_url,
-            :username,
-            :password,
-            :access_token,
-            :domain_api_token,
-            :user_agent,
-            :proxy,
+          :base_url,
+          :username,
+          :password,
+          :access_token,
+          :domain_api_token,
+          :user_agent,
+          :proxy,
         ]
       end