lolcommits 0.6.5 → 0.6.6.pre1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDZhY2Q5NDc0OTVjMzA5ZDE4MmFkNzc3OTc4YTBkM2UxNGQzOTcyNQ==
+    MDQ3ZGMxZDc3YWU4YWZiNGEwNWI1MmUzN2QyMmMwZGUwMDQwNTFmNg==
   data.tar.gz: !binary |-
-    M2EwYjliMDA0ZmFmYThhOWVhNDUyMjlkMGMyZTA0ODAzNDE0ZTk5Ng==
+    Y2RjNWI5YjgyYTVkN2Q2ZGZjMThjOGE5ZDVhNTYwMzI5MzJhYzE3Mg==
 SHA512:
   metadata.gz: !binary |-
-    NmYzMmU0YjJjYjlmNTk4ODFlNDM0MDVkZDlhOWQzODI3ZTE0ZGM4ZTg4NjY1
-    ZDBhODFlNWU0NDUyODA0Y2FjNTM5YzVkNzk5MDNlNzI0ODlmMTgwYjE5Njc5
-    ZWU2NjY0MmM0MTc5NzcwZjhkODU0ZDAyODFkMmM3ODU4YTcyY2M=
+    YTBmMjI4MWUxMWY1MDVkMTM3ZjExMzkwYjQ5NGFhNzI2NzlhOWQ3MmI3NjVl
+    NWE4ZTY3YzMwZDgzYjUzYzZiMmQ1MTFkNDE1OTBmZjMzZTdhYWE0NThkMWYz
+    YzRkOWRjMzViZjU5M2FiZjI3MTI0MWEyZjZjZjllMWFkZjhiYjI=
   data.tar.gz: !binary |-
-    YmQzZGVjYWE3YWU5ZjViOWZhNTZlYTFiOGMwNTE3OTA5MWEzMzFmZTFjYjc0
-    ODliNTdjOGVkNzJhMWFhODlhZTczZjk4NTdjNTQ3NDI1MTUxODMxYmZiNDI2
-    Njc1MThhMmVlZDBkYmI2NThjNDJiYjFmMTBjNDZkMWY0ZWUwYjE=
+    NmE5ZDY2YTA0YTkwZjFiZGFjNTllYjQxNjhlY2FiNzNiNmRhODgwMDY3Yjlk
+    ZDc1ZTVkZGNhNzM5ZDQ2NmJiYTM5M2I1MTE4YTAwNDVlOGY0YTc2MTMxNjk0
+    NDc4ODdjZjkyM2EwZmI0ZTE3Y2NhNWFkZTQ4ZDZiNjU4M2UwZGY=

data/.rubocop_todo.yml

@@ -12,7 +12,7 @@ Metrics/AbcSize:
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 127
+  Max: 150
 
 # Offense count: 5
 Metrics/CyclomaticComplexity:

data/CHANGELOG.md

@@ -1,39 +1,49 @@
-### Version History
+### Lolcommits Change Log
 
-0.7.0 (WIP)
-  * extract plugins to separate gems ...
+All notable changes to this project will be documented in this file. This
+project adheres to [Semantic Versioning][Semver].
 
-0.6.5 (12 April 2016)
+## [Unreleased]
+
+  * WIP - extract plugins to separate gems ...
+  * Your contribution here!
+
+## [0.6.6][] (1 June 2016)
+  * Show error/exit when --config outside a git repo (@matthutchinson #308)
+  * Add more options to loltext plugin (@ruxton #304)
+  * Added CODE_OF_CONDUCT.md to repo (@matthutchinson)
+
+## [0.6.5][] (12 April 2016)
   * Add mercurial support (@tak #301 #302 #303)
 
-0.6.4 (15 March 2016)
+## [0.6.4][] (15 March 2016)
   * Add quotes to correctly handle paths with spaces (@matthutchinson #298)
 
-0.6.3 (14 March 2016)
+## [0.6.3][] (14 March 2016)
   * Add quotes to correctly handle paths with spaces (@pedrocunha #296)
   * Added plugin config path to output (@KrauseFx #294)
 
-0.6.2 (21 February 2016)
+## [0.6.2][] (21 February 2016)
   * Avoid invoking ruby if in a rebase (@jhawthorn #286)
   * Slow gif problem on mac (@a06kin #289)
   * Peg RuboCop gem to 0.37.2 and fix cop issues (@matthutchinson #292)
 
-0.6.1 (16 September 2015)
+## [0.6.1][] (16 September 2015)
   * Optional http auth header user/password in uploldz plugin (@felixroos #283)
   * Slack plugin added (@yasakbulut #284)
   * Updated rubies in Travis settings (@matthutchinson)
   * Fixed README badge URLS (@matthutchinson)
 
-0.6.0 (27 July 2015)
+## [0.6.0][] (27 July 2015)
   * Configurable text options for loltext plugin (@matthutchinson #282)
   * Working AppVeyor configuration added (@nysthee #280)
   * Tumblr plugin (@mveytsman #279)
   * CHANGELOG (this file) now in markdown format (@matthutchinson)
 
-0.5.9 (24 April 2015)
+## [0.5.9][] (24 April 2015)
   * Fix windows post commit hook path (@matthutchinson #278)
 
-0.5.8 (22 April 2015)
+## [0.5.8][] (22 April 2015)
   * Fix Windows MiniMagick issue (@matthutchinson #276)
   * Rubocop code clean ups (@nysthee #272)
   * Fix gem issues on earlier Ruby versions (#270)
@@ -44,14 +54,14 @@
   * lol_protonet plugin added (@salzig #251)
   * Allow local plugins in $LOLCOMMITS_DIR/.plugins (@salzig #250)
 
-0.5.7 (28 December 2014)
+## [0.5.7][] (28 December 2014)
   * Uploldz plugin sends more post params (@clops #224 @matthutchinson #241)
   * More configurable twitter plugin (@woodrowbarlow #207 @matthutchinson)
   * Upgrade all gems that can be, 4 held back (#244 @matthutchinson)
   * Ruby 2.2.0 compatible (#244 @matthutchinson)
   * Glob /dev/video for default video device (linux only) (#246 @Ferada)
 
-0.5.6 (24 November 2014)
+## [0.5.6][] (24 November 2014)
   * Updates and clean ups on the gemspec (@mroth #228)
   * Travis CI now includes ruby-head (@mroth #229)
   * Improved error message for ImageMagick issues #159 (@matthutchinson #233)
@@ -62,7 +72,7 @@
   * Better failover when no snapshot created  (@matthutchinson #237)
   * Export LANG to post-commit hook, fixes GitHub client (@matthutchinson #240)
 
-0.5.5 (29 September 2014)
+## [0.5.5][] (29 September 2014)
   * Animated gif capture support (@theY4Kman #226)
   * Fix plugin config issues with user input (@matthutchinson #225 #223)
   * Fix Linux FPS timing issues (@matthutchinson #215)
@@ -72,14 +82,14 @@
   * Explain global Git hooks how-to in README (@matthutchinson #212 #112)
   * Minor improvments to Linux Capturer (@matthutchinson)
 
-0.5.4 (13 April 2014)
+## [0.5.4][] (13 April 2014)
   * Excluded vendor/bundle from rubocop cops (@matthutchinson)
   * Peg fivemat gem to ~> 1.2.1 (@mroth)
   * Fix lolsrv log file issue (@matthutchinson #202)
   * Yammer Plugin added (@mrclmvn #160)
   * Refactor on capture options (@mroth)
 
-0.5.3 (30 March 2014)
+## [0.5.3][] (30 March 2014)
   * Fixed permissions on CommandCam (755) for cygwin (@matthutchinson)
   * Added `--devices` option, mac only for now (@matthutchinson #183, #174)
   * Replace http with https in twitter plugin (@kleinschmidt #195)
@@ -90,7 +100,7 @@
   * Added --version (-v) flag (@bfontaine #184)
   * Send more VCS details to lolsrv (@drewwells #181)
 
-0.5.2 (5 December 2013)
+## [0.5.2][] (5 December 2013)
   * Allow lolsrv plugin to sync/upload gifs (@matthutchinson #180)
   * Plugins refactor, can now configure themselves (@matthutchinson #179)
     - also closes issue #136 and issue #73
@@ -103,14 +113,14 @@
   * Improved --enable option, accepts passing arguments (@matthutchinson #154)
     - README updated to explain enabling with options
 
-0.5.1 (13 November 2013)
+## [0.5.1][] (13 November 2013)
   * Fix JSON gem issue #163 (@matthutchinson, #171)
   * Enable image capture under Cygwin (@cwc, #105)
   * Add Ruby PATH to post-commit hook (@matthutchinson, #155)
   * "Stealth mode" where no notification is given (@sionide21, #156)
   * BUGFIX: comparison error for animate (@Yabes, #151)
 
-0.5.0 (10 September 2013)
+## [0.5.0][] (10 September 2013)
   * better handling of LOLCOMMITS_DELAY (thx @leewillis77, #125)
   * LOLCOMMITS_DEVICE support on Linux (thx @EbenezerEdelman, #139)
   * better handling of repository names (thx @drocamor and @andromedado, #145 and #146)
@@ -120,27 +130,27 @@
     - feature requires ffmpeg
     - README updated with details and an example
 
-0.4.6 (12 August 2013)
+## 0.4.6 (12 August 2013)
   * Fix for incorrect permissioning in gem issue (see #112)
 
-0.4.5 (8 July 2013)
+## 0.4.5 (8 July 2013)
   * disable&remove statsd plugin (as per #94)
   * fix issues with animated gif generation (#107)
   * added new LOLCOMMITS_FORK (or --fork) option to fork the runner capturing (#109)
 
-0.4.4 (28 June 2013)
+## 0.4.4 (28 June 2013)
   * add -g option to produce animated gifs! (thx @hSATAC, #95)
 
-0.4.3 (29 March 2013)
+## 0.4.3 (29 March 2013)
   * bump mini_magick dependency to deal with security alert
 
-0.4.2 (11 March 2013)
+## 0.4.2 (11 March 2013)
   * fix ruby 2.0 compatibility (#91)
   * gracefully detect upstream issue with git color.ui being set to always (#50)
   * handle external capture devices with special characters in name (#93)
   * fixes to the uploldz plugin (#92)
 
-0.4.1 (17 February 2013)
+## 0.4.1 (17 February 2013)
   * add lolsrv plugin (thx @sebastianmarr!, #82)
   * enable feature to change font (thx @fukayatsu!, #89)
   * correct activesupport gem name in bundle (thx @djbender!, #90)
@@ -148,7 +158,7 @@
   * restructure logging slightly to use Methadone::CLILogging in most places
   * add a bunch of debugging output, viewable via --debug flag
 
-0.4.0 (13 January 2013)
+## 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
@@ -158,40 +168,40 @@
   * make sure quotes are properly handled in commit messages
   * silence warnings generated by twitter gem in MRI 1.8.7
 
-0.3.4 (27 December 2012)
+## 0.3.4 (27 December 2012)
   * Add uploldz plugin for posting to a remote server (thx @cnvandev)
 
-0.3.3 (26 November 2012)
+## 0.3.3 (26 November 2012)
   * BUG: prevent repeated firing of lolcommits capture during a git rebase.
 
-0.3.2 (3 October 2012)
+## 0.3.2 (3 October 2012)
   * Twitter posting support via the `twitter` plugin! (thx @coyboyrushforth!)
 
-0.3.1 (5 August 2012)
+## 0.3.1 (5 August 2012)
   * fix regression with linux capture introduced in previous version
 
-0.3.0 (3 August 2012)
+## 0.3.0 (3 August 2012)
   * fix bug involving git repositories with spaces in the name
   * internal refactoring for modularity (thanks @kenmazaika!), should be easier
     to add new plugin features to lolcommits now.
   * add some extremely basic anonymous usage tracking (if this bugs you, you
     can disable via disabling the `statsd` plugin).
 
-0.2.0 (6 July 2012)
+## 0.2.0 (6 July 2012)
   * improved build system and testing with cucumber/methadone
     - goal is to get into a better framework to start doing major feature work
     - this should lead to increased reliability across systems as we refactor
   * writing tests (please help!)
   * fix issues with packaged files not being readable after a sudo gem install
 
-0.1.5 (25 June 2012)
+## 0.1.5 (25 June 2012)
   * fix tranzlate on ruby1.8
 
-0.1.4 (28 May 2012)
+## 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)
+## 0.1.3 (18 May 2012)
   * add LGPLv3 license
   * add option to translate your commit message to lolspeak! (thx
     to @DanielleSucher!).  To enable, set `LOLCOMMITS_TRANZLATE=1`.
@@ -199,30 +209,50 @@
   * fix issue with git repos with no hooks directory (pull #43 via @mkmaster)
   * fix missing dash in capture -c
 
-0.1.2 (22 April 2012)
+## 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)
+## 0.1.1 (21 April 2012)
   * Windows compatibility!  Thanks to @Prydonious.
 
-0.1.0 (19 April 2012)
+## 0.1.0 (19 April 2012)
   * Linux compatibility! Thanks to @madjar, @cscorely, and @Prydonius.
 
-0.0.3 (16 April 2012)
+## 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)
+## 0.0.2 (2 April 2012)
   * add --delay option to delay image capture (thx JohanB), can be
   persistently set via LOLCOMMITS_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)
+## 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.)
+
+[Unreleased]: https://github.com/mroth/lolcommits/compare/v0.6.6...HEAD
+[0.6.6]: https://github.com/mroth/lolcommits/compare/v0.6.5...v0.6.6
+[0.6.5]: https://github.com/mroth/lolcommits/compare/v0.6.4...v0.6.5
+[0.6.4]: https://github.com/mroth/lolcommits/compare/v0.6.3...v0.6.4
+[0.6.3]: https://github.com/mroth/lolcommits/compare/v0.6.2...v0.6.3
+[0.6.2]: https://github.com/mroth/lolcommits/compare/v0.6.1...v0.6.2
+[0.6.1]: https://github.com/mroth/lolcommits/compare/v0.6.0...v0.6.1
+[0.6.0]: https://github.com/mroth/lolcommits/compare/v0.5.9...v0.6.0
+[0.5.9]: https://github.com/mroth/lolcommits/compare/v0.5.8...v0.5.9
+[0.5.8]: https://github.com/mroth/lolcommits/compare/v0.5.7...v0.5.8
+[0.5.7]: https://github.com/mroth/lolcommits/compare/v0.5.6...v0.5.7
+[0.5.6]: https://github.com/mroth/lolcommits/compare/v0.5.5...v0.5.6
+[0.5.5]: https://github.com/mroth/lolcommits/compare/v0.5.4...v0.5.5
+[0.5.4]: https://github.com/mroth/lolcommits/compare/v0.5.3...v0.5.4
+[0.5.3]: https://github.com/mroth/lolcommits/compare/v0.5.2...v0.5.3
+[0.5.2]: https://github.com/mroth/lolcommits/compare/v0.5.1...v0.5.2
+[0.5.1]: https://github.com/mroth/lolcommits/compare/v0.5.0...v0.5.1
+[0.5.0]: https://github.com/mroth/lolcommits/compare/v0.4.9...v0.5.0
+[Semver]: http://semver.org

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,50 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic
+  addresses, without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to
+fairly and consistently applying these principles to every aspect of managing
+this project. Project maintainers who do not follow or enforce the Code of
+Conduct may be permanently removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting a project maintainer via [GitHub][maintainer]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. Maintainers are
+obligated to maintain confidentiality with regard to the reporter of an
+incident.
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.3.0, available at
+[http://contributor-covenant.org/version/1/3/0/][version]
+
+[maintainer]: https://github.com/matthutchinson
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/3/0/

data/bin/console

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'lolcommits'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# start irb
+require 'irb'
+IRB.start

data/bin/lolcommits

@@ -108,6 +108,7 @@ def do_capture
 end
 
 def do_configure
+  Fatals.die_if_not_vcs_repo!
   $stdout.sync = true
   configuration.do_configure! Choice.choices[:plugin]
 end

data/features/lolcommits.feature

@@ -121,22 +121,32 @@ Feature: Basic UI functionality
       Then I type "loltext"
       And I wait for output to contain "enabled:"
       Then I type "true"
+      And I wait for output to contain "message:"
       And I wait for output to contain "color"
       Then I type "red"
       And I wait for output to contain "font"
       Then I type "my-font.ttf"
       And I wait for output to contain "position"
-      Then I type "SouthEast"
+      Then I type "SE"
       And I wait for output to contain "size"
       Then I type "32"
       And I wait for output to contain "stroke color"
       Then I type "white"
-      And I wait for output to contain "sha text"
+      And I wait for output to contain "uppercase"
+      Then I type "true"
+      And I wait for output to contain "sha"
+      Then I type ""
       Then I type ""
       Then I type ""
       Then I type ""
       Then I type ""
       Then I type ""
+      And I wait for output to contain "overlay:"
+      Then I type "true"
+      And I wait for output to contain "overlay colors"
+      Then I type "#2884ae,#7e231f"
+      And I wait for output to contain "overlay percent"
+      Then I type "40"
     Then the output should contain "Successfully configured plugin: loltext"
       And the output should contain a list of plugins
       And a file named "~/.lolcommits/config-test/config.yml" should exist
@@ -144,9 +154,13 @@ Feature: Basic UI functionality
     Then the output should match /enabled: true/
     And the output should match /:font: my-font\.ttf/
     And the output should match /:size: 32/
-    And the output should match /:position: SouthEast/
+    And the output should match /:position: S/
     And the output should match /:color: red/
     And the output should match /:stroke_color: white/
+    And the output should match /:uppercase: true/
+    And the output should match /:overlay:.*\n.*:enabled: true/
+    And the output should match /:overlay_colors:.*\n.*['"]#2884ae['"].*\n.*['"]#7e231f['"].*\n/
+    And the output should match /:overlay_percent: 40/
 
   Scenario: Configuring loltext plugin in test mode affects test loldir not repo loldir
     Given I am in a git repo named "testmode-config-test"
@@ -185,7 +199,7 @@ Feature: Basic UI functionality
     When I run `lolcommits --last`
     Then the output should not contain:
       """
-      Unknown VCS
+      You don't appear to be in a directory of a supported vcs project.
       """
     And the exit status should be 0
 
@@ -195,7 +209,17 @@ Feature: Basic UI functionality
     When I run `lolcommits --last`
     Then the output should contain:
       """
-      Unknown VCS
+      You don't appear to be in a directory of a supported vcs project.
+      """
+    And the exit status should be 1
+
+  @in-tempdir
+  Scenario: Configuring loltext plugin if not in a lolrepo
+    Given I am in a directory named "gitsuxcvs4eva"
+    When I run `lolcommits --config`
+    Then the output should contain:
+      """
+      You don't appear to be in a directory of a supported vcs project.
       """
     And the exit status should be 1
 
@@ -223,7 +247,7 @@ Feature: Basic UI functionality
     When I run `lolcommits --browse`
     Then the output should not contain:
       """
-      Unknown VCS
+      You don't appear to be in a directory of a supported vcs project.
       """
     And the exit status should be 0
 
@@ -233,7 +257,7 @@ Feature: Basic UI functionality
     When I run `lolcommits --browse`
     Then the output should contain:
       """
-      Unknown VCS
+      You don't appear to be in a directory of a supported vcs project.
       """
     And the exit status should be 1
 
@@ -347,7 +371,7 @@ Feature: Basic UI functionality
     When I run `lolcommits --last`
     Then the output should not contain:
       """
-      Unknown VCS
+      You don't appear to be in a directory of a supported vcs project.
       """
     And the exit status should be 0
 
@@ -365,7 +389,7 @@ Feature: Basic UI functionality
     When I run `lolcommits --browse`
     Then the output should not contain:
       """
-      Unknown VCS
+      You don't appear to be in a directory of a supported vcs project.
       """
     And the exit status should be 0
 

data/lib/lolcommits/cli/fatals.rb

@@ -73,7 +73,7 @@ module Lolcommits
           current = parent
           parent = File.dirname(current)
         end
-        fatal 'Unknown VCS'
+        fatal "You don't appear to be in a directory of a supported vcs project."
         exit 1
       end
     end

data/lib/lolcommits/plugins/loltext.rb

@@ -15,6 +15,13 @@ module Lolcommits
     def run_postcapture
       debug 'Annotating image via MiniMagick'
       image = MiniMagick::Image.open(runner.main_image)
+      if config_option(:overlay, :enabled)
+        image.combine_options do |c|
+          c.fill config_option(:overlay, :overlay_colors).sample
+          c.colorize config_option(:overlay, :overlay_percent)
+        end
+      end
+
       annotate(image, :message, clean_msg(runner.message))
       annotate(image, :sha, runner.sha)
       debug "Writing changed file to #{runner.main_image}"
@@ -22,17 +29,25 @@ module Lolcommits
     end
 
     def annotate(image, type, string)
-      debug("annotating #{type} text to image")
+      debug("annotating #{type} to image with #{string}")
+
+      transformed_position = position_transform(config_option(type, :position))
+      annotate_location = '0'
+      if transformed_position == 'South'
+        annotate_location = '+0+20' # Move South gravity off the edge of the image.
+      end
+
+      string.upcase! if config_option(type, :uppercase)
 
       image.combine_options do |c|
-        c.strokewidth '2'
-        c.interline_spacing '-9'
+        c.strokewidth runner.animate? ? '1' : '2'
+        c.interline_spacing(-(config_option(type, :size) / 5))
         c.stroke config_option(type, :stroke_color)
         c.fill config_option(type, :color)
-        c.gravity position_transform(config_option(type, :position))
-        c.pointsize runner.animate? ? 24 : config_option(type, :size)
+        c.gravity transformed_position
+        c.pointsize runner.animate? ? (config_option(type, :size) / 2) : config_option(type, :size)
         c.font config_option(type, :font)
-        c.annotate '0', string
+        c.annotate annotate_location, string
       end
     end
 
@@ -40,17 +55,22 @@ module Lolcommits
       options = super
       # ask user to configure text options when enabling
       if options['enabled']
-        puts '------------------------------------------------------'
-        puts '  Text options '
-        puts
-        puts '  * blank options use the (default)'
-        puts '  * use full absolute path to fonts'
-        puts '  * valid positions are NE, NW, SE, SW, C (centered)'
+        puts '---------------------------------------------------------------'
+        puts '  LolText options '
+        puts ''
+        puts '  * any blank options will use the (default)'
+        puts '  * always use the full absolute path to fonts'
+        puts '  * valid text positions are NE, NW, SE, SW, S, C (centered)'
         puts '  * colors can be hex #FC0 value or a string \'white\''
-        puts '------------------------------------------------------'
+        puts '      - use `none` for no stroke color'
+        puts '  * overlay fills your image with a random color'
+        puts '      - set one or more overlay_colors with a comma seperator'
+        puts '      - overlay_percent (0-100) sets the fill colorize strength'
+        puts '---------------------------------------------------------------'
 
         options[:message] = configure_sub_options(:message)
         options[:sha]     = configure_sub_options(:sha)
+        options[:overlay] = configure_sub_options(:overlay)
       end
       options
     end
@@ -58,32 +78,52 @@ module Lolcommits
     # TODO: consider this type of configuration prompting in the base Plugin
     # class, working with hash of defaults
     def configure_sub_options(type)
-      print "#{type} text:\n"
+      print "#{type}:\n"
       defaults = config_defaults[type]
 
       # sort option keys since different `Hash#keys` varys across Ruby versions
       defaults.keys.sort_by(&:to_s).reduce({}) do |acc, opt|
-        print "  #{opt.to_s.tr('_', ' ')} (#{defaults[opt]}): "
-        val = parse_user_input(STDIN.gets.strip)
-        acc.merge(opt => val)
+        # if we have an enabled key set to false, abort asking for any more options
+        if acc.key?(:enabled) && acc[:enabled] != true
+          acc
+        else
+          print "  #{opt.to_s.tr('_', ' ')} (#{defaults[opt]}): "
+          val = parse_user_input(STDIN.gets.chomp.strip)
+          # handle array options (comma seperated string)
+          if defaults[opt].is_a?(Array) && !val.nil?
+            val = val.split(',').map(&:strip).delete_if(&:empty?)
+          end
+          acc.merge(opt => val)
+        end
       end
     end
 
     def config_defaults
       {
         :message => {
+          :color    => 'white',
           :font     => DEFAULT_FONT_PATH,
-          :size     => 48,
           :position => 'SW',
-          :color    => 'white',
-          :stroke_color => 'black'
+          :size     => 48,
+          :stroke_color => 'black',
+          :uppercase => false
         },
         :sha => {
+          :color    => 'white',
           :font     => DEFAULT_FONT_PATH,
-          :size     => 32,
           :position => 'NE',
-          :color    => 'white',
-          :stroke_color => 'black'
+          :size     => 32,
+          :stroke_color => 'black',
+          :uppercase => false
+        },
+        :overlay => {
+          :enabled => false,
+          :overlay_colors => [
+            '#2e4970', '#674685', '#ca242f', '#1e7882', '#2884ae', '#4ba000',
+            '#187296', '#7e231f', '#017d9f', '#e52d7b', '#0f5eaa', '#e40087',
+            '#5566ac', '#ed8833', '#f8991c', '#408c93', '#ba9109'
+          ],
+          :overlay_percent => 50
         }
       }
     end
@@ -112,6 +152,8 @@ module Lolcommits
         'SouthWest'
       when 'C'
         'Center'
+      when 'S'
+        'South'
       end
     end
 

data/lib/lolcommits/plugins/uploldz.rb

@@ -21,7 +21,7 @@ module Lolcommits
     def run_postcapture
       return unless valid_configuration?
 
-      if runner.vcs_info.repo.empty?
+      if !runner.vcs_info || runner.vcs_info.repo.empty?
         puts 'Repo is empty, skipping upload'
       else
         debug "Posting capture to #{configuration['endpoint']}"

data/lib/lolcommits/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Lolcommits
-  VERSION = '0.6.5'.freeze
+  VERSION = '0.6.6.pre1'.freeze
 end

data/lolcommits.gemspec

@@ -1,11 +1,12 @@
 # -*- encoding: utf-8 -*-
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'lolcommits/version'
 
 Gem::Specification.new do |s|
   s.name        = 'lolcommits'
   s.version     = Lolcommits::VERSION
-  s.authors     = ['Matthew Rothenberg',    'Matt Hutchinson']
+  s.authors     = ['Matthew Rothenberg', 'Matthew Hutchinson']
   s.email       = ['mrothenberg@gmail.com', 'matt@hiddenloop.com']
   s.homepage    = 'http://mroth.github.com/lolcommits/'
   s.license     = 'LGPL-3'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6.pre1
 platform: ruby
 authors:
 - Matthew Rothenberg
-- Matt Hutchinson
+- Matthew Hutchinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -410,6 +410,7 @@ email:
 - mrothenberg@gmail.com
 - matt@hiddenloop.com
 executables:
+- console
 - lolcommits
 extensions: []
 extra_rdoc_files: []
@@ -422,12 +423,14 @@ files:
 - .rubocop_todo.yml
 - .travis.yml
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - appveyor.yml
+- bin/console
 - bin/lolcommits
 - config/cucumber.yml
 - features/bugs.feature
@@ -501,9 +504,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - imagemagick
 - a webcam