lolcommits 0.16.3 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b77f42634dc21e58f7c16311a6da2ddd82b957d97e3433b66622fdd5a4fac71
-  data.tar.gz: 19b7b1eb0f9a8f33712e0dd74fe4f99c1d2e83f444a292b0f75099e1545fb509
+  metadata.gz: 127f7270f2ceb68501f4f2f158092290638eb45fc7fa9cb354a73bd5f7141016
+  data.tar.gz: 1a059a885d1acbaa0d988365495802ee9bab2bc78e8c95751cee495ee40bdfc2
 SHA512:
-  metadata.gz: dbade52499cd8f0b0259b0d3af947606a666d4fb790e5da44128c5ee07e22a4d1fd8fb1204c7d059a8e67e101a841abdc0a9f5cf03cab69d3e251078bccb7e31
-  data.tar.gz: 417ea2aefa9b94f275fed65cfd5d0abb57d1162ec9a864833cde125d76527065d41093791fb5696a46338c90b860b5bea20cdee7cc86a3ced096fa20558cd343
+  metadata.gz: 0be060d8b449e66f875997ec02e5ad745ad75d320087a5d19f27f506829dcac7796c997cf7e14bb021950222a57e416fdf8ad1724c45dbd3bb92f4d788dec045
+  data.tar.gz: fbb14bf9cc8f82662efb190707f254880509484ab9f4e4a2f4f5c09cf47ad6c552358c864347c30a55ea04f77f1a54c2259f49302e70196a4d1d4d587168e32b

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

@@ -3,10 +3,10 @@ language: ruby
 cache: bundler
 rvm:
   - 2.4.10
-  - 2.5.8
-  - 2.6.6
-  - 2.7.2
-  - 3.0.0
+  - 2.5.9
+  - 2.6.7
+  - 2.7.3
+  - 3.0.1
   - ruby-head
 
 matrix:

data/CHANGELOG.md

@@ -7,10 +7,13 @@ 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][])
+  * 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
 
@@ -385,7 +388,8 @@ This project adheres to [Semantic Versioning][Semver].
   reliable to not glitch.)
 
 [Semver]: http://semver.org
-[Unreleased]: https://github.com/lolcommits/lolcommits/compare/v0.16.3...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
@@ -599,3 +603,4 @@ This project adheres to [Semantic Versioning][Semver].
 [#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)
@@ -39,7 +38,7 @@ page on our wiki!
 
 ## Requirements
 
-* Ruby >= 2.4
+* Ruby >= 2.3
 * A webcam
 * [ImageMagick](http://www.imagemagick.org)
 * [ffmpeg](https://www.ffmpeg.org) (optional) for animated gif capturing

data/Rakefile

@@ -55,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/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,7 +44,7 @@ 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)

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'))

data/lib/lolcommits/backends/installation_git.rb

@@ -63,7 +63,7 @@ module Lolcommits
       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}\""

data/lib/lolcommits/backends/installation_mercurial.rb

@@ -43,7 +43,7 @@ module Lolcommits
       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}\""

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,13 +14,11 @@ module Lolcommits
     end
 
     def yaml
-      @yaml ||= begin
-        if File.exist?(configuration_file)
-          YAML.safe_load(File.open(configuration_file), [Symbol]) || Hash.new({})
-        else
-          Hash.new({})
-        end
-      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
@@ -103,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
@@ -130,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/plugin/base.rb

@@ -52,7 +52,7 @@ module Lolcommits
       # @return [Hash] the configured plugin options
       def configure_options!
         configure_option_hash(
-          (options.map { |option| [option, nil] }.to_h).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/version.rb

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

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.11.0')
+  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.8.1')
+  s.add_runtime_dependency('git', '~> 1.18.0')
 
   # included plugins
   s.add_runtime_dependency('lolcommits-loltext', '~> 0.4.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.4
 platform: ruby
 authors:
 - Matthew Rothenberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.11.0
+        version: 4.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.11.0
+        version: 4.12.0
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.18.0
 - !ruby/object:Gem::Dependency
   name: lolcommits-loltext
   requirement: !ruby/object:Gem::Requirement
@@ -251,7 +251,6 @@ files:
 - appveyor.yml
 - bin/console
 - bin/lolcommits
-- config/cucumber.yml
 - features/bugs.feature
 - features/lolcommits.feature
 - features/step_definitions/lolcommits_steps.rb
@@ -330,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - imagemagick
 - a webcam
-rubygems_version: 3.2.3
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: Capture webcam image on git commit for lulz.

data/config/cucumber.yml

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