lolcommits 0.6.1 → 0.6.2.pre1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzE2YjAyOGQ3MzBhNzVmZjI2MmFjMTc2MmY4YWYwYWQ0NDRjYzZjMA==
+    MTRkY2JjMDgwMmZlYzczM2VlOTRlOGU2NDdiYmQwMjJjNGVhYmI1OA==
   data.tar.gz: !binary |-
-    NjMyYmUxMDI0Y2E4NzhiMDE0Yzc0YTQ5NjFmYzkxMzVkMDRiYWFlNQ==
+    NDQ5NmEzMTk2NDhiNWM0OTVkZDk4MGFmZTQ5M2MxNDVlMDhiYjU3ZA==
 SHA512:
   metadata.gz: !binary |-
-    OTI0M2VjZTkwODZmOGVkYzVmYzFiNmY5ODgzMDMyZjZkMDA3YjU2ZTgxMmQy
-    ODlmZGRkMjE2NWFlNWJlODZjMTJjMDQzMGViOTE3ZmU2N2IzMjUzNWYyZDM4
-    MDdkZTkzMDc5ZDk1YWEyNGIzOTM2ZWE5ZTZjYWU3OGRlNGQ0ZjU=
+    NmQwY2I1OTQ1MGVkZjVkZTU3YWY2YjRiNWJmNmZjOWQxYjY4NjhlMDJjOTBj
+    ZTRhMjdlMTVlMTFhNjY0MjdhMjQ3YTQ5ODU1MjQ3ZmRmYjZiNGU2NjUwZWNi
+    ODViNjgwYzI2ZDI0OGZjNjY5M2QxNjc2MGM4ZWQyYzBkZTAxMGE=
   data.tar.gz: !binary |-
-    YTQ1Yzk0YmZkZWIyODRmZDQxMWY2N2VlYmNhMjc5ODc5MmMxOWEwNGRkYjMz
-    NTlmZDNmM2M2N2Q1N2Q5NmYxZTdkMWE3MGM5ZjdjOTQ0MjNhNDJkOGYxZmYz
-    MGQ1YzdkZTk3MWEwM2ExNTQyZGVjODZhMzkxOWJjM2YzMGFjOGY=
+    MWE3Y2JmMGI1MGFmZWI2OTM4MWY0YzlmMWYwZmE1NTUzNzMyZjg1Y2FiNGE4
+    MTliZTg4MzIzYjE2NjI1NjQ4MmJlYWFiOTNmMmI0ZjA5NzgzNDU0MDBlZTky
+    YTEyNzVhYmI3NGNmYTE2MWZiYTg3MjY5NDU2MWE2M2NjMTZhZDE=

data/.travis.yml

@@ -7,7 +7,8 @@ rvm:
  - 1.9.3
  - 2.0.0
  - 2.1.7
- - 2.2.3
+ - 2.2.4
+ - 2.3.0
  - ruby-head
 
 before_install:

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 0.7.0 (WIP)
   * extract plugins to seperate gems ...
 
+0.6.2 (21 February 2016)
+  * Avoid invoking ruby if in a rebase (@jhawthorn #286)
+  * Slow gif problem on mac (@a06kin #289)
+  * Peg RuboCop gem to 0.37.2 and fix cop issues (@matthutchinson #292)
+
 0.6.1 (16 September 2015)
   * Optional http auth header user/password in uploldz plugin (@felixroos #283)
   * Slack plugin added (@yasakbulut #284)

data/Rakefile

@@ -32,7 +32,7 @@ Rake::TestTask.new do |t|
 end
 
 Rake::FileUtilsExt.verbose(false)
-CUKE_RESULTS = 'results.html'
+CUKE_RESULTS = 'results.html'.freeze
 CLEAN << CUKE_RESULTS
 Cucumber::Rake::Task.new(:features) do |t|
   optstr = "features --format html -o #{CUKE_RESULTS} --format Fivemat -x"

data/bin/lolcommits

@@ -95,7 +95,7 @@ def do_capture
       }
 
       # fire off runner with the overriden fake commit metadata
-      runner = Lolcommits::Runner.new(capture_options.merge override_text)
+      runner = Lolcommits::Runner.new(capture_options.merge(override_text))
       runner.run
 
       # automatically open so user can see the test image results immediately
@@ -322,8 +322,7 @@ elsif Choice.choices[:plugins]
   configuration.puts_plugins
 elsif Choice.choices[:devices]
   puts Platform.device_list
-  puts "Specify a device with --device=\"{device name}\" "\
-    'or set the LOLCOMMITS_DEVICE env variable'
+  puts 'Specify a device with --device="{device name}" or set the LOLCOMMITS_DEVICE env variable'
 elsif Choice.choices[:last]
   do_last
 elsif Choice.choices[:browse]

data/features/bugs.feature

@@ -26,16 +26,6 @@ Feature: Bug regression testing
     # Then there should be 4 commit entries in the git log
     Then there should be exactly 6 jpgs in "../.lolcommits/yuh8history"
 
-  #
-  # issue #80, https://github.com/mroth/lolcommits/issues/80
-  #
-  Scenario: don't warn about system_timer (on MRI 1.8.7)
-    When I successfully run `lolcommits`
-    Then the output should not contain:
-    """
-    Faraday: you may want to install system_timer for reliable timeouts
-    """
-
   #
   # issue #81, https://github.com/mroth/lolcommits/issues/81
   #

data/features/step_definitions/lolcommits_steps.rb

@@ -88,7 +88,7 @@ Given(/^a loldir named "(.*?)" with (\d+) lolimages$/) do |repo, num_images|
   loldir = absolute_path("~/.lolcommits/#{repo}")
   FileUtils.mkdir_p loldir
   num_images.to_i.times do
-    hex = "#{format '%011x', (rand * 0xfffffffffff)}"
+    hex = format('%011x', (rand * 0xfffffffffff)).to_s
     FileUtils.cp 'test/images/test_image.jpg', File.join(loldir, "#{hex}.jpg")
   end
 end

data/features/support/path_helpers.rb

@@ -6,7 +6,7 @@ require 'lolcommits/platform'
 module PathHelpers
   def reject_paths_with_cmd(cmd)
     # make a new subdir that still contains cmds
-    tmpbindir = File.expand_path(File.join @dirs, 'bin')
+    tmpbindir = File.expand_path(File.join(@dirs, 'bin'))
     FileUtils.mkdir_p tmpbindir
 
     preseve_cmds_in_path(%w(git mplayer), tmpbindir)

data/lib/lolcommits/capturer/capture_linux_animated.rb

@@ -45,7 +45,7 @@ module Lolcommits
 
     def frame_skip(fps)
       # of frames to skip depends on movie fps
-      case (fps)
+      case fps
       when 0..15
         2
       when 16..28

data/lib/lolcommits/capturer/capture_mac_animated.rb

@@ -9,14 +9,15 @@ module Lolcommits
       # capture the raw video with videosnap
       system_call "#{executable_path} -s 240 #{capture_device_string}#{capture_delay_string}-t #{animated_duration} --no-audio #{video_location} > /dev/null"
       return unless File.exist?(video_location)
+      # get fps for ffmpeg output stream configuration
+      fps = video_fps(video_location)
       # convert raw video to png frames with ffmpeg
-      system_call "ffmpeg -v quiet -i #{video_location} -t #{animated_duration} #{frames_location}/%09d.png"
+      system_call "ffmpeg -v quiet -i #{video_location} -t #{animated_duration} -r #{fps} #{frames_location}/%09d.png"
 
       # use fps to set delay and number of frames to skip (for lower filesized gifs)
-      fps   = video_fps(video_location)
       skip  = frame_skip(fps)
       delay = frame_delay(fps, skip)
-      debug "Capturer: anaimated gif choosing every #{skip} frames with a frame delay of #{delay}"
+      debug "Capturer: animated gif choosing every #{skip} frames with a frame delay of #{delay}"
 
       # create the looping animated gif from frames (picks nth frame with seq)
       seq_command = "seq -f #{frames_location}/%09g.png 1 #{skip} #{Dir["#{frames_location}/*"].length}"
@@ -49,7 +50,7 @@ module Lolcommits
 
     def frame_skip(fps)
       # of frames to skip depends on movie fps
-      case (fps)
+      case fps
       when 0..15
         2
       when 16..28

data/lib/lolcommits/cli/timelapse_gif.rb

@@ -36,7 +36,7 @@ module Lolcommits
         gif = MiniMagick::Image.new File.join @configuration.archivedir, filename
 
         # This is for ruby 1.8.7, *lolimages just doesn't work with ruby 187
-        gif.run_command('convert', *['-delay', '50', '-loop', '0', lolimages, "#{gif.path}"].flatten)
+        gif.run_command('convert', *['-delay', '50', '-loop', '0', lolimages, gif.path.to_s].flatten)
 
         puts "*** #{gif.path} generated."
       end

data/lib/lolcommits/configuration.rb

@@ -35,11 +35,11 @@ module Lolcommits
     end
 
     def most_recent
-      Dir.glob(File.join loldir, '*.{jpg,gif}').max_by { |f| File.mtime(f) }
+      Dir.glob(File.join(loldir, '*.{jpg,gif}')).max_by { |f| File.mtime(f) }
     end
 
     def jpg_images
-      Dir.glob(File.join loldir, '*.jpg').sort_by { |f| File.mtime(f) }
+      Dir.glob(File.join(loldir, '*.jpg')).sort_by { |f| File.mtime(f) }
     end
 
     def jpg_images_today

data/lib/lolcommits/installation.rb

@@ -84,7 +84,9 @@ module Lolcommits
 
       <<-EOS
 ### lolcommits hook (begin) ###
+if [ ! -d "$GIT_DIR/rebase-merge" ]; then
 #{locale_export}#{hook_export}#{capture_cmd}#{capture_args}
+fi
 ###  lolcommits hook (end)  ###
 EOS
     end

data/lib/lolcommits/platform.rb

@@ -18,7 +18,7 @@ module Lolcommits
       elsif platform_cygwin?
         CaptureCygwin
       else
-        fail 'Unknown / Unsupported Platform.'
+        raise 'Unknown / Unsupported Platform.'
       end
     end
 

data/lib/lolcommits/plugins/dot_com.rb

@@ -3,7 +3,7 @@ require 'httmultiparty'
 
 module Lolcommits
   class DotCom < Plugin
-    BASE_URL = 'http://lolcommits-dot-com.herokuapp.com'
+    BASE_URL = 'http://lolcommits-dot-com.herokuapp.com'.freeze
 
     def initialize(runner)
       super

data/lib/lolcommits/plugins/lol_slack.rb

@@ -3,7 +3,7 @@ require 'rest_client'
 
 module Lolcommits
   class LolSlack < Plugin
-    ENDPOINT_URL = 'https://slack.com/api/files.upload'
+    ENDPOINT_URL = 'https://slack.com/api/files.upload'.freeze
     RETRY_COUNT  = 2
 
     def self.name

data/lib/lolcommits/plugins/lol_tumblr.rb

@@ -7,9 +7,9 @@ require 'tumblr_client'
 
 module Lolcommits
   class LolTumblr < Plugin
-    TUMBLR_API_ENDPOINT    = 'https://www.tumblr.com'
-    TUMBLR_CONSUMER_KEY    = '2FtMEDpEPkxjoUdkpHh42h9wqTu9IVS7Ra0QyNZGixdCvhllN2'
-    TUMBLR_CONSUMER_SECRET = 'qWuvxgFUR2YyWKtbWOkDTMAiBEbj7ZGaNLaNQPba0PI1N4JpBs'
+    TUMBLR_API_ENDPOINT    = 'https://www.tumblr.com'.freeze
+    TUMBLR_CONSUMER_KEY    = '2FtMEDpEPkxjoUdkpHh42h9wqTu9IVS7Ra0QyNZGixdCvhllN2'.freeze
+    TUMBLR_CONSUMER_SECRET = 'qWuvxgFUR2YyWKtbWOkDTMAiBEbj7ZGaNLaNQPba0PI1N4JpBs'.freeze
 
     def run_postcapture
       return unless valid_configuration?
@@ -29,11 +29,8 @@ module Lolcommits
       # 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
+        return unless auth_config
+        options = options.merge(auth_config).merge(configure_tumblr_name)
       end
       options
     end

data/lib/lolcommits/plugins/lol_twitter.rb

@@ -1,20 +1,16 @@
 # -*- encoding : utf-8 -*-
 require 'yaml'
 require 'oauth'
-
-# twitter gem currently spams stdout when activated, surpress warnings just during the inital require
-original_verbose, $VERBOSE = $VERBOSE, nil # Supress warning messages.
 require 'twitter'
-$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_API_ENDPOINT    = 'https://api.twitter.com'.freeze
+    TWITTER_CONSUMER_KEY    = 'qc096dJJCxIiqDNUqEsqQ'.freeze
+    TWITTER_CONSUMER_SECRET = 'rvjNdtwSr1H0TvBvjpk6c4bvrNydHmmbvv7gXZQI'.freeze
     TWITTER_RETRIES         = 2
     TWITTER_PIN_REGEX       = /^\d{4,}$/ # 4 or more digits
-    DEFAULT_SUFFIX          = '#lolcommits'
+    DEFAULT_SUFFIX          = '#lolcommits'.freeze
 
     def run_postcapture
       return unless valid_configuration?
@@ -54,11 +50,8 @@ module Lolcommits
       # ask user to configure tokens if enabling
       if options['enabled']
         auth_config = configure_auth!
-        if auth_config
-          options = options.merge(auth_config).merge(configure_prefix_suffix)
-        else
-          return # return nil if configure_auth failed
-        end
+        return unless auth_config
+        options = options.merge(auth_config).merge(configure_prefix_suffix)
       end
       options
     end

data/lib/lolcommits/plugins/lol_yammer.rb

@@ -3,9 +3,9 @@ require 'yammer'
 require 'rest_client'
 
 # https://developer.yammer.com/oauth2-quickstart/
-YAMMER_CLIENT_ID        = 'bgORyeKtnjZJSMwp8oln9g'
-YAMMER_CLIENT_SECRET    = 'oer2WdGzh74a5QBbW3INUxblHK3yg9KvCZmiBa2r0'
-YAMMER_ACCESS_TOKEN_URL = 'https://www.yammer.com/oauth2/access_token.json'
+YAMMER_CLIENT_ID        = 'bgORyeKtnjZJSMwp8oln9g'.freeze
+YAMMER_CLIENT_SECRET    = 'oer2WdGzh74a5QBbW3INUxblHK3yg9KvCZmiBa2r0'.freeze
+YAMMER_ACCESS_TOKEN_URL = 'https://www.yammer.com/oauth2/access_token.json'.freeze
 YAMMER_RETRY_COUNT      = 2
 
 module Lolcommits
@@ -28,7 +28,7 @@ module Lolcommits
       print 'Enter code param from the redirected URL, then press enter: '
       code = STDIN.gets.to_s.strip
 
-      url = "#{YAMMER_ACCESS_TOKEN_URL}"
+      url = YAMMER_ACCESS_TOKEN_URL
       debug "access_token url: #{url}"
       params = {
         'client_id' => YAMMER_CLIENT_ID,
@@ -47,11 +47,8 @@ module Lolcommits
       # ask user to configure tokens if enabling
       if options['enabled']
         auth_config = configure_access_token
-        if auth_config
-          options.merge!(auth_config)
-        else
-          return # return nil if configure_auth failed
-        end
+        return unless auth_config
+        options.merge!(auth_config)
       end
       options
     end
@@ -75,7 +72,7 @@ module Lolcommits
         lolimage = File.new(runner.main_image)
         response = client.create_message(post, :attachment1 => lolimage)
         debug response.body.inspect
-        puts "\t--> Status posted!" unless runner.capture_stealth if response
+        puts "\t--> Status posted!" if response
       rescue => e
         retries -= 1
         retry if retries > 0

data/lib/lolcommits/plugins/tranzlate.rb

@@ -27,7 +27,6 @@ module Lolspeak
     /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),
@@ -79,7 +78,7 @@ module Lolspeak
     /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']
-  }
+  }.freeze
 
   def tranzlate(str)
     lolstr = str.dup

data/lib/lolcommits/plugins/uploldz.rb

@@ -8,12 +8,14 @@ module Lolcommits
 
     def initialize(runner)
       super
-      options.concat(%w(
-        endpoint
-        optional_key
-        optional_http_auth_username
-        optional_http_auth_password
-      ))
+      options.concat(
+        %w(
+          endpoint
+          optional_key
+          optional_http_auth_username
+          optional_http_auth_password
+        )
+      )
     end
 
     def run_postcapture

data/lib/lolcommits/runner.rb

@@ -24,9 +24,6 @@ module Lolcommits
     # this used to be handled with ActiveSupport::Callbacks, but
     # now we're just using a simple procedural list
     def run
-      # abort if we are in a rebase
-      die_if_rebasing!
-
       # do things that need to happen before capture and plugins
 
       # do native plugins that need to happen before capture
@@ -110,15 +107,6 @@ module Lolcommits
 
   protected
 
-  def die_if_rebasing!
-    debug "Runner: Making sure user isn't rebasing"
-    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(snapshot_loc)

data/lib/lolcommits/version.rb

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

data/lolcommits.gemspec

@@ -28,12 +28,14 @@ Gem::Specification.new do |s|
   s.requirements << 'a webcam'
 
   # hold back upgrading (and why)
-  s.add_runtime_dependency('rest-client', '~> 1.6.7') # yam gem requires uses this older version
-  s.add_runtime_dependency('mini_magick', '~> 3.8.1') # ~> 4+ fails with JRuby
-  s.add_runtime_dependency('mime-types', '~> 1.25')   # ~> 2+ requires Ruby >= 1.9.2
-  s.add_runtime_dependency('httparty', '~> 0.11.0')   # ~> 0.13+ requires Ruby >= 1.9.3
-  s.add_runtime_dependency('git', '=1.2.8')           # ~> 1.2.9 has issues with Ruby 1.8.7
-  s.add_development_dependency('cucumber', '=1.3.19') # ~> 2+ requries Ruby >= 1.9.3
+  s.add_runtime_dependency('rest-client', '~> 1.6.7')   # yam gem requires uses this older version
+  s.add_runtime_dependency('mini_magick', '~> 3.8.1')   # ~> 4+ fails with JRuby
+  s.add_runtime_dependency('mime-types', '~> 1.25')     # ~> 2+ requires Ruby >= 1.9.2
+  s.add_runtime_dependency('httparty', '~> 0.11.0')     # ~> 0.13+ requires Ruby >= 1.9.3
+  s.add_runtime_dependency('git', '=1.2.8')             # ~> 1.2.9 has issues with Ruby 1.8.7
+  s.add_development_dependency('cucumber', '=1.3.19')   # ~> 2+ requries Ruby >= 1.9.3
+  s.add_development_dependency('tins', '=1.6.0')        # ~> 1.6+ requries Ruby >= 2.0
+  s.add_development_dependency('addressable', '=2.3.8') # ~> 2.3+ requries Ruby >= 2.0
 
   # core
   s.add_runtime_dependency('choice', '~> 0.1.6')
@@ -60,6 +62,6 @@ Gem::Specification.new do |s|
 
   if RUBY_VERSION >= '1.9.3'
     s.add_development_dependency('travis', '~> 1.7.4')
-    s.add_development_dependency('rubocop', '~> 0.30')
+    s.add_development_dependency('rubocop', '~> 0.37.2')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2.pre1
 platform: ruby
 authors:
 - Matthew Rothenberg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -95,6 +95,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.19
+- !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: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.3.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.3.8
 - !ruby/object:Gem::Dependency
   name: choice
   requirement: !ruby/object:Gem::Requirement
@@ -353,14 +381,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.37.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.37.2
 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"
@@ -452,9 +480,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - imagemagick
 - a webcam