lolcommits 0.8.1 → 0.9.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MmQ3ODk4ZDY4MWJmN2Y4MWIyMDA0MTM5ZWMyOTUyODNhN2UxNmQwNA==
-  data.tar.gz: !binary |-
-    NGM2ZDNkZmRlN2NkY2I1NTA4MTYyYWIwNzBjNzg4NjI0OTVkODVhNw==
+SHA1:
+  metadata.gz: f26c2d1017250e7f0e83a24fb811c0592f67b778
+  data.tar.gz: 0d062c79096844310e474691e8b23d9e70470e6b
 SHA512:
-  metadata.gz: !binary |-
-    MWVmNTA1OThmMDg4MTBjNWMyNjA2NDk0MDU1NDM0NDZjYzE4N2NiOWFiZjNm
-    MTFlZGIxYzU1MWIzZjA2YmNmZTBhZGRlNDI1OGVkMzlhNTg3OGI4ZTRiMjJl
-    MzJkNTU3MjlmZmRhNDkwMmNiODFkMDMxYmNlNTE2NGY5MWZjMjg=
-  data.tar.gz: !binary |-
-    NGE5M2IxYzZiZmVhMDE3MmE3YTJiY2VlODA1ZDE0NDhkZGNhMDlmZTA3NDAz
-    Yjg2OWU0ZjNmZWQ4ODQ2ZWQ2YTgwYTAxN2FhYjMzNjNhYjIyOGEyYTkwMTU0
-    ZTdkYzUxMGY1ZmU1NzViNWI4ZDQxNTcxYzNjZGY2OTZjZGY3ZDY=
+  metadata.gz: b5806484c1dc7fb6fae3c9d69f309197a98652bede1931d80a4f80ddb9e8ffb8bb53c16c0464f3a1a188c4c1485797d7bdf42b3edb8f5e8956ac7a9efe9ed5c6
+  data.tar.gz: a63fec5024b5472b9243ef12bcdeba846a3fe717128006608fdbd707f66216379d5a0d4a5ef8758cced0dd7e52cc285d1b9d7e8a69d98eed18153d77062497ec

data/.rubocop.yml

@@ -4,7 +4,3 @@ AllCops:
     - .bundle/**/*
 
 inherit_from: .rubocop_todo.yml
-
-# Enforce Ruby 1.8.7 compatible syntax
-HashSyntax:
-  EnforcedStyle: hash_rockets

data/.rubocop_todo.yml

@@ -1,61 +1,44 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-04-12 19:24:55 +0200 using RuboCop version 0.30.0.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-12-11 21:07:49 +0000 using RuboCop version 0.46.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 23
+# Offense count: 35
 Metrics/AbcSize:
   Max: 38
 
 # Offense count: 2
 # Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 150
+Metrics/BlockLength:
+  Max: 113
 
 # Offense count: 5
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 146
+
+# Offense count: 6
 Metrics/CyclomaticComplexity:
   Max: 9
 
-# Offense count: 92
-# Configuration parameters: AllowURI, URISchemes.
+# Offense count: 137
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
 Metrics/LineLength:
-  Max: 170
+  Max: 161
 
-# Offense count: 24
+# Offense count: 44
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 31
 
-# Offense count: 4
+# Offense count: 5
 Metrics/PerceivedComplexity:
   Max: 11
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Performance/Sample:
-  Enabled: false
-
-# Offense count: 12
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/BarePercentLiterals:
-  Enabled: false
-
-# Offense count: 1
-Style/CaseEquality:
-  Enabled: false
-
-# Offense count: 1
-# Configuration parameters: IndentWhenRelativeTo, SupportedStyles, IndentOneStep.
-Style/CaseIndentation:
-  Enabled: false
-
-# Offense count: 28
+# Offense count: 34
 Style/Documentation:
   Enabled: false
-
-# Bug with this cop https://github.com/bbatsov/rubocop/issues/3283
-Lint/ShadowedException:
-  Enabled: false

data/.travis.yml

@@ -2,11 +2,11 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
- - 1.9.3
  - 2.0.0
  - 2.1.7
  - 2.2.4
  - 2.3.0
+ - 2.3.3
  - ruby-head
 
 before_install:

data/CHANGELOG.md

@@ -8,6 +8,10 @@ project adheres to [Semantic Versioning][Semver].
   * WIP - extract plugins to separate gems ...
   * Your contribution here!
 
+## [0.9.0][] (14 December 2016)
+  * ditch ruby 1.9 support and upgrade some gems (@matthutchinson #325)
+  * term_output plugin added (iTerm2 only) (@ruxton #323)
+
 ## [0.8.1][] (11 October 2016)
   * shebang fix in installer (@matthutchinson #317)
   * FlowDock plugin (@mikecrittenden #318)
@@ -255,7 +259,8 @@ project adheres to [Semantic Versioning][Semver].
   instead of compositing multiply image Caption objects (this seems to be more
   reliable to not glitch.)
 
-[Unreleased]: https://github.com/mroth/lolcommits/compare/v0.8.1...HEAD
+[Unreleased]: https://github.com/mroth/lolcommits/compare/v0.9.0...HEAD
+[0.9.0]: https://github.com/mroth/lolcommits/compare/v0.8.1...v0.9.0
 [0.8.1]: https://github.com/mroth/lolcommits/compare/v0.8.0...v0.8.1
 [0.8.0]: https://github.com/mroth/lolcommits/compare/v0.7.0...v0.8.0
 [0.7.0]: https://github.com/mroth/lolcommits/compare/v0.6.7...v0.7.0

data/README.md

@@ -46,10 +46,11 @@ default MacOSX Ruby install is dumb and requires it.
 If [Boxen](https://boxen.github.com) is your thing, [try
 this](https://github.com/AssuredLabor/puppet-lolcommits).
 
-Lolcommits v0.7.0 was the last release to support Ruby < 1.9.3. If you'd like to
+Lolcommits v0.8.1 was the last release to support Ruby < 2.0. If you'd like to
 use this gem on older rubies, install it with:
 
-    [sudo] gem install lolcommits --version 0.7.0
+    [sudo] gem install lolcommits --version 0.8.1   # for Ruby 1.9
+    [sudo] gem install lolcommits --version 0.7.0   # for Ruby 1.8
 
 ### Linux
 

data/Rakefile

@@ -49,7 +49,7 @@ end
 
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new
-task :default => [:rubocop, :test, :features]
+task default: [:rubocop, :test, :features]
 
 desc 'Migrate an existing local .lolcommits directory to Dropbox'
 task :dropboxify do

data/bin/lolcommits

@@ -36,7 +36,7 @@ end
 # @return [Lolcommits::Configuration]
 def configuration
   if Choice.choices[:test]
-    Configuration.new(:loldir => Configuration.loldir_for('test'))
+    Configuration.new(loldir: Configuration.loldir_for('test'))
   else
     Configuration.new
   end
@@ -75,11 +75,11 @@ def do_capture
   capture_device  = default_device
 
   capture_options = {
-    :capture_delay   => capture_delay,
-    :capture_stealth => capture_stealth,
-    :capture_device  => capture_device,
-    :capture_animate => capture_animate,
-    :config          => configuration
+    capture_delay: capture_delay,
+    capture_stealth: capture_stealth,
+    capture_device: capture_device,
+    capture_animate: capture_animate,
+    config: configuration
   }
 
   process_runner = ProcessRunner.new(configuration)
@@ -90,8 +90,8 @@ def do_capture
 
       # get optional fake commit msg and sha from command line
       override_text = {
-        :message => Choice.choices[:msg],
-        :sha     => Choice.choices[:sha]
+        message: Choice.choices[:msg],
+        sha: Choice.choices[:sha]
       }
 
       # fire off runner with the overriden fake commit metadata

data/features/support/env.rb

@@ -11,8 +11,6 @@ include Lolcommits
 World(PathHelpers)
 
 Before do
-  # Using "announce" causes massive warnings on 1.9.2
-  @puts = true
   @aruba_timeout_seconds = 20
 
   # prevent launchy from opening gifs in tests

data/lib/lolcommits.rb

@@ -34,6 +34,7 @@ require 'lolcommits/plugins/dot_com'
 require 'lolcommits/plugins/tranzlate'
 require 'lolcommits/plugins/lol_twitter'
 require 'lolcommits/plugins/uploldz'
+require 'lolcommits/plugins/term_output'
 require 'lolcommits/plugins/lolsrv'
 require 'lolcommits/plugins/lol_yammer'
 require 'lolcommits/plugins/lol_protonet'

data/lib/lolcommits/cli/fatals.rb

@@ -44,22 +44,20 @@ module Lolcommits
         end
 
         # check for a error condition with git config affecting ruby-git
-        if Platform.git_config_color_always?
-          fatal 'Due to a bug in the ruby-git library, git config for color.ui'\
-                " cannot be set to 'always'."
-          fatal "Try setting it to 'auto' instead!"
-          exit 1
-        end
+        return unless Platform.git_config_color_always?
+        fatal 'Due to a bug in the ruby-git library, git config for color.ui'\
+          " cannot be set to 'always'."
+        fatal "Try setting it to 'auto' instead!"
+        exit 1
       end
 
       # Die with an informative error message if ffmpeg is not installed.
       # This is only used for certain functions (such as animation), so only run
       # this when you know the user wants to perform one of them.
       def self.die_if_no_valid_ffmpeg_installed!
-        unless Platform.valid_ffmpeg_installed?
-          fatal 'FATAL: ffmpeg does not appear to be properly installed!'
-          exit 1
-        end
+        return if Platform.valid_ffmpeg_installed?
+        fatal 'FATAL: ffmpeg does not appear to be properly installed!'
+        exit 1
       end
 
       # If we are not in a git repo, we can't do git related things!

data/lib/lolcommits/platform.rb

@@ -118,10 +118,9 @@ module Lolcommits
     # @return String
     def self.device_list
       # TODO: handle other platforms here (linux/windows)
-      if Platform.platform_mac?
-        capturer = Lolcommits::CaptureMacAnimated.new
-        `#{capturer.executable_path} -l`
-      end
+      return unless Platform.platform_mac?
+      capturer = Lolcommits::CaptureMacAnimated.new
+      `#{capturer.executable_path} -l`
     end
   end
 end

data/lib/lolcommits/plugin.rb

@@ -61,9 +61,9 @@ module Lolcommits
 
     def parse_user_input(str)
       # cater for bools, strings, ints and blanks
-      if 'true'.casecmp(str) == 0
+      if 'true'.casecmp(str).zero?
         true
-      elsif 'false'.casecmp(str) == 0
+      elsif 'false'.casecmp(str).zero?
         false
       elsif str =~ /^[0-9]+$/
         str.to_i

data/lib/lolcommits/plugins/dot_com.rb

@@ -16,17 +16,17 @@ module Lolcommits
       t = Time.now.to_i.to_s
       HTTMultiParty.post(
         "#{BASE_URL}/git_commits.json",
-        :body => {
-          :git_commit => {
-            :sha              => runner.sha,
-            :repo_external_id => configuration['repo_id'],
-            :image            => File.open(runner.main_image),
-            :raw              => File.open(runner.snapshot_loc)
+        body: {
+          git_commit: {
+            sha: runner.sha,
+            repo_external_id: configuration['repo_id'],
+            image: File.open(runner.main_image),
+            raw: File.open(runner.snapshot_loc)
           },
 
-          :key   => configuration['api_key'],
-          :t     => t,
-          :token => Digest::SHA1.hexdigest(configuration['api_secret'] + t)
+          key: configuration['api_key'],
+          t: t,
+          token: Digest::SHA1.hexdigest(configuration['api_secret'] + t)
         }
       )
     rescue => e

data/lib/lolcommits/plugins/lol_flowdock.rb

@@ -54,8 +54,8 @@ module Lolcommits
         endpoint = 'https://' + configuration['access_token'] + '@' + ENDPOINT_URL + configuration['organization'] + '/' + configuration['flow'] + '/messages'
         response = RestClient.post(
           endpoint,
-          :event        => 'file',
-          :content      => File.new(runner.main_image)
+          event: 'file',
+          content: File.new(runner.main_image)
         )
         debug response
       rescue => e

data/lib/lolcommits/plugins/lol_hipchat.rb

@@ -57,7 +57,7 @@ module Lolcommits
     end
 
     def message_json
-      { :message => message }.to_json.force_encoding('utf-8')
+      { message: message }.to_json.force_encoding('utf-8')
     end
 
     def picture_part

data/lib/lolcommits/plugins/lol_protonet.rb

@@ -15,8 +15,8 @@ module Lolcommits
       RestClient.post(
         api_url,
         {
-          :files        => [File.new(runner.main_image)],
-          :message      => message
+          files: [File.new(runner.main_image)],
+          message: message
         },
         'X-Protonet-Token' => configuration['api_token']
       )

data/lib/lolcommits/plugins/lol_slack.rb

@@ -48,12 +48,12 @@ module Lolcommits
 
         response = RestClient.post(
           ENDPOINT_URL,
-          :file     => File.new(runner.main_image),
-          :token    => configuration['access_token'],
-          :filetype => 'jpg',
-          :filename => runner.sha,
-          :title    => runner.message + "[#{runner.vcs_info.repo}]",
-          :channels => configuration['channels']
+          file: File.new(runner.main_image),
+          token: configuration['access_token'],
+          filetype: 'jpg',
+          filename: runner.sha,
+          title: runner.message + "[#{runner.vcs_info.repo}]",
+          channels: configuration['channels']
         )
 
         debug response

data/lib/lolcommits/plugins/lol_tumblr.rb

@@ -14,7 +14,7 @@ module Lolcommits
     def run_postcapture
       return unless valid_configuration?
       puts 'Posting to Tumblr'
-      r = client.photo(configuration['tumblr_name'], :data => runner.main_image)
+      r = client.photo(configuration['tumblr_name'], data: runner.main_image)
       if r.key?('id')
         puts "\t--> Post successful!"
       else
@@ -40,16 +40,16 @@ module Lolcommits
       puts 'Need to grab tumblr tokens'
       puts '---------------------------'
 
-      request_token = oauth_consumer.get_request_token(:exclude_callback => true)
+      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 = 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)
+        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
@@ -82,10 +82,10 @@ module Lolcommits
 
     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']
+        consumer_key: TUMBLR_CONSUMER_KEY,
+        consumer_secret: TUMBLR_CONSUMER_SECRET,
+        oauth_token: configuration['access_token'],
+        oauth_token_secret: configuration['secret']
       )
     end
 
@@ -93,9 +93,9 @@ module Lolcommits
       @oauth_consumer ||= OAuth::Consumer.new(
         TUMBLR_CONSUMER_KEY,
         TUMBLR_CONSUMER_SECRET,
-        :site             => TUMBLR_API_ENDPOINT,
-        :request_endpoint => TUMBLR_API_ENDPOINT,
-        :http_method      => :get
+        site: TUMBLR_API_ENDPOINT,
+        request_endpoint: TUMBLR_API_ENDPOINT,
+        http_method: :get
       )
     end
 

data/lib/lolcommits/plugins/lol_twitter.rb

@@ -78,7 +78,7 @@ module Lolcommits
       begin
         debug "Requesting Twitter OAuth Token with PIN: #{twitter_pin}"
         OAuth::RequestToken.new(oauth_consumer, rtoken, rsecret)
-        access_token = request_token.get_access_token(:oauth_verifier => twitter_pin)
+        access_token = request_token.get_access_token(oauth_verifier: twitter_pin)
       rescue OAuth::Unauthorized
         puts "\nERROR: Twitter PIN Auth FAILED!"
         return
@@ -126,9 +126,9 @@ module Lolcommits
       @oauth_consumer ||= OAuth::Consumer.new(
         TWITTER_CONSUMER_KEY,
         TWITTER_CONSUMER_SECRET,
-        :site             => TWITTER_API_ENDPOINT,
-        :request_endpoint => TWITTER_API_ENDPOINT,
-        :sign_in          => true
+        site: TWITTER_API_ENDPOINT,
+        request_endpoint: TWITTER_API_ENDPOINT,
+        sign_in: true
       )
     end
 

data/lib/lolcommits/plugins/lol_yammer.rb

@@ -65,12 +65,12 @@ module Lolcommits
         c.client_secret = YAMMER_CLIENT_SECRET
       end
 
-      client = Yammer::Client.new(:access_token => configuration['access_token'])
+      client = Yammer::Client.new(access_token: configuration['access_token'])
 
       retries = YAMMER_RETRY_COUNT
       begin
         lolimage = File.new(runner.main_image)
-        response = client.create_message(post, :attachment1 => lolimage)
+        response = client.create_message(post, attachment1: lolimage)
         debug response.body.inspect
         puts "\t--> Status posted!" if response
       rescue => e

data/lib/lolcommits/plugins/lolsrv.rb

@@ -38,11 +38,11 @@ module Lolcommits
 
     def upload(file, sha)
       RestClient.post(configuration['server'] + '/uplol',
-                      :lol  => File.new(file),
-                      :url  => runner.vcs_info.url + sha,
-                      :repo => runner.vcs_info.repo,
-                      :date => File.ctime(file),
-                      :sha  => sha)
+                      lol: File.new(file),
+                      url: runner.vcs_info.url + sha,
+                      repo: runner.vcs_info.repo,
+                      date: File.ctime(file),
+                      sha: sha)
     rescue => e
       log_error(e, "ERROR: Upload of lol #{sha} FAILED #{e.class} - #{e.message}")
     end

data/lib/lolcommits/plugins/loltext.rb

@@ -100,30 +100,30 @@ module Lolcommits
 
     def config_defaults
       {
-        :message => {
-          :color    => 'white',
-          :font     => DEFAULT_FONT_PATH,
-          :position => 'SW',
-          :size     => 48,
-          :stroke_color => 'black',
-          :uppercase => false
+        message: {
+          color: 'white',
+          font: DEFAULT_FONT_PATH,
+          position: 'SW',
+          size: 48,
+          stroke_color: 'black',
+          uppercase: false
         },
-        :sha => {
-          :color    => 'white',
-          :font     => DEFAULT_FONT_PATH,
-          :position => 'NE',
-          :size     => 32,
-          :stroke_color => 'black',
-          :uppercase => false
+        sha: {
+          color: 'white',
+          font: DEFAULT_FONT_PATH,
+          position: 'NE',
+          size: 32,
+          stroke_color: 'black',
+          uppercase: false
         },
-        :overlay => {
-          :enabled => false,
-          :overlay_colors => [
+        overlay: {
+          enabled: false,
+          overlay_colors: [
             '#2e4970', '#674685', '#ca242f', '#1e7882', '#2884ae', '#4ba000',
             '#187296', '#7e231f', '#017d9f', '#e52d7b', '#0f5eaa', '#e40087',
             '#5566ac', '#ed8833', '#f8991c', '#408c93', '#ba9109'
           ],
-          :overlay_percent => 50
+          overlay_percent: 50
         }
       }
     end

data/lib/lolcommits/plugins/term_output.rb

@@ -0,0 +1,54 @@
+# -*- encoding : utf-8 -*-
+require 'base64'
+
+module Lolcommits
+  class TermOutput < Plugin
+    def run_postcapture
+      if terminal_supported?
+        if !runner.vcs_info || runner.vcs_info.repo.empty?
+          debug 'repo is empty, skipping term output'
+        else
+          base64 = Base64.encode64(open(runner.main_image, &:read))
+          puts "#{begin_escape}1337;File=inline=1:#{base64};alt=#{runner.message};#{end_escape}\n"
+        end
+      else
+        debug 'Disabled, your terminal is not supported (requires iTerm2)'
+      end
+    end
+
+    def self.name
+      'term_output'
+    end
+
+    def self.runner_order
+      :postcapture
+    end
+
+    def configure_options!
+      if terminal_supported?
+        super
+      else
+        puts "Sorry, your terminal does not support the #{self.class.name} plugin (requires iTerm2)"
+      end
+    end
+
+    private
+
+    # escape sequences for tmux sessions differ
+    def begin_escape
+      tmux? ? "\033Ptmux;\033\033]" : "\033]"
+    end
+
+    def end_escape
+      tmux? ? "\a\033\\" : "\a"
+    end
+
+    def tmux?
+      !ENV['TMUX'].nil?
+    end
+
+    def terminal_supported?
+      ENV['TERM_PROGRAM'] =~ /iTerm/
+    end
+  end
+end

data/lib/lolcommits/plugins/tranzlate.rb

@@ -83,8 +83,7 @@ module Lolspeak
   def tranzlate(str)
     lolstr = str.dup
     LOL_DICTIONARY.each do |english, lolspeak|
-      # ghetto ruby1.8/1.9 agnostic version of choice vs sample
-      lolstr.gsub!(english, lolspeak.shuffle.first)
+      lolstr.gsub!(english, lolspeak.sample)
     end
 
     lolstr << '!  kthxbye!' if rand(10) == 2

data/lib/lolcommits/plugins/uploldz.rb

@@ -28,15 +28,15 @@ module Lolcommits
         RestClient.post(
           configuration['endpoint'],
           {
-            :file         => File.new(runner.main_image),
-            :message      => runner.message,
-            :repo         => runner.vcs_info.repo,
-            :author_name  => runner.vcs_info.author_name,
-            :author_email => runner.vcs_info.author_email,
-            :sha          => runner.sha,
-            :key          => configuration['optional_key']
+            file: File.new(runner.main_image),
+            message: runner.message,
+            repo: runner.vcs_info.repo,
+            author_name: runner.vcs_info.author_name,
+            author_email: runner.vcs_info.author_email,
+            sha: runner.sha,
+            key: configuration['optional_key']
           },
-          :Authorization => authorization_header
+          Authorization: authorization_header
         )
       end
     rescue => e

data/lib/lolcommits/runner.rb

@@ -86,12 +86,12 @@ module Lolcommits
       self.main_image   = config.main_image(sha, image_file_type)
 
       capturer = Platform.capturer_class(animate?).new(
-        :capture_device    => capture_device,
-        :capture_delay     => capture_delay,
-        :snapshot_location => snapshot_loc,
-        :video_location    => config.video_loc,
-        :frames_location   => config.frames_loc,
-        :animated_duration => capture_animate
+        capture_device: capture_device,
+        capture_delay: capture_delay,
+        snapshot_location: snapshot_loc,
+        video_location: config.video_loc,
+        frames_location: config.frames_loc,
+        animated_duration: capture_animate
       )
       capturer.capture
     end

data/lib/lolcommits/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Lolcommits
-  VERSION = '0.8.1'.freeze
+  VERSION = '0.9.0'.freeze
 end

data/lolcommits.gemspec

@@ -24,43 +24,38 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   # non-gem dependencies
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.0'
   s.requirements << 'imagemagick'
   s.requirements << 'a webcam'
 
   # hold back upgrading (and why)
-  s.add_runtime_dependency('rest-client', '=1.8') # yam gem requires uses this older version
-  s.add_runtime_dependency('mime-types', '=2.99') # ~> 3.0+ requires Ruby >= 2.0
-  s.add_runtime_dependency('json', '=1.8.3')      # ~> 2.0+ requires Ruby >= 2.0 (lolsrv)
-  s.add_development_dependency('tins', '=1.6.0')  # ~> 1.7.0+ requires Ruby >= 2.0
-  s.add_development_dependency('aruba', '=0.6.2') # upgrading requires a lot of test code changes
-  s.add_development_dependency('rake', '=10.5.0') # ~> 11+ introduces lots of warnings from other deps
-  s.add_runtime_dependency('term-ansicolor', '=1.3.2') # ~> 1.4+ requires Ruby >= 2.0
-  s.add_runtime_dependency('net-http-persistent', '=2.9.4') # ~> 3.0+ requires Ruby >= 2.1
+  s.add_development_dependency('aruba', '=0.6.2')  # upgrading requires a lot of test code changes
+  s.add_development_dependency('rake', '=10.5.0')  # ~> 11+ introduces lots of warnings from other deps
+  s.add_runtime_dependency('twitter', '~> 5.17.0') # twitter 6+ requires higher faraday
+  s.add_runtime_dependency('net-http-persistent', '=2.9.4') # ~> 3+ requires Ruby 2.1
 
   # core
-  s.add_runtime_dependency('methadone', '~> 1.9.2')
+  s.add_runtime_dependency('methadone', '~> 1.9.3')
   s.add_runtime_dependency('choice', '~> 0.2.0')
   s.add_runtime_dependency('mercurial-ruby', '~> 0.7.12')
-  s.add_runtime_dependency('mini_magick', '~> 4.5.1')
+  s.add_runtime_dependency('mini_magick', '~> 4.6.0')
   s.add_runtime_dependency('launchy', '~> 2.4.3')
   s.add_runtime_dependency('open4', '~> 1.3.4')
   s.add_runtime_dependency('git', '~> 1.3.0')
 
   # plugin gems
-  s.add_runtime_dependency('twitter', '~> 5.16.0')       # twitter
   s.add_runtime_dependency('yam', '~> 2.5.0')            # yammer
   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('rdoc', '~> 4.2.2')
+  s.add_development_dependency('rdoc', '~> 5.0.0')
 
   # testing gems
-  s.add_development_dependency('rubocop', '~> 0.41.0')
-  s.add_development_dependency('travis', '~> 1.8.2')
-  s.add_development_dependency('minitest', '~> 5.9.0')
-  s.add_development_dependency('coveralls', '~> 0.8.14')
-  s.add_development_dependency('ffaker', '~> 2.2.0')
+  s.add_development_dependency('rubocop', '~> 0.46.0')
+  s.add_development_dependency('travis', '~> 1.8.5')
+  s.add_development_dependency('minitest', '~> 5.10.1')
+  s.add_development_dependency('coveralls', '~> 0.8.17')
+  s.add_development_dependency('ffaker', '~> 2.3.0')
   s.add_development_dependency('cucumber', '~> 2.4.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Matthew Rothenberg
@@ -9,64 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '2.99'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '2.99'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.3
-- !ruby/object:Gem::Dependency
-  name: tins
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -96,19 +40,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 10.5.0
 - !ruby/object:Gem::Dependency
-  name: term-ansicolor
+  name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 5.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 5.17.0
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
@@ -127,257 +71,244 @@ dependencies:
   name: methadone
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.9.3
 - !ruby/object:Gem::Dependency
   name: choice
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: mercurial-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.12
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.1
+        version: 4.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.1
+        version: 4.6.0
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.3
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: twitter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 5.16.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 5.16.0
 - !ruby/object:Gem::Dependency
   name: yam
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: httmultiparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !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: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.0
+        version: 0.46.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.0
+        version: 0.46.0
 - !ruby/object:Gem::Dependency
   name: travis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.8.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.8.5
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.9.0
+        version: 5.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.9.0
+        version: 5.10.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.14
+        version: 0.8.17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.14
+        version: 0.8.17
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
-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"
+description: |2
+    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.
 email:
 - mrothenberg@gmail.com
 - matt@hiddenloop.com
@@ -386,13 +317,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .editorconfig
-- .gitattributes
-- .gitignore
-- .rubocop.yml
-- .rubocop_todo.yml
-- .travis.yml
+- ".coveralls.yml"
+- ".editorconfig"
+- ".gitattributes"
+- ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -445,6 +376,7 @@ files:
 - lib/lolcommits/plugins/lol_yammer.rb
 - lib/lolcommits/plugins/lolsrv.rb
 - lib/lolcommits/plugins/loltext.rb
+- lib/lolcommits/plugins/term_output.rb
 - lib/lolcommits/plugins/tranzlate.rb
 - lib/lolcommits/plugins/uploldz.rb
 - lib/lolcommits/runner.rb
@@ -471,12 +403,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: