Fix windows CI build error

jcouball · jcouball · commit f8bc987a3b75 · 2024-09-01T14:44:26.000-07:00
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -357,12 +357,13 @@ def name_rev(commit_ish)
     #
     # @see https://git-scm.com/docs/git-cat-file git-cat-file
     #
-    # @param object [String] the object whose contents to return
-    # @param opts [Hash] the options for this command
-    # @option opts [Boolean] :tag
-    # @option opts [Boolean] :size
-    # @option opts
+    # @example Get the contents of a file without a block
+    #   lib.cat_file_contents('README.md') # => "This is a README file\n"
     #
+    # @example Get the contents of a file with a block
+    #  lib.cat_file_contents('README.md') { |f| f.read } # => "This is a README file\n"
+    #  
+    # @param object [String] the object whose contents to return
     #
     # @return [String] the object contents
     #
diff --git a/tests/units/test_lib.rb b/tests/units/test_lib.rb
@@ -424,7 +424,7 @@ def test_cat_file_tag
 
     in_temp_repo('working') do
       # Creeate an annotated tag:
-      `git tag -a annotated_tag -m 'Creating an annotated tag'`
+      `git tag -a annotated_tag -m "Creating an annotated tag"`
 
       git = Git.open('.')
       cat_file_tag = git.lib.cat_file_tag('annotated_tag')
diff --git a/tests/units/test_logger.rb b/tests/units/test_logger.rb
@@ -17,39 +17,40 @@ def unexpected_log_entry
   end
 
   def test_logger
-    log = Tempfile.new('logfile')
-    log.close
+    in_temp_dir do |path|
+      log_path = 'logfile.log'
 
-    logger = Logger.new(log.path)
-    logger.level = Logger::DEBUG
+      logger = Logger.new(log_path, level: Logger::DEBUG)
 
-    @git = Git.open(@wdir, :log => logger)
-    @git.branches.size
+      @git = Git.open(@wdir, :log => logger)
+      @git.branches.size
 
-    logc = File.read(log.path)
+      logc = File.read(log_path)
 
-    expected_log_entry = /INFO -- : \["git", "(?<global_options>.*?)", "branch", "-a"/
-    assert_match(expected_log_entry, logc, missing_log_entry)
+      expected_log_entry = /INFO -- : \["git", "(?<global_options>.*?)", "branch", "-a"/
+      assert_match(expected_log_entry, logc, missing_log_entry)
 
-    expected_log_entry = /DEBUG -- : stdout:\n"  cherry/
-    assert_match(expected_log_entry, logc, missing_log_entry)
+      expected_log_entry = /DEBUG -- : stdout:\n"  cherry/
+      assert_match(expected_log_entry, logc, missing_log_entry)
+    end
   end
 
   def test_logging_at_info_level_should_not_show_debug_messages
-    log = Tempfile.new('logfile')
-    log.close
-    logger = Logger.new(log.path)
-    logger.level = Logger::INFO
+    in_temp_dir do |path|
+      log_path = 'logfile.log'
 
-    @git = Git.open(@wdir, :log => logger)
-    @git.branches.size
+      logger = Logger.new(log_path, level: Logger::INFO)
 
-    logc = File.read(log.path)
+      @git = Git.open(@wdir, :log => logger)
+      @git.branches.size
 
-    expected_log_entry = /INFO -- : \["git", "(?<global_options>.*?)", "branch", "-a"/
-    assert_match(expected_log_entry, logc, missing_log_entry)
+      logc = File.read(log_path)
 
-    expected_log_entry = /DEBUG -- : stdout:\n"  cherry/
-    assert_not_match(expected_log_entry, logc, unexpected_log_entry)
+      expected_log_entry = /INFO -- : \["git", "(?<global_options>.*?)", "branch", "-a"/
+      assert_match(expected_log_entry, logc, missing_log_entry)
+
+      expected_log_entry = /DEBUG -- : stdout:\n"  cherry/
+      assert_not_match(expected_log_entry, logc, unexpected_log_entry)
+    end
   end
 end

Original file line number	Diff line number	Diff line change
`@@ -357,12 +357,13 @@ def name_rev(commit_ish)`
`357`	`357`	`#`
`358`	`358`	`# @see https://git-scm.com/docs/git-cat-file git-cat-file`
`359`	`359`	`#`
`360`		`- # @param object [String] the object whose contents to return`
`361`		`- # @param opts [Hash] the options for this command`
`362`		`- # @option opts [Boolean] :tag`
`363`		`- # @option opts [Boolean] :size`
`364`		`- # @option opts`
	`360`	`+ # @example Get the contents of a file without a block`
	`361`	`+ # lib.cat_file_contents('README.md') # => "This is a README file\n"`
`365`	`362`	`#`
	`363`	`+ # @example Get the contents of a file with a block`
	`364`	`+ # lib.cat_file_contents('README.md') { \|f\| f.read } # => "This is a README file\n"`
	`365`	`+ #`
	`366`	`+ # @param object [String] the object whose contents to return`
`366`	`367`	`#`
`367`	`368`	`# @return [String] the object contents`
`368`	`369`	`#`