lolcommits 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab90b1b1498877865fbadb3dbaa2d7d91e04ebbdb37c86df53b10c9afbed0f1a
-  data.tar.gz: 113394c58bc134437e550c9df7517440e67ee719992229b3742a6ac94893f47b
+  metadata.gz: 3b2cf93afdba092609bfaf87753b64447ec8c5280661397281321015da132084
+  data.tar.gz: 3700f1b9711610706ae12f5883a3f58805ebf69cd2409adaa610cd39cb84528d
 SHA512:
-  metadata.gz: 627c014f4972173c1415f4d095ee8bb61b8d6de882b5a6153c3e189529dda25fa641f720a51e937518d65ff413b5120c549c53b2a956e273a845481ed4e4e0a0
-  data.tar.gz: 0c23aba6d8e2598578201a6fa261019f1f6ec269ce3f67944602d34d5114df212298869aba1da6fee15b650c681dee6ac7a1afa7d931bbd5d18460d0976cfa55
+  metadata.gz: 4574138c9544daa67e9285af8a502df5131df7292fa0d5b439f56f5fc6ac2a65e3262e6f4c951943fcaf6bc7162610b6bcc6f225b67b372d2802257fe33fdd21
+  data.tar.gz: 6729da5655425c090468ea7e318fdfb33e46c0ca124b0bccabfbada72f0f520911e30ee5721ac908e91a86dec790289d6244afc1911f36a9169422a1570b04a7

data/.travis.yml

@@ -2,26 +2,24 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.1.10
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - 2.3.8
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
   - ruby-head
 
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+
 before_install:
   # stub mplayer/ffmpeg so it looks like they are installed
   - mkdir -p ~/bin
   - touch ~/bin/mplayer ~/bin/ffmpeg
   - chmod +x ~/bin/mplayer ~/bin/ffmpeg
   - export PATH=~/bin:$PATH
-  - gem update --system
   - git --version
 
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-
 notifications:
   slack:
     secure: BkGsQOYMJqW55j94S1QwmR17BkwuTIULKVhwzRdnv37BvVcC17y9KLMo8NH+bcao36XZx9DukXcTyaDQc6tCSlFEbG/FcPUJM8bx9EWjHUoGVg1KdpVu/nVHu+GKosrB41lM3nfJWCnF0TOSnmTXU+bV8Pwkij+L5X+gNyAT2Ns=

data/CHANGELOG.md

@@ -7,6 +7,16 @@ project adheres to [Semantic Versioning][Semver].
 
   * Your contribution here!
 
+## [0.13.0][] (23 April 2019)
+  * Require at least Ruby 2.3
+  * Upgrade git gem dependency to 1.5.0 (@matthutchinson [#377][])
+  * Upgrade mini_magick gem dependency to 4.9.3 (@matthutchinson [#385][])
+  * Add History and Contributor section to README (@mroth [#385][])
+  * add frozen_string_literal: true comment to all Ruby files
+  * change $PATH override precedence in hooks installers
+  * Updated COC (Contributor Covenant v1.4)
+  * Added PR template
+
 ## [0.12.1][] (27 March 2018)
   * Name passed to `Plugin::Base` initializer (@matthutchinson)
   * Removed dead method `configured? in `Plugin::Base`
@@ -292,7 +302,7 @@ project adheres to [Semantic Versioning][Semver].
 ## 0.1.3 (18 May 2012)
   * add LGPLv3 license
   * add option to translate your commit message to lolspeak! (thx
-    to @DanielleSucher!).  To enable, set `LOLCOMMITS_TRANZLATE=1`.
+    to @DanielleSucher!). To enable, set `LOLCOMMITS_TRANZLATE=1`.
   * fix issue with older versions of IM crashing on interline spacing (pull [#31][] via @german)
   * fix issue with git repos with no hooks directory (pull [#43][] via @mkmaster)
   * fix missing dash in capture -c
@@ -302,7 +312,7 @@ project adheres to [Semantic Versioning][Semver].
   * bundle imagesnap as well to remove a dependency on Mac OS X
 
 ## 0.1.1 (21 April 2012)
-  * Windows compatibility!  Thanks to @Prydonious.
+  * Windows compatibility! Thanks to @Prydonious.
 
 ## 0.1.0 (19 April 2012)
   * Linux compatibility! Thanks to @madjar, @cscorely, and @Prydonius.
@@ -325,7 +335,8 @@ project adheres to [Semantic Versioning][Semver].
   instead of compositing multiply image Caption objects (this seems to be more
   reliable to not glitch.)
 
-[Unreleased]: https://github.com/mroth/lolcommits/compare/v0.12.1...HEAD
+[Unreleased]: https://github.com/mroth/lolcommits/compare/v0.13.0...HEAD
+[0.13.0]: https://github.com/mroth/lolcommits/compare/v0.12.1...v0.13.0
 [0.12.1]: https://github.com/mroth/lolcommits/compare/v0.12.0...v0.12.1
 [0.12.0]: https://github.com/mroth/lolcommits/compare/v0.11.0...v0.12.0
 [0.11.0]: https://github.com/mroth/lolcommits/compare/v0.10.0...v0.11.0
@@ -516,3 +527,6 @@ project adheres to [Semantic Versioning][Semver].
 [#366]: https://github.com/mroth/lolcommits/pull/366
 [#367]: https://github.com/mroth/lolcommits/pull/367
 [#369]: https://github.com/mroth/lolcommits/pull/369
+[#377]: https://github.com/mroth/lolcommits/pull/377
+[#384]: https://github.com/mroth/lolcommits/pull/384
+[#385]: https://github.com/mroth/lolcommits/pull/385

data/CODE_OF_CONDUCT.md

@@ -1,24 +1,41 @@
-# Contributor Code of Conduct
+# Contributor Covenant Code of Conduct
 
-As contributors and maintainers of this project, and in the interest of
-fostering an open and welcoming community, we pledge to respect all people who
-contribute through reporting issues, posting feature requests, updating
-documentation, submitting pull requests or patches, and other activities.
+## Our Pledge
 
-We are committed to making participation in this project a harassment-free
-experience for everyone, regardless of level of experience, gender, gender
-identity and expression, sexual orientation, disability, personal appearance,
-body size, race, ethnicity, age, religion, or nationality.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+education, socio-economic status, nationality, personal appearance, race,
+religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing other's private information, such as physical or electronic
-  addresses, without explicit permission
-* Other unethical or unprofessional conduct
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
 
 Project maintainers have the right and responsibility to remove, edit, or
 reject comments, commits, code, wiki edits, issues, and other contributions
@@ -26,25 +43,31 @@ that are not aligned to this Code of Conduct, or to ban temporarily or
 permanently any contributor for other behaviors that they deem inappropriate,
 threatening, offensive, or harmful.
 
-By adopting this Code of Conduct, project maintainers commit themselves to
-fairly and consistently applying these principles to every aspect of managing
-this project. Project maintainers who do not follow or enforce the Code of
-Conduct may be permanently removed from the project team.
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
 
-This code of conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
+## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting a project maintainer via [GitHub][maintainer]. All
+reported by contacting the project team at matt@hiddenloop.com. All
 complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. Maintainers are
-obligated to maintain confidentiality with regard to the reporter of an
-incident.
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.3.0, available at
-[http://contributor-covenant.org/version/1/3/0/][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
 
-[maintainer]: https://github.com/matthutchinson
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/3/0/
+[homepage]: https://www.contributor-covenant.org

data/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+
+Explain what you're changing and why here.
+
+---
+#### :memo: Checklist
+
+Please check this list and leave it intact for the reviewer. Thanks! :heart:
+
+- [ ] Commit messages provide context (why not just what, some tips [here](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)).
+- [ ] If relevant, mention GitHub issue number above and include in a commit message.
+- [ ] Latest code from master merged.
+- [ ] New behaviour has test coverage.
+- [ ] Avoid duplicating code.
+- [ ] No commented out code.
+- [ ] Avoid comments for your code, write code that explains itself.
+- [ ] Changes are simple, useful, clear and brief.

data/README.md

@@ -9,9 +9,21 @@ By default, the lol images are stored by a Github style short SHA in a
 
 [![Gem Version](https://badge.fury.io/rb/lolcommits.svg)](https://rubygems.org/gems/lolcommits)
 [![Build Status](https://travis-ci.org/mroth/lolcommits.svg?branch=master)](https://travis-ci.org/mroth/lolcommits)
-[![Dependency Status](https://gemnasium.com/mroth/lolcommits.svg)](https://gemnasium.com/mroth/lolcommits)
-[![Maintainability](https://img.shields.io/codeclimate/maintainability/mroth/lolcommits.svg)](https://codeclimate.com/github/mroth/lolcommits/maintainability)
-[![Test Coverage](https://img.shields.io/codeclimate/c/mroth/lolcommits.svg)](https://codeclimate.com/github/mroth/lolcommits/test_coverage)
+[![Depfu](https://img.shields.io/depfu/mroth/lolcommits.svg?style=flat)](https://depfu.com/github/mroth/lolcommits)
+[![Maintainability](https://api.codeclimate.com/v1/badges/9d87301dd4fa2184382c/maintainability)](https://codeclimate.com/github/mroth/lolcommits/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/9d87301dd4fa2184382c/test_coverage)](https://codeclimate.com/github/mroth/lolcommits/test_coverage)
+
+## History
+
+Originally created by [@mroth] in 2011 as a joke project for [Hack && Tell], lolcommits has grown considerably since then, and is now
+primarily maintained by [@matthutchinson].
+
+Thank you to all of the [contributors] throughout the years!
+
+[@mroth]: https://github.com/mroth
+[@matthutchinson]: https://github.com/matthutchinson
+[Hack && Tell]: https://hackandtell.org
+[contributors]: https://github.com/mroth/lolcommits/graphs/contributors
 
 ## Sample images
 

data/Rakefile

@@ -42,8 +42,8 @@ Cucumber::Rake::Task.new(:features) do |t|
 end
 
 Rake::RDocTask.new do |rd|
-  rd.main = 'README.rdoc'
-  rd.rdoc_files.include('README.rdoc', 'lib/**/*.rb', 'bin/**/*')
+  rd.main = 'README.md'
+  rd.rdoc_files.include('README.md', 'lib/**/*.rb', 'bin/**/*')
 end
 
 require 'rubocop/rake_task'

data/bin/lolcommits

@@ -196,6 +196,7 @@ class App
         return
       end
       return if VCSInfo.repo_root?
+
       Dir.chdir(nxt)
     end
   end

data/features/step_definitions/lolcommits_steps.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'aruba/api'
 

data/features/support/env.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'aruba/cucumber'
 require 'methadone/cucumber'
 require 'open3'

data/features/support/path_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'aruba/api'
 require 'lolcommits/platform'

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

@@ -1,10 +1,11 @@
-# need to use popen3 on windows - popen4 always eventually calls fork
-if Lolcommits::Platform.platform_windows?
+# frozen_string_literal: true
 
+if Lolcommits::Platform.platform_windows?
   module Mercurial
     class Command
       private
 
+      # need to use popen3 on windows - popen4 always eventually calls fork
       def execution_proc
         proc do
           debug(command)

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

@@ -1,6 +1,8 @@
-# windows command line doesn't like single quotes
+# frozen_string_literal: true
+
 module Mercurial
   class Shell
+    # 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

data/lib/lolcommits.rb

@@ -1,9 +1,8 @@
-$LOAD_PATH.unshift File.expand_path('.')
+# frozen_string_literal: true
 
-require 'core_ext/hash/hash_dig' # backport Hash#dig for Ruby < 2.3
+$LOAD_PATH.unshift File.expand_path('.')
 
 require 'mini_magick'
-require 'core_ext/mini_magick/utilities'
 require 'fileutils'
 require 'git'
 require 'open3'

data/lib/lolcommits/backends/git_info.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Lolcommits
   class GitInfo
-    GIT_URL_REGEX = %r{.*[:]([\/\w\-]*).git}
+    GIT_URL_REGEX = %r{.*[:]([\/\w\-]*).git}.freeze
 
     def self.repo_root?(path = '.')
       File.directory?(File.join(path, '.git'))

data/lib/lolcommits/backends/installation_git.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   #
   # Methods to handle enabling and disabling of lolcommits
@@ -61,17 +63,17 @@ module Lolcommits
       ruby_path     = Lolcommits::Platform.command_which('ruby', true)
       imagick_path  = Lolcommits::Platform.command_which('identify', true)
       capture_cmd   = "if [ ! -d \"$GIT_DIR/rebase-merge\" ] && [ \"$LOLCOMMITS_CAPTURE_DISABLED\" != \"true\" ]; then lolcommits --capture #{capture_args}; fi"
-      exports       = "LANG=\"#{ENV['LANG']}\" && PATH=\"#{ruby_path}:#{imagick_path}:$PATH\""
+      exports       = "LANG=\"#{ENV['LANG']}\" && PATH=\"$PATH:#{ruby_path}:#{imagick_path}\""
 
       if Lolcommits::Platform.platform_windows?
-        exports = "set path=\"#{ruby_path};#{imagick_path};%PATH%\""
+        exports = "set path=\"%PATH%;#{ruby_path};#{imagick_path}\""
       end
 
       <<-HOOK
-### lolcommits hook (begin) ###
-#{exports} && #{capture_cmd}
-###  lolcommits hook (end)  ###
-HOOK
+        ### lolcommits hook (begin) ###
+        #{exports} && #{capture_cmd}
+        ###  lolcommits hook (end)  ###
+      HOOK
     end
 
     # does a git hook exist at all?

data/lib/lolcommits/backends/installation_mercurial.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   #
   # Methods to handle enabling and disabling of lolcommits
@@ -41,13 +43,17 @@ module Lolcommits
       ruby_path     = Lolcommits::Platform.command_which('ruby', true)
       imagick_path  = Lolcommits::Platform.command_which('identify', true)
       capture_cmd   = "if [ \"$LOLCOMMITS_CAPTURE_DISABLED\" != \"true\" ]; then lolcommits --capture #{capture_args}; fi"
-      exports       = "LANG=\"#{ENV['LANG']}\" && PATH=\"#{ruby_path}:#{imagick_path}:$PATH\""
+      exports       = "LANG=\"#{ENV['LANG']}\" && PATH=\"$PATH:#{ruby_path}:#{imagick_path}\""
 
       if Lolcommits::Platform.platform_windows?
-        exports = "set path=\"#{ruby_path};#{imagick_path};%PATH%\""
+        exports = "set path=\"%PATH%;#{ruby_path};#{imagick_path}\""
       end
 
-      "#{exports} && #{capture_cmd}"
+      <<-HOOK
+        ### lolcommits hook (begin) ###
+        #{exports} && #{capture_cmd}
+        ###  lolcommits hook (end)  ###
+      HOOK
     end
 
     def self.repository

data/lib/lolcommits/backends/mercurial_info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   class MercurialInfo
     def self.repo_root?(path = '.')

data/lib/lolcommits/capturer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   class Capturer
     attr_accessor :capture_device, :capture_delay, :snapshot_location,

data/lib/lolcommits/capturer/capture_cygwin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   class CaptureCygwin < Capturer
     def capture

data/lib/lolcommits/capturer/capture_fake.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   class CaptureFake < Capturer
     def capture

data/lib/lolcommits/capturer/capture_linux.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   class CaptureLinux < Capturer
     MPLAYER_FPS = 25

data/lib/lolcommits/capturer/capture_linux_animated.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   class CaptureLinuxAnimated < Capturer
     def capture
@@ -8,6 +10,7 @@ module Lolcommits
       # capture the raw video with ffmpeg video4linux2
       system_call "ffmpeg -v quiet -y -f video4linux2 -video_size 320x240 -i #{capture_device_string} -t #{capture_duration} \"#{video_location}\" > /dev/null"
       return unless File.exist?(video_location)
+
       # convert raw video to png frames with ffmpeg
       system_call "ffmpeg #{capture_delay_string} -v quiet -i \"#{video_location}\" -t #{animated_duration} \"#{frames_location}/%09d.png\" > /dev/null"
 

data/lib/lolcommits/capturer/capture_mac.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   class CaptureMac < Capturer
     def capture_device_string

data/lib/lolcommits/capturer/capture_mac_animated.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   class CaptureMacAnimated < Capturer
     def capture
@@ -8,6 +10,7 @@ module Lolcommits
       # capture the raw video with videosnap
       system_call "#{executable_path} -s 240 #{capture_device_string}#{capture_delay_string}-t #{animated_duration} --no-audio \"#{video_location}\" > /dev/null"
       return unless File.exist?(video_location)
+
       # get fps for ffmpeg output stream configuration
       fps = video_fps(video_location)
       # convert raw video to png frames with ffmpeg

data/lib/lolcommits/capturer/capture_windows.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   class CaptureWindows < Capturer
     def capture

data/lib/lolcommits/capturer/capture_windows_animated.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   class CaptureWindowsAnimated < Capturer
     def capture
@@ -12,6 +14,7 @@ module Lolcommits
       system_call "ffmpeg -v quiet -y -f dshow -i video=\"#{capture_device_string}\" -video_size 320x240 -t #{capture_duration} \"#{video_location}\" > NUL"
 
       return unless File.exist?(video_location)
+
       # convert raw video to png frames with ffmpeg
       system_call "ffmpeg #{capture_delay_string} -v quiet -i \"#{video_location}\" -t #{animated_duration} \"#{frames_location}/%09d.png\" > NUL"
 
@@ -48,6 +51,7 @@ module Lolcommits
           cmd_output = system_call(ffpmeg_list_devices_cmd, true)
           count += 1
           raise 'failed to find a video capture device with ffmpeg -list_devices' if count == 5
+
           sleep 0.1
         end
         cmd_output.gsub!("\r\n", "\n")

data/lib/lolcommits/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lolcommits/cli/fatals'
 require 'lolcommits/cli/launcher'
 require 'lolcommits/cli/process_runner'

data/lib/lolcommits/cli/fatals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lolcommits/platform'
 require 'methadone'
 
@@ -16,6 +18,7 @@ module Lolcommits
         if Platform.platform_mac?
           %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, "\
                   'please file a bug?!'
             exit 1
@@ -36,6 +39,7 @@ 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 "Try setting it to 'auto' instead!"
@@ -47,6 +51,7 @@ module Lolcommits
       # this when you know the user wants to perform one of them.
       def self.die_if_no_valid_ffmpeg_installed!
         return if Platform.valid_ffmpeg_installed?
+
         fatal 'FATAL: ffmpeg does not appear to be properly installed!'
         exit 1
       end
@@ -59,6 +64,7 @@ module Lolcommits
         parent = File.dirname(current)
         while current != parent
           return if VCSInfo.repo_root?(current)
+
           current = parent
           parent = File.dirname(current)
         end

data/lib/lolcommits/cli/launcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'launchy'
 
 module Lolcommits

data/lib/lolcommits/cli/process_runner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   module CLI
     # Helper class for forking lolcommits process to the background (or not).

data/lib/lolcommits/cli/timelapse_gif.rb

@@ -1,5 +1,6 @@
-require 'lolcommits/cli/fatals'
+# frozen_string_literal: true
 
+require 'lolcommits/cli/fatals'
 require 'mini_magick'
 
 module Lolcommits

data/lib/lolcommits/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   class Configuration
     LOLCOMMITS_BASE = ENV['LOLCOMMITS_DIR'] || File.join(ENV['HOME'], '.lolcommits')
@@ -14,6 +16,7 @@ module Lolcommits
     def yaml
       @yaml ||= begin
         return Hash.new({}) unless File.exist?(configuration_file)
+
         YAML.safe_load(File.open(configuration_file), [Symbol]) || Hash.new({})
       end
     end
@@ -24,6 +27,7 @@ module Lolcommits
 
     def loldir
       return @loldir if @loldir
+
       basename ||= if VCSInfo.repo_root?
                      VCSInfo.local_name
                    else

data/lib/lolcommits/gem_plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   class GemPlugin
     attr_accessor :gem_spec, :required

data/lib/lolcommits/installation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   #
   # Methods to handle enabling and disabling of lolcommits
@@ -42,6 +44,7 @@ module Lolcommits
     def self.extract_capture_args(options)
       options.map do |k, v|
         next unless %w(device animate delay stealth fork).include?(k)
+
         if k == 'device'
           "--device '#{v}'"
         else

data/lib/lolcommits/platform.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mini_magick'
 require 'rbconfig'
 
@@ -61,7 +63,9 @@ module Lolcommits
     # @return Boolean
     def self.valid_imagemagick_installed?
       return false unless command_which('identify')
+
       return false unless command_which('mogrify')
+
       # cli_version check will throw a MiniMagick::Error exception if IM is not
       # installed in PATH, since it attempts to parse output from `identify`
       !MiniMagick.cli_version.nil?
@@ -118,6 +122,7 @@ module Lolcommits
     def self.device_list
       # TODO: handle other platforms here (linux/windows) e.g with ffmpeg -list_devices
       return unless Platform.platform_mac?
+
       capturer = Lolcommits::CaptureMacAnimated.new
       `#{capturer.executable_path} -l`
     end

data/lib/lolcommits/plugin/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lolcommits/plugin/configuration_helper'
 
 module Lolcommits
@@ -75,11 +77,13 @@ module Lolcommits
       # dont puts or print if the runner wants to be silent (stealth mode)
       def puts(*args)
         return if runner && runner.capture_stealth
+
         super(*args)
       end
 
       def print(*args)
         return if runner && runner.capture_stealth
+
         super(*args)
       end
 

data/lib/lolcommits/plugin/configuration_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   module Plugin
     module ConfigurationHelper
@@ -43,6 +45,7 @@ module Lolcommits
 
         while (line = Readline.readline(prompt, true).strip)
           return line if words.include?(line)
+
           puts "'#{line}' not found"
         end
       end

data/lib/lolcommits/plugin_manager.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Lolcommits
   class PluginManager
-    GEM_NAME_PREFIX = /^lolcommits-/
+    GEM_NAME_PREFIX = /^lolcommits-/.freeze
 
     def self.init
       pm = new

data/lib/lolcommits/runner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lolcommits/platform'
 
 module Lolcommits
@@ -12,6 +14,7 @@ module Lolcommits
       end
 
       return unless sha.nil? || message.nil?
+
       if GitInfo.repo_root?
         self.vcs_info = GitInfo.new
       elsif MercurialInfo.repo_root?

data/lib/lolcommits/test_helpers/fake_io.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   module TestHelpers
     module FakeIO

data/lib/lolcommits/test_helpers/git_repo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   module TestHelpers
     module GitRepo
@@ -19,6 +21,7 @@ module Lolcommits
 
       def setup_repo
         return if repo_exists?
+
         `git init --quiet #{repo_path}`
       end
 
@@ -31,6 +34,7 @@ module Lolcommits
 
       def in_repo
         return unless repo_exists?
+
         Dir.chdir(File.expand_path(repo_path)) do
           yield
         end

data/lib/lolcommits/vcs_info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lolcommits
   class VCSInfo
     def self.repo_root?(path = '.')

data/lib/lolcommits/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module Lolcommits
-  VERSION  = '0.12.1'.freeze
+  VERSION  = '0.13.0'.freeze
   GEM_NAME = 'lolcommits'.freeze
 end

data/lolcommits.gemspec

@@ -8,7 +8,6 @@ Gem::Specification.new do |s|
 
   s.authors     = ['Matthew Rothenberg', 'Matthew Hutchinson']
   s.email       = ['mrothenberg@gmail.com', 'matt@hiddenloop.com']
-  s.homepage    = 'http://mroth.github.com/lolcommits/'
   s.license     = 'LGPL-3'
   s.summary     = 'Capture webcam image on git commit for lulz.'
 
@@ -16,7 +15,15 @@ Gem::Specification.new do |s|
   lolcommits takes a snapshot with your webcam every time you git commit code,
   and archives a lolcat style image with it. It's selfies for software
   developers. `git blame` has never been so much fun.
-DESC
+  DESC
+
+  s.metadata = {
+    'homepage_uri' => 'https://lolcommits.github.io',
+    'source_code_uri' => 'https://github.com/mroth/lolcommits',
+    'changelog_uri' => 'https://github.com/mroth/lolcommits/blob/master/CHANGELOG.md',
+    'bug_tracker_uri' => 'https://github.com/mroth/lolcommits/issues',
+    'allowed_push_host' => 'https://rubygems.org'
+  }
 
   s.post_install_message = <<-POSTINSTALL
   -------------------------------------------------------------------------------
@@ -36,7 +43,7 @@ DESC
   Happy Lol'ing!
 
   -------------------------------------------------------------------------------
-POSTINSTALL
+  POSTINSTALL
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -44,17 +51,17 @@ POSTINSTALL
   s.require_paths = ['lib']
 
   # non-gem dependencies
-  s.required_ruby_version = '>= 2.1'
+  s.required_ruby_version = '>= 2.3'
   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.8.0')
+  s.add_runtime_dependency('mini_magick', '~> 4.9.3')
   s.add_runtime_dependency('launchy', '~> 2.4.3')
   s.add_runtime_dependency('open4', '~> 1.3.4')
-  s.add_runtime_dependency('git', '~> 1.3.0')
+  s.add_runtime_dependency('git', '~> 1.5.0')
 
   # included plugins
   s.add_runtime_dependency('lolcommits-loltext', '~> 0.0.5')

data/test/permissions_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 class PermissionsTest < Minitest::Test
@@ -10,11 +12,8 @@ class PermissionsTest < Minitest::Test
     videosnap_perms  = File.lstat(File.join(Lolcommits::Configuration::LOLCOMMITS_ROOT, 'vendor', 'ext', 'videosnap', 'videosnap')).mode & 0o777
     commandcam_perms = File.lstat(File.join(Lolcommits::Configuration::LOLCOMMITS_ROOT, 'vendor', 'ext', 'CommandCam', 'CommandCam.exe')).mode & 0o777
 
-    assert imagesnap_perms == 0o755 || imagesnap_perms == 0o775,
-           "expected perms of 755/775 but instead got #{format '%<perms>o', perms: imagesnap_perms}"
-    assert videosnap_perms == 0o755 || videosnap_perms == 0o775,
-           "expected perms of 755/775 but instead got #{format '%<perms>o', perms: videosnap_perms}"
-    assert commandcam_perms == 0o755 || commandcam_perms == 0o775,
-           "expected perms of 755/775 but instead got #{format '%<perms>o', perms: commandcam_perms}"
+    assert [0o755, 0o775].include?(imagesnap_perms), "expected perms of 755/775 but instead got #{format '%<perms>o', perms: imagesnap_perms}"
+    assert [0o755, 0o775].include?(videosnap_perms), "expected perms of 755/775 but instead got #{format '%<perms>o', perms: videosnap_perms}"
+    assert [0o755, 0o775].include?(commandcam_perms), "expected perms of 755/775 but instead got #{format '%<perms>o', perms: commandcam_perms}"
   end
 end

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if ENV['COVERAGE']
   require 'simplecov'
   SimpleCov.start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Matthew Rothenberg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2019-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: 4.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: 4.9.3
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: lolcommits-loltext
   requirement: !ruby/object:Gem::Requirement
@@ -245,6 +245,7 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
+- PULL_REQUEST_TEMPLATE.md
 - README.md
 - Rakefile
 - appveyor.yml
@@ -256,10 +257,8 @@ files:
 - features/step_definitions/lolcommits_steps.rb
 - features/support/env.rb
 - features/support/path_helpers.rb
-- lib/core_ext/hash/hash_dig.rb
 - lib/core_ext/mercurial-ruby/command.rb
 - lib/core_ext/mercurial-ruby/shell.rb
-- lib/core_ext/mini_magick/utilities.rb
 - lib/lolcommits.rb
 - lib/lolcommits/backends/git_info.rb
 - lib/lolcommits/backends/installation_git.rb
@@ -285,7 +284,6 @@ files:
 - lib/lolcommits/platform.rb
 - lib/lolcommits/plugin/base.rb
 - lib/lolcommits/plugin/configuration_helper.rb
-- lib/lolcommits/plugin/lol_yammer.rb
 - lib/lolcommits/plugin_manager.rb
 - lib/lolcommits/runner.rb
 - lib/lolcommits/test_helpers/fake_io.rb
@@ -302,10 +300,15 @@ files:
 - vendor/ext/imagesnap/ReadMeOrDont.rtf
 - vendor/ext/imagesnap/imagesnap
 - vendor/ext/videosnap/videosnap
-homepage: http://mroth.github.com/lolcommits/
+homepage: 
 licenses:
 - LGPL-3
-metadata: {}
+metadata:
+  homepage_uri: https://lolcommits.github.io
+  source_code_uri: https://github.com/mroth/lolcommits
+  changelog_uri: https://github.com/mroth/lolcommits/blob/master/CHANGELOG.md
+  bug_tracker_uri: https://github.com/mroth/lolcommits/issues
+  allowed_push_host: https://rubygems.org
 post_install_message: |2
     -------------------------------------------------------------------------------
 
@@ -331,7 +334,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -340,17 +343,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - imagemagick
 - a webcam
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Capture webcam image on git commit for lulz.
-test_files:
-- features/bugs.feature
-- features/lolcommits.feature
-- features/step_definitions/lolcommits_steps.rb
-- features/support/env.rb
-- features/support/path_helpers.rb
-- test/images/test_image.jpg
-- test/permissions_test.rb
-- test/test_helper.rb
+test_files: []

data/lib/core_ext/hash/hash_dig.rb

@@ -1,21 +0,0 @@
-# Backport Hash#dig to Ruby < 2.3
-# inspired by https://github.com/Invoca/ruby_dig
-
-module HashDig
-  def dig(key, *rest)
-    value = self[key]
-    if value.nil? || rest.empty?
-      value
-    elsif value.respond_to?(:dig)
-      value.dig(*rest)
-    else
-      raise TypeError, "#{value.class} does not have #dig method"
-    end
-  end
-end
-
-if RUBY_VERSION < '2.3'
-  class Hash
-    include HashDig
-  end
-end

data/lib/core_ext/mini_magick/utilities.rb

@@ -1,14 +0,0 @@
-# To maintain MiniMagick compatibility on Windows for v3.8.1 we need this patch
-# If/when we upgrade MiniMagick to 4.2+ this patch can be removed
-# We are locked at v3.8.1 since MiniMagick 4+ dropped support for Ruby 1.8.7
-module MiniMagick
-  module Utilities
-    class << self
-      # fixes issue introduced in this commit
-      # https://github.com/minimagick/minimagick/commit/65b6427395cbfe6
-      def windows_escape(cmdline)
-        '"' + cmdline.gsub(/\\(?=\\*\")/, '\\\\\\').gsub(/\"/, '\\"').gsub(/\\$/, '\\\\\\').gsub('%', '%%') + '"'
-      end
-    end
-  end
-end