Merge branch 'master' into zone-records

.rubocop_dnsimple.yml

@@ -20,7 +20,7 @@ Bundler/OrderedGems:
 #                             do_else
 #                           end
 #
-Lint/EndAlignment:
+Layout/EndAlignment:
   EnforcedStyleAlignWith: variable
 
 # [codesmell]
@@ -84,13 +84,26 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Enabled: false
 
+# We tend to use @_name to represent a variable that is memoized,
+# but it should not be accessed directly and kept as private.
+Naming/MemoizedInstanceVariableName:
+  Enabled: false
+
 # We use it from time to time, as it's not always possible (or maintainable)
 # to use simple ? methods.
 # Moreover, it's actually more efficient to not-use predicates:
 # https://github.com/bbatsov/rubocop/issues/3633
 Naming/PredicateName:
   Enabled: false
 
+# This cop triggers several false positives that make sense in our domain model.
+# For instance, ip is considered an uncommunicative parameter name:
+#
+#   ipv4_to_arpa_name(ip)
+#
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+
 # [codesmell]
 # I don't really get the point of this cop.
 Performance/RedundantMerge:
@@ -229,7 +242,12 @@ Style/StringLiteralsInInterpolation:
 
 # It's nice to be consistent. The trailing comma also allows easy reordering,
 # and doesn't cause a diff in Git when you add a line to the bottom.
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+
+# It's nice to be consistent. The trailing comma also allows easy reordering,
+# and doesn't cause a diff in Git when you add a line to the bottom.
+Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: consistent_comma
 
 Style/TrivialAccessors:

.travis.yml

@@ -3,7 +3,6 @@ language: ruby
 sudo: false
 
 rvm:
-  - 2.0
   - 2.1
   - 2.2
   - 2.3

CHANGELOG.md

@@ -3,6 +3,10 @@
 This project uses [Semantic Versioning 2.0.0](http://semver.org/).
 
 
+### master
+
+- Bump minimum Ruby requirement to 2.1
+
 #### 4.4.0
 
 - NEW: Added Let's Encrypt certificate methods (GH-159)

dnsimple.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary     = 'The DNSimple API client for Ruby'
   s.description = 'The DNSimple API client for Ruby.'
 
-  s.required_ruby_version = ">= 2.0"
+  s.required_ruby_version = ">= 2.1"
 
   s.require_paths    = ['lib']
   s.files            = `git ls-files`.split("\n")

lib/dnsimple/client.rb

@@ -61,7 +61,7 @@ def self.versioned(path)
     def initialize(options = {})
       defaults = Dnsimple::Default.options
 
-      Dnsimple::Default.keys.each do |key| # rubocop:disable Performance/HashEachMethods
+      Dnsimple::Default.keys.each do |key|
         instance_variable_set(:"@#{key}", options[key] || defaults[key])
       end
 

spec/spec_helper.rb

@@ -9,7 +9,7 @@
 require 'dnsimple'
 
 unless defined?(SPEC_ROOT)
-  SPEC_ROOT = File.expand_path("../", __FILE__)
+  SPEC_ROOT = File.expand_path(__dir__)
 end
 
 Dir[File.join(SPEC_ROOT, "support/**/*.rb")].each { |f| require f }