lolcommits 0.15.1 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e82514359cfc87aedfb9c139d4f2dcb380b2d5fd86081e012b2fe3feb27a04a7
-  data.tar.gz: d3f10669c8723cba11309df12c0ce1aeafd8dfb8ef80f98abe975ad4ad4d4531
+  metadata.gz: 3b77f42634dc21e58f7c16311a6da2ddd82b957d97e3433b66622fdd5a4fac71
+  data.tar.gz: 19b7b1eb0f9a8f33712e0dd74fe4f99c1d2e83f444a292b0f75099e1545fb509
 SHA512:
-  metadata.gz: c90be17ef828f988227cb40bbf5cba1f3660216fd850ba0b08a9d48ac67b1f8d659b9eb3ba3f238b37b6143e3a30782421698b2765684de8678e51156e30d593
-  data.tar.gz: e663c70ac161697c01bb02673415cc9883d2c3165811821d56e888147d72b67708cbdb1abdbbb2a4918781c580b3a5493042ab2e9dcd85a7b5a6a4a4acebdea0
+  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/.rubocop_todo.yml

@@ -1,52 +1,68 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-12-13 17:09:06 +0000 using RuboCop version 0.52.0.
+# on 2020-01-20 22:28:11 +0000 using RuboCop version 0.79.0.
 # 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: 7
+# Offense count: 6
 # Cop supports --auto-correct.
-# Configuration parameters: Include, TreatCommentsAsGroupSeparators.
+# 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: auto_detection, squiggly, active_support, powerpack, unindent
-Layout/IndentHeredoc:
+# SupportedStyles: squiggly, active_support, powerpack, unindent
+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
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'lib/lolcommits/cli/process_runner.rb'
 
-# Offense count: 19
+# Offense count: 18
 Metrics/AbcSize:
   Max: 35
 
-# Offense count: 1
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/BlockLength:
-  Max: 40
-
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 150
+  Max: 144
 
 # Offense count: 5
 Metrics/CyclomaticComplexity:
   Max: 10
 
-# Offense count: 23
-# Configuration parameters: CountComments.
+# Offense count: 21
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 24
 
@@ -54,23 +70,20 @@ Metrics/MethodLength:
 Metrics/PerceivedComplexity:
   Max: 10
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Security/YAMLLoad:
-  Exclude:
-    - 'lib/lolcommits/configuration.rb'
-
 # Offense count: 25
 Style/Documentation:
   Enabled: false
 
-# Offense count: 5
+# Offense count: 20
+# Cop supports --auto-correct.
+Style/ExpandPathArguments:
+  Enabled: false
+
+# Offense count: 2
 Style/MixinUsage:
   Exclude:
     - 'Rakefile'
-    - 'bin/lolcommits'
     - 'features/support/env.rb'
-    - 'test/lolcommits_test.rb'
 
 # Offense count: 5
 # Cop supports --auto-correct.
@@ -85,13 +98,28 @@ Style/PercentLiteralDelimiters:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: MinSize.
-# SupportedStyles: percent, brackets
-Style/SymbolArray:
-  EnforcedStyle: brackets
+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: 90
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Offense count: 166
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Enabled: false
+
+# Offense count: 120
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
-Metrics/LineLength:
-  Max: 168
+Layout/LineLength:
+  Max: 198

data/.travis.yml

@@ -2,10 +2,11 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
+  - 3.0.0
   - ruby-head
 
 matrix:

data/CHANGELOG.md

@@ -7,6 +7,25 @@ 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][])
+  * Upgrade lolcommits-loltext to version 0.4.0 (@depfu [#401][])
+
+## [0.16.1][] (21 Jan 2020)
+  * Upgrade mini_magick to version 4.10.1 (@depfu [#399][])
+  * Fix rubocop config (@Salzig [#400][])
+
+## [0.16.0][] (21 Oct 2019)
+  * update macOS binaries for Catalina support (@matthutchinson, @samwize [#398][])
+
 ## [0.15.1][] (6 Jun 2019)
   * fix device list command (@matthutchinson [#394][])
 
@@ -35,7 +54,7 @@ This project adheres to [Semantic Versioning][Semver].
   * Update all links and badges (in gemspec, README etc.) to lolcommits
     organisation (@matthutchinson)
   * remove gem `post_install` message (@matthutchinson)
-  * use `lolcommits-loltext ~> 0.1.0' (@matthutchinson)
+  * use `lolcommits-loltext ~> 0.1.0` (@matthutchinson)
 
 ## [0.13.0][] (23 April 2019)
   * Require at least Ruby 2.3
@@ -49,7 +68,7 @@ This project adheres to [Semantic Versioning][Semver].
 
 ## [0.12.1][] (27 March 2018)
   * Name passed to `Plugin::Base` initializer (@matthutchinson)
-  * Removed dead method `configured? in `Plugin::Base`
+  * Removed dead method `configured?` in `Plugin::Base`
   * Using `YAML.safe_load` for configuration loading
 
 ## [0.12.0][] (15 March 2018)
@@ -366,8 +385,12 @@ This project adheres to [Semantic Versioning][Semver].
   reliable to not glitch.)
 
 [Semver]: http://semver.org
-[Unreleased]: https://github.com/lolcommits/lolcommits/compare/v0.15.1...HEAD
-[0.15.0]: https://github.com/lolcommits/lolcommits/compare/v0.15.0...v0.15.1
+[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
+[0.15.1]: https://github.com/lolcommits/lolcommits/compare/v0.15.0...v0.15.1
 [0.15.0]: https://github.com/lolcommits/lolcommits/compare/v0.14.1...v0.15.0
 [0.14.2]: https://github.com/lolcommits/lolcommits/compare/v0.14.1...v0.14.2
 [0.14.1]: https://github.com/lolcommits/lolcommits/compare/v0.14.0...v0.14.1
@@ -569,3 +592,10 @@ This project adheres to [Semantic Versioning][Semver].
 [#386]: https://github.com/lolcommits/lolcommits/pull/386
 [#392]: https://github.com/lolcommits/lolcommits/pull/392
 [#394]: https://github.com/lolcommits/lolcommits/pull/394
+[#398]: https://github.com/lolcommits/lolcommits/pull/398
+[#399]: https://github.com/lolcommits/lolcommits/pull/399
+[#400]: https://github.com/lolcommits/lolcommits/pull/400
+[#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/config/cucumber.yml

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

data/features/lolcommits.feature

@@ -63,15 +63,6 @@ Feature: Basic UI functionality
     And a file named ".git/hooks/post-commit" should exist
     And the exit status should be 0
 
-  Scenario: Trying to enable while not in a git repo fails
-    Given I am in a directory named "svnrulez"
-    When I run `lolcommits --enable`
-    Then the output should contain:
-      """
-      You don't appear to be in the base directory of a supported vcs project.
-      """
-    And the exit status should be 1
-
   # flakey test sometimes fails
   # Scenario: Capture doesnt break in forked mode
   #   Given I am in a git repo named "forked"
@@ -160,8 +151,17 @@ Feature: Basic UI functionality
       """
     And the exit status should be 0
 
-  @no-repo-dir
+  Scenario: Trying to enable while not in a git repo fails
+    Given I am not in a git repo
+    When I run `lolcommits --enable`
+    Then the output should contain:
+      """
+      You don't appear to be in the base directory of a supported vcs project.
+      """
+    And the exit status should be 1
+
   Scenario: last command should fail gracefully if not in a repo
+    Given I am not in a git repo
     When I run `lolcommits --last`
     Then the output should contain:
       """
@@ -169,8 +169,8 @@ Feature: Basic UI functionality
       """
     And the exit status should be 1
 
-  @no-repo-dir
   Scenario: Configuring loltext plugin if not in a repo
+    Given I am not in a git repo
     When I run `lolcommits --config`
     Then the output should contain:
       """
@@ -178,8 +178,8 @@ Feature: Basic UI functionality
       """
     And the exit status should be 1
 
-  @no-repo-dir
   Scenario: browse command should fail gracefully when not in a repo
+    Given I am not in a git repo
     When I run `lolcommits --browse`
     Then the output should contain:
       """

data/features/step_definitions/lolcommits_steps.rb

@@ -45,6 +45,14 @@ Given(/^I am in a git repo$/) do
     )
 end
 
+Given(/^I am not in a git repo/) do
+  steps %(
+    Given I cd to "/tmp"
+    And a directory named "lolcommits_no_repo"
+    And I cd to "lolcommits_no_repo"
+    )
+end
+
 Given(/^I am in a git repo named "(.*?)" with lolcommits enabled$/) do |repo|
   steps %(
     Given I am in a git repo named "#{repo}"
@@ -58,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:
       """
@@ -67,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}"
     )
@@ -111,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:
       """
@@ -120,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}"
     )
@@ -146,8 +154,8 @@ Given(/^a loldir named "(.*?)" with (\d+) lolimages$/) do |repo, num_images|
   loldir = expand_path("~/.lolcommits/#{repo}")
   FileUtils.mkdir_p loldir
   num_images.to_i.times do
-    hex = format('%011x', (rand * 0xfffffffffff)).to_s
-    FileUtils.cp 'test/assets/test_image.jpg', File.join(loldir, "#{hex}.jpg")
+    sha = format('%<hex>x', hex: (rand * 0xfffffffffff))
+    FileUtils.cp 'test/assets/test_image.jpg', File.join(loldir, "#{sha}.jpg")
   end
 end
 

data/features/support/env.rb

@@ -13,6 +13,8 @@ World(PathHelpers)
 
 Aruba.configure do |config|
   config.exit_timeout = 20
+  # allow absolute paths for tests involving no repo
+  config.allow_absolute_paths = true
 end
 
 Before do
@@ -52,21 +54,3 @@ end
 Before('@fake-no-ffmpeg') do
   reject_paths_with_cmd('ffmpeg')
 end
-
-# do test in a new temp directory (outside our own git repo-ness)
-# due to https://github.com/cucumber/aruba/issues/478 aruba no longer allows
-# wandering out of `tmp/aruba` so this pop/restore is necessary
-Before('@no-repo-dir') do
-  @original_root = aruba.root_directory.pop
-  @original_dir  = aruba.current_directory.pop
-  @working_dir   = Dir.mktmpdir
-  aruba.current_directory << @working_dir
-end
-
-After('@no-repo-dir') do
-  aruba.current_directory.pop
-  aruba.root_directory << @original_root
-  aruba.current_directory << @original_dir
-
-  FileUtils.rm_rf(@working_dir)
-end

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_linux_video.rb

@@ -3,7 +3,7 @@
 module Lolcommits
   class CaptureLinuxVideo < Capturer
     def capture
-      system_call "ffmpeg -nostats -v quiet -y -f video4linux2 -video_size 640x480 -i #{capture_device_string} -t #{capture_duration} \"#{capture_path}\" > /dev/null"
+      system_call "ffmpeg -nostats -v quiet -y -f video4linux2 -video_size 640x480 -i #{capture_device_string} -t #{capture_duration} -ss #{capture_delay || 0} \"#{capture_path}\" > /dev/null"
     end
 
     private

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.15.1'
-  GEM_NAME = 'lolcommits'
+  VERSION  = "0.16.3"
+  GEM_NAME = "lolcommits"
 end

data/lolcommits.gemspec

@@ -33,20 +33,20 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   # non-gem dependencies
-  s.required_ruby_version = '>= 2.3'
+  s.required_ruby_version = '>= 2.4'
   s.requirements << 'imagemagick'
   s.requirements << 'a webcam'
 
   # 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.9.3')
-  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.5.0')
+  s.add_runtime_dependency('git', '~> 1.8.1')
 
   # included plugins
-  s.add_runtime_dependency('lolcommits-loltext', '~> 0.3.0')
+  s.add_runtime_dependency('lolcommits-loltext', '~> 0.4.0')
 
   # development & test gems
   s.add_development_dependency('aruba')

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.15.1
+  version: 0.16.3
 platform: ruby
 authors:
 - Matthew Rothenberg
 - Matthew Hutchinson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-06 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.9.3
+        version: 4.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.9.3
+        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,28 +87,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: lolcommits-loltext
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: aruba
   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
@@ -320,7 +321,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -329,9 +330,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - imagemagick
 - a webcam
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Capture webcam image on git commit for lulz.
-test_files: []
+test_files:
+- features/bugs.feature
+- features/lolcommits.feature
+- features/step_definitions/lolcommits_steps.rb
+- features/support/env.rb
+- features/support/path_helpers.rb
+- test/assets/test_image.jpg
+- test/assets/test_video.mp4
+- test/images/test_image.jpg
+- test/permissions_test.rb
+- test/test_helper.rb