lolcommits 0.1.0 → 0.1.1

data/CHANGELOG

@@ -1,4 +1,7 @@
-0.1.0 (in development)
+0.1.1 (in development)
+  * Windows compatibility!  Thanks to @Prydonious.
+
+0.1.0 (19 April 2012)
   * Linux compatibility! Thanks to @madjar, @cscorely, and @Prydonius.
 
 0.0.3 (16 April 2012)

data/README.md

@@ -6,7 +6,7 @@ Takes a snapshot with your Mac's built-in iSight/FaceTime webcam (or any working
 
 By default, the lolimages are stored by a Github style short SHA in a `~/.lolcommits` directory created for you.
 
-## Installation (for Mac OS X)
+## Installation (Mac OS X)
 You'll need imagesnap and imagemagick installed.  [Homebrew](http://mxcl.github.com/homebrew/) makes this easy.  Simply do:
 
 	brew install imagemagick
@@ -24,7 +24,7 @@ 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)
+## Installation (Linux)
 Install dependencies using your package manager of choice, for example in Ubuntu:
 
     sudo apt-get install mplayer imagemagick libmagick9-dev
@@ -35,8 +35,10 @@ Then install the lolcommits gem:
 
 Then you can `lolcommits --enable` in any git repo as above.
 
+## Installation (Windows)
+See the wiki page for [Installing on Windows](https://github.com/mroth/lolcommits/wiki/Installing-on-Windows).
+
 ## 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" />
 &nbsp;
 <img width='320' height='240' src="https://github.com/mroth/lolcommits/raw/gh-pages/sample5.jpg" />
@@ -54,6 +56,11 @@ Please add your own lolcommit to these samples!  Just fork this repo, add it to
 <a href="http://github.com/codegoblin/"><img width='320' height='240' src="http://cl.ly/2R0u040D2E2k0Y03240B/19bda811539.jpg" /></a>
 <br/>
 <img width='320' height='240' src="https://p.twimg.com/AqE73M1CMAAerqL.jpg" />
+&nbsp;
+<img width='320' height='240' src="https://p.twimg.com/Aq9T0X9CAAAZ8gW.jpg" />
+
+Please add your own lolcommit! Add to the [People Using Lolcommits](https://github.com/mroth/lolcommits/wiki/People-Using-Lolcommits) page on the Wiki.
+
 
 <!--
 ## Upgrading from an old (non-gem) version?

data/bin/lolcommits

@@ -41,13 +41,13 @@ def do_noargs
   puts "Try: lolcommits --enable   (when in a git repository)"
 end
 
-HOOK_PATH = ".git/hooks/post-commit"
+HOOK_PATH = File.join ".git", "hooks", "post-commit"
 
 #
 # IF --ENABLE, DO ENABLE
 #
 def do_enable
-  if not File.directory? ".git/hooks"
+  if not File.directory?(File.join ".git", "hooks")
     puts "You don't appear to be in the base directory of a git project."
     exit 1
   end
@@ -160,7 +160,7 @@ Choice.options do
     long "--delay=SECONDS"
     desc "delay taking of the snapshot by n seconds"
     cast Integer
-    short '-d'
+    short '-w'
   end
 end
 

data/lib/lolcommits.rb

@@ -8,21 +8,27 @@ require "launchy"
 include Magick
 
 module Lolcommits
-  # Your code goes here...
   $home = ENV['HOME']
-  LOLBASEDIR = "#{$home}/.lolcommits"
+  LOLBASEDIR = File.join $home, ".lolcommits"
+  LOLCOMMITS_ROOT = File.join(File.dirname(__FILE__), '..')
 
   def is_mac?
     RUBY_PLATFORM.downcase.include?("darwin")
   end
 
   def is_linux?
-     RUBY_PLATFORM.downcase.include?("linux")
+    RUBY_PLATFORM.downcase.include?("linux")
+  end
+
+  def is_windows?
+    if RUBY_PLATFORM =~ /(win|w)32$/
+      true
+    end
   end
 
   def most_recent(dir='.')
     loldir, commit_sha, commit_msg = parse_git
-    Dir.glob("#{loldir}/*").max_by {|f| File.mtime(f)}
+    Dir.glob(File.join loldir, "*").max_by {|f| File.mtime(f)}
   end
   
   def loldir(dir='.')
@@ -37,7 +43,7 @@ module Lolcommits
     commit_sha = commit.sha[0..10]
     basename = File.basename(g.dir.to_s)
     basename.sub!(/^\./, 'dot') #no invisible directories in output, thanks!
-    loldir = "#{LOLBASEDIR}/#{basename}"
+    loldir = File.join LOLBASEDIR, basename
     return loldir, commit_sha, commit_msg
   end
 
@@ -50,7 +56,7 @@ module Lolcommits
     else
       commit_msg = test_msg
       commit_sha = test_sha
-      loldir = "#{LOLBASEDIR}/test"
+      loldir = File.join LOLBASEDIR, "test"
     end
     
     #
@@ -67,7 +73,7 @@ module Lolcommits
     # if this changes on future mac isights.
     #
     puts "*** Preserving this moment in history."
-    snapshot_loc = "#{loldir}/tmp_snapshot.jpg"
+    snapshot_loc = File.join loldir, "tmp_snapshot.jpg"
     if is_mac?
       system("imagesnap -q #{snapshot_loc} -w #{capture_delay}")
     elsif is_linux?
@@ -83,6 +89,17 @@ module Lolcommits
       r.read
       FileUtils.mv(tmpdir + "/%08d.jpg" % frames, snapshot_loc)
       FileUtils.rm_rf( tmpdir )
+    elsif is_windows?
+      commandcam_exe = File.join LOLCOMMITS_ROOT, "ext", "CommandCam.exe"
+      # DirectShow takes a while to show... at least for me anyway
+      delaycmd = " /delay 3000"
+      if capture_delay > 0
+        # CommandCam delay is in milliseconds
+        delaycmd = " /delay #{capture_delay * 1000}"
+      end
+      _, r, _ = Open3.popen3("#{commandcam_exe} /filename #{snapshot_loc}#{delaycmd}")
+      # looks like we still need to read the outpot for something to happen
+      r.read
     end
 
 
@@ -103,7 +120,7 @@ module Lolcommits
     #else
     #  draw.font = "/usr/share/fonts/TTF/impact.ttf"
     #end
-    draw.font = File.join(File.dirname(__FILE__), "..", "fonts", "Impact.ttf")
+    draw.font = File.join(LOLCOMMITS_ROOT, "fonts", "Impact.ttf")
 
     draw.fill = 'white'
     draw.stroke = 'black'
@@ -132,12 +149,12 @@ module Lolcommits
     # Squash the images and write the files
     #
     #canvas.flatten_images.write("#{loldir}/#{commit_sha}.jpg")
-    canvas.write("#{loldir}/#{commit_sha}.jpg")
-    FileUtils.rm("#{snapshot_loc}")
+    canvas.write(File.join loldir, "#{commit_sha}.jpg")
+    FileUtils.rm(snapshot_loc)
 
     #if in test mode, open image for inspection
     if is_test
-      Launchy.open("#{loldir}/#{commit_sha}.jpg")
+      Launchy.open(File.join loldir, "#{commit_sha}.jpg")
     end
     
     

data/lib/lolcommits/version.rb

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

data/lolcommits.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email       = ["mrothenberg@gmail.com"]
   s.homepage    = "http://github.com/mroth/lolcommits"
   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.description = %q{Takes a snapshot with your Mac's built-in iSight/FaceTime webcam (or any working webcam on Linux or Windows) every time you git commit code, and archives a lolcat style image with it.}
 
   s.rubyforge_project = "lolcommits"
 

data/test/test_lolcommits.rb

@@ -1,11 +1,9 @@
 require 'test/unit'
-
-begin
-  require 'lolcommits'
-rescue LoadError
-  require 'rubygems'
-  require 'lolcommits'
-end
+# Loads lolcommits directly from the lib folder so don't have to create
+# a gem before testing
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'lolcommits'
 
 include Lolcommits
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70219465154200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70219465154200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &70219465153700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70219465153700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70219465153240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70219465153240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: choice
-  requirement: &70219465152660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70219465152660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70219465152180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,9 +85,15 @@ dependencies:
         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.
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Takes a snapshot with your Mac's built-in iSight/FaceTime webcam (or
+  any working webcam on Linux or Windows) every time you git commit code, and archives
+  a lolcat style image with it.
 email:
 - mrothenberg@gmail.com
 executables:
@@ -82,6 +108,7 @@ files:
 - README.md
 - Rakefile
 - bin/lolcommits
+- ext/CommandCam.exe
 - fonts/Impact.ttf
 - lib/lolcommits.rb
 - lib/lolcommits/version.rb
@@ -107,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: lolcommits
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Capture webcam image on git commit for lulz.