lolcommits 0.4.4 → 0.4.5

data/CHANGELOG

@@ -1,6 +1,11 @@
 0.5.0 (in development)
   * TODO: figure out problems with GUI clients
 
+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)
   * add -g option to produce animated gifs! (thx @hSATAC, #95)
 

data/README.md

@@ -14,7 +14,7 @@ By default, the lolimages are stored by a Github style short SHA in a `~/.lolcom
 
 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 
+## Installation
 ### Mac OS X
 You'll need ImageMagick installed.  [Homebrew](http://mxcl.github.com/homebrew/) makes this easy.  Simply do:
 
@@ -57,6 +57,8 @@ environment variables.
  * Set delay persistently (for slow to warmup webcams) - set
    `LOLCOMMITS_DELAY` var to time in seconds.
  * Set font file location - set `LOLCOMMITS_FONT` environment variable.
+ * Fork lolcommits runner - set `LOLCOMMITS_FORK` environment variable
+   (causes capturing command to fork to a new process, speedily returning you to your terminal).
 
 For the full list, see the [configuration variables](https://github.com/mroth/lolcommits/wiki/Configuration-Variables).
 

data/bin/lolcommits

@@ -134,25 +134,35 @@ def do_capture
   capture_device = Choice.choices[:device] || ENV['LOLCOMMITS_DEVICE'] || nil
   capture_font = Choice.choices[:font] || ENV['LOLCOMMITS_FONT'] || nil
 
-  if Choice.choices[:test]
-    info "*** Capturing in test mode."
-    runner = Lolcommits::Runner.new(:capture_delay => capture_delay,
-      :capture_device => capture_device,
-      :message        => Choice.choices[:msg],
-      :sha            => Choice.choices[:sha],
-      :config         => configuration,
-      :font           => capture_font
-   )
-    runner.run
-
-    Launchy.open(runner.main_image)
-  else
-    runner = Lolcommits::Runner.new(:capture_delay => capture_delay,
-      :capture_device => capture_device,
-      :config         => configuration,
-      :font           => capture_font
+  fork_me? do
+    if Choice.choices[:test]
+      info "*** Capturing in test mode."
+      runner = Lolcommits::Runner.new(:capture_delay => capture_delay,
+        :capture_device => capture_device,
+        :message        => Choice.choices[:msg],
+        :sha            => Choice.choices[:sha],
+        :config         => configuration,
+        :font           => capture_font
     )
-    runner.run
+      runner.run
+
+      Launchy.open(runner.main_image)
+    else
+      runner = Lolcommits::Runner.new(:capture_delay => capture_delay,
+        :capture_device => capture_device,
+        :config         => configuration,
+        :font           => capture_font
+      )
+      runner.run
+    end
+  end
+end
+
+def fork_me?(&block)
+  if Choice.choices[:fork] || ENV['LOLCOMMITS_FORK']
+    fork { yield block }
+  else
+    yield block
   end
 end
 
@@ -190,7 +200,9 @@ def do_gif
   puts "*** Generating animated gif."
 
   gif = MiniMagick::Image.new File.join configuration.archivedir, filename
-  gif.run_command("convert", "-delay 50 -loop 0 #{lolimages.join(' ')} #{gif.path}")
+
+  # This is for ruby 1.8.7, *lolimages just doesn't work with ruby 187
+  gif.run_command("convert", *[ "-delay", "50", "-loop", "0", lolimages, "#{gif.path}"].flatten)
 
   puts "*** #{gif.path} generated."
 end
@@ -303,6 +315,10 @@ Choice.options do
     desc "generate animated gif"
   end
 
+  option :fork do
+    long "--fork"
+    desc "fork the lolcommits runner to the background"
+  end
 end
 
 # Set debug level if needed

data/features/lolcommits.feature

@@ -27,6 +27,16 @@ Feature: Basic UI functionality
     Then the output should contain "You don't appear to be in the base directory of a git project."
       And the exit status should be 1
 
+  Scenario: Capture doesnt break in forked mode
+    Given I am in a git repository named "testforkcapture"
+    And I do a git commit
+    When I successfully run `lolcommits --capture --fork`
+    And I run `sleep 3` #give fork enough time to complete
+    Then the output should contain "*** Preserving this moment in history."
+      And 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"
+
   Scenario: Commiting in an enabled repo triggers successful capture
     Given I am in a git repository named "testcapture" with lolcommits enabled
     When I do a git commit

data/features/step_definitions/lolcommits_steps.rb

@@ -32,10 +32,16 @@ Given /^a git repository named "(.*?)" with (a|no) "(.*?)" hook$/ do |repo_name,
   step %{the git repository named "#{repo_name}" has #{yesno_modifier} "#{hook_name}" hook}
 end
 
-Given /^I am in a git repository named "(.*?)" with lolcommits enabled$/ do |repo_name|
+Given /^I am in a git repository named "(.*?)"$/ do |repo_name|
   steps %Q{
     Given a git repository named "#{repo_name}"
     And I cd to "#{repo_name}"
+  }
+end
+
+Given /^I am in a git repository named "(.*?)" with lolcommits enabled$/ do |repo_name|
+  steps %Q{
+    Given I am in a git repository named "#{repo_name}"
     And I successfully run `lolcommits --enable`
   }
 end

data/lib/lolcommits.rb

@@ -23,7 +23,6 @@ require 'lolcommits/plugin'
 require 'lolcommits/plugins/loltext'
 require 'lolcommits/plugins/dot_com'
 require 'lolcommits/plugins/tranzlate'
-require 'lolcommits/plugins/statsd'
 require 'lolcommits/plugins/lol_twitter'
 require 'lolcommits/plugins/uploldz'
 require 'lolcommits/plugins/lolsrv'

data/lib/lolcommits/runner.rb

@@ -16,7 +16,6 @@ module Lolcommits
     set_callback :run, :after,  :execute_lolcommits_uploldz
     set_callback :run, :after,  :execute_lolcommits_lolsrv
     set_callback :run, :after,  :execute_lolcommits_lol_twitter
-    set_callback :run, :after,  :execute_lolcommits_stats_d
     set_callback :run, :after,  :execute_lolcommits_dot_com
     set_callback :run, :after,  :execute_lolcommits_loltext
     # Executed First

data/lib/lolcommits/version.rb

@@ -1,3 +1,3 @@
 module Lolcommits
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/lolcommits.gemspec

@@ -39,7 +39,6 @@ Gem::Specification.new do |s|
   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
   s.add_runtime_dependency('json', '~> 1.7.6')        #lolsrv
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -267,22 +267,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: statsd-ruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -337,7 +321,6 @@ files:
 - lib/lolcommits/plugins/lol_twitter.rb
 - lib/lolcommits/plugins/lolsrv.rb
 - lib/lolcommits/plugins/loltext.rb
-- lib/lolcommits/plugins/statsd.rb
 - lib/lolcommits/plugins/tranzlate.rb
 - lib/lolcommits/plugins/uploldz.rb
 - lib/lolcommits/runner.rb
@@ -367,7 +350,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 388222651593883704
+      hash: -1840880118136918531
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -376,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 388222651593883704
+      hash: -1840880118136918531
 requirements: []
 rubyforge_project: lolcommits
 rubygems_version: 1.8.23

data/lib/lolcommits/plugins/statsd.rb

@@ -1,25 +0,0 @@
-require "statsd"
-
-#
-# This is just to keep some usage statistics on lolcommits.
-#
-
-module Lolcommits
-  class StatsD < Plugin
-    def initialize(runner)
-      super
-
-      self.name    = 'statsd'
-      self.default = true
-    end
-
-    def run
-      $statsd = Statsd.new('23.20.178.143')
-      if Configuration.is_fakecapture?
-        $statsd.increment 'app.lolcommits.fakecaptures'
-      else
-        $statsd.increment 'app.lolcommits.captures'
-      end
-    end
-  end
-end