lolcommits 0.1.3 → 0.1.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.1.4 (28 May 2012)
+  * set device on mac via --device (or LOLCOMMITS_DEVICE env variable) --
+    thanks @pioz (pull #51)
+
 0.1.3 (18 May 2012)
   * add LGPLv3 license
   * add option to translate your commit message to lolspeak! (thx

data/README.md

@@ -68,6 +68,9 @@ Please add your own lolcommit! Add to the [People Using Lolcommits](https://gith
 lolcommits has some options for additional lulz.  You can enable via
 environment variables.
 
+ * Set webcam device on mac - set `LOLCOMMITS_DEVICE` environment variable.
+ * Set delay persistently (for slow to warmup webcams) - set
+   `LOLCOMMITS_DELAY` var to time in seconds.
  * TRANZLATE YOAR COMMIT_MSG TO LOLSPEKK - set
    `LOLCOMMITS_TRANZLATE=1`.
 

data/bin/lolcommits

@@ -53,18 +53,18 @@ def do_enable
     puts "You don't appear to be in the base directory of a git project."
     exit 1
   end
-  
+
   #its possible a hooks dir doesnt exist, so create it if so
   if not File.directory?(HOOK_DIR)
     Dir.mkdir(HOOK_DIR)
   end
-  
+
   if File.exists? HOOK_PATH
     puts "A post-commit hook already exists for this project."
     #TODO: disambiguate between OUR post-commit hook and something else
     exit 1
   end
-  
+
   doc = "#!/bin/sh\nlolcommits --capture\n"
   File.open(HOOK_PATH, 'w') {|f| f.write(doc) }
   FileUtils.chmod 0755, HOOK_PATH
@@ -93,12 +93,13 @@ end
 #
 def do_capture
   capture_delay = Choice.choices[:delay] || ENV['LOLCOMMITS_DELAY'] || 0
+  capture_device = Choice.choices[:device] || ENV['LOLCOMMITS_DEVICE'] || nil
 
   if Choice.choices[:test]
     puts "*** capturing in test mode"
-    Lolcommits.capture(capture_delay, true, Choice.choices[:msg], Choice.choices[:sha])
+    Lolcommits.capture(capture_delay, capture_device, true, Choice.choices[:msg], Choice.choices[:sha])
   else
-    Lolcommits.capture(capture_delay)
+    Lolcommits.capture(capture_delay, capture_device)
   end
 end
 
@@ -113,14 +114,14 @@ Choice.options do
     action { do_enable }
     desc "install lolcommits for this repo"
   end
-  
+
   option :disable do
     long "--disable"
     short '-d'
     action { do_disable }
     desc "uninstall lolcommits for this repo"
   end
-  
+
   option :capture do
     long "--capture"
     short '-c'
@@ -135,7 +136,7 @@ Choice.options do
       Launchy.open Lolcommits.most_recent
     end
   end
-  
+
   option :browse do
     long "--browse"
     short "-b"
@@ -144,19 +145,19 @@ Choice.options do
       Launchy.open Lolcommits.loldir
     end
   end
-  
+
   option :test do
     long "--test"
     desc "Run in test mode"
   end
-  
+
   option :sha do
     desc "pass SHA manually (for test only)"
     long "--sha"
     short '-s'
     default "test-#{rand(10 ** 10)}"
   end
-  
+
   option :msg do
     desc "pass commit msg manually (for test only)"
     long "--msg"
@@ -170,6 +171,11 @@ Choice.options do
     cast Integer
     short '-w'
   end
+
+  option :device do
+    long "--device=DEVICE"
+    desc "the device name used to take the snapshot (only mac)"
+  end
 end
 
 #

data/lib/lolcommits.rb

@@ -33,12 +33,12 @@ module Lolcommits
     loldir, commit_sha, commit_msg = parse_git
     Dir.glob(File.join loldir, "*").max_by {|f| File.mtime(f)}
   end
-  
+
   def loldir(dir='.')
     loldir, commit_sha, commit_msg = parse_git
     return loldir
   end
-  
+
   def parse_git(dir='.')
     g = Git.open('.')
     commit = g.log.first
@@ -50,7 +50,7 @@ module Lolcommits
     return loldir, commit_sha, commit_msg
   end
 
-  def capture(capture_delay=0, is_test=false, test_msg=nil, test_sha=nil)
+  def capture(capture_delay=0, capture_device=nil, is_test=false, test_msg=nil, test_sha=nil)
     #
     # Read the git repo information from the current working directory
     #
@@ -61,7 +61,7 @@ module Lolcommits
       commit_sha = test_sha
       loldir = File.join LOLBASEDIR, "test"
     end
-    
+
     #
     # lolspeak translate the message
     #
@@ -86,7 +86,8 @@ module Lolcommits
     snapshot_loc = File.join loldir, "tmp_snapshot.jpg"
     if is_mac?
       imagesnap_bin = File.join LOLCOMMITS_ROOT, "ext", "imagesnap", "imagesnap"
-      system("#{imagesnap_bin} -q #{snapshot_loc} -w #{capture_delay}")
+      capture_device = "-d '#{capture_device}'" if capture_device
+      system("#{imagesnap_bin} -q #{snapshot_loc} -w #{capture_delay} #{capture_device}")
     elsif is_linux?
       tmpdir = File.expand_path "#{loldir}/tmpdir#{rand(1000)}/"
       FileUtils.mkdir_p( tmpdir )

data/lib/lolcommits/version.rb

@@ -1,3 +1,3 @@
 module Lolcommits
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000 Z
+date: 2012-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake