naturecommits 0.0.1 → 0.0.2

data/CHANGELOG

@@ -1,36 +1,7 @@
-0.1.3 (18 May 2012)
-  * add LGPLv3 license
-  * add option to translate your commit message to lolspeak! (thx
-    to @DanielleSucher!).  To enable, set `naturecommits_TRANZLATE=1`.
-  * fix issue with older versions of IM crashing on interline spacing (pull #31 via @german)
-  * fix issue with git repos with no hooks directory (pull #43 via @mkmaster)
-  * fix missing dash in capture -c
+0.0.2 (23 May 2012)
+  * moved bucket to the config
+  * added error checking for the yaml file
 
-0.1.2 (22 April 2012)
-  * provide licensing info for CommandCam (Windows)
-  * bundle imagesnap as well to remove a dependency on Mac OS X
-
-0.1.1 (21 April 2012)
-  * 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)
-  * use only first line for multi-line commit msgs (pull req #21)
-  * clean up some command line options
-
-0.0.2 (2 April 2012)
-  * add --delay option to delay image capture (thx JohanB), can be
-  persistently set via naturecommits_DELAY environment variable.
-  * add --last command to view most recent lolcommit for a repo
-  * add --browse command to open the lolcommit images directory for a particular repo
-
-0.0.1 (29 March 2012)
-  * initial release as a gem package, major refactoring for this
-  * refactored to remove git-hooks package dependency, now installs stub hook
-  directly into each git repo
-  * wordwrap commit_msg manually, to switch to use imagemagick annotate
-  instead of compositing multiply image Caption objects (this seems to be more
-  reliable to not glitch.)
+0.0.1 (22 May 2012)
+  * initial release as a gem package
 

data/README.md

@@ -1,11 +1,11 @@
-[![Build Status](https://secure.travis-ci.org/mroth/naturecommits.png?branch=master)](http://travis-ci.org/mroth/naturecommits)
-
 # 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.
 
 By default, the lolimages are stored by a Github style short SHA in a `~/.naturecommits` directory created for you.
 
+This is a fork of [lolcommits](https://github.com/mroth/lolcommits) with Amazon S3 support added.
+
 ## Installation (Mac OS X)
 You'll need ImageMagick installed.  [Homebrew](http://mxcl.github.com/homebrew/) makes this easy.  Simply do:
 
@@ -28,8 +28,19 @@ You're all set!  To enable naturecommits for a git repo, go to the base director
 
 Likewise, you can disable it via `naturecommits --disable`.  For a full list of options, you can do `naturecommits --help`.
 
-## Amazon S3
-You will also need the yaml config file in your root, which you can get from me. This sets up your connection to Amazon S3 account.
+## Installation (Linux and Windows)
+
+I have only tested this on Mac, for Windows and Linux instructions please see the original [lolcommits](https://github.com/mroth/lolcommits)
+
+## Configuration
+For Amazon S3 to work you will need a yaml config file in your root called `naturecommits.yaml`, this sets up your connection to Amazon S3 account. This should be in the format shown below with your amazon access keys, a username (no spaces), and the name of the bucket where the images are to be stored.
+
+	---
+	amazon:
+	  access_key: ACCESS_KEY_HERE
+	  secret_key: SECRET_KEY_HERE
+	user: jbloggs
+	bucket: naturecommits
 
 ## Options
 naturecommits has some options for additional lulz.  You can enable via

data/lib/naturecommits/version.rb

@@ -1,3 +1,3 @@
 module NATURECOMMITS
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/naturecommits.rb

@@ -17,12 +17,18 @@ module NATURECOMMITS
   LOLBASEDIR = File.join $home, ".naturecommits"
   naturecommits_ROOT = File.join(File.dirname(__FILE__), '..')
   
-  # Specify and load config
-  CONFIG_FILE = '/naturecommits.yaml'
-  $config = YAML::load(File.open(CONFIG_FILE))
-  $ACCESS = $config['amazon']['access_key']
-  $SECRET = $config['amazon']['secret_key']
-  $USER = $config['user']
+  begin
+    # Specify and load config
+    CONFIG_FILE = '/naturecommits.yaml'
+    $config = YAML::load(File.open(CONFIG_FILE))
+    $ACCESS = $config['amazon']['access_key']
+    $SECRET = $config['amazon']['secret_key']
+    $USER = $config['user']
+    $BUCKET = $config['bucket']
+  rescue
+    puts "Cannot find naturecommits.yaml, or the configuration is wrong. Please ensure the file is in your root and correctly formatted."
+    exit 1
+  end
   
   def is_mac?
     RUBY_PLATFORM.downcase.include?("darwin")
@@ -181,7 +187,7 @@ module NATURECOMMITS
     local_file = "#{loldir}/#{$USER}_#{commit_sha}.jpg"
 
     # bucket & mime-type
-    bucket = 'naturecommits'
+    bucket = $BUCKET
     mime_type = 'image/jpeg'
 
     AWS::S3::Base.establish_connection!(

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: naturecommits
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Alex Kilgour
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-22 00:00:00 Z
+date: 2012-05-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake