Update RuboCop

Resolve new offenses.

Require Ruby 2.4 or greater.

Author: AlexWayfer

.editorconfig

@@ -7,3 +7,4 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+max_line_length = 120

.rubocop.yml

@@ -1,9 +1,9 @@
 AllCops:
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.4
+  NewCops: enable
 
-Eval:
-  Exclude:
-    - "Rakefile"
+Layout/LineLength:
+  Max: 120
 
 Layout/EmptyLinesAroundBlockBody:
   Enabled: false
@@ -21,9 +21,6 @@ Metrics/BlockLength:
   Exclude:
     - "spec/**/*"
 
-Metrics/LineLength:
-  Max: 120
-
 Metrics/MethodLength:
   Max: 30
 

.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 2.3
+  - 2.4
   - 2.5
   - 2.6

Gemfile

@@ -9,7 +9,7 @@ group :development do
   gem "highline"
   gem "listen", "~> 3.0"
   gem "rake", "~> 12.3"
-  gem "rubocop", "~> 0.57.2", "<= 0.58", require: false
+  gem "rubocop", "~> 0.89.0", require: false
 end
 
 group :test do

clamp.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
+  s.required_ruby_version = "~> 2.4"
 end

lib/clamp/attribute/declaration.rb

@@ -30,6 +30,7 @@ def define_reader_for(attribute)
 
       def define_default_for(attribute)
         return false if attribute.default_value.nil?
+
         define_method(attribute.default_method) do
           attribute.default_value
         end

lib/clamp/attribute/definition.rb

@@ -95,7 +95,9 @@ def default_description
           ("$#{@environment_variable}" if defined?(@environment_variable)),
           (@default_value.inspect if defined?(@default_value))
         ].compact
+
         return nil if default_sources.empty?
+
         "#{Clamp.message(:default)}: " + default_sources.join(", #{Clamp.message(:or)} ")
       end
 

lib/clamp/attribute/instance.rb

@@ -70,6 +70,7 @@ def default_from_environment
         return if self.defined?
         return if attribute.environment_variable.nil?
         return unless ENV.key?(attribute.environment_variable)
+
         # Set the parameter value if it's environment variable is present
         value = ENV[attribute.environment_variable]
         begin

lib/clamp/help.rb

@@ -14,7 +14,7 @@ def usage(usage)
       @declared_usage_descriptions << usage
     end
 
-    attr_reader :declared_usage_descriptions
+    attr_reader :declared_usage_descriptions, :description
 
     def description=(description)
       @description = description.dup
@@ -29,8 +29,6 @@ def banner(description)
       self.description = description
     end
 
-    attr_reader :description
-
     def derived_usage_description
       parts = ["[OPTIONS]"]
       parts += parameters.map(&:name)
@@ -84,19 +82,20 @@ def row(lhs, rhs)
       end
 
       def add_usage(invocation_path, usage_descriptions)
-        line Clamp.message(:usage_heading) + ":"
+        line "#{Clamp.message(:usage_heading)}:"
         usage_descriptions.each do |usage|
           line "    #{invocation_path} #{usage}".rstrip
         end
       end
 
       def add_description(description)
         return unless description
+
         line
         line description.gsub(/^/, "  ")
       end
 
-      DETAIL_FORMAT = "    %-29s %s".freeze
+      DETAIL_FORMAT = "    %-29s %s"
 
       def add_list(heading, items)
         line

lib/clamp/option/declaration.rb

@@ -40,6 +40,7 @@ def recognised_options
 
       def declare_implicit_help_option
         return false if effective_options.find { |o| o.handles?("--help") }
+
         help_switches = ["--help"]
         help_switches.unshift("-h") unless effective_options.find { |o| o.handles?("-h") }
         option help_switches, :flag, "print help" do
@@ -55,6 +56,7 @@ def effective_options
 
       def options_declared_on(ancestor)
         return [] unless ancestor.is_a?(Clamp::Option::Declaration)
+
         ancestor.declared_options
       end