lolcommits 0.15.0 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4f33742b052d7ef499ed1ebd967fec77ebbe4e52a76eca2675e2f540ee2b115
-  data.tar.gz: 958254d97dcf9a965bb8e57a8c651ddbc766ebf240ad51f0e542bd24efd97251
+  metadata.gz: 164b3de849954edf608d49789f55504eb4b64a5e9a75eaa543536e22cf7ee354
+  data.tar.gz: 566c9199274b5fb28501daa75ffccf0366ec58079ebb8f7b544b0d605a4991c4
 SHA512:
-  metadata.gz: 480d203c87991f45be26489355729b8ff5073ffc6b248061e2e717515c2c868ccab3bc808aa3b8d36646eac78f4a76b64f6a64354d63d970da1a8dc49d1ac6da
-  data.tar.gz: 86ae68a15665cd07ee7163e519ea8b6c17e57a1e70ac55c82d34d69128cc32177439688121e42ae5460cfeebdbecb14575dd579c135ddcbd6463451265b17940
+  metadata.gz: 213a07bd6e7e6072de06247805da3f390d465d873dd4174e70337cf324a3c6b697209ebb4c42de7c7cbab065fd9cd3f7417bf9a830ac58d50209f96bcec24fe5
+  data.tar.gz: 12acf1920f4901338887f8363a8500a92444d7072650c420683b27021f621bcbfd06d47c882088b603bb31bdf18f3afbf0c7f9326b9bc99626286401579dcf9f

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,10 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
+  - 2.7.1
   - ruby-head
 
 matrix:

data/CHANGELOG.md

@@ -7,6 +7,21 @@ This project adheres to [Semantic Versioning][Semver].
 
   * Your contribution here!
 
+## [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][])
+
 ## [0.15.0][] (20 May 2019)
   * require at least lolcommits-loltext `>= 0.3.0` (@matthutchinson)
   * remove `main_image` method, plugins should use `lolcommit_path` on
@@ -32,7 +47,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
@@ -46,7 +61,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)
@@ -363,7 +378,11 @@ This project adheres to [Semantic Versioning][Semver].
   reliable to not glitch.)
 
 [Semver]: http://semver.org
-[Unreleased]: https://github.com/lolcommits/lolcommits/compare/v0.15.0...HEAD
+[Unreleased]: https://github.com/lolcommits/lolcommits/compare/v0.16.2...HEAD
+[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
@@ -564,3 +583,10 @@ This project adheres to [Semantic Versioning][Semver].
 [#385]: https://github.com/lolcommits/lolcommits/pull/385
 [#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

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}"
@@ -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/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/platform.rb

@@ -123,8 +123,8 @@ module Lolcommits
       # TODO: handle other platforms here (linux/windows) e.g with ffmpeg -list_devices
       return unless Platform.platform_mac?
 
-      capturer = Lolcommits::CaptureMacVideo.new
-      `#{capturer.executable_path} -l`
+      videosnap = File.join(Configuration::LOLCOMMITS_ROOT, 'vendor', 'ext', 'videosnap', 'videosnap')
+      `#{videosnap} -l`
     end
   end
 end

data/lib/lolcommits/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Lolcommits
-  VERSION  = '0.15.0'
+  VERSION  = '0.16.2'
   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('mini_magick', '~> 4.10.1')
   s.add_runtime_dependency('launchy', '~> 2.4.3')
   s.add_runtime_dependency('open4', '~> 1.3.4')
-  s.add_runtime_dependency('git', '~> 1.5.0')
+  s.add_runtime_dependency('git', '~> 1.6.0')
 
   # 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')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.2
 platform: ruby
 authors:
 - Matthew Rothenberg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.9.3
+        version: 4.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.9.3
+        version: 4.10.1
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -87,28 +87,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !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
@@ -320,7 +320,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 +329,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - imagemagick
 - a webcam
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 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