lolcommits 0.5.2 → 0.5.3

data/features/lolcommits.feature

@@ -21,7 +21,7 @@ Feature: Basic UI functionality
     Given a git repository named "loltest" with no "post-commit" hook
     When I cd to "loltest"
     And I successfully run `lolcommits --enable`
-    Then the output should contain "installed lolcommmit hook to:"
+    Then the output should contain "installed lolcommit hook to:"
       And the output should contain "(to remove later, you can use: lolcommits --disable)"
       And a file named ".git/hooks/post-commit" should exist
       And the file ".git/hooks/post-commit" should contain "lolcommits --capture"
@@ -32,7 +32,7 @@ Feature: Basic UI functionality
       And the "loltest" repository "post-commit" hook has content "#!/bin/sh\n\n/my/own/script"
     When I cd to "loltest"
     And I successfully run `lolcommits --enable`
-    Then the output should contain "installed lolcommmit hook to:"
+    Then the output should contain "installed lolcommit hook to:"
       And the output should contain "(to remove later, you can use: lolcommits --disable)"
       And a file named ".git/hooks/post-commit" should exist
       And the file ".git/hooks/post-commit" should contain "#!/bin/sh"
@@ -53,7 +53,7 @@ Feature: Basic UI functionality
     Given a git repository named "loltest" with no "post-commit" hook
     When I cd to "loltest"
     And I successfully run `lolcommits --enable -w 5 --fork`
-    Then the output should contain "installed lolcommmit hook to:"
+    Then the output should contain "installed lolcommit hook to:"
       And the output should contain "(to remove later, you can use: lolcommits --disable)"
       And a file named ".git/hooks/post-commit" should exist
       And the file ".git/hooks/post-commit" should contain "lolcommits --capture -w 5 --fork"
@@ -184,6 +184,16 @@ Feature: Basic UI functionality
     When I run `lolcommits --last`
     Then the exit status should be 0
 
+  Scenario: last command should work properly when in a lolrepo subdirectory
+    Given I am in a git repository named "randomgitrepo"
+      And a loldir named "randomgitrepo" with 2 lolimages
+      And a directory named "randomdir"
+      And I cd to "randomdir"
+    When I run `lolcommits --last`
+    Then the output should not contain "Can't do that since we're not in a valid git repository!"
+     And the exit status should be 0
+
+  @in-tempdir
   Scenario: last command should fail gracefully if not in a lolrepo
     Given I am in a directory named "gitsuxcvs4eva"
     When I run `lolcommits --last`
@@ -205,6 +215,16 @@ Feature: Basic UI functionality
     When I run `lolcommits --browse`
     Then the exit status should be 0
 
+  Scenario: browse command should work properly when in a lolrepo subdirectory
+    Given I am in a git repository named "randomgitrepo"
+      And a loldir named "randomgitrepo" with 2 lolimages
+      And a directory named "randomdir"
+      And I cd to "randomdir"
+    When I run `lolcommits --browse`
+    Then the output should not contain "Can't do that since we're not in a valid git repository!"
+     And the exit status should be 0
+
+  @in-tempdir
   Scenario: browse command should fail gracefully when not in a lolrepo
     Given I am in a directory named "gitsuxcvs4eva"
     When I run `lolcommits --browse`

data/features/step_definitions/lolcommits_steps.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 include FileUtils
 
 Given /^I am in a directory named "(.*?)"$/ do |dir_name|
@@ -11,25 +12,25 @@ Given /^a git repository named "(.*?)"$/ do |repo_name|
   repo_dir = File.join current_dir, repo_name
   mkdir_p repo_dir
   Dir.chdir repo_dir do
-    system "git init --quiet ."
+    system 'git init --quiet .'
     system "git config user.name 'Testy McTesterson'"
     system "git config user.email 'testy@tester.com'"
   end
 end
 
 Given /^the git repository named "(.*?)" has no "(.*?)" hook$/ do |repo_name, hook_name|
-  hook_file = File.join current_dir, repo_name, ".git", "hooks", hook_name
+  hook_file = File.join current_dir, repo_name, '.git', 'hooks', hook_name
   delete(hook_file) if File.exists? hook_file
 end
 
 Given /^the git repository named "(.*?)" has a "(.*?)" hook$/ do |repo_name, hook_name|
-  hook_file = File.join current_dir, repo_name, ".git", "hooks", hook_name
+  hook_file = File.join current_dir, repo_name, '.git', 'hooks', hook_name
   touch(hook_file) if not File.exists? hook_file
 end
 
 Given /^the "(.*?)" repository "(.*?)" hook has content "(.*?)"$/ do |repo_name, hook_name, hook_content|
   step %{the git repository named "#{repo_name}" has a "#{hook_name}" hook}
-  hook_file = File.join current_dir, repo_name, ".git", "hooks", hook_name
+  hook_file = File.join current_dir, repo_name, '.git', 'hooks', hook_name
   File.open(hook_file, 'w') { |f| f.write(hook_content) }
 end
 
@@ -66,8 +67,8 @@ Given /^a loldir named "(.*?)" with (\d+) lolimages$/ do |repo_name, num_images|
   loldir = "tmp/aruba/.lolcommits/#{repo_name}"
   mkdir_p loldir
   num_images.to_i.times do
-    random_hex = "%011x" % (rand * 0xfffffffffff)
-    cp "test/images/test_image.jpg", File.join( loldir, "#{random_hex}.jpg")
+    random_hex = '%011x' % (rand * 0xfffffffffff)
+    cp 'test/images/test_image.jpg', File.join(loldir, "#{random_hex}.jpg")
   end
 end
 
@@ -108,7 +109,7 @@ When /^I do (\d+) git commits$/ do |n|
 end
 
 Then /^there should be (\d+) commit entries in the git log$/ do |n|
-  sleep 1 #let the file writing catch up
+  sleep 1 # let the file writing catch up
   assert_equal n.to_i, `git shortlog | grep -E '^[ ]+\w+' | wc -l`.chomp.to_i
 end
 
@@ -117,7 +118,5 @@ Given /^I am using a "(.*?)" platform$/ do |platform_name|
 end
 
 When /^I wait for the child process to exit in "(.*?)"$/ do |repo_name|
-  while File.exist?("tmp/aruba/.lolcommits/#{repo_name}/lolcommits.pid")
-    sleep 0.1
-  end
+  sleep 0.1 while File.exist?("tmp/aruba/.lolcommits/#{repo_name}/lolcommits.pid")
 end

data/features/support/env.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'aruba/cucumber'
 require 'methadone/cucumber'
 require 'open3'
@@ -9,7 +10,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'path_helpers')
 include Lolcommits
 
 ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
-LIB_DIR = File.join(File.expand_path(File.dirname(__FILE__)),'..','..','lib')
+LIB_DIR = File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', 'lib')
 
 World(PathHelpers)
 
@@ -22,13 +23,13 @@ Before do
   ENV['RUBYLIB'] = LIB_DIR + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s
 
   @original_fakecapture = ENV['LOLCOMMITS_FAKECAPTURE']
-  ENV['LOLCOMMITS_FAKECAPTURE'] = "1"
+  ENV['LOLCOMMITS_FAKECAPTURE'] = '1'
 
   # @original_loldir = ENV['LOLCOMMITS_DIR']
   # ENV['LOLCOMMITS_DIR'] = File.expand_path( File.join(current_dir, ".lolcommits") )
 
   @original_home = ENV['HOME']
-  ENV['HOME'] = File.expand_path( current_dir )
+  ENV['HOME'] = File.expand_path(current_dir)
 
   ENV['LAUNCHY_DRY_RUN'] = 'true'
 end
@@ -47,7 +48,7 @@ Before('@fake-interactive-rebase') do
   # we replace the editor with a script that simply squashes a few random commits
   @original_git_editor = ENV['GIT_EDITOR']
   # ENV['GIT_EDITOR'] = "sed -i -e 'n;s/pick/squash/g'" #every other commit
-  ENV['GIT_EDITOR'] = "sed -i -e '3,5 s/pick/squash/g'" #lines 3-5
+  ENV['GIT_EDITOR'] = "sed -i -e '3,5 s/pick/squash/g'" # lines 3-5
 end
 
 After('@fake-interactive-rebase') do
@@ -76,3 +77,12 @@ end
 After('@fake-no-ffmpeg') do
   reset_path
 end
+
+# do test in temporary directory so our own git repo-ness doesn't affect it
+Before('@in-tempdir') do
+  @dirs = [Dir.mktmpdir]
+end
+
+After('@in-tempdir') do
+  FileUtils.rm_rf(@dirs.first)
+end

data/features/support/path_helpers.rb

@@ -1,9 +1,9 @@
+# -*- encoding : utf-8 -*-
 module PathHelpers
-
   def reject_paths_with_cmd(cmd)
     @original_path = ENV['PATH']
     # 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(['git', 'mplayer'], tmpbindir)
@@ -11,10 +11,10 @@ module PathHelpers
     exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
     newpaths = ENV['PATH'].split(File::PATH_SEPARATOR).reject do |path|
       found_cmd = false
-      exts.each { |ext|
+      exts.each do |ext|
         exe = "#{path}/#{cmd}#{ext}"
         found_cmd = true if File.executable? exe
-      }
+      end
       found_cmd
     end
 
@@ -35,5 +35,4 @@ module PathHelpers
   def reset_path
     ENV['PATH'] = @original_path
   end
-
 end

data/lib/core_ext/class.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Class
   def subclasses
     result = []

data/lib/lolcommits.rb

@@ -1,4 +1,5 @@
-$:.unshift File.expand_path('.')
+# -*- encoding : utf-8 -*-
+$LOAD_PATH.unshift File.expand_path('.')
 
 require 'core_ext/class'
 require 'mini_magick'
@@ -21,6 +22,7 @@ require 'lolcommits/capture_windows'
 require 'lolcommits/capture_cygwin'
 require 'lolcommits/capture_fake'
 require 'lolcommits/git_info'
+require 'lolcommits/installation'
 require 'lolcommits/plugin'
 require 'lolcommits/plugins/loltext'
 require 'lolcommits/plugins/dot_com'

data/lib/lolcommits/capture_cygwin.rb

@@ -1,20 +1,22 @@
+# -*- encoding : utf-8 -*-
 module Lolcommits
   class CaptureCygwin < Capturer
     def capture
-      commandcam_exe = File.join Configuration::LOLCOMMITS_ROOT, "vendor", "ext", "CommandCam", "CommandCam.exe"
       # DirectShow takes a while to show... at least for me anyway
-      delaycmd = " /delay 3000"
+      delaycmd = ' /delay 3000'
       if capture_delay > 0
         # CommandCam delay is in milliseconds
         delaycmd = " /delay #{capture_delay * 1000}"
       end
 
-      _, r, _ = Open3.popen3("#{commandcam_exe} /filename `cygpath -w #{snapshot_location}`#{delaycmd}")
+      _, r, _ = Open3.popen3("#{executable_path} /filename `cygpath -w #{snapshot_location}`#{delaycmd}")
 
       # looks like we still need to read the output for something to happen
       r.read
     end
 
+    def executable_path
+      File.join(Configuration::LOLCOMMITS_ROOT, 'vendor', 'ext', 'CommandCam', 'CommandCam.exe')
+    end
   end
-
 end

data/lib/lolcommits/capture_fake.rb

@@ -1,10 +1,9 @@
+# -*- encoding : utf-8 -*-
 module Lolcommits
   class CaptureFake < Capturer
     def capture
-      test_image = File.join Configuration::LOLCOMMITS_ROOT, "test", "images", "test_image.jpg"
+      test_image = File.join Configuration::LOLCOMMITS_ROOT, 'test', 'images', 'test_image.jpg'
       FileUtils.cp test_image, snapshot_location
     end
-
   end
 end
-

data/lib/lolcommits/capture_linux.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Lolcommits
   class CaptureLinux < Capturer
     def capture_device_string
@@ -5,7 +6,7 @@ module Lolcommits
     end
 
     def capture
-      debug "LinuxCapturer: making tmp directory"
+      debug 'LinuxCapturer: making tmp directory'
       tmpdir = Dir.mktmpdir
 
       # Default delay is 1s
@@ -16,21 +17,23 @@ module Lolcommits
       # multiply the set value (in seconds) by 25
       frames = delay.to_i * 25
 
-      debug "LinuxCapturer: calling out to mplayer to capture image"
+      debug 'LinuxCapturer: calling out to mplayer to capture image'
       # mplayer's output is ugly and useless, let's throw it away
-      _, r, _ = Open3.popen3("mplayer -vo jpeg:outdir=#{tmpdir} #{capture_device_string} -frames #{frames} tv://")
+      _, r, _ = Open3.popen3("#{executable_path} -vo jpeg:outdir=#{tmpdir} #{capture_device_string} -frames #{frames} tv://")
       # looks like we still need to read the output for something to happen
       r.read
 
       # the below SHOULD tell FileUtils actions to post their output if we are in debug mode
       include FileUtils::Verbose if logger.level == 0
 
-      debug "LinuxCapturer: calling out to mplayer to capture image"
-      FileUtils.mv(tmpdir + "/%08d.jpg" % frames, snapshot_location)
-      debug "LinuxCapturer: cleaning up"
-      FileUtils.rm_rf( tmpdir )
+      debug 'LinuxCapturer: calling out to mplayer to capture image'
+      FileUtils.mv(tmpdir + '/%08d.jpg' % frames, snapshot_location)
+      debug 'LinuxCapturer: cleaning up'
+      FileUtils.rm_rf(tmpdir)
     end
 
+    def executable_path
+      'mplayer'
+    end
   end
-
 end

data/lib/lolcommits/capture_mac.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Lolcommits
   class CaptureMac < Capturer
     def capture_device_string
@@ -5,15 +6,13 @@ module Lolcommits
     end
 
     def capture
-      call_str = "#{imagesnap_bin} -q \"#{snapshot_location}\" -w #{capture_delay} #{capture_device_string}"
+      call_str = "#{executable_path} -q \"#{snapshot_location}\" -w #{capture_delay} #{capture_device_string}"
       debug "Capturer: making system call for #{call_str}"
       system(call_str)
     end
 
-    private
-
-    def imagesnap_bin
-      File.join(Configuration::LOLCOMMITS_ROOT, "vendor", "ext", "imagesnap", "imagesnap")
+    def executable_path
+      File.join(Configuration::LOLCOMMITS_ROOT, 'vendor', 'ext', 'imagesnap', 'imagesnap')
     end
   end
 end

data/lib/lolcommits/capture_mac_animated.rb

@@ -1,13 +1,13 @@
+# -*- encoding : utf-8 -*-
 module Lolcommits
   class CaptureMacAnimated < Capturer
-
     def capture
       # make a fresh frames directory
       FileUtils.rm_rf(frames_location)
       FileUtils.mkdir_p(frames_location)
 
       # capture the raw video with videosnap
-      system_call "#{videosnap_bin} -s 240 #{capture_device_string}#{capture_delay_string}-t #{animated_duration} --no-audio #{video_location} > /dev/null"
+      system_call "#{executable_path} -s 240 #{capture_device_string}#{capture_delay_string}-t #{animated_duration} --no-audio #{video_location} > /dev/null"
       if File.exists?(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"
@@ -25,7 +25,12 @@ module Lolcommits
       end
     end
 
+    def executable_path
+      File.join(Configuration::LOLCOMMITS_ROOT, 'vendor', 'ext', 'videosnap', 'videosnap')
+    end
+
     private
+
     def system_call(call_str, capture_output = false)
       debug "Capturer: making system call for \n #{call_str}"
       capture_output ? `#{call_str}` : system(call_str)
@@ -33,7 +38,7 @@ module Lolcommits
 
     def frame_delay(fps, skip)
       # calculate frame delay
-      delay = ((100.0 * skip)/fps.to_f).to_i
+      delay = ((100.0 * skip) / fps.to_f).to_i
       delay < 6 ? 6 : delay # hard limit for IE browsers
     end
 
@@ -45,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
@@ -55,10 +60,6 @@ module Lolcommits
       end
     end
 
-    def videosnap_bin
-      File.join(Configuration::LOLCOMMITS_ROOT, 'vendor', 'ext', 'videosnap', 'videosnap')
-    end
-
     def capture_device_string
       "-d '#{capture_device}' " if capture_device
     end
@@ -66,6 +67,5 @@ module Lolcommits
     def capture_delay_string
       "-w '#{capture_delay}' " if capture_delay.to_i > 0
     end
-
   end
 end

data/lib/lolcommits/capture_windows.rb

@@ -1,20 +1,22 @@
+# -*- encoding : utf-8 -*-
 module Lolcommits
   class CaptureWindows < Capturer
     def capture
-      commandcam_exe = File.join Configuration::LOLCOMMITS_ROOT, "vendor", "ext", "CommandCam", "CommandCam.exe"
       # DirectShow takes a while to show... at least for me anyway
-      delaycmd = " /delay 3000"
+      delaycmd = ' /delay 3000'
       if capture_delay > 0
         # CommandCam delay is in milliseconds
         delaycmd = " /delay #{capture_delay * 1000}"
       end
 
-      _, r, _ = Open3.popen3("#{commandcam_exe} /filename #{snapshot_location}#{delaycmd}")
+      _, r, _ = Open3.popen3("#{executable_path} /filename #{snapshot_location}#{delaycmd}")
 
       # looks like we still need to read the output for something to happen
       r.read
     end
 
+    def executable_path
+      File.join(Configuration::LOLCOMMITS_ROOT, 'vendor', 'ext', 'CommandCam', 'CommandCam.exe')
+    end
   end
-
 end

data/lib/lolcommits/capturer.rb

@@ -1,14 +1,16 @@
+# -*- encoding : utf-8 -*-
 module Lolcommits
   class Capturer
     include Methadone::CLILogging
+
     attr_accessor :capture_device, :capture_delay, :snapshot_location, :font,
                   :video_location, :frames_location, :animated_duration
 
-    def initialize(attributes = Hash.new)
+    def initialize(attributes = {})
       attributes.each do |attr, val|
         self.send("#{attr}=", val)
       end
-      debug "Capturer: initializing new instance " + self.to_s
+      debug 'Capturer: initializing new instance ' + self.to_s
     end
   end
 end