lolcommits 0.17.2 → 0.17.3

data/bin/cucumber

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'cucumber' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("cucumber", "cucumber")

data/bin/lolcommits

@@ -1,22 +1,12 @@
 #!/usr/bin/env ruby
 
-begin
-  require 'lolcommits'
-rescue LoadError
-  require 'rubygems'
-  require 'lolcommits'
-end
-
-require 'optparse'
-require 'optparse_plus'
-require 'lolcommits/cli.rb'
+require 'lolcommits'
 
 # allow logging from everywhere
 include OptparsePlus::CLILogging
 
 class App
   include OptparsePlus::Main
-
   include Lolcommits
   include Lolcommits::CLI
 
@@ -37,7 +27,7 @@ class App
       end
 
       plugin_manager = PluginManager.init
-      config         = Configuration.new(plugin_manager, test_mode: options[:test])
+      config = Configuration.new(plugin_manager, test_mode: options[:test])
 
       if options[:version]
         puts Lolcommits::VERSION

data/bin/rubocop

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rubocop", "rubocop")

data/features/step_definitions/lolcommits_steps.rb

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

data/features/support/env.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'aruba/cucumber'
 require 'optparse_plus/cucumber'
 require 'open3'
@@ -47,7 +45,7 @@ end
 
 # adjust the path so tests dont see a global imagemagick install
 Before('@fake-no-imagemagick') do
-  reject_paths_with_cmd('mogrify')
+  reject_paths_with_cmd('magick')
 end
 
 # adjust the path so tests dont see a global ffmpeg install

data/features/support/path_helpers.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'fileutils'
 require 'aruba/api'
 require 'lolcommits/platform'
@@ -10,9 +8,9 @@ module PathHelpers
     tmpbindir = expand_path('./bin')
     FileUtils.mkdir_p tmpbindir
 
-    preseve_cmds_in_path(%w(git mplayer), tmpbindir)
+    preseve_cmds_in_path(%w[git mplayer], tmpbindir)
 
-    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : [ '' ]
     newpaths = ENV['PATH'].split(File::PATH_SEPARATOR).reject do |path|
       found_cmd = false
       exts.each do |ext|

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

@@ -1,12 +1,10 @@
-# 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: '?')
+      str.encode("utf-8", invalid: :replace, undef: :replace, replace: "?")
     end
   end
 end

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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 if Lolcommits::Platform.platform_windows?
   module Mercurial
     class Command
@@ -9,8 +7,8 @@ if Lolcommits::Platform.platform_windows?
       def execution_proc
         proc do
           debug(command)
-          result = ''
-          error = ''
+          result = ""
+          error = ""
           status = nil
           Open3.popen3(command) do |_stdin, stdout, stderr, wait_thread|
             Timeout.timeout(timeout) do

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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Mercurial
   class ConfigFile
     def exists?

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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Mercurial
   class Repository
     def self.open(destination)

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

@@ -1,11 +1,9 @@
-# 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
+        cmd.gsub!("?") do
           if Lolcommits::Platform.platform_windows?
             "\"#{cmd_with_args.shift}\""
           else

data/lib/lolcommits/animated_gif.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Lolcommits
   class AnimatedGif
     def create(video_path:, output_path:)
@@ -20,12 +18,19 @@ module Lolcommits
       # create the looping animated gif from frames (delete frame files except every #{skip} frame)
       Dir["#{frames_dir}/*.png"].each do |frame_filename|
         basename = File.basename(frame_filename)
-        frame_number = basename.split('.').first.to_i
+        frame_number = basename.split(".").first.to_i
         File.delete(frame_filename) if frame_number % skip != 0
       end
 
-      # convert to animated gif with delay and gif optimisation
-      system_call "convert -layers OptimizeTransparency -delay #{delay} -loop 0 \"#{frames_dir}/*.png\" -coalesce \"#{output_path}\""
+      # convert to animated gif with delay and transparency optimising
+      MiniMagick.convert do |convert|
+        convert << "#{frames_dir}/*.png"
+        convert.layers "OptimizeTransparency"
+        convert.delay delay
+        convert.loop 0
+        convert.coalesce
+        convert << output_path
+      end
 
       # remove tmp frames dir
       FileUtils.rm_rf(frames_dir)
@@ -38,13 +43,13 @@ module Lolcommits
     end
 
     def null_string
-      Lolcommits::Platform.platform_windows? ? 'nul' : '/dev/null'
+      Lolcommits::Platform.platform_windows? ? "nul" : "/dev/null"
     end
 
     def frame_delay(fps, skip)
       # calculate frame delay
       delay = ((100.0 * skip) / fps.to_f).to_i
-      [delay, 6].max # hard limit for IE browsers
+      [ delay, 6 ].max # hard limit for IE browsers
     end
 
     def video_fps(file)

data/lib/lolcommits/backends/git_info.rb

@@ -1,19 +1,17 @@
-# frozen_string_literal: true
-
 module Lolcommits
   class GitInfo
     GIT_URL_REGEX = %r{.*:([/\w-]*).git}
 
-    def self.repo_root?(path = '.')
-      File.directory?(File.join(path, '.git'))
+    def self.repo_root?(path = ".")
+      File.directory?(File.join(path, ".git"))
     end
 
-    def self.local_name(path = '.')
+    def self.local_name(path = ".")
       File.basename(Git.open(path).dir.to_s)
     end
 
     def initialize
-      debug 'parsed the following values from commit:'
+      debug "parsed the following values from commit:"
       debug "\t#{message}"
       debug "\t#{sha}"
       debug "\t#{repo_internal_path}"
@@ -30,7 +28,7 @@ module Lolcommits
 
     def message
       @message ||= begin
-        message = last_commit.message || ''
+        message = last_commit.message || ""
         message.split("\n").first
       end
     end
@@ -81,7 +79,7 @@ module Lolcommits
       "#{url.tr(':', '/').gsub(/^git@/, 'https://').gsub(/\.git$/, '')}/commit/"
     end
 
-    def repository(path = '.')
+    def repository(path = ".")
       @repository ||= Git.open(path)
     end
 

data/lib/lolcommits/backends/installation_git.rb

@@ -1,17 +1,15 @@
-# frozen_string_literal: true
-
 module Lolcommits
   #
   # Methods to handle enabling and disabling of lolcommits
   #
   class InstallationGit
-    HOOK_PATH = File.join '.git', 'hooks', 'post-commit'
-    HOOK_DIR = File.join '.git', 'hooks'
+    HOOK_PATH = File.join ".git", "hooks", "post-commit"
+    HOOK_DIR = File.join ".git", "hooks"
 
     #
     # IF --ENABLE, DO ENABLE
     #
-    def self.do_enable(capture_args = '')
+    def self.do_enable(capture_args = "")
       # its possible a hooks dir doesnt exist, so create it if so
       Dir.mkdir(HOOK_DIR) unless File.directory?(HOOK_DIR)
 
@@ -33,7 +31,7 @@ module Lolcommits
         add_shebang = true
       end
 
-      File.open(HOOK_PATH, add_shebang ? 'w' : 'a') do |f|
+      File.open(HOOK_PATH, add_shebang ? "w" : "a") do |f|
         f.write("#!/bin/sh\n") if add_shebang
         f.write(hook_script(capture_args))
       end
@@ -59,9 +57,9 @@ module Lolcommits
       end
     end
 
-    def self.hook_script(capture_args = '')
-      ruby_path     = Lolcommits::Platform.command_which('ruby', only_path: true)
-      imagick_path  = Lolcommits::Platform.command_which('identify', only_path: true)
+    def self.hook_script(capture_args = "")
+      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       = "GIT_DIR=${GIT_DIR-`git rev-parse --git-dir`} && LANG=\"#{ENV.fetch('LANG', nil)}\" && PATH=\"$PATH:#{ruby_path}:#{imagick_path}\""
 
@@ -95,7 +93,7 @@ module Lolcommits
 
     def self.remove_existing_hook!
       hook = File.read(HOOK_PATH)
-      out  = File.open(HOOK_PATH, 'w')
+      out  = File.open(HOOK_PATH, "w")
       skip = false
 
       hook.lines.each do |line|

data/lib/lolcommits/backends/installation_mercurial.rb

@@ -1,17 +1,15 @@
-# frozen_string_literal: true
-
 module Lolcommits
   #
   # Methods to handle enabling and disabling of lolcommits
   #
   class InstallationMercurial
-    HOOK_SECTION = 'hooks'
-    HOOK_OPERATIONS = %w(commit record crecord).freeze
+    HOOK_SECTION = "hooks"
+    HOOK_OPERATIONS = %w[commit record crecord].freeze
 
     #
     # IF --ENABLE, DO ENABLE
     #
-    def self.do_enable(capture_args = '')
+    def self.do_enable(capture_args = "")
       if lolcommits_hook_exists?
         # clear away any existing lolcommits hook
         remove_existing_hook!
@@ -39,9 +37,9 @@ module Lolcommits
       end
     end
 
-    def self.hook_script(capture_args = '')
-      ruby_path     = Lolcommits::Platform.command_which('ruby', only_path: true)
-      imagick_path  = Lolcommits::Platform.command_which('identify', only_path: true)
+    def self.hook_script(capture_args = "")
+      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.fetch('LANG', nil)}\" && PATH=\"$PATH:#{ruby_path}:#{imagick_path}\""
 
@@ -53,13 +51,13 @@ module Lolcommits
     end
 
     def self.repository
-      Mercurial::Repository.open('.')
+      Mercurial::Repository.open(".")
     end
 
     # does a mercurial hook exist with lolcommits commands?
     def self.lolcommits_hook_exists?
       config = repository.config
-      config.exists? && config.setting_exists?(HOOK_SECTION, 'post-crecord.lolcommits')
+      config.exists? && config.setting_exists?(HOOK_SECTION, "post-crecord.lolcommits")
     end
 
     # can we load the hgrc?

data/lib/lolcommits/backends/mercurial_info.rb

@@ -1,26 +1,24 @@
-# frozen_string_literal: true
-
 module Lolcommits
   class MercurialInfo
-    def self.repo_root?(path = '.')
-      File.directory?(File.join(path, '.hg'))
+    def self.repo_root?(path = ".")
+      File.directory?(File.join(path, ".hg"))
     end
 
-    def self.local_name(path = '.')
+    def self.local_name(path = ".")
       File.basename(File.dirname(Mercurial::Repository.open(path).dothg_path))
     end
 
     def initialize
       # mercurial sets HG_RESULT for post- hooks
-      if ENV.key?('HG_RESULT') && ENV['HG_RESULT'] != '0'
-        debug 'Aborting lolcommits hook from failed operation'
+      if ENV.key?("HG_RESULT") && ENV["HG_RESULT"] != "0"
+        debug "Aborting lolcommits hook from failed operation"
         exit 1
       end
 
       Mercurial.configure do |conf|
-        conf.hg_binary_path = 'hg'
+        conf.hg_binary_path = "hg"
       end
-      debug 'parsed the following values from commit:'
+      debug "parsed the following values from commit:"
       debug "\t#{message}"
       debug "\t#{sha}"
       debug "\t#{repo_internal_path}"
@@ -37,7 +35,7 @@ module Lolcommits
 
     def message
       @message ||= begin
-        message = last_commit.message || ''
+        message = last_commit.message || ""
         message.split("\n").first
       end
     end
@@ -76,7 +74,7 @@ module Lolcommits
       super("#{self.class}: #{message}")
     end
 
-    def repository(path = '.')
+    def repository(path = ".")
       @repository ||= Mercurial::Repository.open(path)
     end
 

data/lib/lolcommits/capturer/capture_cygwin.rb

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

data/lib/lolcommits/capturer/capture_fake.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Lolcommits
   class CaptureFake < Capturer
     def capture
@@ -9,8 +7,8 @@ module Lolcommits
     private
 
     def test_file
-      filename = capture_duration.zero? ? 'test_image.jpg' : 'test_video.mp4'
-      File.join(Configuration::LOLCOMMITS_ROOT, 'test', 'assets', filename)
+      filename = capture_duration.zero? ? "test_image.jpg" : "test_video.mp4"
+      File.join(Configuration::LOLCOMMITS_ROOT, "test", "assets", filename)
     end
   end
 end

data/lib/lolcommits/capturer/capture_linux.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Lolcommits
   class CaptureLinux < Capturer
     MPLAYER_FPS = 25
@@ -15,13 +13,13 @@ module Lolcommits
       # multiply the set value (in seconds) by 25
       frames = delay.to_i * MPLAYER_FPS
 
-      debug 'calling out to mplayer to capture image'
+      debug "calling out to mplayer to capture image"
       # mplayer's output is ugly and useless, let's throw it away
       _stdin, stdout, _stderr = Open3.popen3("mplayer -vo jpeg:outdir=#{tmpdir} #{capture_device_string} -frames #{frames} -fps #{MPLAYER_FPS} tv://")
       # looks like we still need to read the output for something to happen
       stdout.read
 
-      debug 'calling out to mplayer to capture image'
+      debug "calling out to mplayer to capture image"
 
       # get last frame from tmpdir (regardless of fps)
       all_frames = Dir.glob("#{tmpdir}/*.jpg").sort_by do |f|
@@ -29,10 +27,10 @@ module Lolcommits
       end
 
       if all_frames.empty?
-        debug 'failed to capture any image'
+        debug "failed to capture any image"
       else
         FileUtils.mv(all_frames.last, capture_path)
-        debug 'cleaning up'
+        debug "cleaning up"
       end
 
       FileUtils.rm_rf(tmpdir)

data/lib/lolcommits/capturer/capture_linux_video.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Lolcommits
   class CaptureLinuxVideo < Capturer
     def capture
@@ -9,7 +7,7 @@ module Lolcommits
     private
 
     def capture_device_string
-      capture_device || Dir.glob('/dev/video*').first
+      capture_device || Dir.glob("/dev/video*").first
     end
   end
 end

data/lib/lolcommits/capturer/capture_mac.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Lolcommits
   class CaptureMac < Capturer
     def capture
@@ -9,11 +7,11 @@ module Lolcommits
     private
 
     def capture_device_string
-      capture_device.nil? ? '' : "-d \"#{capture_device}\""
+      capture_device.nil? ? "" : "-d \"#{capture_device}\""
     end
 
     def executable_path
-      File.join(Configuration::LOLCOMMITS_ROOT, 'vendor', 'ext', 'imagesnap', 'imagesnap')
+      File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "ext", "imagesnap", "imagesnap")
     end
   end
 end

data/lib/lolcommits/capturer/capture_mac_video.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Lolcommits
   class CaptureMacVideo < Capturer
     def capture
@@ -17,7 +15,7 @@ module Lolcommits
     end
 
     def executable_path
-      File.join(Configuration::LOLCOMMITS_ROOT, 'vendor', 'ext', 'videosnap', 'videosnap')
+      File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "ext", "videosnap", "videosnap")
     end
   end
 end

data/lib/lolcommits/capturer/capture_windows.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Lolcommits
   class CaptureWindows < Capturer
     def capture
@@ -17,12 +15,12 @@ module Lolcommits
         " /delay #{capture_delay * 1000}"
       else
         # DirectShow takes a while to show, default to 3 sec delay
-        ' /delay 3000'
+        " /delay 3000"
       end
     end
 
     def executable_path
-      File.join(Configuration::LOLCOMMITS_ROOT, 'vendor', 'ext', 'CommandCam', 'CommandCam.exe')
+      File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "ext", "CommandCam", "CommandCam.exe")
     end
   end
 end

data/lib/lolcommits/capturer/capture_windows_video.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Lolcommits
   class CaptureWindowsVideo < Capturer
     def capture
@@ -15,24 +13,24 @@ module Lolcommits
     end
 
     def ffpmeg_list_devices_cmd
-      'ffmpeg -list_devices true -f dshow -i dummy 2>&1'
+      "ffmpeg -list_devices true -f dshow -i dummy 2>&1"
     end
 
     # inspired by this code from @rdp http://tinyurl.com/y7t276bh
     def device_names
       @device_names ||= begin
         names      = []
-        cmd_output = ''
+        cmd_output = ""
         count      = 0
-        while cmd_output.empty? || !cmd_output.split('DirectShow')[2]
+        while cmd_output.empty? || !cmd_output.split("DirectShow")[2]
           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
+          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")
-        video = cmd_output.split('DirectShow')[1]
+        video = cmd_output.split("DirectShow")[1]
 
         video.lines.map do |line|
           names << Regexp.last_match(1) if line =~ /"(.+)"\n/

data/lib/lolcommits/capturer.rb

@@ -1,9 +1,6 @@
-# frozen_string_literal: true
-
 module Lolcommits
   class Capturer
-    attr_accessor :capture_device, :capture_delay, :capture_duration,
-                  :capture_path
+    attr_accessor :capture_device, :capture_delay, :capture_duration, :capture_path
 
     def initialize(attributes = {})
       attributes.each do |attr, val|
@@ -22,11 +19,11 @@ module Lolcommits
   end
 end
 
-require 'lolcommits/capturer/capture_mac'
-require 'lolcommits/capturer/capture_mac_video'
-require 'lolcommits/capturer/capture_linux'
-require 'lolcommits/capturer/capture_linux_video'
-require 'lolcommits/capturer/capture_windows'
-require 'lolcommits/capturer/capture_windows_video'
-require 'lolcommits/capturer/capture_cygwin'
-require 'lolcommits/capturer/capture_fake'
+require "lolcommits/capturer/capture_mac"
+require "lolcommits/capturer/capture_mac_video"
+require "lolcommits/capturer/capture_linux"
+require "lolcommits/capturer/capture_linux_video"
+require "lolcommits/capturer/capture_windows"
+require "lolcommits/capturer/capture_windows_video"
+require "lolcommits/capturer/capture_cygwin"
+require "lolcommits/capturer/capture_fake"