lolcommits 0.6.0 → 0.6.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjA1ZjZlYWRmOGZjOGM4MDcxNTQ4NGQzYWM5OGI3MTY0ODQ5ZjliYQ==
+    MzE2YjAyOGQ3MzBhNzVmZjI2MmFjMTc2MmY4YWYwYWQ0NDRjYzZjMA==
   data.tar.gz: !binary |-
-    YTAwODliMjE0MjIxNTljYjI4OWU5MzllM2E0ODM0YTZiNGE4MjIyOQ==
+    NjMyYmUxMDI0Y2E4NzhiMDE0Yzc0YTQ5NjFmYzkxMzVkMDRiYWFlNQ==
 SHA512:
   metadata.gz: !binary |-
-    MzJkNmZhMWVlZTQ2MmQ1NWE4NTA1NDU3MWE2YTc3NzRjMTY3MDk2MmIyOGEw
-    NGRiNzhlZWE4ZDY3OTFjZWYwNDJlZjA2NTMxMGNkNWU3MWVjOTM5MTQ5ZGRk
-    ZTI5MTcyYzgyNTZjNGMyMWY1YTg2MzU1MTI4ZWVkZDc1MzJjOWE=
+    OTI0M2VjZTkwODZmOGVkYzVmYzFiNmY5ODgzMDMyZjZkMDA3YjU2ZTgxMmQy
+    ODlmZGRkMjE2NWFlNWJlODZjMTJjMDQzMGViOTE3ZmU2N2IzMjUzNWYyZDM4
+    MDdkZTkzMDc5ZDk1YWEyNGIzOTM2ZWE5ZTZjYWU3OGRlNGQ0ZjU=
   data.tar.gz: !binary |-
-    Y2JlNTIwZjMyNmFiODc4MDU0NjU2NThmZDQwOTg0ZmNiYzEyMDk5YWYzMGEy
-    M2MwNmJkOGU3ZjZjN2QwOGIyMjE3YjVmNTBlZDY4MDk1Y2JkOTdiM2YxYjc3
-    NDQwOTZlNWYwOTAzZmY4ZWU1NGI2NDQ1MGU5ODNkMjUwZjA2MmY=
+    YTQ1Yzk0YmZkZWIyODRmZDQxMWY2N2VlYmNhMjc5ODc5MmMxOWEwNGRkYjMz
+    NTlmZDNmM2M2N2Q1N2Q5NmYxZTdkMWE3MGM5ZjdjOTQ0MjNhNDJkOGYxZmYz
+    MGQ1YzdkZTk3MWEwM2ExNTQyZGVjODZhMzkxOWJjM2YzMGFjOGY=

data/.travis.yml

@@ -6,8 +6,8 @@ rvm:
  - 1.9.2
  - 1.9.3
  - 2.0.0
- - 2.1.5
- - 2.2.2
+ - 2.1.7
+ - 2.2.3
  - ruby-head
 
 before_install:

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 0.7.0 (WIP)
   * extract plugins to seperate gems ...
 
+0.6.1 (16 September 2015)
+  * Optional http auth header user/password in uploldz plugin (@felixroos #283)
+  * Slack plugin added (@yasakbulut #284)
+  * Updated rubies in Travis settings (@matthutchinson)
+  * Fixed README badge URLS (@matthutchinson)
+
 0.6.0 (27 July 2015)
   * Configurable text options for loltext plugin (@matthutchinson #282)
   * Working AppVeyor configuration added (@nysthee #280)

data/README.md

@@ -6,11 +6,11 @@ archives a lolcat style image with it.  Git blame has never been so much fun.
 By default, the lol images are stored by a Github style short SHA in a
 `~/.lolcommits` directory created for you.
 
-[![Gem Version](http://img.shields.io/gem/v/lolcommits.svg?style=flat)](https://rubygems.org/gems/lolcommits)
-[![Build Status](http://img.shields.io/travis/mroth/lolcommits.svg?style=flat)](https://travis-ci.org/mroth/lolcommits)
-[![Dependency Status](http://img.shields.io/gemnasium/mroth/lolcommits.svg?style=flat)](https://gemnasium.com/mroth/lolcommits)
-[![CodeClimate Status](http://img.shields.io/codeclimate/github/mroth/lolcommits.svg?style=flat)](https://codeclimate.com/github/mroth/lolcommits)
-[![Coverage Status](http://img.shields.io/coveralls/mroth/lolcommits.svg?style=flat)](https://coveralls.io/r/mroth/lolcommits)
+[![Gem Version](https://badge.fury.io/rb/lolcommits.svg)](https://rubygems.org/gems/lolcommits)
+[![Build Status](https://travis-ci.org/mroth/lolcommits.svg?branch=master)](https://travis-ci.org/mroth/lolcommits)
+[![Dependency Status](https://gemnasium.com/mroth/lolcommits.svg)](https://gemnasium.com/mroth/lolcommits)
+[![CodeClimate Status](https://d3s6mut3hikguw.cloudfront.net/github/mroth/lolcommits/badges/gpa.svg)](https://codeclimate.com/github/mroth/lolcommits)
+[![Coverage Status](https://coveralls.io/repos/mroth/lolcommits/badge.svg?branch=master&service=github)](https://coveralls.io/r/mroth/lolcommits)
 
 ## Sample images
 

data/lib/lolcommits.rb

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

data/lib/lolcommits/cli/fatals.rb

@@ -67,10 +67,10 @@ module Lolcommits
       def self.die_if_not_git_repo!
         debug 'Checking for valid git repo'
         Git.open('.') # FIXME: should be extracted to GitInfo class
-        rescue ArgumentError
-          # ruby-git throws an argument error if path isnt for a valid git repo.
-          fatal "Erm? Can't do that since we're not in a valid git repository!"
-          exit 1
+      rescue ArgumentError
+        # ruby-git throws an argument error if path isnt for a valid git repo.
+        fatal "Erm? Can't do that since we're not in a valid git repository!"
+        exit 1
       end
     end
   end

data/lib/lolcommits/git_info.rb

@@ -68,7 +68,7 @@ module Lolcommits
     private
 
     def remote_https_url(url)
-      url.gsub(':', '/').gsub(/^git@/, 'https://').gsub(/\.git$/, '') + '/commit/'
+      url.tr(':', '/').tr(/^git@/, 'https://').tr(/\.git$/, '') + '/commit/'
     end
 
     def repository(path = '.')

data/lib/lolcommits/plugins/dot_com.rb

@@ -26,7 +26,7 @@ module Lolcommits
 
           :key   => configuration['api_key'],
           :t     => t,
-          :token =>  Digest::SHA1.hexdigest(configuration['api_secret'] + t)
+          :token => Digest::SHA1.hexdigest(configuration['api_secret'] + t)
         })
     rescue => e
       log_error(e, "ERROR: HTTMultiParty POST FAILED #{e.class} - #{e.message}")

data/lib/lolcommits/plugins/lol_slack.rb

@@ -0,0 +1,68 @@
+# -*- encoding : utf-8 -*-
+require 'rest_client'
+
+module Lolcommits
+  class LolSlack < Plugin
+    ENDPOINT_URL = 'https://slack.com/api/files.upload'
+    RETRY_COUNT  = 2
+
+    def self.name
+      'slack'
+    end
+
+    def self.runner_order
+      :postcapture
+    end
+
+    def configured?
+      !configuration['access_token'].nil?
+    end
+
+    def configure
+      print "Open the URL below and issue a token for your user:\n"
+      print "https://api.slack.com/web\n"
+      print "Enter the generated token below, then press enter: (e.g. xxxx-xxxxxxxxx-xxxx) \n"
+      code = STDIN.gets.to_s.strip
+      print "Enter a comma-seperated list of channel IDs to post images in, then press enter: (e.g. C1234567890,C1234567890)\n"
+      print "NOTE: you must use channel IDs (not channel names). Grab them from here; https://api.slack.com/methods/channels.list/test\n"
+      channels = STDIN.gets.to_s.strip
+
+      { 'access_token' => code,
+        'channels' => channels }
+    end
+
+    def configure_options!
+      options = super
+      if options['enabled']
+        config = configure
+        options.merge!(config)
+      end
+      options
+    end
+
+    def run_postcapture
+      return unless valid_configuration?
+
+      retries = RETRY_COUNT
+      begin
+
+        response = RestClient.post(
+          ENDPOINT_URL,
+          :file     => File.new(runner.main_image),
+          :token    => configuration['access_token'],
+          :filetype => 'jpg',
+          :filename => runner.sha,
+          :title    => runner.message + "[#{runner.git_info.repo}]",
+          :channels => configuration['channels'])
+
+        debug response
+      rescue => e
+        retries -= 1
+        retry if retries > 0
+        puts "Posting to slack failed - #{e.message}"
+        puts 'Try running config again:'
+        puts "\tlolcommits --config --plugin slack"
+      end
+    end
+  end
+end

data/lib/lolcommits/plugins/lol_yammer.rb

@@ -68,7 +68,7 @@ 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

data/lib/lolcommits/plugins/loltext.rb

@@ -63,7 +63,7 @@ module Lolcommits
 
       # 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]}): "
+        print "  #{opt.to_s.tr('_', ' ')} (#{defaults[opt]}): "
         val = parse_user_input(STDIN.gets.strip)
         acc.merge(opt => val)
       end

data/lib/lolcommits/plugins/uploldz.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
 require 'rest_client'
+require 'base64'
 
 module Lolcommits
   class Uploldz < Plugin
@@ -7,7 +8,12 @@ module Lolcommits
 
     def initialize(runner)
       super
-      options.concat(%w(endpoint optional_key))
+      options.concat(%w(
+        endpoint
+        optional_key
+        optional_http_auth_username
+        optional_http_auth_password
+      ))
     end
 
     def run_postcapture
@@ -18,13 +24,17 @@ module Lolcommits
       else
         debug "Posting capture to #{configuration['endpoint']}"
         RestClient.post(configuration['endpoint'],
-                        :file         => File.new(runner.main_image),
-                        :message      => runner.message,
-                        :repo         => runner.git_info.repo,
-                        :author_name  => runner.git_info.author_name,
-                        :author_email => runner.git_info.author_email,
-                        :sha          => runner.sha,
-                        :key          => configuration['optional_key'])
+                        {
+                          :file         => File.new(runner.main_image),
+                          :message      => runner.message,
+                          :repo         => runner.git_info.repo,
+                          :author_name  => runner.git_info.author_name,
+                          :author_email => runner.git_info.author_email,
+                          :sha          => runner.sha,
+                          :key          => configuration['optional_key']
+                        },
+                        :Authorization => authorization_header
+                       )
       end
     rescue => e
       log_error(e, "ERROR: RestClient POST FAILED #{e.class} - #{e.message}")
@@ -34,6 +44,14 @@ module Lolcommits
       !configuration['enabled'].nil? && configuration['endpoint']
     end
 
+    def authorization_header
+      user     = configuration['optional_http_auth_username']
+      password = configuration['optional_http_auth_password']
+      return unless user || password
+
+      'Basic ' + Base64.encode64("#{user}:#{password}").chomp
+    end
+
     def self.name
       'uploldz'
     end

data/lib/lolcommits/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Matthew Rothenberg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -416,6 +416,7 @@ files:
 - lib/lolcommits/plugin.rb
 - lib/lolcommits/plugins/dot_com.rb
 - lib/lolcommits/plugins/lol_protonet.rb
+- lib/lolcommits/plugins/lol_slack.rb
 - lib/lolcommits/plugins/lol_tumblr.rb
 - lib/lolcommits/plugins/lol_twitter.rb
 - lib/lolcommits/plugins/lol_yammer.rb