lolcommits 0.5.9 → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODE2NDgxMzBmNWVjZWEyOTM3YTEzZTU2N2FlMWE0OThkNjZhODBjZg==
+    ZjA1ZjZlYWRmOGZjOGM4MDcxNTQ4NGQzYWM5OGI3MTY0ODQ5ZjliYQ==
   data.tar.gz: !binary |-
-    NWUxZmJlOGNiZjAwZjJlYWU0NzBmM2Y1NTRlNzBmYzhmMGI2MDk5YQ==
+    YTAwODliMjE0MjIxNTljYjI4OWU5MzllM2E0ODM0YTZiNGE4MjIyOQ==
 SHA512:
   metadata.gz: !binary |-
-    MTk4OGQzMDNhZGFmMTAzYjBhZWViNTJmODdjNDI3NzE1MjA1ZjJhZGIzODgw
-    YmNiOTc1NTc0YjhiNmE4NTY5NTE3YzQ4ZTViZjJiYzk2MjJiYjIxNGNmNDhi
-    YjNjN2NjNjIwYjAyNjQ1NzkwODlmNDhhNjE0ZWMxNzVjNmEyZGU=
+    MzJkNmZhMWVlZTQ2MmQ1NWE4NTA1NDU3MWE2YTc3NzRjMTY3MDk2MmIyOGEw
+    NGRiNzhlZWE4ZDY3OTFjZWYwNDJlZjA2NTMxMGNkNWU3MWVjOTM5MTQ5ZGRk
+    ZTI5MTcyYzgyNTZjNGMyMWY1YTg2MzU1MTI4ZWVkZDc1MzJjOWE=
   data.tar.gz: !binary |-
-    Y2Y1NGJkMTY3NWQ1OTIzMzI1YzljNjg2ZWQ4NWU1NDRkY2NlMDY1YzBiOTdl
-    ZWE5OTQ2MjU4YTVlZDFlNDNkMDI0OWM5NGUxZGUxZTE3N2ZjODQxYWExNWIy
-    YTRlNzM3MWUwN2Y5OWVjOGZmNjA0M2MyMzQwOWZkNjlkZTA2NzU=
+    Y2JlNTIwZjMyNmFiODc4MDU0NjU2NThmZDQwOTg0ZmNiYzEyMDk5YWYzMGEy
+    M2MwNmJkOGU3ZjZjN2QwOGIyMjE3YjVmNTBlZDY4MDk1Y2JkOTdiM2YxYjc3
+    NDQwOTZlNWYwOTAzZmY4ZWU1NGI2NDQ1MGU5ODNkMjUwZjA2MmY=

data/{CHANGELOG → CHANGELOG.md}

@@ -1,6 +1,14 @@
-0.6.0 (WIP)
+### Version History
+
+0.7.0 (WIP)
   * extract plugins to seperate gems ...
 
+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)
   * Fix windows post commit hook path (@matthutchinson #278)
 
@@ -20,7 +28,7 @@
   * 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)
+  * Glob /dev/video for default video device (linux only) (#246 @Ferada)
 
 0.5.6 (24 November 2014)
   * Updates and clean ups on the gemspec (@mroth #228)
@@ -145,7 +153,7 @@
   * 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 extremeley basic anonymous usage tracking (if this bugs you, you
+  * 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)
@@ -197,4 +205,3 @@
   * 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.)
-

data/CONTRIBUTING.md

@@ -0,0 +1,44 @@
+### Contributing
+
+Pull Requests are welcome! To start helping out on lolcommits:
+
+Fork then clone the repository:
+
+    git clone git@github.com:your-username/acts_as_textcaptcha.git
+
+Create your feature branch:
+
+    git checkout -b my-new-feature
+
+When you are happy with your change, run the full test suite:
+
+    bundle exec rake
+
+Please ensure nothing is broken. It'd be awesome if you manually tested for
+regressions as well (since the test suite is far from complete).
+
+This default rake task uses [RuboCop](https://github.com/bbatsov/rubocop) to
+ensure Ruby style guidelines. If you want to run tests before conforming to this
+to verify functionality, just run `rake test` and `rake features` manually.
+
+With a passing test suite, commit your changes, push and submit a new [Pull
+Request](https://github.com/mroth/lolcomits/compare/):
+
+    git commit -am 'Added some feature'
+    git push origin my-new-feature
+
+At this point you'll be waiting for one of our maintainers to review it. We will
+try to reply to new Pull Requests within a few days. We might suggest some
+changes, improvements or alternatives. To increase the chance that your pull
+request gets accepted:
+
+* Explain what your are doing (and why) in your Pull Request description.
+* If you are fixing an
+  [issue](https://github.com/mroth/lolcomits/issues), link to
+  it in your description and [mention
+  it](https://help.github.com/articles/closing-issues-via-commit-messages/) in
+  the commit message.
+* Write a good [commit
+  message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+* Write tests.
+

data/README.md

@@ -45,7 +45,7 @@ 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:
@@ -104,7 +104,6 @@ via environment variables like so;
   **requires ffmpeg**
 * `LOLCOMMITS_DELAY` (in seconds) set delay persistently (for slow webcams to
   warmup)
-* `LOLCOMMITS_FONT` set font file location for lolcommit text
 * `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
@@ -116,12 +115,16 @@ in your repository's `.git/hooks/post-commit` file).
 * `--device=DEVICE` or `-d DEVICE`
 * `--animate=SECONDS` or `-a SECONDS`
 * `--delay=SECONDS` or `-w SECONDS`
-* `--font=FONT_PATH` or `-f FONT_PATH`
 * `--fork`
 * `--stealth`
 
-Use `lolcommits --devices` to list all attached video devices available for
-capturing. Read how to [configure commit
+To change the font (including point size, position & color), simply configure
+the default loltext plugin with this command:
+
+    lolcommits --config -p loltext
+
+You can use `lolcommits --devices` to list all attached video devices available
+for capturing. Read how to [configure commit
 capturing](https://github.com/mroth/lolcommits/wiki/Configure-Commit-Capturing)
 for more details.
 
@@ -149,9 +152,16 @@ animated lolcommit gif")
 
 ### Plugins
 
-There are a growing amount of plugins for lolcommits to enable things like
-Twitter upload, translating your commit messages to lolspeak, etc.  Check them
-out on the [plugins
+A growing number of plugins are now available allowing you to transform or share
+your lolcommits with others. The default plugin simply appends your commit
+message and sha to the captured image. Others can auto post to Twitter, Tumblr
+(and other services), or even translate your commit messages to
+[lolspeak](http://www.urbandictionary.com/define.php?term=lolspeak). They can be
+easily enabled, configured or disabled with our config command:
+
+    lolcommits --config
+
+Check them out on our [plugins
 page](https://github.com/mroth/lolcommits/wiki/Configuring-Plugins).
 
 ## Troubles?

data/appveyor.yml

@@ -0,0 +1,41 @@
+version: "{build}"
+
+os: Windows Server 2012
+platform:
+  - x64
+
+environment:
+  matrix:
+    - ruby_version: "193"
+    - ruby_version: "200"
+    - ruby_version: "21"
+    - ruby_version: "22"
+
+clone_folder: c:\projects\lolcommits
+clone_depth: 10
+skip_tags: true
+
+branches:
+  except:
+    - gh-pages
+
+init:
+  # stub mplayer/ffmpeg so it looks like they are installed
+  - mkdir c:\bin
+  - fsutil file createnew c:\bin\mplayer 1
+  - fsutil file createnew c:\bin\ffmpeg 1
+  - setx path "%path%;c:\bin"
+
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - ruby --version
+  - gem --version
+  - gem install bundler --quiet --no-ri --no-rdoc
+  - bundler --version
+  - choco install imagemagick.app -y
+
+build_script:
+  - bundle install
+
+test_script:
+  - bundle exec rake

data/bin/lolcommits

@@ -72,14 +72,12 @@ end
 def do_capture
   capture_delay   = Choice.choices[:delay] || ENV['LOLCOMMITS_DELAY'] || 0
   capture_stealth = Choice.choices[:stealth] || ENV['LOLCOMMITS_STEALTH'] || nil
-  capture_font    = Choice.choices[:font] || ENV['LOLCOMMITS_FONT'] || nil
   capture_device  = default_device
 
   capture_options = {
     :capture_delay   => capture_delay,
     :capture_stealth => capture_stealth,
     :capture_device  => capture_device,
-    :font            => capture_font,
     :capture_animate => capture_animate,
     :config          => configuration
   }
@@ -267,12 +265,6 @@ Choice.options do
     desc 'output debugging information'
   end
 
-  option :font do
-    long '--font=FONT_PATH'
-    short '-f'
-    desc 'pass font file location'
-  end
-
   option :gif do
     long '--gif'
     short '-g'

data/features/lolcommits.feature

@@ -114,30 +114,49 @@ Feature: Basic UI functionality
     When I successfully run `lolcommits --plugins`
     Then the output should contain a list of plugins
 
-  Scenario: Configuring plugin
+  Scenario: Configuring loltext plugin
     Given I am in a git repo named "config-test"
     When I run `lolcommits --config` interactively
       And I wait for output to contain "Name of plugin to configure:"
       Then I type "loltext"
       And I wait for output to contain "enabled:"
       Then I type "true"
+      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"
+      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"
+      Then I type ""
+      Then I type ""
+      Then I type ""
+      Then I type ""
+      Then I type ""
     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
+      And the output should contain a list of plugins
+      And a file named "~/.lolcommits/config-test/config.yml" should exist
     When I successfully run `lolcommits --show-config`
-    Then the output should match /loltext:\s+enabled: true/
-
-  Scenario: Configuring plugin in test mode affects test loldir not repo loldir
+    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 /:color: red/
+    And the output should match /:stroke_color: white/
+
+  Scenario: Configuring loltext plugin in test mode affects test loldir not repo loldir
     Given I am in a git repo named "testmode-config-test"
-    When I run `lolcommits --config --test` interactively
-      And I wait for output to contain "Name of plugin to configure:"
-      Then I type "loltext"
+    When I run `lolcommits --config --test -p loltext` interactively
       And I wait for output to contain "enabled:"
-      Then I type "true"
+      Then I type "false"
     Then the output should contain "Successfully configured plugin: loltext"
     And a file named "~/.lolcommits/test/config.yml" should exist
     When I successfully run `lolcommits --test --show-config`
-    Then the output should match /loltext:\s+enabled: true/
+    Then the output should match /loltext:\s+enabled: false/
 
   Scenario: test capture should work regardless of whether in a git repo
     Given I am in a directory named "nothingtoseehere"

data/lib/lolcommits.rb

@@ -26,6 +26,7 @@ require 'lolcommits/plugins/uploldz'
 require 'lolcommits/plugins/lolsrv'
 require 'lolcommits/plugins/lol_yammer'
 require 'lolcommits/plugins/lol_protonet'
+require 'lolcommits/plugins/lol_tumblr'
 
 # require runner after all the plugins have been required
 require 'lolcommits/runner'

data/lib/lolcommits/capturer.rb

@@ -3,7 +3,7 @@ module Lolcommits
   class Capturer
     include Methadone::CLILogging
 
-    attr_accessor :capture_device, :capture_delay, :snapshot_location, :font,
+    attr_accessor :capture_device, :capture_delay, :snapshot_location,
                   :video_location, :frames_location, :animated_duration
 
     def initialize(attributes = {})

data/lib/lolcommits/capturer/capture_cygwin.rb

@@ -9,10 +9,10 @@ module Lolcommits
         delaycmd = " /delay #{capture_delay * 1000}"
       end
 
-      _, r, _ = Open3.popen3("#{executable_path} /filename `cygpath -w #{snapshot_location}`#{delaycmd}")
+      _stdin, stdout, _stderr = Open3.popen3("#{executable_path} /filename `cygpath -w #{snapshot_location}`#{delaycmd}")
 
       # looks like we still need to read the output for something to happen
-      r.read
+      stdout.read
     end
 
     def executable_path

data/lib/lolcommits/capturer/capture_linux.rb

@@ -21,9 +21,9 @@ module Lolcommits
 
       debug 'LinuxCapturer: calling out to mplayer to capture image'
       # mplayer's output is ugly and useless, let's throw it away
-      _, r, _ = Open3.popen3("mplayer -vo jpeg:outdir=#{tmpdir} #{capture_device_string} -frames #{frames} -fps #{MPLAYER_FPS} tv://")
+      _stdin, stdout, _stderr = Open3.popen3("mplayer -vo jpeg:outdir=#{tmpdir} #{capture_device_string} -frames #{frames} -fps #{MPLAYER_FPS} tv://")
       # looks like we still need to read the output for something to happen
-      r.read
+      stdout.read
 
       debug 'LinuxCapturer: calling out to mplayer to capture image'
 

data/lib/lolcommits/capturer/capture_windows.rb

@@ -9,10 +9,10 @@ module Lolcommits
         delaycmd = " /delay #{capture_delay * 1000}"
       end
 
-      _, r, _ = Open3.popen3("#{executable_path} /filename #{snapshot_location}#{delaycmd}")
+      _stdin, stdout, _stderr = Open3.popen3("#{executable_path} /filename #{snapshot_location}#{delaycmd}")
 
       # looks like we still need to read the output for something to happen
-      r.read
+      stdout.read
     end
 
     def executable_path

data/lib/lolcommits/cli/fatals.rb

@@ -29,8 +29,8 @@ module Lolcommits
           end
         end
 
-        # make sure we can find the Impact truetype font
-        unless File.readable? File.join(Configuration::LOLCOMMITS_ROOT, 'vendor', 'fonts', 'Impact.ttf')
+        # make sure we can find the default font
+        unless File.readable? Lolcommits::Loltext::DEFAULT_FONT_PATH
           fatal "Couldn't properly read Impact font from gem package, "\
                 'please file a bug?!'
           exit 1

data/lib/lolcommits/plugin.rb

@@ -50,8 +50,8 @@ module Lolcommits
         print "#{option}: "
         val = parse_user_input(STDIN.gets.strip)
         # check enabled option isn't a String
-        if (option == 'enabled') && val.is_a?(String)
-          puts "Aborting - please enable with 'true' or 'false'"
+        if (option == 'enabled') && ![true, false].include?(val)
+          puts "Aborting - please respond with 'true' or 'false'"
           exit 1
         else
           acc.merge(option => val)
@@ -60,10 +60,15 @@ module Lolcommits
     end
 
     def parse_user_input(str)
+      # cater for bools, strings, ints and blanks
       if 'true'.casecmp(str) == 0
         true
       elsif 'false'.casecmp(str) == 0
         false
+      elsif str =~ /^[0-9]+$/
+        str.to_i
+      elsif str.strip.empty?
+        nil
       else
         str
       end

data/lib/lolcommits/plugins/lol_tumblr.rb

@@ -0,0 +1,130 @@
+# -*- encoding : utf-8 -*-
+require 'yaml'
+require 'oauth'
+require 'webrick'
+require 'cgi'
+require 'tumblr_client'
+
+module Lolcommits
+  class LolTumblr < Plugin
+    TUMBLR_API_ENDPOINT    = 'https://www.tumblr.com'
+    TUMBLR_CONSUMER_KEY    = '2FtMEDpEPkxjoUdkpHh42h9wqTu9IVS7Ra0QyNZGixdCvhllN2'
+    TUMBLR_CONSUMER_SECRET = 'qWuvxgFUR2YyWKtbWOkDTMAiBEbj7ZGaNLaNQPba0PI1N4JpBs'
+
+    def run_postcapture
+      return unless valid_configuration?
+      puts 'Posting to Tumblr'
+      r = client.photo(configuration['tumblr_name'], :data => runner.main_image)
+      if r.key?('id')
+        puts "\t--> Post successful!"
+      else
+        puts "Tumblr post FAILED! #{r}"
+      end
+    rescue Faraday::Error => e
+      puts "Tumblr post FAILED! #{e.message}"
+    end
+
+    def configure_options!
+      options = super
+      # ask user to configure tokens if enabling
+      if options['enabled']
+        auth_config = configure_auth!
+        if auth_config
+          options = options.merge(auth_config).merge(configure_tumblr_name)
+        else
+          return # return nil if configure_auth failed
+        end
+      end
+      options
+    end
+
+    def configure_auth!
+      puts '---------------------------'
+      puts 'Need to grab tumblr tokens'
+      puts '---------------------------'
+
+      request_token = oauth_consumer.get_request_token(:exclude_callback => true)
+      print "\n1) Please open this url in your browser to authorize lolcommits:\n\n"
+      puts request_token.authorize_url
+      print "\n2) Launching a local server to complete the OAuth authentication process:\n\n"
+      begin
+        server = WEBrick::HTTPServer.new :Port => 3000
+        server.mount_proc '/', server_callback(server)
+        server.start
+        debug "Requesting Tumblr OAuth Token with verifier: #{@verifier}"
+        access_token = request_token.get_access_token(:oauth_verifier => @verifier)
+      rescue Errno::EADDRINUSE
+        puts "\nERROR You have something running on port 3000. Please turn it off to complete the authorization process"
+        return
+      rescue OAuth::Unauthorized
+        puts "\nERROR: Tumblr OAuth verification faile!"
+        return
+      end
+      return unless access_token.token && access_token.secret
+      puts ''
+      puts '------------------------------'
+      puts 'Thanks! Tumblr Auth Succeeded'
+      puts '------------------------------'
+
+      {
+        'access_token' => access_token.token,
+        'secret'       => access_token.secret
+      }
+    end
+
+    def configure_tumblr_name
+      print "\n3) What's your tumblr name? (i.e. 'http://[THIS PART HERE].tumblr.com'): "
+      { 'tumblr_name' => STDIN.gets.strip }
+    end
+
+    def configured?
+      !configuration['enabled'].nil? &&
+        configuration['access_token'] &&
+        configuration['secret']
+    end
+
+    def client
+      @client ||= Tumblr.new(:consumer_key       => TUMBLR_CONSUMER_KEY,
+                             :consumer_secret    => TUMBLR_CONSUMER_SECRET,
+                             :oauth_token        => configuration['access_token'],
+                             :oauth_token_secret => configuration['secret']
+                            )
+    end
+
+    def oauth_consumer
+      @oauth_consumer ||= OAuth::Consumer.new(TUMBLR_CONSUMER_KEY,
+                                              TUMBLR_CONSUMER_SECRET,
+                                              :site             => TUMBLR_API_ENDPOINT,
+                                              :request_endpoint => TUMBLR_API_ENDPOINT,
+                                              :http_methdo => :get
+                                             )
+    end
+
+    def config_with_default(key, default = nil)
+      if configuration[key]
+        configuration[key].strip.empty? ? default : configuration[key]
+      else
+        default
+      end
+    end
+
+    def self.name
+      'tumblr'
+    end
+
+    def self.runner_order
+      :postcapture
+    end
+
+    protected
+
+    def server_callback(server)
+      proc do |req, res|
+        q = CGI.parse req.request_uri.query
+        @verifier = q['oauth_verifier'][0]
+        server.stop
+        res.body = 'Lolcommits authorization complete!'
+      end
+    end
+  end
+end

data/lib/lolcommits/plugins/loltext.rb

@@ -1,9 +1,10 @@
 # -*- encoding : utf-8 -*-
 module Lolcommits
   class Loltext < Plugin
-    def initialize(runner)
-      super
-      @font_location = runner ? runner.font : nil
+    DEFAULT_FONT_PATH = File.join(Configuration::LOLCOMMITS_ROOT, 'vendor', 'fonts', 'Impact.ttf')
+
+    def self.name
+      'loltext'
     end
 
     # enabled by default (if no configuration exists)
@@ -12,44 +13,108 @@ module Lolcommits
     end
 
     def run_postcapture
-      font_location = @font_location || File.join(Configuration::LOLCOMMITS_ROOT,
-                                                  'vendor',
-                                                  'fonts',
-                                                  'Impact.ttf')
-
       debug 'Annotating image via MiniMagick'
       image = MiniMagick::Image.open(runner.main_image)
+      annotate(image, :message, clean_msg(runner.message))
+      annotate(image, :sha, runner.sha)
+      debug "Writing changed file to #{runner.main_image}"
+      image.write runner.main_image
+    end
+
+    def annotate(image, type, string)
+      debug("annotating #{type} text to image")
+
       image.combine_options do |c|
-        c.gravity 'SouthWest'
-        c.fill 'white'
-        c.stroke 'black'
         c.strokewidth '2'
-        c.pointsize(runner.animate? ? '24' : '48')
         c.interline_spacing '-9'
-        c.font font_location
-        c.annotate '0', clean_msg(runner.message)
+        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.font config_option(type, :font)
+        c.annotate '0', string
       end
+    end
 
-      image.combine_options do |c|
-        c.gravity 'NorthEast'
-        c.fill 'white'
-        c.stroke 'black'
-        c.strokewidth '2'
-        c.pointsize(runner.animate? ? '21' : '32')
-        c.font font_location
-        c.annotate '0', runner.sha
+    def configure_options!
+      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 '  * colors can be hex #FC0 value or a string \'white\''
+        puts '------------------------------------------------------'
+
+        options[:message] = configure_sub_options(:message)
+        options[:sha]     = configure_sub_options(:sha)
       end
+      options
+    end
 
-      debug "Writing changed file to #{runner.main_image}"
-      image.write runner.main_image
+    # 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"
+      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.gsub('_', ' ')} (#{defaults[opt]}): "
+        val = parse_user_input(STDIN.gets.strip)
+        acc.merge(opt => val)
+      end
     end
 
-    def self.name
-      'loltext'
+    def config_defaults
+      {
+        :message => {
+          :font     => DEFAULT_FONT_PATH,
+          :size     => 48,
+          :position => 'SW',
+          :color    => 'white',
+          :stroke_color => 'black'
+        },
+        :sha => {
+          :font     => DEFAULT_FONT_PATH,
+          :size     => 32,
+          :position => 'NE',
+          :color    => 'white',
+          :stroke_color => 'black'
+        }
+      }
+    end
+
+    def config_option(type, option)
+      default_option = config_defaults[type][option]
+      if configuration[type]
+        configuration[type][option] || default_option
+      else
+        default_option
+      end
     end
 
     private
 
+    # explode psuedo-names for text position
+    def position_transform(position)
+      case position
+      when 'NE'
+        'NorthEast'
+      when 'NW'
+        'NorthWest'
+      when 'SE'
+        'SouthEast'
+      when 'SW'
+        'SouthWest'
+      when 'C'
+        'Center'
+      end
+    end
+
     # do whatever is required to commit message to get it clean and ready for imagemagick
     def clean_msg(text)
       wrapped_text = word_wrap text

data/lib/lolcommits/runner.rb

@@ -4,7 +4,7 @@ require 'lolcommits/platform'
 module Lolcommits
   class Runner
     attr_accessor :capture_delay, :capture_stealth, :capture_device, :message,
-                  :sha, :snapshot_loc, :main_image, :config, :font, :git_info,
+                  :sha, :snapshot_loc, :main_image, :config, :git_info,
                   :capture_animate
 
     include Methadone::CLILogging
@@ -85,7 +85,6 @@ module Lolcommits
         :capture_device    => capture_device,
         :capture_delay     => capture_delay,
         :snapshot_location => snapshot_loc,
-        :font              => font,
         :video_location    => config.video_loc,
         :frames_location   => config.frames_loc,
         :animated_duration => capture_animate

data/lib/lolcommits/version.rb

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

data/lolcommits.gemspec

@@ -47,6 +47,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('yam', '~> 2.4.0')            # yammer
   s.add_runtime_dependency('json', '~> 1.8.1')           # lolsrv
   s.add_runtime_dependency('httmultiparty', '~> 0.3.16') # dot_com
+  s.add_runtime_dependency('tumblr_client', '~> 0.8.5')  # tumblr
 
   # development gems
   s.add_development_dependency('fivemat', '~> 1.3.1')

data/test/lolcommits_test.rb

@@ -18,7 +18,7 @@ class LolTest < MiniTest::Test
   # this will test the permissions but only locally, important before building a gem package!
   #
   def test_permissions
-    impact_perms     = File.lstat(File.join(Configuration::LOLCOMMITS_ROOT, 'vendor', 'fonts', 'Impact.ttf')).mode & 0777
+    impact_perms     = File.lstat(Lolcommits::Loltext::DEFAULT_FONT_PATH).mode & 0777
     imagesnap_perms  = File.lstat(File.join(Configuration::LOLCOMMITS_ROOT, 'vendor', 'ext', 'imagesnap', 'imagesnap')).mode & 0777
     videosnap_perms  = File.lstat(File.join(Configuration::LOLCOMMITS_ROOT, 'vendor', 'ext', 'videosnap', 'videosnap')).mode & 0777
     commandcam_perms = File.lstat(File.join(Configuration::LOLCOMMITS_ROOT, 'vendor', 'ext', 'CommandCam', 'CommandCam.exe')).mode & 0777

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
 platform: ruby
 authors:
 - Matthew Rothenberg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -221,6 +221,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.16
+- !ruby/object:Gem::Dependency
+  name: tumblr_client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.5
 - !ruby/object:Gem::Dependency
   name: fivemat
   requirement: !ruby/object:Gem::Requirement
@@ -365,12 +379,13 @@ files:
 - .rubocop.yml
 - .rubocop_todo.yml
 - .travis.yml
-- CHANGELOG
-- CONTRIBUTING
+- CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- appveyor.yml
 - bin/lolcommits
 - config/cucumber.yml
 - features/bugs.feature
@@ -401,6 +416,7 @@ files:
 - lib/lolcommits/plugin.rb
 - lib/lolcommits/plugins/dot_com.rb
 - lib/lolcommits/plugins/lol_protonet.rb
+- lib/lolcommits/plugins/lol_tumblr.rb
 - lib/lolcommits/plugins/lol_twitter.rb
 - lib/lolcommits/plugins/lol_yammer.rb
 - lib/lolcommits/plugins/lolsrv.rb

data/CONTRIBUTING

@@ -1,13 +0,0 @@
-GUIDELINES FOR CONTRIBUTING
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-You can run the existing test-suite via `rake`.  Ensure nothing is broken, but since the test since is far from complete, it'd be awesome if you manually tested for regressions as well.
-
-Please, if at all possible, write a passing test for the functionality you added.
-
-The default rake task uses Rubocop on default settings to ensure Ruby Style Guidelines.  If you want to run tests before conforming to this to verify functionality you can just run `rake test` and `rake features` manually.