Merge pull request #840 from HParker/remove-ruby-2.7-warnings

Remove ruby 2.7 warnings

Author: carlosmn

lib/rugged/commit.rb

@@ -5,7 +5,6 @@
 
 module Rugged
   class Commit
-
     def self.prettify_message(msg, strip_comments = true)
       Rugged::prettify_message(msg, strip_comments)
     end
@@ -30,7 +29,7 @@ def diff(*args)
     #
     # See Rugged::Tree#diff_workdir for more details.
     def diff_workdir(options = {})
-      self.tree.diff_workdir(options)
+      self.tree.diff_workdir(**options)
     end
 
     # The time when this commit was made effective. This is the same value

lib/rugged/repository.rb

@@ -30,7 +30,7 @@ def checkout(target, options = {})
       options[:strategy] ||= :safe
       options.delete(:paths)
 
-      return checkout_head(options) if target == "HEAD"
+      return checkout_head(**options) if target == "HEAD"
 
       if target.kind_of?(Rugged::Branch)
         branch = target
@@ -39,7 +39,7 @@ def checkout(target, options = {})
       end
 
       if branch
-        self.checkout_tree(branch.target, options)
+        self.checkout_tree(branch.target, **options)
 
         if branch.remote?
           references.create("HEAD", branch.target_id, force: true)
@@ -49,7 +49,7 @@ def checkout(target, options = {})
       else
         commit = Commit.lookup(self, self.rev_parse_oid(target))
         references.create("HEAD", commit.oid, force: true)
-        self.checkout_tree(commit, options)
+        self.checkout_tree(commit, **options)
       end
     end
 
@@ -250,12 +250,11 @@ def blob_at(revision, path)
       (blob.type == :blob) ? blob : nil
     end
 
-    def fetch(remote_or_url, *args)
+    def fetch(remote_or_url, *args, **kwargs)
       unless remote_or_url.kind_of? Remote
         remote_or_url = remotes[remote_or_url] || remotes.create_anonymous(remote_or_url)
       end
-
-      remote_or_url.fetch(*args)
+      remote_or_url.fetch(*args, **kwargs)
     end
 
     # Push a list of refspecs to the given remote.

lib/rugged/submodule_collection.rb

@@ -26,8 +26,8 @@ class SubmoduleCollection
     #
     # Returns the newly created +submodule+
     def add(url, path, options = {})
-      submodule = setup_add(url, path, options)
-      clone_submodule(submodule.repository, options)
+      submodule = setup_add(url, path, **options)
+      clone_submodule(submodule.repository, **options)
       submodule.finalize_add
     end
 
@@ -40,9 +40,9 @@ def add(url, path, options = {})
     # 1. fetches the remote
     # 2. sets up a master branch to be tracking origin/master
     # 3. checkouts the submodule
-    def clone_submodule(repo, fetch_options)
+    def clone_submodule(repo, **fetch_options)
       # the remote was just added by setup_add, no need to check presence
-      repo.remotes['origin'].fetch(fetch_options)
+      repo.remotes['origin'].fetch(**fetch_options)
 
       repo.branches.create('master','origin/master')
       repo.branches['master'].upstream = repo.branches['origin/master']

test/online/fetch_test.rb

@@ -33,14 +33,14 @@ def test_fetch_over_https_with_certificate_callback
       @repo.remotes.create("origin", "https://github.com/libgit2/TestGitRepository.git")
 
       args = {}
-      @repo.fetch("origin", {
+      @repo.fetch(
+        "origin",
         certificate_check: lambda { |valid, host|
           args[:valid] = valid
           args[:host] = host
-
           true
         }
-      })
+      )
 
       assert_equal({ valid: true, host: "github.com" }, args)
     end
@@ -49,9 +49,10 @@ def test_fetch_over_https_with_certificate_callback_fail
       @repo.remotes.create("origin", "https://github.com/libgit2/TestGitRepository.git")
 
       exception = assert_raises Rugged::HTTPError do
-        @repo.fetch("origin", {
+        @repo.fetch(
+          "origin",
           certificate_check: lambda { |valid, host| false }
-        })
+        )
       end
 
       assert_equal "user rejected certificate for github.com", exception.message
@@ -61,11 +62,12 @@ def test_fetch_over_https_with_certificate_callback_exception
       @repo.remotes.create("origin", "https://github.com/libgit2/TestGitRepository.git")
 
       exception = assert_raises RuntimeError do
-        @repo.fetch("origin", {
+        @repo.fetch(
+          "origin",
           certificate_check: lambda { |valid, host|
             raise "Exception from callback"
           }
-        })
+        )
       end
 
       assert_equal "Exception from callback", exception.message
@@ -92,11 +94,11 @@ def test_fetch_over_ssh_with_credentials_from_agent
     def test_fetch_over_ssh_with_credentials_callback
       @repo.remotes.create("origin", ENV['GITTEST_REMOTE_SSH_URL'])
 
-      @repo.fetch("origin", {
+      @repo.fetch("origin",
         credentials: lambda { |url, username, allowed_types|
           return ssh_key_credential
         }
-      })
+      )
     end
   end
 end

test/rebase_test.rb

@@ -172,10 +172,10 @@ def test_rebase_does_not_lose_files
     rebase = Rugged::Rebase.new(@repo, "refs/heads/gravy", "refs/heads/veal")
 
     assert rebase.next
-    assert rebase.commit({ committer: { :email => "[email protected]", :name => "Rebaser" } })
+    assert rebase.commit(committer: { :email => "[email protected]", :name => "Rebaser" })
 
     assert rebase.next
-    assert rebase.commit({ committer: { :email => "[email protected]", :name => "Rebaser" } })
+    assert rebase.commit(committer: { :email => "[email protected]", :name => "Rebaser" })
   end
 
   def test_inmemory_rebase_does_not_lose_files
@@ -197,9 +197,9 @@ def test_inmemory_rebase_does_not_lose_files
     rebase = Rugged::Rebase.new(@repo, "refs/heads/gravy", "refs/heads/veal", inmemory: true)
 
     assert rebase.next
-    assert rebase.commit({ committer: { :email => "[email protected]", :name => "Rebaser" } })
+    assert rebase.commit(committer: { :email => "[email protected]", :name => "Rebaser" })
 
     assert rebase.next
-    assert rebase.commit({ committer: { :email => "[email protected]", :name => "Rebaser" } })
+    assert rebase.commit(committer: { :email => "[email protected]", :name => "Rebaser" })
   end
 end

test/reference_test.rb

@@ -336,9 +336,9 @@ def test_create_default_log_custom_ident
   def test_create_default_log_custom_log_message
     ref = @repo.references.create(
       "refs/heads/test-reflog-default",
-      "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", {
-        message: "reference created"
-      })
+      "a65fedf39aefe402d3bb6e24df4d4f5fe4547750",
+      message: "reference created"
+      )
     reflog = ref.log
 
     assert_equal reflog.size, 1
@@ -359,9 +359,9 @@ def test_create_default_log_custom_ident_and_log_message
 
     ref = @repo.references.create(
       "refs/heads/test-reflog-default",
-      "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", {
-        message: "reference created"
-      })
+      "a65fedf39aefe402d3bb6e24df4d4f5fe4547750",
+      message: "reference created"
+    )
     reflog = ref.log
 
     assert_equal reflog.size, 1
@@ -408,9 +408,11 @@ def test_set_target_default_log_custom_signature
   end
 
   def test_set_target_default_log_custom_log_message
-    @repo.references.update(@ref, "5b5b025afb0b4c913b4c338a42934a3863bf3644", {
+    @repo.references.update(
+      @ref,
+      "5b5b025afb0b4c913b4c338a42934a3863bf3644",
       message: "reference updated"
-    })
+    )
 
     reflog = @ref.log
     assert_equal reflog.size, 2

test/tag_test.rb

@@ -158,10 +158,12 @@ def test_extract_signature
 class AnnotatedTagTest < Rugged::TestCase
   def setup
     @repo = FixtureRepo.from_libgit2("testrepo.git")
-    @tag = @repo.tags.create('annotated_tag', "5b5b025afb0b4c913b4c338a42934a3863bf3644", {
+    @tag = @repo.tags.create(
+      'annotated_tag',
+      "5b5b025afb0b4c913b4c338a42934a3863bf3644",
       :message => "test tag message\n",
       :tagger  => { :name => 'Scott', :email => '[email protected]', :time => Time.now }
-    })
+    )
   end
 
   def test_is_annotated
@@ -242,10 +244,12 @@ def setup
   end
 
   def test_writing_a_tag
-    tag = @repo.tags.create('tag', "5b5b025afb0b4c913b4c338a42934a3863bf3644", {
+    tag = @repo.tags.create(
+      'tag',
+      "5b5b025afb0b4c913b4c338a42934a3863bf3644",
       :message => "test tag message\n",
       :tagger  => { :name => 'Scott', :email => '[email protected]', :time => Time.now }
-    })
+    )
 
     annotation = tag.annotation
     assert_equal :tag, annotation.type
@@ -261,20 +265,24 @@ def test_writing_a_tag_without_signature
     @repo.config['user.name'] = name
     @repo.config['user.email'] = email
 
-    tag = @repo.tags.create('tag', "5b5b025afb0b4c913b4c338a42934a3863bf3644", {
+    tag = @repo.tags.create(
+      'tag',
+      "5b5b025afb0b4c913b4c338a42934a3863bf3644",
       :message => "test tag message\n"
-    })
+    )
 
     assert_equal name, tag.annotation.tagger[:name]
     assert_equal email, tag.annotation.tagger[:email]
   end
 
   def test_tag_invalid_message_type
     assert_raises TypeError do
-      @repo.tags.create('tag', "5b5b025afb0b4c913b4c338a42934a3863bf3644", {
+      @repo.tags.create(
+        'tag',
+        "5b5b025afb0b4c913b4c338a42934a3863bf3644",
         :message => :invalid_message,
         :tagger  => {:name => 'Scott', :email => '[email protected]', :time => Time.now }
-      })
+      )
     end
   end