Upgrade rubocop config and fix some rubocop offenses

Author: FreedomBen

.rubocop.yml

@@ -528,11 +528,6 @@ Style/DefWithParentheses:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#method-parens'
   Enabled: false
 
-Style/DeprecatedHashMethods:
-  Description: 'Checks for use of deprecated Hash methods.'
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#hash-key'
-  Enabled: false
-
 Style/Documentation:
   Description: 'Document classes and non-namespace modules.'
   Enabled: false
@@ -716,7 +711,7 @@ Style/LineEndConcatenation:
                  line end.
   Enabled: false
 
-Style/MethodCallParentheses:
+Style/MethodCallWithoutArgsParentheses:
   Description: 'Do not use parentheses for method calls with no arguments.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-args-no-parens'
   Enabled: false

lib/dory/dnsmasq.rb

@@ -40,7 +40,7 @@ def self.run_postconditions
       self.up_systemd_services if @@handle_systemd_services
     end
 
-    def self.handle_error(command_output)
+    def self.handle_error(_command_output)
       puts "[DEBUG] handling dnsmasq start error" if Dory::Config.debug?
       # If we've already tried to handle failure, prevent infinite recursion
       if @@first_attempt_failed
@@ -101,16 +101,16 @@ def self.domain_addr_arg_string
       end
     end
 
-    def self.run_command(domains = self.domains)
+    def self.run_command
       "docker run -d -p #{self.port}:#{self.port}/tcp -p #{self.port}:#{self.port}/udp " \
       "--name=#{Shellwords.escape(self.container_name)} " \
       "--cap-add=NET_ADMIN #{Shellwords.escape(self.dnsmasq_image_name)} " \
       "#{self.domain_addr_arg_string}"
     end
 
-    def self.check_port(port_num)
-      puts "Requesting sudo to check if something is bound to port #{self.port}".green
-      ret = Sh.run_command("sudo lsof -i :#{self.port}")
+    def self.check_port(port_num = self.port)
+      puts "Requesting sudo to check if something is bound to port #{port_num}".green
+      ret = Sh.run_command("sudo lsof -i :#{port_num}")
       return [] unless ret.success?
 
       list = ret.stdout.split("\n")

lib/dory/docker_service.rb

@@ -21,7 +21,7 @@ def run_postconditions
       return true
     end
 
-    def handle_error(command_output)
+    def handle_error(_command_output)
       # Override to provide error handling
       return false
     end

lib/dory/proxy.rb

@@ -31,7 +31,7 @@ def self.certs_arg
     def self.tls_arg
       if [:tls_enabled, :ssl_enabled, :https_enabled].any? { |s|
           Dory::Config.settings[:dory][:nginx_proxy][s]
-        }
+         }
         "-p 443:443"
       else
         ''

spec/lib/resolv/linux_spec.rb

@@ -166,14 +166,14 @@
   end
 
   context "knows if we've edited the file" do
-    let (:comment) { '# added by dory' }
+    let(:comment) { '# added by dory' }
 
-    let (:stub_resolv) do
+    let(:stub_resolv) do
       ->(nameserver, file_comment = comment) do
         allow(Dory::Resolv::Linux).to receive(:nameserver){ nameserver }
-        allow(Dory::Resolv::Linux).to receive(:file_comment){ comment }
+        allow(Dory::Resolv::Linux).to receive(:file_comment){ file_comment }
         expect(Dory::Resolv::Linux.nameserver).to eq(nameserver)
-        expect(Dory::Resolv::Linux.file_comment).to eq(comment)
+        expect(Dory::Resolv::Linux.file_comment).to eq(file_comment)
       end
     end
 

spec/lib/resolv/macos_spec.rb

@@ -180,18 +180,18 @@
   end
 
   context "knows if we've edited the file" do
-    let (:comment) { '# added by dory' }
+    let(:comment) { '# added by dory' }
 
-    let (:stub_resolv) do
+    let(:stub_resolv) do
       ->(nameserver, file_comment = comment) do
         allow(Dory::Resolv::Macos).to receive(:nameserver){ nameserver }
-        allow(Dory::Resolv::Macos).to receive(:file_comment){ comment }
+        allow(Dory::Resolv::Macos).to receive(:file_comment){ file_comment }
         expect(Dory::Resolv::Macos.nameserver).to eq(nameserver)
-        expect(Dory::Resolv::Macos.file_comment).to eq(comment)
+        expect(Dory::Resolv::Macos.file_comment).to eq(file_comment)
       end
     end
 
-    let (:contents) do
+    let(:contents) do
       ->(nameserver, port) do
         <<-EOF.gsub(' ' * 10, '')
           # added by dory
@@ -201,7 +201,7 @@
       end
     end
 
-    let (:stub_the_things) do
+    let(:stub_the_things) do
       ->(nameserver, port) do
         allow(Dory::Resolv::Macos).to receive(:file_nameserver_line) { "nameserver #{nameserver}" }
         allow(Dory::Resolv::Macos).to receive(:port) { port }

spec/lib/upgrade_spec.rb

@@ -13,7 +13,7 @@
     let(:stub_sh) do
       ->(success, stdout) do
         allow(Dory::Sh).to receive(:run_command) do
-          OpenStruct.new(success?: true, stdout: stdout)
+          OpenStruct.new(success?: success, stdout: stdout)
         end
       end
     end