lolcommits 0.5.5 → 0.5.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWEyZjJjMzUxNGE1N2M3ZTI0ZTc5N2ExZmI1OWQwYTRjZGNiZjliZg==
+    MzgxMmM4Y2M4ZjUzYTQ0NzQ5ZTQ4ZDUyZDIyYTUxMzViYTczMGQwMw==
   data.tar.gz: !binary |-
-    NDlkNDQyNDk3NmQzOTRmNTRkMjQ4ZmQ1YmNmMDQ2MDRhMmUzNjkzZg==
+    MTZjOTY1OGI5NGQ2NTdiOWQ4ZjE2YjczMzk0ZDBmODY1ODk2ZjhlMg==
 SHA512:
   metadata.gz: !binary |-
-    ZmQ1ZTQ3ZDZlNDE1NDNjMzc0YjU4NTQzMDdhNzJjZGUzMDExMTBmNDVlNmM2
-    MTUwNzIzOTgzNjUyMDhmOTQ4Nzk4MGU1NzA4NWM5ZjdmMzc0ZTdmYTA1YjZh
-    ODExYTUxNDJjOTZjMDQ0MWZiNmU5OTNjZTA1ZDA5YmEwMTA1NzU=
+    OTZlNjU5ZGFhOTQ5M2ZlYTJmODBmYTYwMjA2MTBhNDJiY2Q1NDQwMmM1MGFh
+    ZDAwMmE4YTQwZTE2MDEyMjQ3MGFmMDMxMmY2OTI1YTM5NjM4ZDI3MWUwM2Y4
+    NjYxZjBiMGI4ZDZkNDc5NTBmZDMzM2Y5ZjQwYmI4OTk0NjkyYjU=
   data.tar.gz: !binary |-
-    OTk0NGNlY2Y4MTZiNDhiNTNhODRhOTRhODNmNjRmMDAyNjI4NmNjYTY1N2Ez
-    NTdjZTE3ZjJhZDQ1NTAwMThiYTY4MDJiMTQ2N2EyYjA2NWY3ZjVjNWFhZDgw
-    OWVlZjQ5ZjdjNDdlOGJkZTE0N2M4ODgyNjk3Nzc0YmM4NzkzOWY=
+    YjQ5YjUzZjU4YTQyNmM5NDRkY2FiZDIyYTRjMWY3NGZiNDAyMjg0Yzg4OTFi
+    NDFlYzUyYjY1NDI2MjNmNzIzZDQ1YWMwYmQ2MmM5ZTI2MDY5NGQ0ZmExYmY4
+    NjgxNzAyMmVjMzIyZjZhMzcwNTVjMGE3MzQ0NWFjMjE5NmRmNWU=

data/.travis.yml

@@ -6,20 +6,20 @@ rvm:
  - 2.0.0
  - 2.1.0
  - 2.1.2
+ - ruby-head
 
 before_install:
  # use earlier version of Rubygems to avoid fatal bundler error on 1.8.7
  - gem update --system 2.1.11
  - gem --version
  - sudo apt-get update -qq
- - sudo apt-get install -qq -y mplayer
- - sudo apt-get install ffmpeg
+ - sudo apt-get install -qq -y mplayer ffmpeg
  # imagemagick is installed by default on normal travis image now
  # - sudo apt-get install -qq -y imagemagick libmagickwand-dev
 
-# matrix:
-  # allow_failures:
-    # - rvm: 2.0.0
+matrix:
+  allow_failures:
+    - rvm: ruby-head
 
 branches:
   except:

data/CHANGELOG

@@ -1,6 +1,17 @@
-0.5.6 (in development)
-  * update gems!
-  * prepare plugins for extraction
+0.5.7 (WIP)
+  * upgrade gems
+  * seperate gems for all plugins
+
+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)
+  * Fix twitter plugin config issue #231 (@matthutchinson #232)
+  * Update mini_magick gem to 3.8.1 (@matthutchinson #234)
+  * Improve README for LOLCOMMITS_DIR (@dagar #235)
+  * Update README to include ffmpeg installation (@VictorBjelkholm #236)
+  * 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)
   * Animated gif capture support (@theY4Kman #226)

data/README.md

@@ -45,6 +45,8 @@ Install dependencies using your package manager of choice, for example in
 Ubuntu:
 
     sudo apt-get install mplayer imagemagick libmagickwand-dev
+    
+For Ubuntu 14.04 or newer, you need to manually install ffmpeg since it no longer ships with the default Ubuntu sources. [Downloads for ffmpeg](http://ffmpeg.org/download.html)
 
 Then install the gem with:
 
@@ -106,6 +108,7 @@ via environment variables like so;
 * `LOLCOMMITS_FORK` fork lolcommit runner (capture command forks to a new
   process, speedily returning you to your terminal)
 * `LOLCOMMITS_STEALTH` disable notification messages at commit time
+* `LOLCOMMITS_DIR` set the output directory (defaults to ~/.lolcommits)
 
 Or they can be set via the following arguments in the capture command (located
 in your repository's `.git/hooks/post-commit` file).

data/features/lolcommits.feature

@@ -79,8 +79,7 @@ Feature: Basic UI functionality
     When I successfully run `lolcommits --capture --fork`
     Then there should be exactly 1 pid in "../.lolcommits/testforkcapture"
     When I wait for the child process to exit in "testforkcapture"
-    Then the output should contain "*** Preserving this moment in history."
-      And a directory named "../.lolcommits/testforkcapture" should exist
+    Then a directory named "../.lolcommits/testforkcapture" should exist
       And a file named "../.lolcommits/testforkcapture/tmp_snapshot.jpg" should not exist
       And there should be exactly 1 jpg in "../.lolcommits/testforkcapture"
 

data/lib/lolcommits/configuration.rb

@@ -198,6 +198,11 @@ module Lolcommits
       # you'd expect the below to work on its own, but it only handles old versions
       # and will throw an exception if IM is not installed in PATH
       MiniMagick.valid_version_installed?
+    rescue
+      puts "FATAL: ImageMagick >= #{MiniMagick.minimum_image_magick_version} required (http://imagemagick.org)"
+      puts 'Please check the following command works and returns a valid version number'
+      puts '=> mogrify --version'
+      exit 1
     end
 
     def self.valid_ffmpeg_installed?

data/lib/lolcommits/installation.rb

@@ -75,15 +75,16 @@ module Lolcommits
     protected
 
     def self.hook_script(add_shebang = true)
-      ruby_path    = Lolcommits::Configuration.command_which('ruby', true)
-      imagick_path = Lolcommits::Configuration.command_which('identify', true)
-      hook_export  = "export PATH=\"#{ruby_path}:#{imagick_path}:$PATH\"\n"
-      capture_cmd  = 'lolcommits --capture'
-      capture_args = " #{ARGV[1..-1].join(' ')}" if ARGV.length > 1
+      ruby_path     = Lolcommits::Configuration.command_which('ruby', true)
+      imagick_path  = Lolcommits::Configuration.command_which('identify', true)
+      locale_export = "export LANG=\"#{ENV['LANG']}\"\n"
+      hook_export   = "export PATH=\"#{ruby_path}:#{imagick_path}:$PATH\"\n"
+      capture_cmd   = 'lolcommits --capture'
+      capture_args  = " #{ARGV[1..-1].join(' ')}" if ARGV.length > 1
 
       <<-EOS
 ### lolcommits hook (begin) ###
-#{hook_export}#{capture_cmd}#{capture_args}
+#{locale_export}#{hook_export}#{capture_cmd}#{capture_args}
 ###  lolcommits hook (end)  ###
 EOS
     end

data/lib/lolcommits/plugins/lol_twitter.rb

@@ -47,7 +47,7 @@ module Lolcommits
     def configure_options!
       options = super
       # ask user to configure tokens if enabling
-      if enabled?
+      if options['enabled']
         auth_config = configure_auth!
         if auth_config
           options.merge!(auth_config)

data/lib/lolcommits/plugins/lol_yammer.rb

@@ -44,12 +44,13 @@ module Lolcommits
 
     def configure_options!
       options = super
-      if enabled?
+      # ask user to configure tokens if enabling
+      if options['enabled']
         auth_config = configure_access_token
         if auth_config
           options.merge!(auth_config)
         else
-          return
+          return # return nil if configure_auth failed
         end
       end
       options

data/lib/lolcommits/runner.rb

@@ -28,43 +28,55 @@ module Lolcommits
     # this used to be handled with ActiveSupport::Callbacks, but
     # now we're just using a simple procedural list
     def run
+      # abort if we are in a rebase
+      die_if_rebasing!
+
       # do things that need to happen before capture and plugins
 
       # do native plugins that need to happen before capture
       plugins_for(:precapture).each do |plugin|
-        debug "precapture: about to execute #{plugin}"
+        debug "Runner: precapture about to execute #{plugin}"
         plugin.new(self).execute_precapture
       end
 
       # do gem plugins that need to happen before capture?
 
-      # **** do the main capture ****
-      run_capture_and_resize
+      # do main capture to snapshot_loc
+      run_capture
 
-      # do native plugins that need to happen immediately after capture
-      # this is effectively the "image processing" phase
-      # for now, reserve just for us and handle manually...?
-      Lolcommits::Loltext.new(self).execute_postcapture
+      # check capture succeded, file must exist
+      if File.exists?(self.snapshot_loc)
 
-      # do native plugins that need to happen after capture
-      plugins_for(:postcapture).each do |plugin|
-        plugin.new(self).execute_postcapture
-      end
+        ## resize snapshot first
+        resize_snapshot!
+
+        # do native plugins that need to happen immediately after capture and
+        # resize this is effectively the "image processing" phase for now,
+        # reserve just for us and handle manually...?
+        Lolcommits::Loltext.new(self).execute_postcapture
 
-      # do gem plugins that need to happen after capture?
+        # do native plugins that need to happen after capture
+        plugins_for(:postcapture).each do |plugin|
+          debug "Runner: postcapture about to execute #{plugin}"
+          plugin.new(self).execute_postcapture
+        end
 
-      # do things that should happen last
-      cleanup!
+        # do gem plugins that need to happen after capture?
+
+        # do things that should happen last
+        cleanup!
+      else
+        debug 'Runner: failed to capture a snapshot'
+        exit 1
+      end
     end
 
     def plugins_for(position)
       Lolcommits::PLUGINS.select { |p| p.runner_order == position }
     end
 
-    # the main capture and resize operation, critical
-    def run_capture_and_resize
-      die_if_rebasing!
-
+    # the main capture
+    def run_capture
       puts '*** Preserving this moment in history.' unless capture_stealth
       self.snapshot_loc = self.config.raw_image(image_file_type)
       self.main_image   = self.config.main_image(self.sha, image_file_type)
@@ -78,7 +90,6 @@ module Lolcommits
         :animated_duration => self.capture_animate
       )
       capturer.capture
-      resize_snapshot!
     end
 
     def animate?

data/lib/lolcommits/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Lolcommits
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 end

data/lolcommits.gemspec

@@ -3,23 +3,32 @@ $:.push File.expand_path("../lib", __FILE__)
 require "lolcommits/version"
 
 Gem::Specification.new do |s|
-  s.name        = "lolcommits"
+  s.name        = 'lolcommits'
   s.version     = Lolcommits::VERSION
-  s.authors     = ["Matthew Rothenberg"]
-  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 webcam every time you git commit code, and archives a lolcat style image with it.}
-  s.license     = "LGPL-3"
-  s.rubyforge_project = "lolcommits"
+  s.authors     = ['Matthew Rothenberg',    'Matt Hutchinson']
+  s.email       = ['mrothenberg@gmail.com', 'matt@hiddenloop.com']
+  s.homepage    = 'http://mroth.github.com/lolcommits/'
+  s.license     = 'LGPL-3'
+  s.summary     = 'Capture webcam image on git commit for lulz.'
+
+  s.description = <<-EOF
+  lolcommits takes a snapshot with your webcam every time you git commit code,
+  and archives a lolcat style image with it. It's selfies for software
+  developers. `git blame` has never been so much fun.
+  EOF
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  # non-gem dependencies
+  s.required_ruby_version = '>= 1.8.7'
+  s.requirements << 'imagemagick'
+  s.requirements << 'a webcam'
+
   # core gem dependencies
-  s.add_runtime_dependency('mini_magick', '~> 3.5')
+  s.add_runtime_dependency('mini_magick', '~> 3.8.1')
   s.add_runtime_dependency('git', '~> 1.2.5')
   s.add_runtime_dependency('choice', '~> 0.1.6')
   s.add_runtime_dependency('launchy', '~> 2.2.0')

data/rubocop-todo.yml

@@ -66,7 +66,7 @@ Documentation:
 # Offence count: 3
 # Configuration parameters: CountComments.
 ClassLength:
-  Max: 179
+  Max: 190
 
 # Offence count: 73
 LineLength:

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Matthew Rothenberg
+- Matt Hutchinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -16,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 3.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 3.8.1
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -332,10 +333,12 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.25'
-description: Takes a snapshot with your webcam every time you git commit code, and
-  archives a lolcat style image with it.
+description: ! "  lolcommits takes a snapshot with your webcam every time you git
+  commit code,\n  and archives a lolcat style image with it. It's selfies for software\n
+  \ developers. `git blame` has never been so much fun.\n"
 email:
 - mrothenberg@gmail.com
+- matt@hiddenloop.com
 executables:
 - lolcommits
 extensions: []
@@ -407,15 +410,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
-rubyforge_project: lolcommits
-rubygems_version: 2.4.1
+requirements:
+- imagemagick
+- a webcam
+rubyforge_project: 
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Capture webcam image on git commit for lulz.