lolcommits 0.16.2 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 164b3de849954edf608d49789f55504eb4b64a5e9a75eaa543536e22cf7ee354
-  data.tar.gz: 566c9199274b5fb28501daa75ffccf0366ec58079ebb8f7b544b0d605a4991c4
+  metadata.gz: 3b77f42634dc21e58f7c16311a6da2ddd82b957d97e3433b66622fdd5a4fac71
+  data.tar.gz: 19b7b1eb0f9a8f33712e0dd74fe4f99c1d2e83f444a292b0f75099e1545fb509
 SHA512:
-  metadata.gz: 213a07bd6e7e6072de06247805da3f390d465d873dd4174e70337cf324a3c6b697209ebb4c42de7c7cbab065fd9cd3f7417bf9a830ac58d50209f96bcec24fe5
-  data.tar.gz: 12acf1920f4901338887f8363a8500a92444d7072650c420683b27021f621bcbfd06d47c882088b603bb31bdf18f3afbf0c7f9326b9bc99626286401579dcf9f
+  metadata.gz: dbade52499cd8f0b0259b0d3af947606a666d4fb790e5da44128c5ee07e22a4d1fd8fb1204c7d059a8e67e101a841abdc0a9f5cf03cab69d3e251078bccb7e31
+  data.tar.gz: 417ea2aefa9b94f275fed65cfd5d0abb57d1162ec9a864833cde125d76527065d41093791fb5696a46338c90b860b5bea20cdee7cc86a3ced096fa20558cd343

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/.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.8
+  - 2.6.6
+  - 2.7.2
+  - 3.0.0
   - ruby-head
 
 matrix:

data/CHANGELOG.md

@@ -7,6 +7,13 @@ This project adheres to [Semantic Versioning][Semver].
 
   * Your contribution here!
 
+## [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 +385,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.2...HEAD
+[Unreleased]: https://github.com/lolcommits/lolcommits/compare/v0.16.3...HEAD
+[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 +598,4 @@ 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

data/README.md

@@ -39,7 +39,7 @@ page on our wiki!
 
 ## Requirements
 
-* Ruby >= 2.3
+* Ruby >= 2.4
 * A webcam
 * [ImageMagick](http://www.imagemagick.org)
 * [ffmpeg](https://www.ffmpeg.org) (optional) for animated gif capturing

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'
 

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/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/lib/lolcommits/animated_gif.rb

@@ -49,7 +49,7 @@ module Lolcommits
 
     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}.freeze
 
     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,8 +60,8 @@ 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}\""
 
@@ -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,8 +40,8 @@ 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}\""
 
@@ -49,11 +49,7 @@ module Lolcommits
         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.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/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/configuration.rb

@@ -15,9 +15,11 @@ module Lolcommits
 
     def yaml
       @yaml ||= begin
-        return Hash.new({}) unless File.exist?(configuration_file)
-
-        YAML.safe_load(File.open(configuration_file), [Symbol]) || Hash.new({})
+        if File.exist?(configuration_file)
+          YAML.safe_load(File.open(configuration_file), [Symbol]) || Hash.new({})
+        else
+          Hash.new({})
+        end
       end
     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/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.3"
+  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.10.1')
-  s.add_runtime_dependency('launchy', '~> 2.4.3')
+  s.add_runtime_dependency('mini_magick', '~> 4.11.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.8.1')
 
   # 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.3
 platform: ruby
 authors:
 - Matthew Rothenberg
 - Matthew Hutchinson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2021-01-28 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.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.10.1
+        version: 4.11.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.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: lolcommits-loltext
   requirement: !ruby/object:Gem::Requirement
@@ -257,6 +257,7 @@ files:
 - 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 +304,7 @@ files:
 - vendor/ext/imagesnap/ReadMeOrDont.rtf
 - vendor/ext/imagesnap/imagesnap
 - vendor/ext/videosnap/videosnap
-homepage: 
+homepage:
 licenses:
 - LGPL-3.0
 metadata:
@@ -312,7 +313,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 +330,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - imagemagick
 - a webcam
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Capture webcam image on git commit for lulz.
 test_files: