lolcommits 0.17.2 → 0.18.0

data/lib/lolcommits/platform.rb

@@ -1,15 +1,13 @@
-# frozen_string_literal: true
-
-require 'mini_magick'
-require 'rbconfig'
+require "mini_magick"
+require "rbconfig"
 
 module Lolcommits
   class Platform
     # The capturer class constant to use
     # @return Class
     def self.capturer_class(animate: false)
-      if ENV['LOLCOMMITS_CAPTURER']
-        const_get(ENV['LOLCOMMITS_CAPTURER'])
+      if ENV["LOLCOMMITS_CAPTURER"]
+        const_get(ENV["LOLCOMMITS_CAPTURER"])
       elsif platform_mac?
         animate ? CaptureMacVideo : CaptureMac
       elsif platform_linux?
@@ -19,20 +17,20 @@ module Lolcommits
       elsif platform_cygwin?
         CaptureCygwin
       else
-        raise 'Unknown / Unsupported Platform.'
+        raise "Unknown / Unsupported Platform."
       end
     end
 
     # Are we on a Mac platform?
     # @return Boolean
     def self.platform_mac?
-      host_os.include?('darwin')
+      host_os.include?("darwin")
     end
 
     # Are we on a Linux platform?
     # @return Boolean
     def self.platform_linux?
-      host_os.include?('linux')
+      host_os.include?("linux")
     end
 
     # Are we on a Windows platform?
@@ -44,13 +42,13 @@ module Lolcommits
     # Are we on a Cygwin platform?
     # @return Boolean
     def self.platform_cygwin?
-      host_os.include?('cygwin')
+      host_os.include?("cygwin")
     end
 
     # return host_os identifier from the RbConfig::CONFIG constant
     # @return String
     def self.host_os
-      ENV['LOLCOMMITS_FAKE_HOST_OS'] || RbConfig::CONFIG['host_os'].downcase
+      ENV["LOLCOMMITS_FAKE_HOST_OS"] || RbConfig::CONFIG["host_os"].downcase
     end
 
     # Is the platform capable of capturing animated GIFs from webcam?
@@ -62,9 +60,7 @@ module Lolcommits
     # Is a valid install of imagemagick present on the system?
     # @return Boolean
     def self.valid_imagemagick_installed?
-      return false unless command_which('identify')
-
-      return false unless command_which('mogrify')
+      return false unless command_which("magick")
 
       # cli_version check will throw a MiniMagick::Error exception if IM is not
       # installed in PATH, since it attempts to parse output from `identify`
@@ -78,7 +74,7 @@ module Lolcommits
     # @note For now, this just checks for presence, any version should work.
     # @return Boolean
     def self.valid_ffmpeg_installed?
-      command_which('ffmpeg')
+      command_which("ffmpeg")
     end
 
     # Cross-platform way of finding an executable in the $PATH.
@@ -91,8 +87,8 @@ module Lolcommits
     #
     # @return Boolean
     def self.command_which(cmd, only_path: false)
-      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      exts = ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [ "" ]
+      ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
         exts.each do |ext|
           exe = "#{path}/#{cmd}#{ext}"
           return only_path ? path : exe if File.executable? exe
@@ -123,7 +119,7 @@ module Lolcommits
       # TODO: handle other platforms here (linux/windows) e.g with ffmpeg -list_devices
       return unless Platform.platform_mac?
 
-      videosnap = File.join(Configuration::LOLCOMMITS_ROOT, 'vendor', 'ext', 'videosnap', 'videosnap')
+      videosnap = File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "ext", "videosnap", "videosnap")
       `#{videosnap} -l`
     end
   end

data/lib/lolcommits/plugin/base.rb

@@ -1,6 +1,4 @@
-# frozen_string_literal: true
-
-require 'lolcommits/plugin/configuration_helper'
+require "lolcommits/plugin/configuration_helper"
 
 module Lolcommits
   module Plugin
@@ -13,7 +11,7 @@ module Lolcommits
         self.runner = runner
         self.name = name || self.class.to_s
         self.configuration = config || {}
-        self.options = [:enabled]
+        self.options = [ :enabled ]
       end
 
       def run_pre_capture; end
@@ -51,9 +49,7 @@ module Lolcommits
       #
       # @return [Hash] the configured plugin options
       def configure_options!
-        configure_option_hash(
-          options.map { |option| [option, nil] }.to_h.merge(default_options)
-        )
+        configure_option_hash(options.map { |option| [ option, nil ] }.to_h.merge(default_options))
       end
 
       def default_options
@@ -103,7 +99,7 @@ module Lolcommits
       def configure_option_hash(option_hash, spacing_count = 0)
         option_hash.keys.reduce({}) do |acc, option|
           option_value = option_hash[option]
-          prefix       = '  ' * spacing_count
+          prefix       = "  " * spacing_count
           if option_value.is_a?(Hash)
             puts "#{prefix}#{option}:\n"
             acc.merge(option => configure_option_hash(option_value, (spacing_count + 1)))

data/lib/lolcommits/plugin/configuration_helper.rb

@@ -1,13 +1,11 @@
-# frozen_string_literal: true
-
 module Lolcommits
   module Plugin
     module ConfigurationHelper
       # handle for bools, strings, ints and blanks from user input
       def parse_user_input(str)
-        if 'true'.casecmp(str).zero?
+        if "true".casecmp(str).zero?
           true
-        elsif 'false'.casecmp(str).zero?
+        elsif "false".casecmp(str).zero?
           false
         elsif str =~ /^[0-9]+$/
           str.to_i
@@ -29,7 +27,7 @@ module Lolcommits
       # ]
       # User will be asked for Organization, can tab to autocomplete, and chosen
       # value is returned.
-      def prompt_autocomplete_hash(prompt, items, name: 'name', value: 'value', suggest_words: 5)
+      def prompt_autocomplete_hash(prompt, items, name: "name", value: "value", suggest_words: 5)
         words = items.map { |item| item[name] }.sort
         puts "e.g. #{words.take(suggest_words).join(', ')}" if suggest_words.positive?
         completed_input = gets_autocomplete(prompt, words)
@@ -40,7 +38,7 @@ module Lolcommits
 
       def gets_autocomplete(prompt, words)
         completion_handler = proc { |s| words.grep(/^#{Regexp.escape(s)}/) }
-        Readline.completion_append_character = ''
+        Readline.completion_append_character = ""
         Readline.completion_proc = completion_handler
 
         while (line = Readline.readline(prompt, true).strip)

data/lib/lolcommits/plugin_manager.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Lolcommits
   class PluginManager
     GEM_NAME_PREFIX = /^#{Lolcommits::GEM_NAME}-/
@@ -62,7 +60,7 @@ module Lolcommits
 
     def gem_list
       Gem.refresh
-      Gem::Specification.respond_to?(:each) ? Gem::Specification : Gem.source_index.find_name('')
+      Gem::Specification.respond_to?(:each) ? Gem::Specification : Gem.source_index.find_name("")
     end
   end
 end

data/lib/lolcommits/runner.rb

@@ -1,7 +1,5 @@
-# frozen_string_literal: true
-
-require 'lolcommits/platform'
-require 'lolcommits/animated_gif'
+require "lolcommits/platform"
+require "lolcommits/animated_gif"
 
 module Lolcommits
   class Runner
@@ -30,7 +28,7 @@ module Lolcommits
 
       self.capture_path       = config.capture_path(lolcommit_ext)
       self.lolcommit_path     = config.sha_path(sha, lolcommit_ext)
-      self.lolcommit_gif_path = config.sha_path(sha, 'gif') if capture_gif
+      self.lolcommit_gif_path = config.sha_path(sha, "gif") if capture_gif
     end
 
     def run
@@ -41,7 +39,7 @@ module Lolcommits
 
       # capture must exist to run post capture methods
       unless File.exist?(capture_path)
-        raise 'failed to capture any image or video!'
+        raise "failed to capture any image or video!"
       end
 
       run_post_capture
@@ -50,7 +48,7 @@ module Lolcommits
       debug("#{e.class}: #{e.message}")
       exit 1
     ensure
-      debug 'running cleanup'
+      debug "running cleanup"
       FileUtils.rm_f(capture_path)
     end
 
@@ -63,15 +61,17 @@ module Lolcommits
         end
 
         base = MiniMagick::Image.open(source_path)
-        png_tempfile = MiniMagick::Utilities.tempfile('.png')
+        png_tempfile = MiniMagick::Utilities.tempfile(".png")
         debug("creating a new empty overlay png for lolcommit (#{base.dimensions.join('x')})")
 
-        MiniMagick::Tool::Convert.new do |i|
-          i.size "#{base.width}x#{base.height}"
-          i.xc 'transparent'
-          i << png_tempfile.path
+        MiniMagick.convert do |convert|
+          convert.size "#{base.width}x#{base.height}"
+          convert.xc "transparent"
+          convert << png_tempfile.path
         end
 
+        debug "mehhh!"
+
         MiniMagick::Image.open(png_tempfile.path)
       end
     end
@@ -94,7 +94,7 @@ module Lolcommits
     end
 
     def run_capture
-      puts '*** Preserving this moment in history.' unless capture_stealth
+      puts "*** Preserving this moment in history." unless capture_stealth
       capturer = Platform.capturer_class(animate: !capture_image?).new(
         capture_path: capture_path,
         capture_device: capture_device,
@@ -119,10 +119,7 @@ module Lolcommits
       # optionally create animated gif
       return unless capture_gif
 
-      AnimatedGif.new.create(
-        video_path: lolcommit_path,
-        output_path: lolcommit_gif_path
-      )
+      AnimatedGif.new.create(video_path: lolcommit_path, output_path: lolcommit_gif_path)
 
       # done if we are capturing both video and gif
       return if capture_video
@@ -145,9 +142,9 @@ module Lolcommits
         debug "resizing raw image (#{image.dimensions.join('x')}) to #{lolcommit_path} (640x480)"
         # hacky resize to fill bounds
         image.combine_options do |c|
-          c.resize '640x480^'
-          c.gravity 'center'
-          c.extent '640x480'
+          c.resize "640x480^"
+          c.gravity "center"
+          c.extent "640x480"
         end
         image.write(lolcommit_path)
       else
@@ -157,10 +154,10 @@ module Lolcommits
     end
 
     def apply_overlay
-      debug 'applying overlay to lolcommit'
+      debug "applying overlay to lolcommit"
       if capture_image?
         MiniMagick::Image.open(lolcommit_path).composite(overlay) do |c|
-          c.gravity 'center'
+          c.gravity "center"
         end.write(lolcommit_path)
       else
         system_call "ffmpeg -v quiet -nostats -i #{capture_path} -i #{overlay.path} \
@@ -171,9 +168,9 @@ module Lolcommits
 
     def lolcommit_ext
       if capture_image?
-        'jpg'
+        "jpg"
       else
-        'mp4'
+        "mp4"
       end
     end
 

data/lib/lolcommits/test_helpers/fake_io.rb

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

data/lib/lolcommits/test_helpers/git_repo.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Lolcommits
   module TestHelpers
     module GitRepo
@@ -8,11 +6,11 @@ module Lolcommits
       end
 
       def repo_path
-        '/tmp/lolcommits-plugin-test-repo'
+        "/tmp/lolcommits-plugin-test-repo"
       end
 
       def repo_exists?
-        File.directory?(File.expand_path(repo_path, '.git'))
+        File.directory?(File.expand_path(repo_path, ".git"))
       end
 
       def last_commit
@@ -25,7 +23,7 @@ module Lolcommits
         `git init --quiet #{repo_path}`
       end
 
-      def commit_repo_with_message(message = 'test message', file_name: 'test.txt', file_content: 'testing')
+      def commit_repo_with_message(message = "test message", file_name: "test.txt", file_content: "testing")
         setup_repo unless repo_exists?
         `echo '#{file_content}' >> #{repo_path}/#{file_name}`
         `cd #{repo_path} && git add #{file_name}`

data/lib/lolcommits/vcs_info.rb

@@ -1,12 +1,10 @@
-# frozen_string_literal: true
-
 module Lolcommits
   class VCSInfo
-    def self.repo_root?(path = '.')
+    def self.repo_root?(path = ".")
       GitInfo.repo_root?(path) || MercurialInfo.repo_root?(path)
     end
 
-    def self.local_name(path = '.')
+    def self.local_name(path = ".")
       if GitInfo.repo_root?(path)
         GitInfo.local_name(path)
       elsif MercurialInfo.repo_root?(path)

data/lib/lolcommits/version.rb

@@ -1,6 +1,4 @@
-# frozen_string_literal: true
-
 module Lolcommits
-  VERSION  = "0.17.2"
+  VERSION  = "0.18.0"
   GEM_NAME = "lolcommits"
 end

data/lib/lolcommits.rb

@@ -1,41 +1,37 @@
-# frozen_string_literal: true
+require "mini_magick"
+require "fileutils"
+require "git"
+require "open3"
+require "date"
+require "mercurial-ruby"
 
-$LOAD_PATH.unshift File.expand_path('.')
-
-require 'mini_magick'
-require 'fileutils'
-require 'git'
-require 'open3'
-require 'optparse_plus'
-require 'date'
-require 'mercurial-ruby'
-
-require 'lolcommits/version'
-require 'lolcommits/configuration'
-require 'lolcommits/capturer'
-require 'lolcommits/vcs_info'
-require 'lolcommits/installation'
-require 'lolcommits/platform'
-require 'lolcommits/gem_plugin'
-require 'lolcommits/plugin_manager'
-require 'lolcommits/plugin/base'
+require "lolcommits/version"
+require "lolcommits/cli"
+require "lolcommits/configuration"
+require "lolcommits/capturer"
+require "lolcommits/vcs_info"
+require "lolcommits/installation"
+require "lolcommits/platform"
+require "lolcommits/gem_plugin"
+require "lolcommits/plugin_manager"
+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'
+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'
+require "core_ext/mercurial-ruby/changed_file"
 # Mercurial::ConfigFile#exists? patched to be Ruby 3.2+ compatible
-require 'core_ext/mercurial-ruby/config_file'
+require "core_ext/mercurial-ruby/config_file"
 # Mercurial::Repository.open patched to be Ruby 3.2+ compatible
-require 'core_ext/mercurial-ruby/repository'
+require "core_ext/mercurial-ruby/repository"
 
 # backends
-require 'lolcommits/backends/installation_git'
-require 'lolcommits/backends/installation_mercurial'
-require 'lolcommits/backends/git_info'
-require 'lolcommits/backends/mercurial_info'
+require "lolcommits/backends/installation_git"
+require "lolcommits/backends/installation_mercurial"
+require "lolcommits/backends/git_info"
+require "lolcommits/backends/mercurial_info"
 
 # require runner after all the plugins have been required
-require 'lolcommits/runner'
+require "lolcommits/runner"