lolcommits 0.3.4 → 0.4.0.pre1

data/CHANGELOG

@@ -1,3 +1,12 @@
+0.4.0 (in development)
+  * 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
+    - this should also result in less problems with IM version changes
+    - some preliminary test work on using image_sorcery instead too
+    - perhaps finally kill issue #9 from continually resurfacing
+  * make sure quotes are properly handled in commit messages
+
 0.3.4 (27 December 2012)
   * Add uploldz plugin for posting to a remote server (thx @cnvandev)
 

data/features/lolcommits.feature

@@ -140,3 +140,8 @@ Feature: Basic UI functionality
     Then the output should contain "Can't do that since we're not in a valid git repository!"
       And the exit status should be 1
 
+  Scenario: handle commit messages with quotation marks
+    Given I am in a git repository named "shellz" with lolcommits enabled
+    When I successfully run `git commit --allow-empty -m 'i hate \"air quotes\" dont you'`
+    Then the exit status should be 0
+      And there should be exactly 1 jpg in "../.lolcommits/shellz"

data/lib/lolcommits.rb

@@ -1,7 +1,7 @@
 $:.unshift File.expand_path('.')
 
 require 'core_ext/class'
-require 'RMagick'
+require 'mini_magick'
 require 'fileutils'
 require 'git'
 require 'open3'

data/lib/lolcommits/plugins/loltext.rb

@@ -1,6 +1,5 @@
 module Lolcommits
   class Loltext < Plugin
-    include Magick
 
     def initialize(runner)
       super
@@ -10,31 +9,77 @@ module Lolcommits
     end
 
     def run
-      canvas = ImageList.new(self.runner.main_image)
-      draw = Magick::Draw.new
-      draw.font = File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "fonts", "Impact.ttf")
+      mm_run
+    end
 
-      draw.fill   = 'white'
-      draw.stroke = 'black'
+    # use minimagick wrapper
+    def mm_run
+      font_location = File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "fonts", "Impact.ttf")
 
-      draw.annotate(canvas, 0, 0, 0, 0, self.runner.sha) do
-        self.gravity = NorthEastGravity
-        self.pointsize = 32
-        self.stroke_width = 2
+      image = MiniMagick::Image.open(self.runner.main_image)
+      image.combine_options do |c|
+        c.gravity 'SouthWest'
+        c.fill 'white'
+        c.stroke 'black'
+        c.strokewidth '2'
+        c.pointsize '48'
+        c.interline_spacing '-9'
+        c.font font_location
+        c.annotate '0', clean_msg(self.runner.message)
       end
 
-      draw.annotate(canvas, 0, 0, 0, 0, word_wrap(self.runner.message)) do
-        self.gravity = SouthWestGravity
-        self.pointsize = 48
-        self.interline_spacing = -(48 / 5) if self.respond_to?(:interline_spacing)
-        self.stroke_width = 2
+      image.combine_options do |c|
+        c.gravity 'NorthEast'
+        c.fill 'white'
+        c.stroke 'black'
+        c.strokewidth '2'
+        c.pointsize '32'
+        c.font font_location
+        c.annotate '0', self.runner.sha
       end
 
-      canvas.write(runner.main_image)
+      image.write self.runner.main_image
     end
 
+    # use Rmagick wrapper (deprecated, no longer works in IM6.10+)
+    # def rm_run
+    #   canvas = ImageList.new(self.runner.main_image)
+    #   draw = Magick::Draw.new
+    #   draw.font = File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "fonts", "Impact.ttf")
+
+    #   draw.fill   = 'white'
+    #   draw.stroke = 'black'
+
+    #   draw.annotate(canvas, 0, 0, 0, 0, self.runner.sha) do
+    #     self.gravity = NorthEastGravity
+    #     self.pointsize = 32
+    #     self.stroke_width = 2
+    #   end
+
+    #   draw.annotate(canvas, 0, 0, 0, 0, word_wrap(self.runner.message)) do
+    #     self.gravity = SouthWestGravity
+    #     self.pointsize = 48
+    #     self.interline_spacing = -(48 / 5) if self.respond_to?(:interline_spacing)
+    #     self.stroke_width = 2
+    #   end
+
+    #   canvas.write(runner.main_image)
+    # end
+
     private
 
+    # do whatever is required to commit message to get it clean and ready for imagemagick
+    def clean_msg(text)
+      wrapped_text = word_wrap text
+      escape_quotes wrapped_text
+    end
+
+    # 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

@@ -1,6 +1,5 @@
 module Lolcommits
   PLUGINS = Lolcommits::Plugin.subclasses
-  include Magick
 
   class Runner
     attr_accessor :capture_delay, :capture_device, :message, :sha,
@@ -61,11 +60,16 @@ module Lolcommits
   end
 
   def resize_snapshot!
-    canvas = ImageList.new(self.snapshot_loc)
-    if (canvas.columns > 640 || canvas.rows > 480)
-      canvas.resize_to_fill!(640,480)
+    image = MiniMagick::Image.open(self.snapshot_loc)
+    if (image[:width] > 640 || image[:height] > 480)
+      #this is ghetto resize-to-fill
+      image.combine_options do |c|
+        c.resize '640x480^'
+        c.gravity 'center'
+        c.extent '640x480'
+      end
+      image.write self.snapshot_loc
     end
-    canvas.write(self.snapshot_loc)
     FileUtils.cp(self.snapshot_loc, self.main_image)
   end
 

data/lib/lolcommits/version.rb

@@ -1,3 +1,3 @@
 module Lolcommits
-  VERSION = "0.3.4"
+  VERSION = "0.4.0.pre1"
 end

data/lolcommits.gemspec

@@ -18,22 +18,26 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency('rmagick', '~> 2.13.1')
+  # core gem dependencies
+  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("twitter")
-  s.add_runtime_dependency("oauth")
+  s.add_runtime_dependency('methadone', '~> 1.2.4')
+  s.add_runtime_dependency('active_support', '~> 3.0.0')
 
+  # development dependencies
   s.add_development_dependency('rdoc')
-  s.add_development_dependency('aruba')
-  s.add_development_dependency('rake','~> 10.0.2')
+  s.add_development_dependency('aruba', '~> 0.5.1')
+  s.add_development_dependency('rake',' ~> 10.0.2')
   s.add_development_dependency('fivemat')
   s.add_development_dependency('faker')
 
-  s.add_dependency("rest-client")
-  s.add_dependency('methadone', '~>1.2.1')
-  s.add_runtime_dependency('httmultiparty')
-  s.add_runtime_dependency('active_support')
-  s.add_runtime_dependency('statsd-ruby')
+  # plugin dependencies
+  s.add_runtime_dependency("twitter") #twitter
+  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.1.0') #statsd
+
 end

metadata

@@ -1,24 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.3.4
-  prerelease: 
+  version: 0.4.0.pre1
+  prerelease: 6
 platform: ruby
 authors:
 - Matthew Rothenberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2013-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rmagick
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.1
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.1
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -76,37 +76,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.1.1
 - !ruby/object:Gem::Dependency
-  name: twitter
+  name: methadone
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.4
 - !ruby/object:Gem::Dependency
-  name: oauth
+  name: active_support
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -128,17 +128,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -188,7 +188,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: twitter
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -204,23 +204,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: methadone
+  name: oauth
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: httmultiparty
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -236,7 +236,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: active_support
+  name: httmultiparty
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -256,17 +256,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 description: Takes a snapshot with your Mac's built-in iSight/FaceTime webcam (or
   any working webcam on Linux or Windows) every time you git commit code, and archives
   a lolcat style image with it.
@@ -335,16 +335,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2853708059940813353
+      hash: 3995732561961219726
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -2853708059940813353
+      version: 1.3.1
 requirements: []
 rubyforge_project: lolcommits
 rubygems_version: 1.8.24