lolcommits 0.4.0.pre2 → 0.4.0

data/.travis.yml

@@ -4,7 +4,6 @@ rvm:
  - 1.9.2
  - 1.9.3
  - ruby-head
- - jruby
 
 before_install:
 # - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 16126D3A3E5C1192
@@ -15,7 +14,6 @@ before_install:
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby
 
 branches:
   except:

data/CHANGELOG

@@ -1,4 +1,4 @@
-0.4.0 (in development)
+0.4.0 (13 January 2013)
   * Switch the main ImageMagick wrapper from RMagick to mini_magick
     - fix for RMagick not working with ImageMagick 6.8+ and generally
       being a buggy unmaintained piece of crap

data/README.md

@@ -1,15 +1,21 @@
-![lion](http://9.mshcdn.com/follow/uploads/topic/image/67/3d/84/a9/e6/29/thumb_mountain-lion-eb890e1974.png) **HAVING TROUBLE AFTER UPGRADING TO MOUNTAIN LION? [READ THIS.](https://github.com/mroth/lolcommits/issues/65)**
-
 # lolcommits (git + webcam = lol)
 
-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.
+lolcommits takes a snapshot with your webcam every time you git commit code, and archives a lolcat style image with it.
+Git blame has never been so much fun.
 
 By default, the lolimages are stored by a Github style short SHA in a `~/.lolcommits` directory created for you.
 
+[![Gem Version](https://badge.fury.io/rb/lolcommits.png)](http://badge.fury.io/rb/lolcommits)
 [![Build Status](https://secure.travis-ci.org/mroth/lolcommits.png?branch=master)](http://travis-ci.org/mroth/lolcommits)
 [![Dependency Status](https://gemnasium.com/mroth/lolcommits.png)](https://gemnasium.com/mroth/lolcommits)
 
-## Installation (Mac OS X)
+## Sample images
+<img src="http://blog.mroth.info/images/postcontent/yearinsideprojects/lolcommits_users2.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.
+
+## Installation 
+### Mac OS X
 You'll need ImageMagick installed.  [Homebrew](http://mxcl.github.com/homebrew/) makes this easy.  Simply do:
 
 	brew install imagemagick
@@ -18,15 +24,9 @@ Then simply do:
 
 	[sudo] gem install lolcommits
 
-(If you're using rvm or something like that, you can/should probably omit the sudo, but the default MacOSX Ruby install is dumb and requires it.)
-
-You're all set!  To enable lolcommits for a git repo, go to the base directory of the repository, and run:
-
-	lolcommits --enable
+(If you're using RVM, you can/should probably omit the sudo, but the default MacOSX Ruby install is dumb and requires it.)
 
-Likewise, you can disable it via `lolcommits --disable`.  For a full list of options, you can do `lolcommits --help`.
-
-## Installation (Linux)
+### Linux
 Install dependencies using your package manager of choice, for example in Ubuntu:
 
     sudo apt-get install mplayer imagemagick libmagickwand-dev
@@ -35,37 +35,21 @@ Then install the lolcommits gem:
 
     gem install lolcommits
 
-Then you can `lolcommits --enable` in any git repo as above.
-
 For more details, see [Installing on Linux](https://github.com/mroth/lolcommits/wiki/Installing-on-Linux).
 
-## Installation (Windows)
-See the wiki page for [Installing on Windows](https://github.com/mroth/lolcommits/wiki/Installing-on-Windows).
+### Windows
+Here be dragons! It all works but you'll need some more detailed instructions to get the dependencies installed.  See the wiki page for [Installing on Windows](https://github.com/mroth/lolcommits/wiki/Installing-on-Windows).
 
-## Sample images
-<img width='320' height='240' src="https://github.com/mroth/lolcommits/raw/gh-pages/assets/img/sample_old/sample2.jpg" />
-&nbsp;
-<img width='320' height='240' src="https://github.com/mroth/lolcommits/raw/gh-pages/assets/img/sample_old/sample5.jpg" />
-<br/>
-<img width='320' height='240' src="https://github.com/mroth/lolcommits/raw/gh-pages/assets/img/sample_old/sample4.jpg" />
-&nbsp;
-<img width='320' height='240' src="https://github.com/mroth/lolcommits/raw/gh-pages/assets/img/sample_old/sample6.jpg" />
-<br/>
-<img width='320' height='240' src="https://github.com/mroth/lolcommits/raw/gh-pages/assets/img/sample_old/sample7.jpg" />
-&nbsp;
-<img width='320' height='240' src="https://github.com/mroth/lolcommits/raw/gh-pages/assets/img/sample_old/sample8.jpg" />
-<br/>
-<a href="http://github.com/sfsekaran/"><img width='320' height='240' src="http://cl.ly/252S0o1J3x3n1b1k251N/d5f80e4f88a.jpg" /></a>
-&nbsp;
-<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" />
+## Usage
+### Enabling and basic usage
+From within any git repository, simply do a `lolcommits --enable`. From that point on, any git commit will automatically trigger a lolcommit capture! All lolcommits are stored in `~/.lolcommits` by default, placed in a subdirectory by project name, and with a filename matching the commit hash.
 
-Please add your own lolcommit! Add to the [People Using Lolcommits](https://github.com/mroth/lolcommits/wiki/People-Using-Lolcommits) page on the Wiki.
+Don't worry about it too much, half the fun of lolcommits is forgetting it's installed!
+
+### Other commands
+Ok, if you insist... Since you know about `--enable`, common sense suggest there is also a repository specific `--disable`, hopefully you can guess what that does. Other handy common commands include `--last`, which will open for display your most recent lolcommit image, or `--browse`, which pops open the directory containing all the lolcommit images for your current repository. You can always do `--help` for a full list of available commands.
 
-## Options
+### Configuration variables
 lolcommits has some options for additional lulz.  You can enable via
 environment variables.
 
@@ -73,10 +57,11 @@ environment variables.
  * Set delay persistently (for slow to warmup webcams) - set
    `LOLCOMMITS_DELAY` var to time in seconds.
 
-## Plugins
+For the full list, see the [configuration variables](https://github.com/mroth/lolcommits/wiki/Configuration-Variables).
+
+### Plugins
 
- * TRANZLATE YOAR COMMIT_MSG TO LOLSPEKK - do 
-   `lolcommits --config -p tranzlate` and set enabled to `true`.
+There are a growing amount of plugins for lolcommits to enable things like Twitter upload, translating your commit messages to lolspeak, etc.  Check them out on the [plugins wiki page](https://github.com/mroth/lolcommits/wiki/Plugins).
 
 ## Troubles?
 Started a [FAQ](https://github.com/mroth/lolcommits/wiki/FAQ).
@@ -85,4 +70,4 @@ Started a [FAQ](https://github.com/mroth/lolcommits/wiki/FAQ).
 
 To watch your face as it decays while you program, you can create a quick mpeg of all your lolcommits snapshots (if you have `imagemagick` and `ffmpeg` installed):
 
-    convert `find . -type f -name "*.jpg" -print0 | xargs -0 ls -tlr | awk '{print $9}'` timelapse.mpeg
+    convert `find . -type f -name "*.jpg" -print0 | xargs -0 ls -tlr | awk '{print $9}'` timelapse.mpeg

data/features/plugins.feature

@@ -1,33 +1,24 @@
 Feature: Plugins Work
 
   Scenario: Lolcommits.com integration works
-    Given a git repository named "dot_com"
-    And an empty file named "dot_com/FOOBAR"
-    When I cd to "dot_com"
-    And I successfully run `lolcommits --enable`
-    And I run `lolcommits --config` and wait for output
+    Given I am in a git repository named "dot_com" with lolcommits enabled
+    When I run `lolcommits --config` and wait for output
     And I enter "dot_com" for "Plugin Name"
     And I enter "true" for "enabled"
     And I enter "b2a70ac0b64e012fa61522000a8c42dc" for "api_key"
     And I enter "b2a720b0b64e012fa61522000a8c42dc" for "api_secret"
     And I enter "c4aed530b64e012fa61522000a8c42dc" for "repo_id"
     Then I should be presented "Successfully Configured"
-    When I successfully run `git add .`
-    And I successfully run `git commit -m 'can haz commit'`
+    When I do a git commit
     Then the output should contain "*** Preserving this moment in history."
     And there should be exactly 1 jpg in "../.lolcommits/dot_com"
 
   Scenario: Disable loltext
-    Given a git repository named "loltext"
-    And an empty file named "loltext/FOOBAR"
-    When I cd to "loltext"
-    And I successfully run `lolcommits --enable`
+    Given I am in a git repository named "loltext" with lolcommits enabled
     And I run `lolcommits --config` and wait for output
     And I enter "loltext" for "Plugin Name"
     And I enter "false" for "enabled"
     Then I should be presented "Successfully Configured"
-    When I successfully run `git add .`
-    And I successfully run `git commit -m 'can haz commit'`
+    When I do a git commit
     Then the output should contain "*** Preserving this moment in history."
     And there should be exactly 1 jpg in "../.lolcommits/loltext"
-

data/lib/lolcommits/version.rb

@@ -1,3 +1,3 @@
 module Lolcommits
-  VERSION = "0.4.0.pre2"
+  VERSION = "0.4.0"
 end

data/lolcommits.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email       = ["mrothenberg@gmail.com"]
   s.homepage    = "http://mroth.github.com/lolcommits/"
   s.summary     = %q{Capture webcam image on git commit for lulz.}
-  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.description = %q{Takes a snapshot with your webcam every time you git commit code, and archives a lolcat style image with it.}
   s.license     = "LGPL-3"
   s.rubyforge_project = "lolcommits"
 
@@ -34,10 +34,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency('faker')
 
   # plugin dependencies
-  s.add_runtime_dependency("twitter") #twitter
-  s.add_runtime_dependency("oauth") #twitter
-  s.add_runtime_dependency("rest-client") #uploldz
-  s.add_runtime_dependency('httmultiparty') #dot_com
-  s.add_runtime_dependency('statsd-ruby', '~> 1.1.0') #statsd
+  s.add_runtime_dependency('twitter')                 #twitter
+  s.add_runtime_dependency('oauth')                   #twitter
+  s.add_runtime_dependency('rest-client')             #uploldz
+  s.add_runtime_dependency('httmultiparty')           #dot_com
+  s.add_runtime_dependency('statsd-ruby', '~> 1.2.0') #statsd
 
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre2
-  prerelease: 6
+  version: 0.4.0
+  prerelease: 
 platform: ruby
 authors:
 - Matthew Rothenberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -258,7 +258,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -266,10 +266,9 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.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.
+        version: 1.2.0
+description: Takes a snapshot with your webcam every time you git commit code, and
+  archives a lolcat style image with it.
 email:
 - mrothenberg@gmail.com
 executables:
@@ -335,13 +334,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4160934492553499753
+      hash: 3878014605033370511
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 3878014605033370511
 requirements: []
 rubyforge_project: lolcommits
 rubygems_version: 1.8.24