lolcommits 0.5.7 → 0.5.8.pre1

data/lib/lolcommits/plugins/lol_twitter.rb

@@ -18,14 +18,14 @@ module Lolcommits
 
     def run_postcapture
       return unless valid_configuration?
-      tweet = build_tweet(self.runner.message)
+      tweet = build_tweet(runner.message)
 
       attempts = 0
       begin
         attempts += 1
         puts "Tweeting: #{tweet}"
         debug "--> Tweeting! (attempt: #{attempts}, tweet length: #{tweet.length} chars)"
-        if client.update_with_media(tweet, File.open(self.runner.main_image, 'r'))
+        if client.update_with_media(tweet, File.open(runner.main_image, 'r'))
           puts "\t--> Tweet Sent!"
         end
       rescue Twitter::Error::ServerError,
@@ -39,9 +39,7 @@ module Lolcommits
     def build_tweet(commit_message)
       prefix = config_with_default('prefix', '')
       suffix = " #{config_with_default('suffix', DEFAULT_SUFFIX)}"
-      unless prefix.empty?
-        prefix = "#{prefix} "
-      end
+      prefix = "#{prefix} " unless prefix.empty?
 
       available_commit_msg_size = max_tweet_size - (prefix.length + suffix.length)
       if commit_message.length > available_commit_msg_size
@@ -93,16 +91,15 @@ module Lolcommits
         return
       end
 
-      if access_token.token && access_token.secret
-        puts ''
-        puts '------------------------------'
-        puts 'Thanks! Twitter Auth Succeeded'
-        puts '------------------------------'
-        {
-          'access_token' => access_token.token,
-          'secret'       => access_token.secret
-        }
-      end
+      return unless access_token.token && access_token.secret
+      puts ''
+      puts '------------------------------'
+      puts 'Thanks! Twitter Auth Succeeded'
+      puts '------------------------------'
+      {
+        'access_token' => access_token.token,
+        'secret'       => access_token.secret
+      }
     end
 
     def configure_prefix_suffix

data/lib/lolcommits/plugins/lol_yammer.rb

@@ -59,9 +59,9 @@ module Lolcommits
     def run_postcapture
       return unless valid_configuration?
 
-      commit_msg = self.runner.message
+      commit_msg = runner.message
       post = "#{commit_msg} #lolcommits"
-      puts "Yammer post: #{post}" unless self.runner.capture_stealth
+      puts "Yammer post: #{post}" unless runner.capture_stealth
 
       Yammer.configure do |c|
         c.client_id = YAMMER_CLIENT_ID
@@ -72,12 +72,10 @@ module Lolcommits
 
       retries = YAMMER_RETRY_COUNT
       begin
-        lolimage = File.new(self.runner.main_image)
+        lolimage = File.new(runner.main_image)
         response = client.create_message(post, :attachment1 => lolimage)
         debug response.body.inspect
-        if response
-          puts "\t--> Status posted!" unless self.runner.capture_stealth
-        end
+        puts "\t--> Status posted!" unless runner.capture_stealth if response
       rescue => e
         retries -= 1
         retry if retries > 0

data/lib/lolcommits/plugins/lolsrv.rb

@@ -7,7 +7,7 @@ module Lolcommits
   class Lolsrv < Plugin
     def initialize(runner)
       super
-      self.options << 'server'
+      options << 'server'
     end
 
     def run_postcapture
@@ -21,19 +21,16 @@ module Lolcommits
 
     def sync
       existing = existing_lols
-      unless existing.nil?
-        Dir[self.runner.config.loldir + '/*.{jpg,gif}'].each do |item|
-          sha = File.basename(item, '.*')
-          unless existing.include?(sha) || sha == 'tmp_snapshot'
-            upload(item, sha)
-          end
-        end
+      return unless existing.nil?
+      Dir[runner.config.loldir + '/*.{jpg,gif}'].each do |item|
+        sha = File.basename(item, '.*')
+        upload(item, sha) unless existing.include?(sha) || sha == 'tmp_snapshot'
       end
     end
 
     def existing_lols
       lols = JSON.parse(
-      RestClient.get(configuration['server'] + '/lols'))
+        RestClient.get(configuration['server'] + '/lols'))
       lols.map { |lol| lol['sha'] }
     rescue => e
       log_error(e, "ERROR: existing lols could not be retrieved #{e.class} - #{e.message}")
@@ -43,8 +40,8 @@ module Lolcommits
     def upload(file, sha)
       RestClient.post(configuration['server'] + '/uplol',
                       :lol  => File.new(file),
-                      :url  => self.runner.git_info.url + sha,
-                      :repo => self.runner.git_info.repo,
+                      :url  => runner.git_info.url + sha,
+                      :repo => runner.git_info.repo,
                       :date => File.ctime(file),
                       :sha  => sha)
     rescue => e

data/lib/lolcommits/plugins/loltext.rb

@@ -18,16 +18,16 @@ module Lolcommits
                                                   'Impact.ttf')
 
       debug 'Annotating image via MiniMagick'
-      image = MiniMagick::Image.open(self.runner.main_image)
+      image = MiniMagick::Image.open(runner.main_image)
       image.combine_options do |c|
         c.gravity 'SouthWest'
         c.fill 'white'
         c.stroke 'black'
         c.strokewidth '2'
-        c.pointsize(self.runner.animate? ? '24' : '48')
+        c.pointsize(runner.animate? ? '24' : '48')
         c.interline_spacing '-9'
         c.font font_location
-        c.annotate '0', clean_msg(self.runner.message)
+        c.annotate '0', clean_msg(runner.message)
       end
 
       image.combine_options do |c|
@@ -35,13 +35,13 @@ module Lolcommits
         c.fill 'white'
         c.stroke 'black'
         c.strokewidth '2'
-        c.pointsize(self.runner.animate? ? '21' : '32')
+        c.pointsize(runner.animate? ? '21' : '32')
         c.font font_location
-        c.annotate '0', self.runner.sha
+        c.annotate '0', runner.sha
       end
 
-      debug "Writing changed file to #{self.runner.main_image}"
-      image.write self.runner.main_image
+      debug "Writing changed file to #{runner.main_image}"
+      image.write runner.main_image
     end
 
     def self.name

data/lib/lolcommits/plugins/tranzlate.rb

@@ -5,77 +5,77 @@
 
 module Lolspeak
   LOL_DICTIONARY = {
-    /what/             => %w{wut whut},
-    /you\b/            => %w{yu yous yoo u yooz},
-    /cture/            => %w{kshur},
-    /ss\b/             => %w{s zz z},
-    /the\b/            => %w{teh},
-    /more/             => %w{moar},
-    /my/               => %w{mah mai},
-    /are/              => %w{is ar},
-    /eese/             => %w{eez},
-    /ph/               => %w{f},
-    /as\b/             => %w{az},
-    /seriously/        => %w{srsly},
-    /sion/             => %w{shun},
-    /just/             => %w{jus},
-    /ose\b/            => %w{oze},
-    /eady/             => %w{eddy},
-    /ome?\b/           => %w{um},
-    /of\b/             => %w{of ov of},
-    /uestion/          => %w{wesjun},
-    /want/             => %w{wants},
-    /ead\b/            => %w{edd},
-    /ck/               => %w{kk kkk},
-    /sion/             => %w{shun},
-    /cat|kitten|kitty/ => %w{kitteh kittehz cat fuzzeh fuzzyrumpus foozles fuzzbut fluffernutter beast mew},
-    /eak/              => %w{ekk},
-    /age/              => %w{uj},
-    /like/             => %w{likez liek licks},
-    /love/             => %w{lovez lub lubs luv lurve lurves},
+    /what/             => %w(wut whut),
+    /you\b/            => %w(yu yous yoo u yooz),
+    /cture/            => %w(kshur),
+    /ss\b/             => %w(s zz z),
+    /the\b/            => %w(teh),
+    /more/             => %w(moar),
+    /my/               => %w(mah mai),
+    /are/              => %w(is ar),
+    /eese/             => %w(eez),
+    /ph/               => %w(f),
+    /as\b/             => %w(az),
+    /seriously/        => %w(srsly),
+    /sion/             => %w(shun),
+    /just/             => %w(jus),
+    /ose\b/            => %w(oze),
+    /eady/             => %w(eddy),
+    /ome?\b/           => %w(um),
+    /of\b/             => %w(of ov of),
+    /uestion/          => %w(wesjun),
+    /want/             => %w(wants),
+    /ead\b/            => %w(edd),
+    /ck/               => %w(kk kkk),
+    /sion/             => %w(shun),
+    /cat|kitten|kitty/ => %w(kitteh kittehz cat fuzzeh fuzzyrumpus foozles fuzzbut fluffernutter beast mew),
+    /eak/              => %w(ekk),
+    /age/              => %w(uj),
+    /like/             => %w(likez liek licks),
+    /love/             => %w(lovez lub lubs luv lurve lurves),
     /\bis\b/           => ['ar teh', 'ar'],
-    /nd\b/             => %w{n n'},
-    /who/              => %w{hoo},
+    /nd\b/             => %w(n n'),
+    /who/              => %w(hoo),
     /'/                => [''],
-    /ese\b/            => %w{eez},
-    /outh/             => %w{owf},
-    /scio/             => %w{shu},
-    /esque/            => %w{esk},
-    /ture/             => %w{chur},
-    /\btoo?\b/         => %w{to t 2 to t},
-    /tious/            => %w{shus},
-    /sure\b/           => %w{shur},
-    /tty\b/            => %w{tteh},
-    /were/             => %w{was},
-    /ok\b|okay/        => %w{kthxbye!},
-    /\ba\b/            => %w{uh},
-    /ym/               => %w{im},
-    /fish/             => %w{ghoti},
-    /thy\b/            => %w{fee},
-    /\wly\w/           => %w{li},
-    /que\w/            => %w{kwe},
-    /\both/            => %w{udd},
-    /though\b/         => %w{tho},
-    /(t|r|en)ough/     => %w{\1uff},
-    /ought/            => %w{awt},
-    /ease/             => %w{eez},
-    /ing\b/            => %w{in ins ng ing in'},
+    /ese\b/            => %w(eez),
+    /outh/             => %w(owf),
+    /scio/             => %w(shu),
+    /esque/            => %w(esk),
+    /ture/             => %w(chur),
+    /\btoo?\b/         => %w(to t 2 to t),
+    /tious/            => %w(shus),
+    /sure\b/           => %w(shur),
+    /tty\b/            => %w(tteh),
+    /were/             => %w(was),
+    /ok\b|okay/        => %w(kthxbye!),
+    /\ba\b/            => %w(uh),
+    /ym/               => %w(im),
+    /fish/             => %w(ghoti),
+    /thy\b/            => %w(fee),
+    /\wly\w/           => %w(li),
+    /que\w/            => %w(kwe),
+    /\both/            => %w(udd),
+    /though\b/         => %w(tho),
+    /(t|r|en)ough/     => %w(\1uff),
+    /ought/            => %w(awt),
+    /ease/             => %w(eez),
+    /ing\b/            => %w(in ins ng ing in'),
     /have/             => ['haz', 'hav', 'haz a'],
-    /has/              => %w{haz gots},
-    /your/             => %w{yur ur yore yoar},
-    /ove\b/            => %w{oov ove uuv uv oove},
-    /for/              => %w{for 4 fr fur for foar},
-    /thank/            => %w{fank tank thx thnx},
-    /good/             => %w{gud goed guud gude gewd goot gut},
-    /really/           => %w{rly rily rilly rilleh},
-    /world/            => %w{wurrld whirld wurld wrld},
+    /has/              => %w(haz gots),
+    /your/             => %w(yur ur yore yoar),
+    /ove\b/            => %w(oov ove uuv uv oove),
+    /for/              => %w(for 4 fr fur for foar),
+    /thank/            => %w(fank tank thx thnx),
+    /good/             => %w(gud goed guud gude gewd goot gut),
+    /really/           => %w(rly rily rilly rilleh),
+    /world/            => %w(wurrld whirld wurld wrld),
     /i'?m\b/           => ['im', 'i yam', 'i iz'],
-    /(?!e)ight/        => %w{ite},
-    /(?!ues)tion/      => %w{shun},
-    /you'?re/          => %w{yore yr},
-    /er\b|are|ere/     => %w{r},
-    /y\b|ey\b/         => %w{eh},
-    /ea/               => %w{ee},
+    /(?!e)ight/        => %w(ite),
+    /(?!ues)tion/      => %w(shun),
+    /you'?re/          => %w(yore yr),
+    /er\b|are|ere/     => %w(r),
+    /y\b|ey\b/         => %w(eh),
+    /ea/               => %w(ee),
     /can\si\s(?:ple(?:a|e)(?:s|z)e?)?\s?have\sa/ => ['i can haz'],
     /(?:hello|\bhi\b|\bhey\b|howdy|\byo\b),?/    => ['oh hai,'],
     /(?:god\b|allah|buddah?|diety|lord)/         => ['ceiling cat']
@@ -100,9 +100,9 @@ module Lolcommits
     extend Lolspeak
 
     def run_precapture
-      debug "Commit message before: #{self.runner.message}"
-      self.runner.message = self.class.tranzlate(self.runner.message)
-      debug "Commit message after: #{self.runner.message}"
+      debug "Commit message before: #{runner.message}"
+      runner.message = self.class.tranzlate(runner.message)
+      debug "Commit message after: #{runner.message}"
     end
 
     def self.name

data/lib/lolcommits/plugins/uploldz.rb

@@ -7,23 +7,23 @@ module Lolcommits
 
     def initialize(runner)
       super
-      self.options.concat(['endpoint', 'optional_key'])
+      options.concat(%w(endpoint optional_key))
     end
 
     def run_postcapture
       return unless valid_configuration?
 
-      if self.runner.git_info.repo.empty?
+      if runner.git_info.repo.empty?
         puts 'Repo is empty, skipping upload'
       else
         debug "Posting capture to #{configuration['endpoint']}"
         RestClient.post(configuration['endpoint'],
-                        :file         => File.new(self.runner.main_image),
-                        :message      => self.runner.message,
-                        :repo         => self.runner.git_info.repo,
-                        :author_name  => self.runner.git_info.author_name,
-                        :author_email => self.runner.git_info.author_email,
-                        :sha          => self.runner.sha,
+                        :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'])
       end
     rescue => e

data/lib/lolcommits/runner.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
-module Lolcommits
-  PLUGINS = Lolcommits::Plugin.subclasses
+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,
@@ -11,14 +11,13 @@ module Lolcommits
 
     def initialize(attributes = {})
       attributes.each do |attr, val|
-        self.send("#{attr}=", val)
+        send("#{attr}=", val)
       end
 
-      if self.sha.nil? || self.message.nil?
-        self.git_info = GitInfo.new
-        self.sha      = git_info.sha if self.sha.nil?
-        self.message  = git_info.message if self.message.nil?
-      end
+      return unless sha.nil? || message.nil?
+      self.git_info = GitInfo.new
+      self.sha      = git_info.sha if sha.nil?
+      self.message  = git_info.message if message.nil?
     end
 
     # wrap run to handle things that should happen before and after
@@ -42,7 +41,7 @@ module Lolcommits
       run_capture
 
       # check capture succeded, file must exist
-      if File.exists?(self.snapshot_loc)
+      if File.exist?(snapshot_loc)
 
         ## resize snapshot first
         resize_snapshot!
@@ -69,22 +68,26 @@ module Lolcommits
     end
 
     def plugins_for(position)
-      Lolcommits::PLUGINS.select { |p| p.runner_order == position }
+      self.class.plugins.select { |p| p.runner_order == position }
+    end
+
+    def self.plugins
+      Lolcommits::Plugin.subclasses
     end
 
     # the main capture
     def run_capture
       puts '*** Preserving this moment in history.' unless capture_stealth
-      self.snapshot_loc = self.config.raw_image(image_file_type)
-      self.main_image   = self.config.main_image(self.sha, image_file_type)
+      self.snapshot_loc = config.raw_image(image_file_type)
+      self.main_image   = config.main_image(sha, image_file_type)
       capturer = capturer_class.new(
-        :capture_device    => self.capture_device,
-        :capture_delay     => self.capture_delay,
-        :snapshot_location => self.snapshot_loc,
-        :font              => self.font,
-        :video_location    => self.config.video_loc,
-        :frames_location   => self.config.frames_loc,
-        :animated_duration => self.capture_animate
+        :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
       )
       capturer.capture
     end
@@ -97,7 +100,7 @@ module Lolcommits
 
     def capturer_class
       capturer_module = 'Lolcommits'
-      capturer_class  = "Capture#{Configuration.platform}#{animate? ? 'Animated' : nil}"
+      capturer_class  = "Capture#{Platform.platform}#{animate? ? 'Animated' : nil}"
       Object.const_get(capturer_module).const_get(capturer_class)
     end
 
@@ -110,18 +113,16 @@ module Lolcommits
 
   def die_if_rebasing!
     debug "Runner: Making sure user isn't rebasing"
-    if self.git_info && !self.git_info.repo_internal_path.nil?
-      mergeclue = File.join self.git_info.repo_internal_path, 'rebase-merge'
-      if File.directory? mergeclue
-        debug 'Runner: Rebase detected, silently exiting!'
-        exit 0
-      end
-    end
+    return unless git_info && !git_info.repo_internal_path.nil?
+    mergeclue = File.join git_info.repo_internal_path, 'rebase-merge'
+    return unless File.directory? mergeclue
+    debug 'Runner: Rebase detected, silently exiting!'
+    exit 0
   end
 
   def resize_snapshot!
     debug 'Runner: resizing snapshot'
-    image = MiniMagick::Image.open(self.snapshot_loc)
+    image = MiniMagick::Image.open(snapshot_loc)
     if image[:width] > 640 || image[:height] > 480
       # this is ghetto resize-to-fill
       image.combine_options do |c|
@@ -129,18 +130,18 @@ module Lolcommits
         c.gravity 'center'
         c.extent '640x480'
       end
-      debug "Runner: writing resized image to #{self.snapshot_loc}"
-      image.write self.snapshot_loc
+      debug "Runner: writing resized image to #{snapshot_loc}"
+      image.write snapshot_loc
     end
-    debug "Runner: copying resized image to #{self.main_image}"
-    FileUtils.cp(self.snapshot_loc, self.main_image)
+    debug "Runner: copying resized image to #{main_image}"
+    FileUtils.cp(snapshot_loc, main_image)
   end
 
   def cleanup!
     debug 'Runner: running cleanup'
     # clean up the captured image and any other raw assets
-    FileUtils.rm(self.snapshot_loc)
-    FileUtils.rm_f(self.config.video_loc)
-    FileUtils.rm_rf(self.config.frames_loc)
+    FileUtils.rm(snapshot_loc)
+    FileUtils.rm_f(config.video_loc)
+    FileUtils.rm_rf(config.frames_loc)
   end
 end