lolcommits 0.0.3 → 0.1.0

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+ - 1.8.7
+ - 1.9.2
+ - 1.9.3
+
+before_install:
+ - sudo apt-get update
+ - sudo apt-get install mplayer libmagick9-dev
+

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.1.0 (in development)
+  * Linux compatibility! Thanks to @madjar, @cscorely, and @Prydonius.
+
 0.0.3 (16 April 2012)
   * use only first line for multi-line commit msgs (pull req #21)
   * clean up some command line options

data/README.md

@@ -1,12 +1,12 @@
+[![Build Status](https://secure.travis-ci.org/mroth/lolcommits.png?branch=master)](http://travis-ci.org/mroth/lolcommits)
+
 # git + webcam = lol
 
-Takes a snapshot with your Mac's built-in iSight/FaceTime webcam every time you git commit code, and archives a lolcat style image with it.
+Takes a snapshot with your Mac's built-in iSight/FaceTime webcam (or any working webcam on Linux) every time you git commit code, and archives a lolcat style image with it.
 
 By default, the lolimages are stored by a Github style short SHA in a `~/.lolcommits` directory created for you.
 
 ## Installation (for Mac OS X)
-We've gotten rid of most of the dependency chain, yay!
-
 You'll need imagesnap and imagemagick installed.  [Homebrew](http://mxcl.github.com/homebrew/) makes this easy.  Simply do:
 
 	brew install imagemagick
@@ -24,6 +24,17 @@ You're all set!  To enable lolcommits for a git repo, go to the base directory o
 
 Likewise, you can disable it via `lolcommits --disable`.  For a full list of options, you can do `lolcommits --help`.
 
+## Installation (for Linux)
+Install dependencies using your package manager of choice, for example in Ubuntu:
+
+    sudo apt-get install mplayer imagemagick libmagick9-dev
+
+Then install the lolcommits gem:
+
+    gem install lolcommits
+
+Then you can `lolcommits --enable` in any git repo as above.
+
 ## Sample images
 Please add your own lolcommit to these samples!  Just fork this repo, add it to this section of the README, and send me a pull request.
 <img width='320' height='240' src="https://github.com/mroth/lolcommits/raw/gh-pages/sample2.jpg" />

data/Rakefile

@@ -1,4 +1,13 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  #t.libs << 'test'
+  t.test_files = Dir.glob('test/test_*.rb')
+end
+
+desc "Run tests"
+task :default => :test
 
 desc "Migrate an existing local .lolcommits directory to Dropbox"
 task :dropboxify do

data/bin/lolcommits

@@ -19,10 +19,17 @@ def command?(name)
   $?.success?
 end
 
-if not command?('imagesnap')
-  puts "Couldn't find imagesnap in your PATH!"
-  puts "Easiest way to get it is to install homebrew and do `brew install imagesnap`"
-  exit 1
+if is_mac?
+  if not command?('imagesnap')
+    puts "Couldn't find imagesnap in your PATH!"
+    puts "Easiest way to get it is to install homebrew and do `brew install imagesnap`"
+    exit 1
+  end
+elsif is_linux?
+  if not command?('mplayer')
+    puts "Couldn't find mplayer in your PATH!"
+    exit 1
+  end
 end
 
 #
@@ -117,7 +124,7 @@ Choice.options do
     short "-l"
     desc "view the most recent lolcommit"
     action do
-      system "open #{Lolcommits.most_recent}"
+      Launchy.open Lolcommits.most_recent
     end
   end
   
@@ -126,7 +133,7 @@ Choice.options do
     short "-b"
     desc "browse this repo's lolcommits"
     action do
-      system "open #{Lolcommits.loldir}"
+      Launchy.open Lolcommits.loldir
     end
   end
   

data/lib/lolcommits.rb

@@ -3,13 +3,23 @@ require "choice"
 require "fileutils"
 require "git"
 require "RMagick"
+require "open3"
+require "launchy"
 include Magick
 
 module Lolcommits
   # Your code goes here...
   $home = ENV['HOME']
   LOLBASEDIR = "#{$home}/.lolcommits"
-  
+
+  def is_mac?
+    RUBY_PLATFORM.downcase.include?("darwin")
+  end
+
+  def is_linux?
+     RUBY_PLATFORM.downcase.include?("linux")
+  end
+
   def most_recent(dir='.')
     loldir, commit_sha, commit_msg = parse_git
     Dir.glob("#{loldir}/*").max_by {|f| File.mtime(f)}
@@ -38,13 +48,11 @@ module Lolcommits
     if not is_test
       loldir, commit_sha, commit_msg = parse_git
     else
-      commit_msg = test_msg #Choice.choices[:msg]
-      commit_sha = test_sha #Choice.choices[:sha]
+      commit_msg = test_msg
+      commit_sha = test_sha
       loldir = "#{LOLBASEDIR}/test"
     end
     
-    #puts "#{commit_sha}: #{commit_msg}"
-    
     #
     # Create a directory to hold the lolimages
     #
@@ -60,9 +68,24 @@ module Lolcommits
     #
     puts "*** Preserving this moment in history."
     snapshot_loc = "#{loldir}/tmp_snapshot.jpg"
-    system("imagesnap -q #{snapshot_loc} -w #{capture_delay}")
-  
-    
+    if is_mac?
+      system("imagesnap -q #{snapshot_loc} -w #{capture_delay}")
+    elsif is_linux?
+      tmpdir = File.expand_path "#{loldir}/tmpdir#{rand(1000)}/"
+      FileUtils.mkdir_p( tmpdir )
+      # There's no way to give a capture delay in mplayer, but a number of frame
+      # I've found that 6 is a good value for me.
+      frames = if capture_delay != 0 then capture_delay else 6 end
+
+      # mplayer's output is ugly and useless, let's throw it away
+      _, r, _ = Open3.popen3("mplayer -vo jpeg:outdir=#{tmpdir} -frames #{frames} tv://")
+      # looks like we still need to read the outpot for something to happen
+      r.read
+      FileUtils.mv(tmpdir + "/%08d.jpg" % frames, snapshot_loc)
+      FileUtils.rm_rf( tmpdir )
+    end
+
+
     #
     # Process the image with ImageMagick to add loltext
     #
@@ -75,7 +98,13 @@ module Lolcommits
 
     # create a draw object for annotation
     draw = Magick::Draw.new
-    draw.font = "/Library/Fonts/Impact.ttf"
+    #if is_mac?
+    #  draw.font = "/Library/Fonts/Impact.ttf"
+    #else
+    #  draw.font = "/usr/share/fonts/TTF/impact.ttf"
+    #end
+    draw.font = File.join(File.dirname(__FILE__), "..", "fonts", "Impact.ttf")
+
     draw.fill = 'white'
     draw.stroke = 'black'
 
@@ -107,8 +136,8 @@ module Lolcommits
     FileUtils.rm("#{snapshot_loc}")
 
     #if in test mode, open image for inspection
-    if Choice.choices[:test]
-      system("open #{loldir}/#{commit_sha}.jpg")
+    if is_test
+      Launchy.open("#{loldir}/#{commit_sha}.jpg")
     end
     
     

data/lib/lolcommits/version.rb

@@ -1,3 +1,3 @@
 module Lolcommits
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lolcommits.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Matthew Rothenberg"]
   s.email       = ["mrothenberg@gmail.com"]
   s.homepage    = "http://github.com/mroth/lolcommits"
-  s.summary     = %q{Capture webcam image on git commit}
-  s.description = %q{Capture webcam image on git commit for lulz}
+  s.summary     = %q{Capture webcam image on git commit for lulz.}
+  s.description = %q{Capture webcam image on git commit for lulz. Works with Mac OS X and Linux.}
 
   s.rubyforge_project = "lolcommits"
 
@@ -21,7 +21,9 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
   # s.add_runtime_dependency "rest-client"
+  s.add_development_dependency "rake"
   s.add_runtime_dependency "rmagick"
   s.add_runtime_dependency "git"
   s.add_runtime_dependency "choice", ">= 0.1.6"
+  s.add_runtime_dependency "launchy"
 end

data/test/test_lolcommits.rb

@@ -0,0 +1,25 @@
+require 'test/unit'
+
+begin
+  require 'lolcommits'
+rescue LoadError
+  require 'rubygems'
+  require 'lolcommits'
+end
+
+include Lolcommits
+
+class LolTest < Test::Unit::TestCase
+    def test_can_parse_git
+        assert_nothing_raised do
+            Lolcommits.parse_git()
+        end
+    end
+
+    # Hmm.. webcam capture breaks travis-ci tests
+    #def test_can_capture
+    #    assert_nothing_raised do
+    #        Lolcommits.capture(0,true,'test commit message','test-sha-001')
+    #    end
+    #end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,27 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rmagick
-  requirement: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70219465154200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *70219465154200
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: &70219465153700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70219465153700
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70219465153240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70219465153240
 - !ruby/object:Gem::Dependency
   name: choice
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70219465152660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,13 +54,20 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *70219465152660
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: &70219465152180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.6
-description: Capture webcam image on git commit for lulz
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70219465152180
+description: Capture webcam image on git commit for lulz. Works with Mac OS X and
+  Linux.
 email:
 - mrothenberg@gmail.com
 executables:
@@ -68,14 +76,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - README.md
 - Rakefile
 - bin/lolcommits
+- fonts/Impact.ttf
 - lib/lolcommits.rb
 - lib/lolcommits/version.rb
 - lolcommits.gemspec
+- test/test_lolcommits.rb
 homepage: http://github.com/mroth/lolcommits
 licenses: []
 post_install_message: 
@@ -96,8 +107,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: lolcommits
-rubygems_version: 1.8.21
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: Capture webcam image on git commit
-test_files: []
+summary: Capture webcam image on git commit for lulz.
+test_files:
+- test/test_lolcommits.rb