lolcommits 0.5.0.pre3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad3bb7059d1456292c62655602fe093d02489634
-  data.tar.gz: d58ec1f441f2e30b8cc5a1dda9884dffb29ac9e9
+  metadata.gz: 1feac734020184b6e062b2db34194eedaf54821c
+  data.tar.gz: 8b651d7e62a750d42a582226c3750d3dd14405eb
 SHA512:
-  metadata.gz: 5725cfe06bb7f1dcf77e42f6c4a3b29f17403743ea25bb88473996a5c05e3cbccd1d238332fb02a8da2da618cdcde7b6530a25a1e08c08fe0b5c5a7b5ae8d68f
-  data.tar.gz: 0b6a84abbd2db137131a753933d92ad6f1b60b46e513730dde74ec6fab1bbe2dabb6052ef8b5e7479139599fc2c15892b4216a9d71824b902b727dc2598bf64b
+  metadata.gz: 0fa9dc7db5600ffaa9aacd066d214309e65b33568dbb7038611d276d118b33ec36e1136ff97f2059af15f02fdce1902cf43b461a5d52288acb97d9d688440740
+  data.tar.gz: e81be290e664334907c884b5d8d3d8d3eaf9f4181ba26fd7e4fa5e6aba357a80c8f6db217596852fd6c4feeba5058cd6f0ddf9ac0d034a1f124f9583bf8be14d

data/CHANGELOG

@@ -1,7 +1,7 @@
 0.x.x (in development)
   * TODO: figure out problems with GUI clients
 
-0.5.0 (9 September 2013)
+0.5.0 (10 September 2013)
   * better handling of LOLCOMMITS_DELAY (thx @leewillis77, #125)
   * LOLCOMMITS_DEVICE support on Linux (thx @EbenezerEdelman, #139)
   * better handling of repository names (thx @drocamor and @andromedado, #145 and #146)

data/lib/lolcommits/capture_mac_animated.rb

@@ -11,17 +11,48 @@ module Lolcommits
       if File.exists?(video_location)
         # convert raw video to png frames with ffmpeg
         system_call "ffmpeg -v quiet -i #{video_location} -t #{animated_duration} #{frames_location}/%09d.png"
-        # create the looping animated gif from frames (picks every 3rd frame with seq)
-        seq_command = "seq -f #{frames_location}/%09g.png 1 3 #{Dir["#{frames_location}/*"].length}"
-        # delay is chosen assuming the capture was 29.97fps
-        system_call "convert -layers OptimizeTransparency -delay 7 -loop 0 `#{seq_command}` -coalesce #{snapshot_location}"
+
+        # 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}"
+
+        # create the looping animated gif from frames (picks nth frame with seq)
+        seq_command = "seq -f #{frames_location}/%09g.png 1 #{skip} #{Dir["#{frames_location}/*"].length}"
+        # convert to animated gif with delay and gif optimisation
+        system_call "convert -layers OptimizeTransparency -delay #{delay} -loop 0 `#{seq_command}` -coalesce #{snapshot_location}"
       end
     end
 
     private
-    def system_call(call_str)
+    def system_call(call_str, capture_output = false)
       debug "Capturer: making system call for \n #{call_str}"
-      system(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 videosnap_bin

data/lib/lolcommits/version.rb

@@ -1,3 +1,3 @@
 module Lolcommits
-  VERSION = "0.5.0.pre3"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre3
+  version: 0.5.0
 platform: ruby
 authors:
 - Matthew Rothenberg
@@ -319,9 +319,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: lolcommits
 rubygems_version: 2.0.3