lolcommits 0.5.6 → 0.5.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzgxMmM4Y2M4ZjUzYTQ0NzQ5ZTQ4ZDUyZDIyYTUxMzViYTczMGQwMw==
+    MWE3MGEwZGZkZDk1ZGVhMzgyOGUzODdhMjY4OGQ5OWNjYjc4YWYwZQ==
   data.tar.gz: !binary |-
-    MTZjOTY1OGI5NGQ2NTdiOWQ4ZjE2YjczMzk0ZDBmODY1ODk2ZjhlMg==
+    ODczNTk4MGFlODMwODg5OTdjMGJkNWJhOTk1N2QwMzMyZjkwZWE1Mw==
 SHA512:
   metadata.gz: !binary |-
-    OTZlNjU5ZGFhOTQ5M2ZlYTJmODBmYTYwMjA2MTBhNDJiY2Q1NDQwMmM1MGFh
-    ZDAwMmE4YTQwZTE2MDEyMjQ3MGFmMDMxMmY2OTI1YTM5NjM4ZDI3MWUwM2Y4
-    NjYxZjBiMGI4ZDZkNDc5NTBmZDMzM2Y5ZjQwYmI4OTk0NjkyYjU=
+    NjJhYTc0YTVmY2E2ZGU4MmU3ODBkYjQyYTUyYjg2ODM1NjY5YTdiY2E0Mzli
+    NjRhOTVlODNhMDdjNzI2NjM1MjcxN2VjN2EzYzJjNmYxMTQ4ZTU1NWQyNTk5
+    ZDljZTc1MTQ0ODY4NzhmMjQyYjYxNTVmYTVhY2M0OTA2OGM0MDU=
   data.tar.gz: !binary |-
-    YjQ5YjUzZjU4YTQyNmM5NDRkY2FiZDIyYTRjMWY3NGZiNDAyMjg0Yzg4OTFi
-    NDFlYzUyYjY1NDI2MjNmNzIzZDQ1YWMwYmQ2MmM5ZTI2MDY5NGQ0ZmExYmY4
-    NjgxNzAyMmVjMzIyZjZhMzcwNTVjMGE3MzQ0NWFjMjE5NmRmNWU=
+    OGY4Zjg5OGU3Mzc1MGZlODg1YzQzODE0NTQ3Y2FhMGQ1ODU1YTQwODhhY2Nk
+    ODVmOWM3ZGM5MDYyNTM2YTkzMDA5ZDhlYTE3YzQ1Y2IzNmMwM2ZjYTliNmJl
+    NTkwZmFlYTI5ZjNlODUyM2FkODc0ZTVhNzUxMjk4YTBkN2YyMjE=

data/.rubocop.yml

@@ -1,10 +1,9 @@
 AllCops:
-  Excludes:
-    - vendor/bundle/**
+  Exclude:
+    - vendor/bundle/**/*
 
-inherit_from: rubocop-todo.yml
+inherit_from: .rubocop_todo.yml
 
 # Enforce Ruby 1.8.7 compatible syntax
 HashSyntax:
   EnforcedStyle: hash_rockets
-

data/.rubocop_todo.yml

@@ -0,0 +1,202 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2014-12-09 17:12:22 +0000 using RuboCop version 0.27.1.
+# 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: 22
+Lint/AmbiguousRegexpLiteral:
+  Enabled: false
+
+# Offense count: 8
+# Cop supports --auto-correct.
+Lint/DeprecatedClassMethods:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Lint/StringConversionInInterpolation:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Lint/UnusedMethodArgument:
+  Enabled: false
+
+# Offense count: 1
+Lint/UselessAccessModifier:
+  Enabled: false
+
+# Offense count: 2
+Lint/UselessAssignment:
+  Enabled: false
+
+# Offense count: 23
+Metrics/AbcSize:
+  Max: 59
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 184
+
+# Offense count: 6
+Metrics/CyclomaticComplexity:
+  Max: 10
+
+# Offense count: 101
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 157
+
+# Offense count: 26
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 32
+
+# Offense count: 5
+Metrics/PerceivedComplexity:
+  Max: 11
+
+# Offense count: 3
+# 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: 25
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 1
+Style/DoubleNegation:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/EmptyLines:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/FormatString:
+  Enabled: false
+
+# Offense count: 4
+# Configuration parameters: AllowedVariables.
+Style/GlobalVars:
+  Enabled: false
+
+# Offense count: 10
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Enabled: false
+
+# Offense count: 12
+# Configuration parameters: MaxLineLength.
+Style/IfUnlessModifier:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/IndentHash:
+  Enabled: true
+
+# Offense count: 13
+# Cop supports --auto-correct.
+Style/LeadingCommentSpace:
+  Enabled: false
+
+# Offense count: 7
+# Cop supports --auto-correct.
+Style/NegatedIf:
+  Enabled: false
+
+# Offense count: 7
+# Cop supports --auto-correct.
+Style/Not:
+  Enabled: false
+
+# Offense count: 1
+Style/OneLineConditional:
+  Enabled: false
+
+# Offense count: 79
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/Proc:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantBegin:
+  Enabled: false
+
+# Offense count: 76
+# Cop supports --auto-correct.
+Style/RedundantSelf:
+  Enabled: false
+
+# Offense count: 1
+Style/RegexpLiteral:
+  MaxSlashes: 2
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/SingleSpaceBeforeFirstArg:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/SpaceAfterComma:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/SpaceBeforeBlockBraces:
+  Enabled: false
+
+# Offense count: 5
+# Cop supports --auto-correct.
+Style/SpaceInsideParens:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/SpecialGlobalVars:
+  Enabled: false
+
+# Offense count: 15
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/StringLiterals:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/StringLiteralsInInterpolation:
+  Enabled: false
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: WordRegex.
+Style/WordArray:
+  MinSize: 3

data/.travis.yml

@@ -4,18 +4,13 @@ rvm:
  - 1.9.2
  - 1.9.3
  - 2.0.0
- - 2.1.0
- - 2.1.2
+ - 2.1.5
+ - 2.2.0
  - ruby-head
 
 before_install:
- # use earlier version of Rubygems to avoid fatal bundler error on 1.8.7
- - gem update --system 2.1.11
- - gem --version
  - sudo apt-get update -qq
  - sudo apt-get install -qq -y mplayer ffmpeg
- # imagemagick is installed by default on normal travis image now
- # - sudo apt-get install -qq -y imagemagick libmagickwand-dev
 
 matrix:
   allow_failures:

data/CHANGELOG

@@ -1,6 +1,12 @@
-0.5.7 (WIP)
-  * upgrade gems
-  * seperate gems for all plugins
+0.6.0 (WIP)
+  * extract plugins to seperate gems ...
+
+0.5.7 (28 December 2014)
+  * Uploldz plugin sends more post params (@clops #224 @matthutchinson #241)
+  * 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)
 
 0.5.6 (24 November 2014)
   * Updates and clean ups on the gemspec (@mroth #228)

data/Rakefile

@@ -48,12 +48,12 @@ Rake::RDocTask.new do |rd|
 end
 
 # only run rubocop on platforms where it is supported, sigh
-if RUBY_VERSION >= '1.9.2'
+if RUBY_VERSION >= '1.9.3'
   require 'rubocop/rake_task'
-  Rubocop::RakeTask.new
-  task :default => [:rubocop,:test,:features]
+  RuboCop::RakeTask.new
+  task :default => [:rubocop, :test, :features]
 else
-  task :default => [:test,:features]
+  task :default => [:test, :features]
 end
 
 

data/bin/lolcommits

@@ -87,13 +87,23 @@ def capture_animate
   end
 end
 
+def default_device
+  result = Choice.choices[:device] || ENV['LOLCOMMITS_DEVICE']
+
+  if Configuration.platform_linux?
+    result ||= Dir.glob('/dev/video*').first
+  end
+
+  result
+end
+
 #
 # IF --CAPTURE, DO CAPTURE
 #
 def do_capture
   capture_delay   = Choice.choices[:delay]    || ENV['LOLCOMMITS_DELAY']    || 0
   capture_stealth = Choice.choices[:stealth]  || ENV['LOLCOMMITS_STEALTH']  || nil
-  capture_device  = Choice.choices[:device]   || ENV['LOLCOMMITS_DEVICE']   || nil
+  capture_device  = default_device
   capture_font    = Choice.choices[:font]     || ENV['LOLCOMMITS_FONT']     || nil
 
   capture_options = {

data/features/support/env.rb

@@ -4,7 +4,7 @@ require 'methadone/cucumber'
 require 'open3'
 require 'test/unit/assertions'
 include Test::Unit::Assertions
-require 'faker'
+require 'ffaker'
 require 'lolcommits/configuration'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'path_helpers')
 include Lolcommits

data/lib/lolcommits/git_info.rb

@@ -2,11 +2,10 @@
 module Lolcommits
   class GitInfo
     include Methadone::CLILogging
-    attr_accessor :sha, :message, :repo_internal_path, :repo, :url
+    attr_accessor :sha, :message, :repo_internal_path, :repo, :url,
+                  :author_name, :author_email
 
-    def remote_https_url(url)
-      url.gsub(':', '/').gsub(/^git@/, 'https://').gsub(/\.git$/, '') + '/commit/'
-    end
+    GIT_URL_REGEX = /.*[:]([\/\w\-]*).git/
 
     def initialize
       debug 'GitInfo: attempting to read local repository'
@@ -18,21 +17,36 @@ module Lolcommits
       self.message = commit.message.split("\n").first
       self.sha     = commit.sha[0..10]
       self.repo_internal_path = g.repo.path
-      self.url = remote_https_url(g.remote.url) if g.remote.url
 
-      regex = /.*[:]([\/\w\-]*).git/
-      match = g.remote.url.match regex if g.remote.url
+      if g.remote.url
+        self.url = remote_https_url(g.remote.url)
+        match = g.remote.url.match(GIT_URL_REGEX)
+      end
+
       if match
         self.repo = match[1]
       elsif !g.repo.path.empty?
         self.repo = g.repo.path.split(File::SEPARATOR)[-2]
       end
 
+      if commit.author
+        self.author_name = commit.author.name
+        self.author_email = commit.author.email
+      end
+
       debug 'GitInfo: parsed the following values from commit:'
-      debug "GitInfo: \t#{self.message}"
-      debug "GitInfo: \t#{self.sha}"
-      debug "GitInfo: \t#{self.repo_internal_path}"
-      debug "GitInfo: \t#{self.repo}"
+      debug "GitInfo: \t#{message}"
+      debug "GitInfo: \t#{sha}"
+      debug "GitInfo: \t#{repo_internal_path}"
+      debug "GitInfo: \t#{repo}"
+      debug "GitInfo: \t#{author_name}" if author_name
+      debug "GitInfo: \t#{author_email}" if author_email
+    end
+
+    private
+
+    def remote_https_url(url)
+      url.gsub(':', '/').gsub(/^git@/, 'https://').gsub(/\.git$/, '') + '/commit/'
     end
   end
 end

data/lib/lolcommits/plugins/lol_twitter.rb

@@ -9,26 +9,26 @@ $VERBOSE = original_verbose # activate warning messages again.
 
 module Lolcommits
   class LolTwitter < Plugin
+    TWITTER_API_ENDPOINT    = 'https://api.twitter.com'
     TWITTER_CONSUMER_KEY    = 'qc096dJJCxIiqDNUqEsqQ'
     TWITTER_CONSUMER_SECRET = 'rvjNdtwSr1H0TvBvjpk6c4bvrNydHmmbvv7gXZQI'
     TWITTER_RETRIES         = 2
     TWITTER_PIN_REGEX       = /^\d{4,}$/ # 4 or more digits
+    DEFAULT_SUFFIX          = '#lolcommits'
 
     def run_postcapture
       return unless valid_configuration?
+      tweet = build_tweet(self.runner.message)
 
       attempts = 0
-
       begin
         attempts += 1
-        tweet = build_tweet(self.runner.message)
         puts "Tweeting: #{tweet}"
-        debug "--> Tweeting! (attempt: #{attempts}, tweet size: #{tweet.length} chars)"
+        debug "--> Tweeting! (attempt: #{attempts}, tweet length: #{tweet.length} chars)"
         if client.update_with_media(tweet, File.open(self.runner.main_image, 'r'))
           puts "\t--> Tweet Sent!"
         end
-      rescue Twitter::Error::InternalServerError,
-             Twitter::Error::BadRequest,
+      rescue Twitter::Error::ServerError,
              Twitter::Error::ClientError => e
         debug "Tweet FAILED! #{e.class} - #{e.message}"
         retry if attempts < TWITTER_RETRIES
@@ -36,12 +36,19 @@ module Lolcommits
       end
     end
 
-    def build_tweet(commit_message, tag = '#lolcommits')
-      available_commit_msg_size = max_tweet_size - (tag.length + 1)
+    def build_tweet(commit_message)
+      prefix = config_with_default('prefix', '')
+      suffix = " #{config_with_default('suffix', DEFAULT_SUFFIX)}"
+      unless prefix.empty?
+        prefix = "#{prefix} "
+      end
+
+      available_commit_msg_size = max_tweet_size - (prefix.length + suffix.length)
       if commit_message.length > available_commit_msg_size
         commit_message = "#{commit_message[0..(available_commit_msg_size - 3)]}..."
       end
-      "#{commit_message} #{tag}"
+
+      "#{prefix}#{commit_message}#{suffix}"
     end
 
     def configure_options!
@@ -50,7 +57,7 @@ module Lolcommits
       if options['enabled']
         auth_config = configure_auth!
         if auth_config
-          options.merge!(auth_config)
+          options = options.merge(auth_config).merge(configure_prefix_suffix)
         else
           return # return nil if configure_auth failed
         end
@@ -63,13 +70,7 @@ module Lolcommits
       puts 'Need to grab twitter tokens'
       puts '---------------------------'
 
-      consumer = OAuth::Consumer.new(TWITTER_CONSUMER_KEY,
-                                     TWITTER_CONSUMER_SECRET,
-                                     :site => 'https://api.twitter.com',
-                                     :request_endpoint => 'https://api.twitter.com',
-                                     :sign_in => true)
-
-      request_token = consumer.get_request_token
+      request_token = oauth_consumer.get_request_token
       rtoken        = request_token.token
       rsecret       = request_token.secret
 
@@ -85,7 +86,7 @@ module Lolcommits
 
       begin
         debug "Requesting Twitter OAuth Token with PIN: #{twitter_pin}"
-        OAuth::RequestToken.new(consumer, rtoken, rsecret)
+        OAuth::RequestToken.new(oauth_consumer, rtoken, rsecret)
         access_token = request_token.get_access_token(:oauth_verifier => twitter_pin)
       rescue OAuth::Unauthorized
         puts "\nERROR: Twitter PIN Auth FAILED!"
@@ -93,12 +94,29 @@ module Lolcommits
       end
 
       if access_token.token && access_token.secret
-        print "\n3) Thanks! Twitter Auth Succeeded\n"
-        return { 'access_token' => access_token.token,
-                 'secret'       => access_token.secret }
+        puts ''
+        puts '------------------------------'
+        puts 'Thanks! Twitter Auth Succeeded'
+        puts '------------------------------'
+        {
+          'access_token' => access_token.token,
+          'secret'       => access_token.secret
+        }
       end
     end
 
+    def configure_prefix_suffix
+      print "\n3) Prefix all tweets with something? e.g. @user (leave blank for no prefix): "
+      prefix = STDIN.gets.strip
+      print "\n4) End all tweets with something? e.g. #hashtag (leave blank for default suffix #{DEFAULT_SUFFIX}): "
+      suffix = STDIN.gets.strip
+
+      config = {}
+      config['prefix'] = prefix unless prefix.empty?
+      config['suffix'] = suffix unless suffix.empty?
+      config
+    end
+
     def configured?
       !configuration['enabled'].nil? &&
         configuration['access_token'] &&
@@ -106,14 +124,32 @@ module Lolcommits
     end
 
     def client
-      @client ||= Twitter::Client.new(
-        :consumer_key       => TWITTER_CONSUMER_KEY,
-        :consumer_secret    => TWITTER_CONSUMER_SECRET,
-        :oauth_token        => configuration['access_token'],
-        :oauth_token_secret => configuration['secret']
+      @client ||= Twitter::REST::Client.new do |config|
+        config.consumer_key        = TWITTER_CONSUMER_KEY
+        config.consumer_secret     = TWITTER_CONSUMER_SECRET
+        config.access_token        = configuration['access_token']
+        config.access_token_secret = configuration['secret']
+      end
+    end
+
+    def oauth_consumer
+      @oauth_consumer ||= OAuth::Consumer.new(
+        TWITTER_CONSUMER_KEY,
+        TWITTER_CONSUMER_SECRET,
+        :site             => TWITTER_API_ENDPOINT,
+        :request_endpoint => TWITTER_API_ENDPOINT,
+        :sign_in          => true
       )
     end
 
+    def config_with_default(key, default = nil)
+      if configuration[key]
+        configuration[key].strip.empty? ? default : configuration[key]
+      else
+        default
+      end
+    end
+
     def max_tweet_size
       139 - client.configuration.characters_reserved_per_media
     end