lolcommits 0.3.2 → 0.3.3

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.3.3 (26 November 2012)
+  * BUG: prevent repeated firing of lolcommits capture during a git rebase.
+
 0.3.2 (3 October 2012)
   * Twitter posting support via the `twitter` plugin! (thx @coyboyrushforth!)
 

data/features/bugs.feature

@@ -15,37 +15,10 @@ Feature: Bug regression testing
   #
   # issue #68, https://github.com/mroth/lolcommits/issues/68
   #
-  #@focus
-  #Scenario: Don't trigger capture during a git rebase
-  #  Given I am in a git repository named "yuh8history" with lolcommits enabled
-  #    And I do a git commit
-  #    And I successfully run `git tag 'vA'`
-  #    And I do a git commit
-  #    And I successfully run `git tag 'vB'`
-  #    And I do a git commit
-  #    And I successfully run `git tag 'vC'`
-  #    And I do a git commit
-  #    And I successfully run `git tag 'vD'`
-  #    And I do a git commit
-  #    And I successfully run `git tag 'vE'`
-  #    And I do a git commit
-  #    And I successfully run `git tag 'vF'`
-  #    And I successfully run `git checkout vB`
-  #    And I successfully run `git reset --soft master`
-  #    And I successfully run `git merge --squash vD`
-  #  When I successfully run `git rebase --onto $(cat .git/HEAD) vE vF`
-  #  # When I successfully run `git rebase placeholder`
-  #  Then there should be 4 commit entries in the git log
-  #  # But there should be exactly 5 jpgs in "../.lolcommits/yuh8history"
-
-    # Given I am in a git repository named "yuh8history" with lolcommits enabled
-    #   And I do 2 git commits
-    #   And I successfully run `git branch middle`
-    #   And I do 2 git commits
-    #   And I successfully run `git branch placeholder`
-    #   And I successfully run `git checkout middle`
-    #   And I do 2 git commits
-    # When I successfully run `git rebase placeholder`
-    # Then there should be 6 commit entries in the git log
-    # But there should be exactly 6 jpgs in "../.lolcommits/yuh8history"
-
+  @fake-interactive-rebase @slow_process
+  Scenario: Don't trigger capture during a git rebase
+    Given I am in a git repository named "yuh8history" with lolcommits enabled
+      And I do 6 git commits
+    When I successfully run `git rebase -i HEAD~5`
+    # Then there should be 4 commit entries in the git log
+    Then there should be exactly 6 jpgs in "../.lolcommits/yuh8history"

data/features/step_definitions/lolcommits_steps.rb

@@ -87,10 +87,12 @@ end
 When /^I do (\d+) git commits$/ do |n|
   n.to_i.times do
     step %{I do a git commit}
+    sleep 0.1
   end
 end
 
 Then /^there should be (\d+) commit entries in the git log$/ do |n|
-  #sleep 1
+  sleep 1 #let the file writing catch up
   assert_equal n.to_i, `git shortlog | grep -E '^[ ]+\w+' | wc -l`.chomp.to_i
 end
+

data/features/support/env.rb

@@ -35,3 +35,19 @@ After do
   ENV['HOME'] = @original_home
   ENV['LAUNCHY_DRY_RUN'] = 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
+
+After('@fake-interactive-rebase') do
+  ENV['GIT_EDITOR'] = @original_git_editor
+end
+
+Before('@slow_process') do
+  @aruba_io_wait_seconds = 3
+end

data/lib/lolcommits/git_info.rb

@@ -1,12 +1,13 @@
 module Lolcommits
   class GitInfo
-    attr_accessor :sha, :message
+    attr_accessor :sha, :message, :repo_internal_path
     def initialize
-      git    = Git.open('.')
-      commit = git.log.first
+      g    = Git.open('.')
+      commit = g.log.first
 
       self.message = commit.message.split("\n").first
       self.sha     = commit.sha[0..10]
+      self.repo_internal_path = g.repo.path
     end
   end
 end

data/lib/lolcommits/runner.rb

@@ -4,7 +4,7 @@ module Lolcommits
 
   class Runner
     attr_accessor :capture_delay, :capture_device, :message, :sha,
-      :snapshot_loc, :main_image, :repo, :config
+      :snapshot_loc, :main_image, :repo, :config, :repo_internal_path
 
     include ActiveSupport::Callbacks
     define_callbacks :run
@@ -27,10 +27,13 @@ module Lolcommits
         git_info = GitInfo.new
         self.sha = git_info.sha if self.sha.nil?
         self.message = git_info.message if self.message.nil?
+        self.repo_internal_path = git_info.repo_internal_path
       end
     end
 
     def run
+      die_if_rebasing!
+
       run_callbacks :run do
         puts "*** Preserving this moment in history."
         self.snapshot_loc = self.config.raw_image
@@ -47,6 +50,14 @@ module Lolcommits
   end
 
   protected
+  def die_if_rebasing!
+    if not self.repo_internal_path.nil?
+      mergeclue = File.join self.repo_internal_path, "rebase-merge"
+      if File.directory? mergeclue
+        exit 0
+      end
+    end
+  end
 
   def resize_snapshot!
     canvas = ImageList.new(self.snapshot_loc)

data/lib/lolcommits/version.rb

@@ -1,3 +1,3 @@
 module Lolcommits
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lolcommits.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('rdoc')
   s.add_development_dependency('aruba')
-  s.add_development_dependency('rake','~> 0.9.2')
+  s.add_development_dependency('rake','~> 10.0.2')
   s.add_development_dependency('fivemat')
   s.add_development_dependency('faker')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolcommits
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.0.2
 - !ruby/object:Gem::Dependency
   name: fivemat
   requirement: !ruby/object:Gem::Requirement
@@ -316,12 +316,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -395206904349173535
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -395206904349173535
 requirements: []
 rubyforge_project: lolcommits
 rubygems_version: 1.8.24