lolcommits 0.4.1pre2 → 0.4.1

data/CHANGELOG

@@ -1,5 +1,12 @@
-0.4.1 (in development)
-  * add lolsrv plugin
+0.4.2 (in development)
+  * TODO: figure out problems with GUI clients
+  * TODO: figure out ruby 2.0 compatibility and testing
+
+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)
+  * graceful detection of imagemagick not being installed (#87)
   * restructure logging slightly to use Methadone::CLILogging in most places
   * add a bunch of debugging output, viewable via --debug flag
 

data/README.md

@@ -56,6 +56,7 @@ environment variables.
  * Set webcam device on mac - set `LOLCOMMITS_DEVICE` environment variable.
  * 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.
 
 For the full list, see the [configuration variables](https://github.com/mroth/lolcommits/wiki/Configuration-Variables).
 

data/Rakefile

@@ -22,7 +22,8 @@ CUKE_RESULTS = 'results.html'
 CLEAN << CUKE_RESULTS
 Cucumber::Rake::Task.new(:features) do |t|
   optstr = "features --format html -o #{CUKE_RESULTS} --format Fivemat -x"
-  optstr << " -t @#{ENV["tag"]}" unless ENV["tag"].nil?
+  optstr << " --tags @#{ENV["tag"]}" unless ENV["tag"].nil?
+  optstr << " --tags ~@unstable" if ENV["tag"].nil? #ignore unstable tests unless specifying something at CLI
   t.cucumber_opts = optstr
   t.fork = false
 end

data/bin/lolcommits

@@ -39,6 +39,10 @@ unless File.readable? File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "fonts
   fatal "Couldn't properly read Impact font from gem package, please file a bug?!"
   exit 1
 end
+unless Configuration.valid_imagemagick_installed?
+  fatal "FATAL: ImageMagick does not appear to be properly installed!"
+  exit 1
+end
 
 def die_if_not_git_repo!
   begin
@@ -121,6 +125,7 @@ end
 def do_capture
   capture_delay = Choice.choices[:delay] || ENV['LOLCOMMITS_DELAY'] || 0
   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."
@@ -128,7 +133,8 @@ def do_capture
       :capture_device => capture_device,
       :message        => Choice.choices[:msg],
       :sha            => Choice.choices[:sha],
-      :config         => configuration 
+      :config         => configuration,
+      :font           => capture_font
    )
     runner.run
 
@@ -136,7 +142,8 @@ def do_capture
   else
     runner = Lolcommits::Runner.new(:capture_delay => capture_delay,
       :capture_device => capture_device,
-      :config         => configuration 
+      :config         => configuration,
+      :font           => capture_font
     )
     runner.run
   end
@@ -252,6 +259,12 @@ Choice.options do
     desc "Output debugging information"
   end
 
+  option :font do
+    long "--font=FONT_PATH"
+    short "-f"
+    desc "pass font file location"
+  end
+
 end
 
 # Set debug level if needed

data/features/bugs.feature

@@ -15,7 +15,7 @@ Feature: Bug regression testing
   #
   # issue #68, https://github.com/mroth/lolcommits/issues/68
   #
-  @fake-interactive-rebase @slow_process
+  @fake-interactive-rebase @slow_process @unstable
   Scenario: Don't trigger capture during a git rebase
     Given I am in a git repository named "yuh8history" with lolcommits enabled
       And I do 6 git commits
@@ -36,4 +36,12 @@ Feature: Bug regression testing
   Scenario: don't want to see initialized constant warning from Faraday on CLI (on MRI 1.8.7)
     When I successfully run `lolcommits`
     Then the output should not contain "warning: already initialized constant DEFAULT_BOUNDARY"
-  
+  
+  #
+  # issue #87, https://github.com/mroth/lolcommits/issues/87
+  #
+  @fake-no-imagemagick
+  Scenario: gracefully fail when imagemagick is not installed
+    When I run `lolcommits`
+    Then the output should contain "ImageMagick does not appear to be properly installed"
+    And the exit status should be 1

data/features/plugins.feature

@@ -1,5 +1,6 @@
 Feature: Plugins Work
 
+  @focus @announce @slow_process
   Scenario: Lolcommits.com integration works
     Given I am in a git repository named "dot_com" with lolcommits enabled
     When I run `lolcommits --config` and wait for output

data/features/support/env.rb

@@ -4,6 +4,8 @@ require 'open3'
 require 'test/unit/assertions'
 include Test::Unit::Assertions
 require 'faker'
+require 'lolcommits/configuration'
+include Lolcommits
 
 ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 LIB_DIR = File.join(File.expand_path(File.dirname(__FILE__)),'..','..','lib')
@@ -49,5 +51,44 @@ After('@fake-interactive-rebase') do
 end
 
 Before('@slow_process') do
-  @aruba_io_wait_seconds = 3
+  @aruba_io_wait_seconds = 5
+  @aruba_timeout_seconds = 60
 end
+
+# adjust the path so tests dont see a global imagemagick install
+Before('@fake-no-imagemagick') do
+
+  # make a new subdir that still contains git and mplayer
+  tmpbindir = File.expand_path(File.join @dirs, "bin")
+  FileUtils.mkdir_p tmpbindir
+  ["git","mplayer"].each do |cmd|
+    whichcmd = Lolcommits::Configuration.command_which(cmd)
+    unless whichcmd.nil?
+      FileUtils.ln_s whichcmd, File.join(tmpbindir, File.basename(whichcmd))
+    end
+  end
+
+  # use a modified version of Configuration::command_which to detect where IM is installed
+  # and remove that from the path
+  cmd = 'mogrify'
+  exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+  newpaths = ENV['PATH'].split(File::PATH_SEPARATOR).reject do |path|
+    found_cmd = false
+    exts.each { |ext|
+      exe = "#{path}/#{cmd}#{ext}"
+      found_cmd = true if File.executable? exe
+    }
+    found_cmd
+  end
+
+  # add the temporary directory with git in it back into the path
+  newpaths << tmpbindir 
+
+  @original_path = ENV['PATH']
+  ENV['PATH'] = newpaths.join(File::PATH_SEPARATOR)
+  puts ENV['PATH']
+end
+
+After('@fake-no-imagemagick') do
+  ENV['PATH'] = @original_path
+end

data/lib/lolcommits/capturer.rb

@@ -1,7 +1,7 @@
 module Lolcommits
   class Capturer
     include Methadone::CLILogging
-    attr_accessor :capture_device, :capture_delay, :snapshot_location
+    attr_accessor :capture_device, :capture_delay, :snapshot_location, :font
 
     def initialize(attributes = Hash.new)
       attributes.each do |attr, val|

data/lib/lolcommits/configuration.rb

@@ -129,5 +129,28 @@ module Lolcommits
       (ENV['LOLCOMMITS_FAKECAPTURE'] == '1' || false)
     end
 
+    def self.valid_imagemagick_installed?
+      return false unless self.command_which('identify')
+      return false unless self.command_which('mogrify')
+      # 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?
+    end
+
+    # Cross-platform way of finding an executable in the $PATH.
+    # idea taken from http://bit.ly/qDaTbY
+    #
+    #   which('ruby') #=> /usr/bin/ruby
+    def self.command_which(cmd)
+      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each { |ext|
+          exe = "#{path}/#{cmd}#{ext}"
+          return exe if File.executable? exe
+        }
+      end
+      return nil
+    end
+
   end
 end

data/lib/lolcommits/plugins/loltext.rb

@@ -4,6 +4,8 @@ module Lolcommits
     def initialize(runner)
       super
 
+      @font_location = runner ? runner.font : nil
+
       self.name    = 'loltext'
       self.default = true
     end
@@ -14,7 +16,7 @@ module Lolcommits
 
     # use minimagick wrapper
     def mm_run
-      font_location = File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "fonts", "Impact.ttf")
+      font_location = @font_location || File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "fonts", "Impact.ttf")
 
       plugdebug "Annotating image via MiniMagick"
       image = MiniMagick::Image.open(self.runner.main_image)
@@ -76,12 +78,12 @@ module Lolcommits
       escape_quotes wrapped_text
     end
 
-    # conversion for quotation marks to avoid shell interpretation 
+    # conversion for quotation marks to avoid shell interpretation
     # does not seem to be a safe way to escape cross-platform?
     def escape_quotes(text)
       text.gsub(/"/, "''")
     end
-    
+
     # convenience method for word wrapping
     # based on https://github.com/cmdrkeene/memegen/blob/master/lib/meme_generator.rb
     def word_wrap(text, col = 27)

data/lib/lolcommits/runner.rb

@@ -3,8 +3,9 @@ module Lolcommits
 
   class Runner
     attr_accessor :capture_delay, :capture_device, :message, :sha,
-      :snapshot_loc, :main_image, :repo, :config, :repo_internal_path
-    
+      :snapshot_loc, :main_image, :repo, :config, :repo_internal_path,
+      :font
+
     include Methadone::CLILogging
     include ActiveSupport::Callbacks
     define_callbacks :run
@@ -24,7 +25,7 @@ module Lolcommits
       attributes.each do |attr, val|
         self.send("#{attr}=", val)
       end
-      
+
       if self.sha.nil? || self.message.nil?
         git_info = GitInfo.new
         self.sha = git_info.sha if self.sha.nil?
@@ -41,9 +42,10 @@ module Lolcommits
         self.snapshot_loc = self.config.raw_image
         self.main_image   = self.config.main_image(self.sha)
         capturer = "Lolcommits::Capture#{Configuration.platform}".constantize.new(
-          :capture_device    => self.capture_device, 
-          :capture_delay     => self.capture_delay, 
-          :snapshot_location => self.snapshot_loc
+          :capture_device    => self.capture_device,
+          :capture_delay     => self.capture_delay,
+          :snapshot_location => self.snapshot_loc,
+          :font              => self.font
         )
         capturer.capture
         resize_snapshot!
@@ -86,7 +88,7 @@ module Lolcommits
     FileUtils.rm(self.snapshot_loc)
   end
 
-  # register a method called "execute_lolcommits_#{plugin_name}" 
+  # register a method called "execute_lolcommits_#{plugin_name}"
   # for each subclass of plugin.  these methods should be used as
   # callbacks to the run method.
   Lolcommits::PLUGINS.each do |plugin|

data/lib/lolcommits/version.rb

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

data/lolcommits.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('mini_magick', '~> 3.4')
   s.add_runtime_dependency('git', '~> 1.2.5')
   s.add_runtime_dependency('choice', '~> 0.1.6')
-  s.add_runtime_dependency('launchy', '~> 2.1.1')
+  s.add_runtime_dependency('launchy', '~> 2.2.0')
   s.add_runtime_dependency('methadone', '~> 1.2.4')
   s.add_runtime_dependency('open4', '~> 1.3.0')
-  s.add_runtime_dependency('active_support', '~> 3.0.0')
+  s.add_runtime_dependency('activesupport', '~> 3.2.12')
 
   # development dependencies
   s.add_development_dependency('rdoc')

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.4.1pre2
-  prerelease: 5
+  version: 0.4.1
+  prerelease: 
 platform: ruby
 authors:
 - Matthew Rothenberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: methadone
   requirement: !ruby/object:Gem::Requirement
@@ -108,13 +108,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: active_support
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.12
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -367,16 +367,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1836956995693832529
+      hash: 4513374714395710926
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 4513374714395710926
 requirements: []
 rubyforge_project: lolcommits
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Capture webcam image on git commit for lulz.