lolcommits 0.5.7 → 0.5.8.pre1

data/features/plugins.feature

@@ -1,37 +1,20 @@
 Feature: Plugins Work
 
+  Background:
+    Given a mocked home directory
+
   @slow_process @unstable
   Scenario: Lolcommits.com integration works
-    Given I am in a git repository named "dot_com" with lolcommits enabled
-    When I run `lolcommits --config` and wait for output
-    And I enter "dot_com" for "Plugin Name"
-    And I enter "true" for "enabled"
-    And I enter "b2a70ac0b64e012fa61522000a8c42dc" for "api_key"
-    And I enter "b2a720b0b64e012fa61522000a8c42dc" for "api_secret"
-    And I enter "c4aed530b64e012fa61522000a8c42dc" for "repo_id"
-    Then I should be presented "Successfully configured plugin: dot_com"
-    When I do a git commit
-    Then the output should contain "*** Preserving this moment in history."
-    And there should be exactly 1 jpg in "../.lolcommits/dot_com"
-
-  Scenario: Disable loltext
-    Given I am in a git repository named "loltext" with lolcommits enabled
-    And I run `lolcommits --config` and wait for output
-    And I enter "loltext" for "Plugin Name"
-    And I enter "false" for "enabled"
-    Then I should be presented "Successfully configured plugin: loltext"
-    When I do a git commit
-    Then the output should contain "*** Preserving this moment in history."
-    And there should be exactly 1 jpg in "../.lolcommits/loltext"
-
-  Scenario: lolsrv integration works
-    Given I am in a git repository named "lolsrv" with lolcommits enabled
-    When I run `lolcommits --config` and wait for output
-    And I enter "lolsrv" for "Plugin Name"
-    And I enter "true" for "enabled"
-    And I enter "http://localhost" for "server"
-    Then I should be presented "Successfully configured plugin: lolsrv"
-    When I do a git commit
-    Then the output should contain "*** Preserving this moment in history."
-    And there should be exactly 1 jpg in "../.lolcommits/lolsrv"
-
+    Given I am in a git repo named "dot_com" with lolcommits enabled
+    When I run `lolcommits --config` interactively
+      And I wait for output to contain "Name of plugin to configure:"
+      Then I type "dot_com"
+      And I wait for output to contain "enabled:"
+      Then I type "true"
+      And I wait for output to contain "api_key:"
+      Then I type "b2a70ac0b64e012fa61522000a8c42dc"
+      And I wait for output to contain "api_secret:"
+      Then I type "b2a70ac0b64e012fa61522000a8c42dc"
+      And I wait for output to contain "repo_id:"
+      Then I type "b2a70ac0b64e012fa61522000a8c42dc"
+    Then the output should contain "Successfully configured plugin: dot_com"

data/features/step_definitions/lolcommits_steps.rb

@@ -1,122 +1,142 @@
 # -*- encoding : utf-8 -*-
-include FileUtils
+require 'fileutils'
+require 'aruba/api'
 
-Given /^I am in a directory named "(.*?)"$/ do |dir_name|
-  steps %Q{
+def postcommit_hook
+  '.git/hooks/post-commit'
+end
+
+def default_repo
+  'mygit'
+end
+
+def default_loldir
+  absolute_path("~/.lolcommits/#{default_repo}")
+end
+
+Given(/^I am in a directory named "(.*?)"$/) do |dir_name|
+  steps %(
     Given a directory named "#{dir_name}"
     And I cd to "#{dir_name}"
-  }
+    )
 end
 
-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 config user.name 'Testy McTesterson'"
-    system "git config user.email 'testy@tester.com'"
-  end
+Given(/^a git repo named "(.*?)"$/) do |repo_name|
+  steps %(
+   Given I successfully run `git init --quiet "#{repo_name}"`
+    )
 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
-  delete(hook_file) if File.exists? hook_file
+Given(/^I am in a git repo named "(.*?)"$/) do |repo|
+  steps %(
+    Given a git repo named "#{repo}"
+    And I cd to "#{repo}"
+    )
 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
-  touch(hook_file) if not File.exists? hook_file
+Given(/^I am in a git repo$/) do
+  steps %(
+    Given I am in a git repo named "#{default_repo}"
+    )
 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
-  File.open(hook_file, 'w') { |f| f.write(hook_content) }
+Given(/^I am in a git repo named "(.*?)" with lolcommits enabled$/) do |repo|
+  steps %(
+    Given I am in a git repo named "#{repo}"
+    And I successfully run `lolcommits --enable`
+    )
 end
 
-Given /^a git repository named "(.*?)" with (a|no) "(.*?)" hook$/ do |repo_name, yesno_modifier, hook_name|
-  step %{a git repository named "#{repo_name}"}
-  step %{the git repository named "#{repo_name}" has #{yesno_modifier} "#{hook_name}" hook}
+Given(/^I am in a git repo with lolcommits enabled$/) do
+  steps %(
+    Given I am in a git repo named "#{default_repo}" with lolcommits enabled
+    )
 end
 
-Given /^I am in a git repository named "(.*?)"$/ do |repo_name|
-  steps %Q{
-    Given a git repository named "#{repo_name}"
-    And I cd to "#{repo_name}"
-  }
+Given(/^a post\-commit hook with "(.*?)"$/) do |file_content|
+  steps %(
+    Given a file named "#{postcommit_hook}" with:
+      """
+      #{file_content}
+      """
+    )
 end
 
-Given /^I am in a git repository named "(.*?)" with lolcommits enabled$/ do |repo_name|
-  steps %Q{
-    Given I am in a git repository named "#{repo_name}"
-    And I successfully run `lolcommits --enable`
-  }
+Then(/^the lolcommits post\-commit hook should be properly installed$/) do
+  steps %(
+    Then the post-commit hook should contain "lolcommits --capture"
+    )
+end
+
+Then(/^the post\-commit hook (should|should not) contain "(.*?)"$/) do |should, content|
+  steps %(
+    Then the file "#{postcommit_hook}" #{should} contain "#{content}"
+    )
 end
 
-Given /^I have environment variable (.*?) set to (.*?)$/ do |var, value|
+Given(/^I have environment variable (.*?) set to (.*?)$/) do |var, value|
   set_env var, value
 end
 
-When /^I run `(.*?)` and wait for output$/ do |command|
-  command = "cd #{current_dir} && #{command}"
-  @stdin, @stdout, @stderr = Open3.popen3(command)
-  @fields = Hash.new
+Given(/^its loldir has (\d+) lolimages$/) do |num_images|
+  steps %(
+    Given a loldir named "#{default_repo}" with #{num_images} lolimages
+    )
 end
 
-Given /^a loldir named "(.*?)" with (\d+) lolimages$/ do |repo_name, num_images|
-  loldir = "tmp/aruba/.lolcommits/#{repo_name}"
-  mkdir_p loldir
+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
-    random_hex = '%011x' % (rand * 0xfffffffffff)
-    cp 'test/images/test_image.jpg', File.join(loldir, "#{random_hex}.jpg")
+    hex = "#{format '%011x', (rand * 0xfffffffffff)}"
+    FileUtils.cp 'test/images/test_image.jpg', File.join(loldir, "#{hex}.jpg")
   end
 end
 
-Then /^I should be (prompted for|presented) "(.*?)"$/ do |_, prompt|
-  assert @stdout.read.to_s.include?(prompt)
-end
-
-When /^I enter "(.*?)" for "(.*?)"$/ do |input, field|
-  @fields[field] = input
-  @stdin.puts input
+Then(/^there should be exactly (.*?) (jpg|gif|pid)s? in its loldir$/) do |n, type|
+  steps %(
+    Then there should be exactly #{n} #{type} in "#{default_loldir}"
+    )
 end
 
-Then /^there should be (?:exactly|only) (.*?) (jpg|gif|pid)(?:s?) in "(.*?)"$/ do |n, type, folder|
-  assert_equal n.to_i, Dir["#{current_dir}/#{folder}/*.#{type}"].count
+Then(/^there should be exactly (.*?) (jpg|gif|pid)s? in "(.*?)"$/) do |n, type, folder|
+  expect(Dir[absolute_path(folder, "*.#{type}")].count).to eq(n.to_i)
 end
 
-Then /^the output should contain a list of plugins$/ do
-  step %{the output should contain "Available plugins: "}
+Then(/^the output should contain a list of plugins$/) do
+  step %(the output should contain "Available plugins: ")
 end
 
-When /^I do a git commit with commit message "(.*?)"$/ do |commit_msg|
+When(/^I do a git commit with commit message "(.*?)"$/) do |commit_msg|
   filename = Faker::Lorem.words(1).first
-  step %{a 98 byte file named "#{filename}"}
-  step %{I successfully run `git add #{filename}`}
-  step %{I successfully run `git commit -m "#{commit_msg}"`}
+  steps %(
+    Given a 98 byte file named "#{filename}"
+    And I successfully run `git add #{filename}`
+    And I successfully run `git commit -m "#{commit_msg}"`
+    )
 end
 
-When /^I do a git commit$/ do
-  commit_msg = Faker::Lorem.sentence
-  step %{I do a git commit with commit message "#{commit_msg}"}
+When(/^I do a git commit$/) do
+  step %(I do a git commit with commit message "#{Faker::Lorem.sentence}")
 end
 
-When /^I do (\d+) git commits$/ do |n|
+When(/^I do (\d+) git commits$/) do |n|
   n.to_i.times do
-    step %{I do a git commit}
+    step %(I do a git commit)
     sleep 0.1
   end
 end
 
-Then /^there should be (\d+) commit entries in the git log$/ do |n|
+Then(/^there should be (\d+) commit entries in the git log$/) do |n|
   sleep 1 # let the file writing catch up
-  assert_equal n.to_i, `git shortlog | grep -E '^[ ]+\w+' | wc -l`.chomp.to_i
+  expect(n.to_i).to eq `git shortlog | grep -E '^[ ]+\w+' | wc -l`.chomp.to_i
 end
 
-Given /^I am using a "(.*?)" platform$/ do |platform_name|
-  ENV['LOLCOMMITS_FAKEPLATFORM'] = platform_name
+Given(/^I am using a "(.*?)" platform$/) do |platform_name|
+  set_env 'LOLCOMMITS_FAKEPLATFORM', platform_name
 end
 
-When /^I wait for the child process to exit in "(.*?)"$/ do |repo_name|
-  sleep 0.1 while File.exist?("tmp/aruba/.lolcommits/#{repo_name}/lolcommits.pid")
+When(/^I wait for the child process to exit in "(.*?)"$/) do |repo_name|
+  pid_loc = absolute_path("~/.lolcommits/#{repo_name}/lolcommits.pid")
+  sleep 0.1 while File.exist?(pid_loc)
 end

data/features/support/env.rb

@@ -2,16 +2,12 @@
 require 'aruba/cucumber'
 require 'methadone/cucumber'
 require 'open3'
-require 'test/unit/assertions'
-include Test::Unit::Assertions
 require 'ffaker'
-require 'lolcommits/configuration'
+require 'fileutils'
+
 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')
-
 World(PathHelpers)
 
 Before do
@@ -19,70 +15,44 @@ Before do
   @puts = true
   @aruba_timeout_seconds = 20
 
-  @original_rubylib = ENV['RUBYLIB']
-  ENV['RUBYLIB'] = LIB_DIR + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s
-
-  @original_fakecapture = ENV['LOLCOMMITS_FAKECAPTURE']
-  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['LAUNCHY_DRY_RUN'] = 'true'
-end
-
-After do
-  ENV['RUBYLIB'] = @original_rubylib
-  ENV['LOLCOMMITS_FAKECAPTURE'] = @original_fakecapture
-  # ENV['LOLCOMMITS_DIR'] = @original_loldir
-  ENV['HOME'] = @original_home
-  ENV['LAUNCHY_DRY_RUN'] = nil
-  ENV['LOLCOMMITS_FAKEPLATFORM'] = nil
-end
-
-Before('@fake-interactive-rebase') do
-  # in order to fake an interactive rebase,
-  # 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
-end
+  set_env 'LOLCOMMITS_FAKECAPTURE', '1'
+  set_env 'LAUNCHY_DRY_RUN', 'true'
 
-After('@fake-interactive-rebase') do
-  ENV['GIT_EDITOR'] = @original_git_editor
+  author_name  = 'Testy McTesterson'
+  author_email = 'testy@tester.com'
+  set_env 'GIT_AUTHOR_NAME',     author_name
+  set_env 'GIT_COMMITTER_NAME',  author_name
+  set_env 'GIT_AUTHOR_EMAIL',    author_email
+  set_env 'GIT_COMMITTER_EMAIL', author_email
 end
 
+# for tasks that may take an insanely long time (e.g. network related)
+# we should strive to not have any of these in our scenarios, naturally.
 Before('@slow_process') do
   @aruba_io_wait_seconds = 5
   @aruba_timeout_seconds = 60
 end
 
+# in order to fake an interactive rebase, we replace the editor with a script
+# to simply squash a few random commits. in this case, using lines 3-5.
+Before('@fake-interactive-rebase') do
+  set_env 'GIT_EDITOR', "sed -i -e '3,5 s/pick/squash/g'"
+end
+
 # adjust the path so tests dont see a global imagemagick install
 Before('@fake-no-imagemagick') do
   reject_paths_with_cmd('mogrify')
 end
 
-After('@fake-no-imagemagick') do
-  reset_path
-end
-
 # adjust the path so tests dont see a global ffmpeg install
 Before('@fake-no-ffmpeg') do
   reject_paths_with_cmd('ffmpeg')
 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,12 +1,15 @@
 # -*- encoding : utf-8 -*-
+require 'fileutils'
+require 'aruba/api'
+require 'lolcommits/platform'
+
 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')
     FileUtils.mkdir_p tmpbindir
 
-    preseve_cmds_in_path(['git', 'mplayer'], tmpbindir)
+    preseve_cmds_in_path(%w(git mplayer), tmpbindir)
 
     exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
     newpaths = ENV['PATH'].split(File::PATH_SEPARATOR).reject do |path|
@@ -20,19 +23,17 @@ module PathHelpers
 
     # add the temporary directory with git in it back into the path
     newpaths << tmpbindir
-    ENV['PATH'] = newpaths.join(File::PATH_SEPARATOR)
+
+    # use aruba/api set_env to set PATH, which will be automaticaly restored
+    set_env 'PATH', newpaths.join(File::PATH_SEPARATOR)
   end
 
   def preseve_cmds_in_path(cmds, tmpbindir)
     cmds.each do |cmd|
-      whichcmd = Lolcommits::Configuration.command_which(cmd)
+      whichcmd = Lolcommits::Platform.command_which(cmd)
       unless whichcmd.nil?
         FileUtils.ln_s whichcmd, File.join(tmpbindir, File.basename(whichcmd))
       end
     end
   end
-
-  def reset_path
-    ENV['PATH'] = @original_path
-  end
 end

data/lib/lolcommits.rb

@@ -11,20 +11,12 @@ require 'date'
 
 require 'lolcommits/version'
 require 'lolcommits/configuration'
-
 require 'lolcommits/capturer'
-require 'lolcommits/capturer/capture_mac'
-require 'lolcommits/capturer/capture_mac_animated'
-require 'lolcommits/capturer/capture_linux'
-require 'lolcommits/capturer/capture_linux_animated'
-require 'lolcommits/capturer/capture_windows'
-require 'lolcommits/capturer/capture_cygwin'
-require 'lolcommits/capturer/capture_fake'
-
 require 'lolcommits/git_info'
 require 'lolcommits/installation'
-
 require 'lolcommits/plugin'
+require 'lolcommits/platform'
+
 require 'lolcommits/plugins/loltext'
 require 'lolcommits/plugins/dot_com'
 require 'lolcommits/plugins/tranzlate'
@@ -32,6 +24,7 @@ require 'lolcommits/plugins/lol_twitter'
 require 'lolcommits/plugins/uploldz'
 require 'lolcommits/plugins/lolsrv'
 require 'lolcommits/plugins/lol_yammer'
+require 'lolcommits/plugins/lol_protonet'
 
 # require runner after all the plugins have been required
 require 'lolcommits/runner'

data/lib/lolcommits/capturer.rb

@@ -8,9 +8,17 @@ module Lolcommits
 
     def initialize(attributes = {})
       attributes.each do |attr, val|
-        self.send("#{attr}=", val)
+        send("#{attr}=", val)
       end
-      debug 'Capturer: initializing new instance ' + self.to_s
+      debug 'Capturer: initializing new instance ' + to_s
     end
   end
 end
+
+require 'lolcommits/capturer/capture_mac'
+require 'lolcommits/capturer/capture_mac_animated'
+require 'lolcommits/capturer/capture_linux'
+require 'lolcommits/capturer/capture_linux_animated'
+require 'lolcommits/capturer/capture_windows'
+require 'lolcommits/capturer/capture_cygwin'
+require 'lolcommits/capturer/capture_fake'