lolcommits 0.13.1 → 0.14.0

data/lib/lolcommits/version.rb

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

data/lolcommits.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'lolcommits/version'
@@ -44,13 +46,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('git', '~> 1.5.0')
 
   # included plugins
-  s.add_runtime_dependency('lolcommits-loltext', '~> 0.1.0')
+  s.add_runtime_dependency('lolcommits-loltext', '~> 0.2.3')
 
   # development & test gems
   s.add_development_dependency('aruba')
   s.add_development_dependency('rake')
   s.add_development_dependency('rdoc')
-  s.add_development_dependency('pry')
+  s.add_development_dependency('pry-remote')
   s.add_development_dependency('rubocop')
   s.add_development_dependency('minitest')
   s.add_development_dependency('simplecov')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Matthew Rothenberg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-29 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -101,14 +101,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +152,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-remote
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -260,6 +260,7 @@ files:
 - lib/core_ext/mercurial-ruby/command.rb
 - lib/core_ext/mercurial-ruby/shell.rb
 - lib/lolcommits.rb
+- lib/lolcommits/animated_gif.rb
 - lib/lolcommits/backends/git_info.rb
 - lib/lolcommits/backends/installation_git.rb
 - lib/lolcommits/backends/installation_mercurial.rb
@@ -268,11 +269,11 @@ files:
 - lib/lolcommits/capturer/capture_cygwin.rb
 - lib/lolcommits/capturer/capture_fake.rb
 - lib/lolcommits/capturer/capture_linux.rb
-- lib/lolcommits/capturer/capture_linux_animated.rb
+- lib/lolcommits/capturer/capture_linux_video.rb
 - lib/lolcommits/capturer/capture_mac.rb
-- lib/lolcommits/capturer/capture_mac_animated.rb
+- lib/lolcommits/capturer/capture_mac_video.rb
 - lib/lolcommits/capturer/capture_windows.rb
-- lib/lolcommits/capturer/capture_windows_animated.rb
+- lib/lolcommits/capturer/capture_windows_video.rb
 - lib/lolcommits/cli.rb
 - lib/lolcommits/cli/fatals.rb
 - lib/lolcommits/cli/launcher.rb
@@ -291,6 +292,8 @@ files:
 - lib/lolcommits/vcs_info.rb
 - lib/lolcommits/version.rb
 - lolcommits.gemspec
+- test/assets/test_image.jpg
+- test/assets/test_video.mp4
 - test/images/test_image.jpg
 - test/permissions_test.rb
 - test/test_helper.rb
@@ -327,7 +330,7 @@ requirements:
 - imagemagick
 - a webcam
 rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Capture webcam image on git commit for lulz.

data/lib/lolcommits/capturer/capture_linux_animated.rb

@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-
-module Lolcommits
-  class CaptureLinuxAnimated < Capturer
-    def capture
-      # make a fresh frames directory
-      FileUtils.rm_rf(frames_location)
-      FileUtils.mkdir_p(frames_location)
-
-      # 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"
-
-      # use fps to set delay and number of frames to skip (for lower filesized gifs)
-      fps   = video_fps(video_location)
-      skip  = frame_skip(fps)
-      delay = frame_delay(fps, skip)
-      debug "Capturer: anaimated gif choosing every #{skip} frames with a frame delay of #{delay} (video fps: #{fps})"
-
-      # create the looping animated gif from frames (picks nth frame with seq,
-      # quotes output and concats to a single line with tr)
-      seq_command = "seq -f \"\\\"#{frames_location}/%09g.png\\\"\" 1 #{skip} #{Dir["#{frames_location}/*"].length} | tr '\\n' ' '"
-      seq_frame_files = system_call(seq_command, true)
-      # convert to animated gif with delay and gif optimisation
-      system_call "convert -layers OptimizeTransparency -delay #{delay} -loop 0 #{seq_frame_files} -coalesce \"#{snapshot_location}\""
-    end
-
-    private
-
-    def system_call(call_str, capture_output = false)
-      debug "Capturer: making system call for \n #{call_str}"
-      capture_output ? `#{call_str}` : system(call_str)
-    end
-
-    def frame_delay(fps, skip)
-      # calculate frame delay
-      delay = ((100.0 * skip) / fps.to_f).to_i
-      delay < 6 ? 6 : delay # hard limit for IE browsers
-    end
-
-    def video_fps(file)
-      # inspect fps of the captured video file (default to 29.97)
-      fps = system_call("ffmpeg -i \"#{file}\" 2>&1 | sed -n \"s/.*, \\(.*\\) fp.*/\\1/p\"", true)
-      fps.to_i < 1 ? 29.97 : fps.to_f
-    end
-
-    def frame_skip(fps)
-      # of frames to skip depends on movie fps
-      case fps
-      when 0..15
-        2
-      when 16..28
-        3
-      else
-        4
-      end
-    end
-
-    def capture_device_string
-      capture_device || '/dev/video0'
-    end
-
-    def capture_delay_string
-      " -ss #{capture_delay}" if capture_delay.to_i > 0
-    end
-
-    def capture_duration
-      animated_duration.to_i + capture_delay.to_i
-    end
-  end
-end

data/lib/lolcommits/capturer/capture_mac_animated.rb

@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-module Lolcommits
-  class CaptureMacAnimated < Capturer
-    def capture
-      # make a fresh frames directory
-      FileUtils.rm_rf(frames_location)
-      FileUtils.mkdir_p(frames_location)
-
-      # 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
-      system_call "ffmpeg -v quiet -i \"#{video_location}\" -t #{animated_duration} -r #{fps} \"#{frames_location}/%09d.png\""
-
-      # use fps to set delay and number of frames to skip (for lower filesized gifs)
-      skip  = frame_skip(fps)
-      delay = frame_delay(fps, skip)
-      debug "Capturer: animated gif choosing every #{skip} frames with a frame delay of #{delay} (video fps: #{fps})"
-
-      # create the looping animated gif from frames (picks nth frame with seq,
-      # quotes output and concats to a single line with tr)
-      seq_command = "seq -f \"\\\"#{frames_location}/%09g.png\\\"\" 1 #{skip} #{Dir["#{frames_location}/*"].length} | tr '\\n' ' '"
-      seq_frame_files = system_call(seq_command, true)
-      # convert to animated gif with delay and gif optimisation
-      system_call "convert -layers OptimizeTransparency -delay #{delay} -loop 0 #{seq_frame_files} -coalesce \"#{snapshot_location}\" > /dev/null"
-    end
-
-    def executable_path
-      File.join(Configuration::LOLCOMMITS_ROOT, 'vendor', 'ext', 'videosnap', 'videosnap')
-    end
-
-    private
-
-    def system_call(call_str, capture_output = false)
-      debug "Capturer: making system call for \n #{call_str}"
-      capture_output ? `#{call_str}` : system(call_str)
-    end
-
-    def frame_delay(fps, skip)
-      # calculate frame delay
-      delay = ((100.0 * skip) / fps.to_f).to_i
-      delay < 6 ? 6 : delay # hard limit for IE browsers
-    end
-
-    def video_fps(file)
-      # inspect fps of the captured video file (default to 29.97)
-      fps = system_call("ffmpeg -i \"#{file}\" 2>&1 | sed -n \"s/.*, \\(.*\\) fp.*/\\1/p\"", true)
-      fps.to_i < 1 ? 29.97 : fps.to_f
-    end
-
-    def frame_skip(fps)
-      # of frames to skip depends on movie fps
-      case fps
-      when 0..15
-        2
-      when 16..28
-        3
-      else
-        4
-      end
-    end
-
-    def capture_device_string
-      "-d \"#{capture_device}\" " if capture_device
-    end
-
-    def capture_delay_string
-      "-w \"#{capture_delay}\" " if capture_delay.to_i > 0
-    end
-  end
-end

data/lib/lolcommits/capturer/capture_windows_animated.rb

@@ -1,110 +0,0 @@
-# frozen_string_literal: true
-
-module Lolcommits
-  class CaptureWindowsAnimated < Capturer
-    def capture
-      # make a fresh frames directory
-      FileUtils.rm_rf(frames_location)
-      FileUtils.mkdir_p(frames_location)
-
-      # abort capture if we don't have a device name
-      return unless capture_device_string
-
-      # capture raw video with ffmpeg dshow
-      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"
-
-      # use fps to set delay and number of frames to skip (for lower filesized gifs)
-      fps   = video_fps(video_location)
-      skip  = frame_skip(fps)
-      delay = frame_delay(fps, skip)
-      debug "Capturer: animated gif choosing every #{skip} frames with a frame delay of #{delay} (video fps: #{fps})"
-
-      # create the looping animated gif from frames (delete frame files except every #{skip} frame)
-      Dir["#{frames_location}/*.png"].each do |frame_filename|
-        basename = File.basename(frame_filename)
-        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_location}/*.png\" -coalesce \"#{snapshot_location}\""
-    end
-
-    private
-
-    def ffpmeg_list_devices_cmd
-      '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 = ''
-        count      = 0
-        while cmd_output.empty? || !cmd_output.split('DirectShow')[2]
-          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")
-        video = cmd_output.split('DirectShow')[1]
-
-        video.lines.map do |line|
-          names << Regexp.last_match(1) if line =~ /"(.+)"\n/
-        end
-
-        debug "Capturer: found #{names.length} video devices: #{names.join(', ')}"
-        names
-      end
-    end
-
-    def system_call(call_str, capture_output = false)
-      debug "Capturer: making system call for \n #{call_str}"
-      capture_output ? `#{call_str}` : system(call_str)
-    end
-
-    def frame_delay(fps, skip)
-      # calculate frame delay
-      delay = ((100.0 * skip) / fps.to_f).to_i
-      delay < 6 ? 6 : delay # hard limit for IE browsers
-    end
-
-    def video_fps(file)
-      # inspect fps of the captured video file (default to 29.97)
-      fps = system_call("ffmpeg -i \"#{file}\" 2>&1 | sed -n \"s/.*, \\(.*\\) fp.*/\\1/p\"", true)
-      fps.to_i < 1 ? 29.97 : fps.to_f
-    end
-
-    def frame_skip(fps)
-      # of frames to skip depends on movie fps
-      case fps
-      when 0..15
-        2
-      when 16..28
-        3
-      else
-        4
-      end
-    end
-
-    def capture_device_string
-      capture_device || device_names.first
-    end
-
-    def capture_delay_string
-      " -ss #{capture_delay}" if capture_delay.to_i > 0
-    end
-
-    def capture_duration
-      animated_duration.to_i + capture_delay.to_i
-    end
-  end
-end