lolcommits 0.16.2 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 164b3de849954edf608d49789f55504eb4b64a5e9a75eaa543536e22cf7ee354
-  data.tar.gz: 566c9199274b5fb28501daa75ffccf0366ec58079ebb8f7b544b0d605a4991c4
+  metadata.gz: 127f7270f2ceb68501f4f2f158092290638eb45fc7fa9cb354a73bd5f7141016
+  data.tar.gz: 1a059a885d1acbaa0d988365495802ee9bab2bc78e8c95751cee495ee40bdfc2
 SHA512:
-  metadata.gz: 213a07bd6e7e6072de06247805da3f390d465d873dd4174e70337cf324a3c6b697209ebb4c42de7c7cbab065fd9cd3f7417bf9a830ac58d50209f96bcec24fe5
-  data.tar.gz: 12acf1920f4901338887f8363a8500a92444d7072650c420683b27021f621bcbfd06d47c882088b603bb31bdf18f3afbf0c7f9326b9bc99626286401579dcf9f
+  metadata.gz: 0be060d8b449e66f875997ec02e5ad745ad75d320087a5d19f27f506829dcac7796c997cf7e14bb021950222a57e416fdf8ad1724c45dbd3bb92f4d788dec045
+  data.tar.gz: fbb14bf9cc8f82662efb190707f254880509484ab9f4e4a2f4f5c09cf47ad6c552358c864347c30a55ea04f77f1a54c2259f49302e70196a4d1d4d587168e32b

data/.rubocop.yml

@@ -1,20 +1,15 @@
 AllCops:
+  SuggestExtensions: false
+  NewCops: enable
   Exclude:
     - 'vendor/bundle/**/*'
     - 'vendor/bundle/**/.*'
     - '.bundle/**/*'
     - 'bin/lolcommits'
-
-Metrics/BlockLength:
-  Exclude:
     - 'lolcommits.gemspec'
 
 # don't agree with this one, can lead to long lines that are harder to parse
 Style/IfUnlessModifier:
   Enabled: false
 
-# our gem supports 2.0+ but Rubocop only supports 2.1+
-Gemspec/RequiredRubyVersion:
-  Enabled: false
-
 inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -1,83 +1,68 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-01-20 22:28:11 +0000 using RuboCop version 0.79.0.
+# on 2023-05-14 21:38:57 UTC using RuboCop version 1.50.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: TreatCommentsAsGroupSeparators, Include.
-# Include: **/*.gemspec
-Gemspec/OrderedDependencies:
-  Exclude:
-    - 'lolcommits.gemspec'
-
-# Offense count: 19
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/ArgumentAlignment:
-  Enabled: false
-
-# Offense count: 6
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterGuardClause:
-  Exclude:
-    - 'bin/bundle'
-
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: squiggly, active_support, powerpack, unindent
+# This cop supports safe autocorrection (--autocorrect).
 Layout/HeredocIndentation:
   Exclude:
     - 'lib/lolcommits/backends/installation_git.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: aligned, indented
-Layout/MultilineOperationIndentation:
-  Exclude:
-    - 'bin/bundle'
-
-# Offense count: 1
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'lib/lolcommits/cli/process_runner.rb'
 
-# Offense count: 18
+# Offense count: 15
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 35
+  Max: 33
 
 # Offense count: 2
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
   Max: 144
 
 # Offense count: 5
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 10
 
-# Offense count: 21
-# Configuration parameters: CountComments, ExcludedMethods.
+# Offense count: 20
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 24
 
 # Offense count: 5
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 10
 
-# Offense count: 25
+# Offense count: 26
+# Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
 
-# Offense count: 20
-# Cop supports --auto-correct.
-Style/ExpandPathArguments:
-  Enabled: false
+# Offense count: 6
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+# SupportedShorthandSyntax: always, never, either, consistent
+Style/HashSyntax:
+  Exclude:
+    - 'lib/lolcommits/gem_plugin.rb'
+    - 'lib/lolcommits/runner.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/MapToHash:
+  Exclude:
+    - 'lib/lolcommits/plugin/base.rb'
 
 # Offense count: 2
 Style/MixinUsage:
@@ -86,7 +71,7 @@ Style/MixinUsage:
     - 'features/support/env.rb'
 
 # Offense count: 5
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
   Exclude:
@@ -96,30 +81,17 @@ Style/PercentLiteralDelimiters:
     - 'lib/lolcommits/cli/fatals.rb'
     - 'lib/lolcommits/installation.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/PerlBackrefs:
-  Exclude:
-    - 'bin/bundle'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: use_perl_names, use_english_names
-Style/SpecialGlobalVars:
-  Exclude:
-    - 'bin/bundle'
-
-# Offense count: 166
-# Cop supports --auto-correct.
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
-  Enabled: false
+  Exclude:
+    - 'lib/lolcommits/version.rb'
 
-# Offense count: 120
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Offense count: 16
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 198
+  Max: 192

data/.travis.yml

@@ -2,10 +2,11 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.4.9
-  - 2.5.7
-  - 2.6.5
-  - 2.7.1
+  - 2.4.10
+  - 2.5.9
+  - 2.6.7
+  - 2.7.3
+  - 3.0.1
   - ruby-head
 
 matrix:

data/CHANGELOG.md

@@ -7,6 +7,16 @@ This project adheres to [Semantic Versioning][Semver].
 
   * Your contribution here!
 
+## [0.16.4][] (05 Sep 2023)
+  * Fixing for Git 1.18+, it no longer sets a `$GIT_DIR` in post-commit hooks [#417][]
+
+## [0.16.3][] (28 Jan 2021)
+  * Upgrade gem dependencies (for Ruby 3.0 compatibility)
+  * Patched `mercurial-ruby` to work with Ruby 3.0 [#411][]
+  * Fixed up the formatting of generated hooks in `.hg/hgrc` [#411][]
+  * Fix failing RuboCops and update config
+  * Update Travis CI rubies
+
 ## [0.16.2][] (24 Aug 2020)
   * Support delays w/ Linux animated GIFs (@theY4Kman [#405][])
   * Upgrade git gem to version 1.6.0 (@depfu [#402][])
@@ -378,7 +388,9 @@ This project adheres to [Semantic Versioning][Semver].
   reliable to not glitch.)
 
 [Semver]: http://semver.org
-[Unreleased]: https://github.com/lolcommits/lolcommits/compare/v0.16.2...HEAD
+[Unreleased]: https://github.com/lolcommits/lolcommits/compare/v0.16.4...HEAD
+[0.16.4]: https://github.com/lolcommits/lolcommits/compare/v0.16.3...v0.16.4
+[0.16.3]: https://github.com/lolcommits/lolcommits/compare/v0.16.2...v0.16.3
 [0.16.2]: https://github.com/lolcommits/lolcommits/compare/v0.16.1...v0.16.2
 [0.16.1]: https://github.com/lolcommits/lolcommits/compare/v0.16.0...v0.16.1
 [0.16.0]: https://github.com/lolcommits/lolcommits/compare/v0.15.1...v0.16.0
@@ -590,3 +602,5 @@ This project adheres to [Semantic Versioning][Semver].
 [#401]: https://github.com/lolcommits/lolcommits/pull/401
 [#402]: https://github.com/lolcommits/lolcommits/pull/402
 [#405]: https://github.com/lolcommits/lolcommits/pull/405
+[#411]: https://github.com/lolcommits/lolcommits/pull/411
+[#417]: https://github.com/lolcommits/lolcommits/pull/417

data/README.md

@@ -1,7 +1,6 @@
 # lolcommits
 
 [![Gem](https://img.shields.io/gem/v/lolcommits.svg?style=flat)](http://rubygems.org/gems/lolcommits)
-[![Travis](https://img.shields.io/travis/com/lolcommits/lolcommits/master.svg?style=flat)](https://travis-ci.com/lolcommits/lolcommits)
 [![Depfu](https://img.shields.io/depfu/lolcommits/lolcommits.svg?style=flat)](https://depfu.com/github/lolcommits/lolcommits)
 [![Maintainability](https://api.codeclimate.com/v1/badges/c13fa50206e122e416c2/maintainability)](https://codeclimate.com/github/lolcommits/lolcommits/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/c13fa50206e122e416c2/test_coverage)](https://codeclimate.com/github/lolcommits/lolcommits/test_coverage)

data/Rakefile

@@ -5,8 +5,10 @@ require 'rake/clean'
 
 require 'rake/testtask'
 
+ENV['CUCUMBER_PUBLISH_QUIET'] = 'true'
 require 'cucumber'
 require 'cucumber/rake/task'
+
 gem 'rdoc' # we need the installed RDoc gem, not the system one
 require 'rdoc/task'
 
@@ -53,9 +55,9 @@ RuboCop::RakeTask.new
 
 desc 'Migrate an existing local .lolcommits directory to Dropbox'
 task :dropboxify do
-  dropbox_loldir = "#{ENV['HOME']}/Dropbox/lolcommits"
-  loldir = "#{ENV['HOME']}/.lolcommits"
-  backup_loldir = "#{ENV['HOME']}/.lolcommits.old"
+  dropbox_loldir = "#{Dir.home}/Dropbox/lolcommits"
+  loldir = "#{Dir.home}/.lolcommits"
+  backup_loldir = "#{Dir.home}/.lolcommits.old"
 
   # check whether we've done this already
   abort 'already dropboxified!' if File.symlink? loldir

data/features/step_definitions/lolcommits_steps.rb

@@ -66,7 +66,7 @@ Given(/^I am in a git repo with lolcommits enabled$/) do
     )
 end
 
-Given(/^a git post\-commit hook with "(.*?)"$/) do |file_content|
+Given(/^a git post-commit hook with "(.*?)"$/) do |file_content|
   steps %(
     Given a file named "#{postcommit_hook_git}" with:
       """
@@ -75,13 +75,13 @@ Given(/^a git post\-commit hook with "(.*?)"$/) do |file_content|
     )
 end
 
-Then(/^the lolcommits git post\-commit hook should be properly installed$/) do
+Then(/^the lolcommits git post-commit hook should be properly installed$/) do
   steps %(
     Then the git post-commit hook should contain "lolcommits --capture"
     )
 end
 
-Then(/^the git post\-commit hook (should|should not) contain "(.*?)"$/) do |should, content|
+Then(/^the git post-commit hook (should|should not) contain "(.*?)"$/) do |should, content|
   steps %(
     Then the file "#{postcommit_hook_git}" #{should} contain "#{content}"
     )
@@ -119,7 +119,7 @@ Given(/^I am in a mercurial repo with lolcommits enabled$/) do
     )
 end
 
-Given(/^a mercurial post\-commit hook with "(.*?)"$/) do |file_content|
+Given(/^a mercurial post-commit hook with "(.*?)"$/) do |file_content|
   steps %(
     Given a file named "#{postcommit_hook_mercurial}" with:
       """
@@ -128,13 +128,13 @@ Given(/^a mercurial post\-commit hook with "(.*?)"$/) do |file_content|
     )
 end
 
-Then(/^the lolcommits mercurial post\-commit hook should be properly installed$/) do
+Then(/^the lolcommits mercurial post-commit hook should be properly installed$/) do
   steps %(
     Then the mercurial post-commit hook should contain "lolcommits --capture"
     )
 end
 
-Then(/^the mercurial post\-commit hook (should|should not) contain "(.*?)"$/) do |should, content|
+Then(/^the mercurial post-commit hook (should|should not) contain "(.*?)"$/) do |should, content|
   steps %(
     Then the file "#{postcommit_hook_mercurial}" #{should} contain "#{content}"
     )

data/lib/core_ext/mercurial-ruby/changed_file.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Mercurial
+  class ChangedFile
+    private
+
+    def enforce_unicode(str)
+      # String#encode patched to be Ruby 3.0+ compatible
+      str.encode('utf-8', invalid: :replace, undef: :replace, replace: '?')
+    end
+  end
+end

data/lib/core_ext/mercurial-ruby/shell.rb

@@ -5,7 +5,7 @@ module Mercurial
     # windows command line doesn't like single quotes
     def self.interpolate_arguments(cmd_with_args)
       cmd_with_args.shift.tap do |cmd|
-        cmd.gsub!(/\?/) do
+        cmd.gsub!('?') do
           if Lolcommits::Platform.platform_windows?
             "\"#{cmd_with_args.shift}\""
           else

data/lib/lolcommits/animated_gif.rb

@@ -44,12 +44,12 @@ module Lolcommits
     def frame_delay(fps, skip)
       # calculate frame delay
       delay = ((100.0 * skip) / fps.to_f).to_i
-      delay < 6 ? 6 : delay # hard limit for IE browsers
+      [delay, 6].max # hard limit for IE browsers
     end
 
     def video_fps(file)
       # inspect fps of the captured video file (default to 29.97)
-      fps = system_call("ffmpeg -nostats -v quiet -i \"#{file}\" 2>&1 | sed -n \"s/.*, \\(.*\\) fp.*/\\1/p\"", true)
+      fps = system_call("ffmpeg -nostats -v quiet -i \"#{file}\" 2>&1 | sed -n \"s/.*, \\(.*\\) fp.*/\\1/p\"", capture_output: true)
       fps.to_i < 1 ? 29.97 : fps.to_f
     end
 
@@ -65,7 +65,7 @@ module Lolcommits
       end
     end
 
-    def system_call(call_str, capture_output = false)
+    def system_call(call_str, capture_output: false)
       debug "making system call for \n #{call_str}"
       capture_output ? `#{call_str}` : system(call_str)
     end

data/lib/lolcommits/backends/git_info.rb

@@ -2,7 +2,7 @@
 
 module Lolcommits
   class GitInfo
-    GIT_URL_REGEX = %r{.*[:]([\/\w\-]*).git}.freeze
+    GIT_URL_REGEX = %r{.*:([/\w-]*).git}
 
     def self.repo_root?(path = '.')
       File.directory?(File.join(path, '.git'))
@@ -78,7 +78,7 @@ module Lolcommits
     end
 
     def remote_https_url(url)
-      url.tr(':', '/').gsub(/^git@/, 'https://').gsub(/\.git$/, '') + '/commit/'
+      "#{url.tr(':', '/').gsub(/^git@/, 'https://').gsub(/\.git$/, '')}/commit/"
     end
 
     def repository(path = '.')

data/lib/lolcommits/backends/installation_git.rb

@@ -60,10 +60,10 @@ module Lolcommits
     end
 
     def self.hook_script(capture_args = '')
-      ruby_path     = Lolcommits::Platform.command_which('ruby', true)
-      imagick_path  = Lolcommits::Platform.command_which('identify', true)
+      ruby_path     = Lolcommits::Platform.command_which('ruby', only_path: true)
+      imagick_path  = Lolcommits::Platform.command_which('identify', only_path: true)
       capture_cmd   = "if [ ! -d \"$GIT_DIR/rebase-merge\" ] && [ \"$LOLCOMMITS_CAPTURE_DISABLED\" != \"true\" ]; then lolcommits --capture #{capture_args}; fi"
-      exports       = "LANG=\"#{ENV['LANG']}\" && PATH=\"$PATH:#{ruby_path}:#{imagick_path}\""
+      exports       = "GIT_DIR=${GIT_DIR-`git rev-parse --git-dir`} && LANG=\"#{ENV.fetch('LANG', nil)}\" && PATH=\"$PATH:#{ruby_path}:#{imagick_path}\""
 
       if Lolcommits::Platform.platform_windows?
         exports = "set path=\"%PATH%;#{ruby_path};#{imagick_path}\""
@@ -90,7 +90,7 @@ module Lolcommits
 
     # does the git hook file have a good shebang?
     def self.good_shebang?
-      File.read(HOOK_PATH).lines.first =~ %r{^\#\!.*\/bin\/.*sh}
+      File.read(HOOK_PATH).lines.first =~ %r{^\#!.*/bin/.*sh}
     end
 
     def self.remove_existing_hook!

data/lib/lolcommits/backends/installation_mercurial.rb

@@ -40,20 +40,16 @@ module Lolcommits
     end
 
     def self.hook_script(capture_args = '')
-      ruby_path     = Lolcommits::Platform.command_which('ruby', true)
-      imagick_path  = Lolcommits::Platform.command_which('identify', true)
+      ruby_path     = Lolcommits::Platform.command_which('ruby', only_path: true)
+      imagick_path  = Lolcommits::Platform.command_which('identify', only_path: true)
       capture_cmd   = "if [ \"$LOLCOMMITS_CAPTURE_DISABLED\" != \"true\" ]; then lolcommits --capture #{capture_args}; fi"
-      exports       = "LANG=\"#{ENV['LANG']}\" && PATH=\"$PATH:#{ruby_path}:#{imagick_path}\""
+      exports       = "LANG=\"#{ENV.fetch('LANG', nil)}\" && PATH=\"$PATH:#{ruby_path}:#{imagick_path}\""
 
       if Lolcommits::Platform.platform_windows?
         exports = "set path=\"%PATH%;#{ruby_path};#{imagick_path}\""
       end
 
-      <<-HOOK
-        ### lolcommits hook (begin) ###
-        #{exports} && #{capture_cmd}
-        ###  lolcommits hook (end)  ###
-      HOOK
+      "#{exports} && #{capture_cmd}"
     end
 
     def self.repository

data/lib/lolcommits/capturer/capture_linux.rb

@@ -8,7 +8,7 @@ module Lolcommits
       tmpdir = Dir.mktmpdir
 
       # Default delay is 1s
-      delay = capture_delay != 0 ? capture_delay : 1
+      delay = capture_delay.zero? ? 1 : capture_delay
 
       # There's no way to give a capture delay in mplayer, but a number of frame
       # mplayer's "delay" is actually a number of frames at 25 fps

data/lib/lolcommits/capturer/capture_windows_video.rb

@@ -25,7 +25,7 @@ module Lolcommits
         cmd_output = ''
         count      = 0
         while cmd_output.empty? || !cmd_output.split('DirectShow')[2]
-          cmd_output = system_call(ffpmeg_list_devices_cmd, true)
+          cmd_output = system_call(ffpmeg_list_devices_cmd, capture_output: true)
           count += 1
           raise 'failed to find a video capture device with ffmpeg -list_devices' if count == 5
 

data/lib/lolcommits/capturer.rb

@@ -11,7 +11,7 @@ module Lolcommits
       end
     end
 
-    def system_call(call_str, capture_output = false)
+    def system_call(call_str, capture_output: false)
       debug "making system call for \n #{call_str}"
       capture_output ? `#{call_str}` : system(call_str)
     end

data/lib/lolcommits/cli/fatals.rb

@@ -19,7 +19,7 @@ module Lolcommits
           %w(imagesnap videosnap).each do |executable|
             next if File.executable? File.join(Configuration::LOLCOMMITS_ROOT, 'vendor', 'ext', executable, executable)
 
-            fatal "Couldn't properly execute #{executable} for some reason, "\
+            fatal "Couldn't properly execute #{executable} for some reason, " \
                   'please file a bug?!'
             exit 1
           end
@@ -32,7 +32,7 @@ module Lolcommits
 
         # make sure imagemagick is around and good to go
         unless Platform.valid_imagemagick_installed?
-          fatal 'FATAL: ImageMagick does not appear to be properly installed!'\
+          fatal 'FATAL: ImageMagick does not appear to be properly installed!' \
                 '(or version is too old)'
           exit 1
         end
@@ -40,8 +40,8 @@ module Lolcommits
         # check for a error condition with git config affecting ruby-git
         return unless Platform.git_config_color_always?
 
-        fatal 'Due to a bug in the ruby-git library, git config for color.ui'\
-          " cannot be set to 'always'."
+        fatal 'Due to a bug in the ruby-git library, git config for color.ui ' \
+              "cannot be set to 'always'."
         fatal "Try setting it to 'auto' instead!"
         exit 1
       end

data/lib/lolcommits/cli/process_runner.rb

@@ -33,11 +33,11 @@ module Lolcommits
       private
 
       def write_pid(pid)
-        File.open(pid_file, 'w') { |f| f.write(pid) }
+        File.write(pid_file, pid)
       end
 
       def delete_pid
-        File.delete(pid_file) if File.exist?(pid_file)
+        File.rm_f(pid_file)
       end
 
       def pid_file

data/lib/lolcommits/configuration.rb

@@ -2,7 +2,7 @@
 
 module Lolcommits
   class Configuration
-    LOLCOMMITS_BASE = ENV['LOLCOMMITS_DIR'] || File.join(ENV['HOME'], '.lolcommits')
+    LOLCOMMITS_BASE = ENV['LOLCOMMITS_DIR'] || File.join(Dir.home, '.lolcommits')
     LOLCOMMITS_ROOT = File.join(File.dirname(__FILE__), '../..')
 
     attr_accessor :plugin_manager
@@ -14,11 +14,11 @@ module Lolcommits
     end
 
     def yaml
-      @yaml ||= begin
-        return Hash.new({}) unless File.exist?(configuration_file)
-
-        YAML.safe_load(File.open(configuration_file), [Symbol]) || Hash.new({})
-      end
+      @yaml ||= if File.exist?(configuration_file)
+                  YAML.safe_load(File.open(configuration_file), permitted_classes: [Symbol]) || Hash.new({})
+                else
+                  Hash.new({})
+                end
     end
 
     def configuration_file
@@ -101,16 +101,14 @@ module Lolcommits
         # print config if plugin was enabled
         if plugin_config[:enabled]
           puts "\nSuccessfully configured plugin: #{plugin.name} - at path '#{configuration_file}'"
-          puts plugin_config.to_yaml.to_s
+          puts plugin_config.to_yaml
         end
       end
     end
 
     def save(plugin_name, plugin_config)
       config_file_contents = yaml.merge(plugin_name => plugin_config).to_yaml
-      File.open(configuration_file, 'w') do |f|
-        f.write(config_file_contents)
-      end
+      File.write(configuration_file, config_file_contents)
     end
 
     def to_s
@@ -128,7 +126,7 @@ module Lolcommits
           File.chmod(0o755, loldir)
         rescue Errno::EPERM
           # abort if permissions cannot be met
-          puts "FATAL: directory '#{loldir}' should be present and writeable by user '#{ENV['USER']}'"
+          puts "FATAL: directory '#{loldir}' should be present and writeable by user '#{ENV.fetch('USER', nil)}'"
           puts 'Try changing the directory permissions to 755'
           exit 1
         end

data/lib/lolcommits/gem_plugin.rb

@@ -15,7 +15,7 @@ module Lolcommits
         require gem_path unless required?
       rescue LoadError => e
         warn "Found plugin #{name}, but could not require gem '#{gem_name}'"
-        warn e.to_s
+        warn e
       rescue StandardError => e
         warn "require gem '#{gem_name}' failed with: #{e}"
       end

data/lib/lolcommits/platform.rb

@@ -7,7 +7,7 @@ module Lolcommits
   class Platform
     # The capturer class constant to use
     # @return Class
-    def self.capturer_class(animate = false)
+    def self.capturer_class(animate: false)
       if ENV['LOLCOMMITS_CAPTURER']
         const_get(ENV['LOLCOMMITS_CAPTURER'])
       elsif platform_mac?
@@ -90,7 +90,7 @@ module Lolcommits
     #   command_which('ruby') #=> /usr/bin/ruby
     #
     # @return Boolean
-    def self.command_which(cmd, only_path = false)
+    def self.command_which(cmd, only_path: false)
       exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
       ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
         exts.each do |ext|

data/lib/lolcommits/plugin/base.rb

@@ -52,7 +52,7 @@ module Lolcommits
       # @return [Hash] the configured plugin options
       def configure_options!
         configure_option_hash(
-          Hash[options.map { |key, _value| [key, nil] }].merge(default_options)
+          options.map { |option| [option, nil] }.to_h.merge(default_options)
         )
       end
 

data/lib/lolcommits/plugin_manager.rb

@@ -2,7 +2,7 @@
 
 module Lolcommits
   class PluginManager
-    GEM_NAME_PREFIX = /^#{Lolcommits::GEM_NAME}-/.freeze
+    GEM_NAME_PREFIX = /^#{Lolcommits::GEM_NAME}-/
 
     def self.init
       pm = new

data/lib/lolcommits/runner.rb

@@ -95,7 +95,7 @@ module Lolcommits
 
     def run_capture
       puts '*** Preserving this moment in history.' unless capture_stealth
-      capturer = Platform.capturer_class(!capture_image?).new(
+      capturer = Platform.capturer_class(animate: !capture_image?).new(
         capture_path: capture_path,
         capture_device: capture_device,
         capture_delay: capture_delay,
@@ -181,7 +181,7 @@ module Lolcommits
       @enabled_plugins ||= config.plugin_manager.enabled_plugins_for(self)
     end
 
-    def system_call(call_str, capture_output = false)
+    def system_call(call_str, capture_output: false)
       debug "making system call for \n #{call_str}"
       capture_output ? `#{call_str}` : system(call_str)
     end

data/lib/lolcommits/test_helpers/git_repo.rb

@@ -32,11 +32,11 @@ module Lolcommits
         `cd #{repo_path} && git commit -m "#{message}"`
       end
 
-      def in_repo
+      def in_repo(&block)
         return unless repo_exists?
 
         Dir.chdir(File.expand_path(repo_path)) do
-          yield
+          yield block
         end
       end
 

data/lib/lolcommits/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Lolcommits
-  VERSION  = '0.16.2'
-  GEM_NAME = 'lolcommits'
+  VERSION  = "0.16.4"
+  GEM_NAME = "lolcommits"
 end

data/lib/lolcommits.rb

@@ -9,7 +9,6 @@ require 'open3'
 require 'methadone'
 require 'date'
 require 'mercurial-ruby'
-require 'core_ext/mercurial-ruby/shell'
 
 require 'lolcommits/version'
 require 'lolcommits/configuration'
@@ -23,6 +22,10 @@ require 'lolcommits/plugin/base'
 
 # after lolcommits/platform, so that we can do platform-conditional override
 require 'core_ext/mercurial-ruby/command'
+require 'core_ext/mercurial-ruby/shell'
+
+# String#encode patched to be Ruby 3.0+ compatible
+require 'core_ext/mercurial-ruby/changed_file'
 
 # backends
 require 'lolcommits/backends/installation_git'

data/lolcommits.gemspec

@@ -40,10 +40,10 @@ Gem::Specification.new do |s|
   # core
   s.add_runtime_dependency('methadone', '~> 1.9.5')
   s.add_runtime_dependency('mercurial-ruby', '~> 0.7.12')
-  s.add_runtime_dependency('mini_magick', '~> 4.10.1')
-  s.add_runtime_dependency('launchy', '~> 2.4.3')
+  s.add_runtime_dependency('mini_magick', '~> 4.12.0')
+  s.add_runtime_dependency('launchy', '~> 2.5.0')
   s.add_runtime_dependency('open4', '~> 1.3.4')
-  s.add_runtime_dependency('git', '~> 1.6.0')
+  s.add_runtime_dependency('git', '~> 1.18.0')
 
   # included plugins
   s.add_runtime_dependency('lolcommits-loltext', '~> 0.4.0')

data/test/permissions_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class PermissionsTest < Minitest::Test
   #

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.4
 platform: ruby
 authors:
 - Matthew Rothenberg
 - Matthew Hutchinson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -45,28 +45,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.10.1
+        version: 4.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.10.1
+        version: 4.12.0
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.18.0
 - !ruby/object:Gem::Dependency
   name: lolcommits-loltext
   requirement: !ruby/object:Gem::Requirement
@@ -251,12 +251,12 @@ files:
 - appveyor.yml
 - bin/console
 - bin/lolcommits
-- config/cucumber.yml
 - features/bugs.feature
 - features/lolcommits.feature
 - features/step_definitions/lolcommits_steps.rb
 - features/support/env.rb
 - features/support/path_helpers.rb
+- lib/core_ext/mercurial-ruby/changed_file.rb
 - lib/core_ext/mercurial-ruby/command.rb
 - lib/core_ext/mercurial-ruby/shell.rb
 - lib/lolcommits.rb
@@ -303,7 +303,7 @@ files:
 - vendor/ext/imagesnap/ReadMeOrDont.rtf
 - vendor/ext/imagesnap/imagesnap
 - vendor/ext/videosnap/videosnap
-homepage: 
+homepage:
 licenses:
 - LGPL-3.0
 metadata:
@@ -312,7 +312,7 @@ metadata:
   changelog_uri: https://github.com/lolcommits/lolcommits/blob/master/CHANGELOG.md
   bug_tracker_uri: https://github.com/lolcommits/lolcommits/issues
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -329,8 +329,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - imagemagick
 - a webcam
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.17
+signing_key:
 specification_version: 4
 summary: Capture webcam image on git commit for lulz.
 test_files:

data/config/cucumber.yml

@@ -1,2 +0,0 @@
----
-default: <%= ENV['TRAVIS'] == "true" ? "features --tags \"not @requires_ffmpeg\"" : "features" %>