gitloop 0.0.3

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in gitloop.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,61 @@
+PATH
+  remote: .
+  specs:
+    gitloop (0.0.3)
+      methadone
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    aruba (0.4.11)
+      childprocess (>= 0.2.3)
+      cucumber (>= 1.1.1)
+      ffi (>= 1.0.11)
+      rspec (>= 2.7.0)
+    builder (3.0.0)
+    childprocess (0.3.1)
+      ffi (~> 1.0.6)
+    cucumber (1.1.4)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.7.1)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    diff-lcs (1.1.3)
+    ffi (1.0.11)
+    gherkin (2.7.7)
+      json (>= 1.4.6)
+    guard (1.0.0)
+      ffi (>= 0.5.0)
+      thor (~> 0.14.6)
+    guard-cucumber (0.7.5)
+      cucumber (>= 0.10)
+      guard (>= 0.8.3)
+    json (1.6.5)
+    methadone (0.5.1)
+      bundler
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    ruby_gntp (0.3.4)
+    term-ansicolor (1.0.7)
+    thor (0.14.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aruba
+  gitloop!
+  guard-cucumber
+  rake (~> 0.9.2)
+  rdoc
+  ruby_gntp

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2012 Alain Ravet
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown

@@ -0,0 +1,49 @@
+[gitloop](http://rubygems.org/gems/gitloop)
+=======
+
+
+<table>
+  <tr style="line-height:5em">
+    <td colspan="3" style="text-align:center;">
+        <code style="font-size:1.6em;padding:20px 40px;background:lightyellow">
+            git <b>loop</b>&nbsp;&nbsp;master~4&nbsp;&nbsp;master~2&nbsp;&nbsp;&nbsp;<b>-m</b> "let's group them"
+        </code>
+    </td>
+  </tr>
+  <tr>
+    <td width="42%" style="text-align:center"> <img src="https://github.com/alainravet/gitloop/raw/master/doc/BEFORE.png"/></td>
+    <td width="6%" style="text-align:center;font-size:4em;">&rarr;</td>
+    <td width="42%" style="text-align:center"> <img src="https://github.com/alainravet/gitloop/raw/master/doc/AFTER.png" /></td>
+  </tr>
+</table>
+
+
+The same results would be obtained by any of :
+
+    $ git loop   7355c79 6ffd9       -m "a logical group"
+    $ git loop   second  c4          -m "a logical group"
+    $ git loop   c2      6ffd9       -m "a logical group"
+
+
+Installation :
+-------------
+        $ gem install gitloop
+
+#### Report bugs to <https://github.com/alainravet/alainravet/>
+
+--------------------------------------------------------------------------------
+
+== Note on Patches/Pull Requests
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+== Copyright
+
+Copyright (c) 2012 Alain Ravet. See LICENSE for details.
+·

data/bin/git-loop

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'methadone'
+require File.dirname(__FILE__) + '/../lib/gitloop'
+
+include Methadone::Main
+
+main do |from_ref, to_ref|
+  all_parameters_provided = from_ref && to_ref && options[:message]
+  if all_parameters_provided
+    begin
+      Gitloop::Looper.make_loop_for_references_or_messages(from_ref, to_ref, options[:message])
+    rescue Gitloop::GitError => e
+      puts "*** ERROR : #{e}"
+    end
+  else
+    puts @banner
+  end
+end
+
+on("-m MESSAGE", "--message", "commit message for the loop") do |m|
+  options[:message] = m
+end
+
+@banner = <<-DOC
+  Usage: git loop <from_ref> <to_ref> -m "<message>"
+    where <*_ref> is either
+       - a commit reference (SHA, branch name, etc..) or
+       - a commit message part
+
+
+    example:
+
+          +-----------------------------------------------------------------+
+          |     $ git loop   "c2"     "the third"   -m "a logical group"    |
+          | or  $ git loop   7355c79  bab916a       -m "a logical group"    |
+          +-----------------------------------------------------------------+
+              BEFORE                                        AFTER
+          -------------------------------------------------------------------
+                                                    * 69fd256 c6
+                                                    * 377c650 c5 five - fifth commit
+                                                    * 9f31be9 c4 not the third commit
+    * edadbb7 c6                     ---------->    *   845c17e *** a logical group
+    * da55377 c5 five - fifth commit                |\\
+    * 6fddd9c c4 not the third commit            [  | * bab916a c3 the third commit    ]
+ [  * bab916a c3 the third commit       ]        [  | * 7355c79 c2 the second commit   ]
+ [  * 7355c79 c2 the second commit      ]           |/
+    * 91182df c1                                    * 91182df c1
+
+DOC
+description "  combine `git merge --no--ff ..` and `git rebase ..` to regroup commits sequences in \"loops\"" +
+            "\n\n" +
+            @banner
+
+
+version Gitloop::VERSION
+
+go!

data/bin/gitloop

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'methadone'
+require File.dirname(__FILE__) + '/../lib/gitloop'
+
+include Methadone::Main
+
+main do |from_ref, to_ref|
+  all_parameters_provided = from_ref && to_ref && options[:message]
+  if all_parameters_provided
+    begin
+      Gitloop::Looper.make_loop_for_references_or_messages(from_ref, to_ref, options[:message])
+    rescue Gitloop::GitError => e
+      puts "*** ERROR : #{e}"
+    end
+  else
+    puts @banner
+  end
+end
+
+on("-m MESSAGE", "--message", "commit message for the loop") do |m|
+  options[:message] = m
+end
+
+@banner = <<-DOC
+  Usage: git loop <from_ref> <to_ref> -m "<message>"
+    where <*_ref> is either
+       - a commit reference (SHA, branch name, etc..) or
+       - a commit message part
+
+
+    example:
+
+          +-----------------------------------------------------------------+
+          |     $ git loop   "c2"     "the third"   -m "a logical group"    |
+          | or  $ git loop   7355c79  bab916a       -m "a logical group"    |
+          +-----------------------------------------------------------------+
+              BEFORE                                        AFTER
+          -------------------------------------------------------------------
+                                                    * 69fd256 c6
+                                                    * 377c650 c5 five - fifth commit
+                                                    * 9f31be9 c4 not the third commit
+    * edadbb7 c6                     ---------->    *   845c17e *** a logical group
+    * da55377 c5 five - fifth commit                |\\
+    * 6fddd9c c4 not the third commit            [  | * bab916a c3 the third commit    ]
+ [  * bab916a c3 the third commit       ]        [  | * 7355c79 c2 the second commit   ]
+ [  * 7355c79 c2 the second commit      ]           |/
+    * 91182df c1                                    * 91182df c1
+
+DOC
+description "  combine `git merge --no--ff ..` and `git rebase ..` to regroup commits sequences in \"loops\"" +
+            "\n\n" +
+            @banner
+
+
+version Gitloop::VERSION
+
+go!

data/doc/TODO.txt

@@ -0,0 +1,31 @@
+TESTS FOR ERROR CASES
+
+error result
+  - exception
+  - error message in the output
+------------------------------------------------------------------------
+
+
+-f -t  : allow using SHA for 1/2 of the args
+
+ABORT if
+  - unstaged changes
+  - not on a branch (current_branch.nil?)
+  - <from> == very 1st commit
+  - missing parameters
+  - `git` not found
+  - not in a git directory
+
+after ABORT,
+  * reset --hard to original situation + clean if anything fails
+  * explain
+
+
+edge case :
+- empty repository
+
+    def current_SHA
+      `git rev-parse HEAD`
+    end
+
+

data/doc/dev_notes.txt

@@ -0,0 +1,6 @@
+
+- After bootstraping the app, launch the binary skeleton
+
+    $ cd <..>/gitloop
+    $ bundle exec rake install
+    $ ./bin/gitloop  --help

data/features/errors.feature

@@ -0,0 +1,29 @@
+Feature: Errors detection and handling
+
+  As a          developer
+  In order to   improve my git history structure
+  I want to     create a few loops via git merge and git rebase
+
+
+  Background:
+    Given the sandbox is setup
+    Given I cd to "sandbox"
+
+
+  Scenario Outline: in Ruby, create a loop from the exact SHAs
+
+
+    When I run `git-loop <from_ref> <to_ref> -m "fail"`
+
+    Then the repo is in its original state
+     And there are no unstaged nor staged changes
+     And the current branch is "master"
+
+    Scenarios: invalid or unknown SHAs
+      | from_ref  | to_ref  |
+      | 91182df   | a059392 |
+      | 1111111   | a059392 |
+
+    Scenarios: wrong order
+      | from_ref  | to_ref  |
+      | a059392   | 8aab2de |

data/features/happy_path.feature

@@ -0,0 +1,58 @@
+Feature: Happy path (no problems, no edge case)
+
+  As a          developer
+  In order to   improve my git history structure
+  I want to     create a few loops via git merge and git rebase
+
+
+  Background:
+    Given the sandbox is setup
+    Given I cd to "sandbox"
+
+#--------------------------------------------------------------------------------
+
+  Scenario Outline: the many ways to create the same loop
+
+
+    When I run `<command>`
+
+    Then the git log graph matches:
+       """
+       * <a_sha> c6
+       * <a_sha> c5 five - fifth commit
+       *   <a_sha> *** hellboy was here
+       |\
+       | * 6fddd9c c4 not the third commit
+       | * bab916a c3 the third commit
+       | * 7355c79 c2 the second commit
+       |/
+       * 91182df c1
+       """
+    And the current branch is "master"
+
+    Scenarios: pure SHAs or pure messages snippets
+      |                           command                      |
+      | git-loop 7355c79 6fddd9c   -m "hellboy was here"       |
+      | git-loop master~4 master~2 -m "hellboy was here"       |
+      | git-loop "c2"  "c4" -m "hellboy was here"              |
+      | git-loop "second commit" 6fddd9c -m "hellboy was here" |
+
+
+#--------------------------------------------------------------------------------
+
+  Scenario: comment can contain quote
+    When I run `git-loop 7355c79 6fddd9c   -m "let's do it"`
+
+    Then the current branch is "master"
+     And the git log graph matches:
+       """
+       * <a_sha> c6
+       * <a_sha> c5 five - fifth commit
+       *   <a_sha> *** let's do it
+       |\
+       | * 6fddd9c c4 not the third commit
+       | * bab916a c3 the third commit
+       | * 7355c79 c2 the second commit
+       |/
+       * 91182df c1
+       """

data/features/sandbox.feature

@@ -0,0 +1,98 @@
+Feature: playing in the sanbox
+  As a          developer
+  In order to   test `gitloop` thoroughly
+  I want to     Install in tmp/sandbox different prepared git repositories
+                that cover all the possible combinations of staged/unstanged
+                files
+
+
+  Background:
+        * I cleared the sandbox directory
+        * a directory named "sandbox" should not exist
+
+
+#############################
+# Test the git status output :
+#############################
+
+  Scenario: checking the clean sandbox
+
+     Given I unzip the clean git repo in the sandbox
+         * I cd to "sandbox"
+      Then the git status is empty
+
+
+  Scenario: checking the sandbox with some unstaged changes
+
+     Given I unzip the git repo with unstaged changes in the sandbox
+         * I cd to "sandbox"
+      Then the git status is:
+         """
+          M f1
+         ?? unstaged-new-file
+         """
+
+  Scenario: checking the sandbox with some staged changes
+
+     Given I unzip the git repo with staged changes in the sandbox
+         * I cd to "sandbox"
+      Then the git status is:
+         """
+         M  f1
+         A  unstaged-new-file
+         """
+
+
+
+#############################
+# Test the git log graph output :
+#############################
+
+  Scenario Outline: the sandbox is initialized by unzipping a model git repository
+
+     Given I unzip the <repository> in the sandbox
+         * I cd to "sandbox"
+
+    Then the repo is in its original state
+    Then HEAD starts with edadbb7
+       * the current branch is "master"
+       * there are <outcome>
+
+    Examples:
+      | repository                      | outcome                        |
+      | clean git repo                  | no unstaged nor staged changes |
+
+
+
+  Scenario Outline: the sandbox is initialized by unzipping a model git repository
+
+     Given I unzip the <repository> in the sandbox
+         * I cd to "sandbox"
+
+    Then the git log graph is:
+       """
+       * a059392 c6
+       * e917b56 c5
+       * 933c4d1 c4
+       * 4d72f8a c3
+       * 8aab2de c2
+       * 91182df c1
+       """
+    Then the git log graph matches:
+       """
+       * a059392 c6
+       * <a_sha> c5
+       * 933c4d1 c4
+       * <a_sha> c3
+       * 8aab2de c2
+       * <a_sha> c1
+       """
+    Then HEAD starts with a059392
+       * the current branch is "master"
+       * there are <outcome>
+
+    Examples:
+      | repository                      | outcome                        |
+      | git repo with unstaged changes  | untracked or uncommited changes|
+      | git repo with staged changes    | untracked or uncommited changes|
+

data/features/shell_command.feature

@@ -0,0 +1,14 @@
+Feature: My bootstrapped app kinda works
+  In order to get going on coding my awesome app
+  I want to have aruba and cucumber setup
+  So I don't have to do it myself
+
+  Scenario: App just runs
+    When I get help for "git-loop"
+    Then the exit status should be 0
+    And the banner should document that this app's arguments are:
+      |message|which is not optional|
+    And the output should contain:
+        """
+        Usage: git loop <from_ref> <to_ref> -m "<message>"
+        """

data/features/step_definitions/git_steps.rb

@@ -0,0 +1,21 @@
+
+# Setup :
+#########
+
+
+
+# Test :
+#########
+
+Then 'the git status is empty' do
+  untracked_or_uncommited_changes.chomp.should be_empty
+end
+
+Then 'the git status is:' do |text|
+  untracked_or_uncommited_changes.chomp.should == text
+end
+
+
+Then 'the current branch is "$branch"' do |branch|
+  the_current_branch.should == "* #{branch}"
+end

data/features/step_definitions/gitloop_steps.rb

@@ -0,0 +1,49 @@
+# -----------
+# Setup :
+# -----------
+
+
+# -----------
+# Tests :
+# -----------
+
+
+# Usage :
+#   Then HEAD starts with a059392
+
+Then 'HEAD starts with $sha_start' do |sha_start|
+  in_current_dir do
+    `git rev-parse HEAD`.should match(/^#{sha_start}/)
+  end
+end
+
+
+# Usage :
+#   Then the git log graph is:
+#     """
+#     * 4d72f8a c3
+#     * 8aab2de c2
+#     * 91182df c1
+#     """
+
+Then 'the git log graph is:' do |expected_output|
+  record_time_taken("git-log-graph-IS") do
+    the_git_log_graph.should == expected_output
+  end
+
+end
+
+
+# Usage :
+#   Then the git log graph matches:
+#     """
+#     * <a_sha> c3
+#     * 8aab2de c2
+#     * 91182df c1
+#     """
+
+Then 'the git log graph matches:' do |raw_expected_output|
+  record_time_taken("git-log-graph-matches") do
+    the_git_log_graph.should match(make_smart_regexp(raw_expected_output))
+  end
+end

data/features/step_definitions/sandbox_steps.rb

@@ -0,0 +1,63 @@
+
+# Setup :
+#########
+
+Given /^I cleared the sandbox directory$/ do
+  in_current_dir do
+    FileUtils.rm_rf("sandbox")
+  end
+end
+
+SANDBOX_PATH = {
+  :default    => FIXTURES_PATH + '/sandbox.zip',
+  :staged     => FIXTURES_PATH + '/sandbox-with-staged-changes.zip',
+  :unstaged   => FIXTURES_PATH + '/sandbox-with-unstaged-changes.zip'
+}
+
+Given /^the sandbox is setup$/ do
+  step %Q{I cleared the sandbox directory}
+  step %Q{I unzip the clean git repo in the sandbox}
+end
+
+
+Given /^I unzip the (.*) in the sandbox$/ do |repository|
+  path = case repository
+    when 'clean git repo'                   then SANDBOX_PATH[:default ]
+    when 'git repo with staged changes'     then SANDBOX_PATH[:staged  ]
+    when 'git repo with unstaged changes'   then SANDBOX_PATH[:unstaged]
+      else raise "NOT SUPPORTED repository : #{repository.inspect}"
+  end
+  record_time_taken("unzip") do
+    in_current_dir do `unzip #{path}` end           # 0.5 seconds
+   #step %(I successfully run `unzip #{path}`)      # 2.3 seconds
+  end
+end
+
+
+# Test :
+#########
+
+Then /^there are (.*)$/ do |outcome|
+  case outcome
+    when 'no unstaged nor staged changes'
+      untracked_or_uncommited_changes.should be_empty
+    when 'untracked or uncommited changes'
+      untracked_or_uncommited_changes.should_not be_empty
+    else
+      raise "BUG : unsupported outcome #{outcome}"
+  end
+end
+
+
+CLEAN_REPO_LOG =<<TEXT.chomp
+* edadbb7 c6
+* da55377 c5 five - fifth commit
+* 6fddd9c c4 not the third commit
+* bab916a c3 the third commit
+* 7355c79 c2 the second commit
+* 91182df c1
+TEXT
+
+Then /^the (?:clean repo|repo) is in its original state$/ do
+  the_git_log_graph.should == CLEAN_REPO_LOG
+end

data/features/support/benchmarking.rb

@@ -0,0 +1,24 @@
+$timers={}
+
+
+def record_time_taken(category)
+  category = category.to_sym
+  $timers[category] ||= [0,0]
+  start = Time.now
+  res = yield
+  time, count = $timers[category]
+  $timers[category] = [time + (Time.now - start), count+1]
+  res
+end
+
+at_exit do
+  puts "-"*80
+  keylength = $timers.keys.collect(&:length).max
+  puts "****                               total   ||    secs/run  ||    runs"
+  puts "-"*66
+  $timers.keys.each do |key|
+    time, count = $timers[key]
+    #puts "**** %{key} : total = %{time} sec. || %{count} secs/run || %{loop_time} runs" % {:key => key, :time => time, :count => count, :loop_time => (time/count)}
+    puts "**** %#{keylength+1}s : %#7.2f sec. || %7.3f sec. || %3d runs" % [key, time, (time/count), count]
+  end
+end

data/features/support/env.rb

@@ -0,0 +1,20 @@
+require 'aruba/cucumber'
+require 'methadone/cucumber'
+
+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')
+require LIB_DIR + '/gitloop'
+
+FIXTURES_PATH = File.join(File.expand_path(File.dirname(__FILE__)),'fixtures')
+
+Before do
+  # Using "announce" causes massive warnings on 1.9.2
+  @puts = true
+  @original_rubylib = ENV['RUBYLIB']
+  ENV['RUBYLIB'] = LIB_DIR + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s
+end
+
+After do
+  ENV['RUBYLIB'] = @original_rubylib
+  FileUtils.rm_rf File.join(File.dirname(__FILE__), '../../tmp/aruba')
+end

data/features/support/git.rb

@@ -0,0 +1,21 @@
+def the_current_branch
+  in_current_dir do
+    `git branch | grep "*"`.chomp
+  end
+end
+
+
+GIT_LOG_GRAPH_COMMAND = "git log --oneline --graph"
+
+def the_git_log_graph
+  step %Q{I run `#{GIT_LOG_GRAPH_COMMAND}`} # runs the actual process
+  output_from(GIT_LOG_GRAPH_COMMAND).chomp  # only accesses the previous processes outputs
+end
+
+
+def untracked_or_uncommited_changes
+  in_current_dir do
+    `git status -s`
+  end
+end
+

data/features/support/regexp.rb

@@ -0,0 +1,23 @@
+
+# turn the feature multiline "enhanced" text into a regexp
+
+def make_smart_regexp(raw_expected_output)
+  Regexp.compile escape_xxl(raw_expected_output),
+                 Regexp::MULTILINE
+end
+
+
+# turn the feature multiline "enhanced" text into a valid regexp-ready string.
+# It
+#  - escapes the string
+#  - translate <a_sha> -> (\S+)
+#  - replace \n by \s+ because of a problem with multiline strings in Cucumber
+
+def escape_xxl(raw_text)
+  Regexp.escape(raw_text).tap do |text|
+    text.gsub!('\n', "\\s*")  # necessary (? due to Cucumber ??)
+    text.gsub!(/<a_sha>/, '(\S+)')
+  end
+end
+
+

data/lib/gitloop.rb

@@ -0,0 +1,8 @@
+module Gitloop
+
+  class GitError < Exception; end
+
+end
+
+require File.dirname(__FILE__) + "/gitloop/version"
+require File.dirname(__FILE__) + "/gitloop/looper"

data/lib/gitloop/git_utils.rb

@@ -0,0 +1,33 @@
+module Gitloop
+
+  module GitUtils
+
+    def current_branch
+      branch = `git branch | grep "*"`
+      branch.empty? ?
+        nil :
+        branch[2..-2] # remove the current branch marker : '* '
+    end
+
+
+    def invalid_commits_sequence?(first_sha, second_sha)
+      output = (first_sha == second_sha) ?
+        call_git("show #{first_sha}") :
+        call_git("show #{first_sha}..#{second_sha}")
+      error = !output.start_with?('commit')
+    end
+
+    def valid_commits_reference?(reference)
+      call_git("show #{reference}").start_with?('commit')
+    rescue Gitloop::GitError
+      false
+    end
+
+
+    def shas_for_messages_that_match(from_grep)
+      onelines = (`git log --oneline --grep "#{from_grep}"`).split("\n")
+      shas = onelines.collect { |l| l[/\w+/] }
+    end
+
+  end
+end

data/lib/gitloop/looper.rb

@@ -0,0 +1,59 @@
+require 'open3'
+require File.dirname(__FILE__) + '/git_utils'
+
+module Gitloop
+
+  class Looper
+    extend GitUtils
+
+    def self.make_loop_for_references_or_messages(from, to, message=nil)
+      from_ref, to_ref = convert_messages_to_git_refs(from, to)
+      validate_commits_refs_sequence! from_ref, to_ref
+
+      build_the_loop(from_ref, message, to_ref)
+
+      loop_starts_at_very_first_commit = !valid_commits_reference?("#{from_ref}^^")
+      puts loop_starts_at_very_first_commit ?
+        call_git("log --oneline --graph --color --decorate") :
+        call_git("log --oneline --graph --color --decorate #{from_ref}^^..HEAD")
+    end
+
+  private
+
+    def self.build_the_loop(from_ref, message, to_ref)
+      curr_branch = current_branch()
+
+      call_git "co #{from_ref}^ --quiet"
+
+      msg = message || "loop #{from_ref}..#{to_ref}"
+      call_git "merge --no-ff #{to_ref} -m \"*** #{msg}\""
+
+      merge_top = call_git "rev-parse HEAD"
+      call_git "co  --quiet #{curr_branch}"
+      call_git "rebase #{merge_top}"
+    end
+
+    def self.convert_messages_to_git_refs(from, to)
+      from_ref = valid_commits_reference?(from) ? from : shas_for_messages_that_match(from).last
+      to_ref   = valid_commits_reference?(to  ) ? to   : shas_for_messages_that_match(to  ).last
+      [from_ref, to_ref]
+    end
+
+    def self.call_git(command, error_message_prefix=nil)
+      output, error, status = Open3.capture3("git #{command}")
+      if error.empty?
+        output
+      else
+        raise Gitloop::GitError.new [error_message_prefix,error].compact.join("\n")
+      end
+    end
+
+    def self.validate_commits_refs_sequence!(first_sha, second_sha)
+      if invalid_commits_sequence?(first_sha, second_sha)
+        error_msg = "#{first_sha}..#{second_sha} is an invalid SHAs sequence"
+        raise Gitloop::GitError.new(error_msg)
+      end
+    end
+
+  end
+end

data/lib/gitloop/version.rb

@@ -0,0 +1,3 @@
+module Gitloop
+  VERSION = "0.0.3"
+end

metadata

@@ -0,0 +1,161 @@
+--- !ruby/object:Gem::Specification
+name: gitloop
+version: !ruby/object:Gem::Version
+  version: 0.0.3
+  prerelease: 
+platform: ruby
+authors:
+- Alain Ravet
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2012-02-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: methadone
+  requirement: &70328618475780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70328618475780
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70328618473840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70328618473840
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: &70328618471420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70328618471420
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70328618469200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: *70328618469200
+- !ruby/object:Gem::Dependency
+  name: guard-cucumber
+  requirement: &70328618466840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70328618466840
+- !ruby/object:Gem::Dependency
+  name: ruby_gntp
+  requirement: &70328618453460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70328618453460
+description: easily merge and rebase flat git history
+email:
+- alainravet@gmail.com
+executables:
+- git-loop
+- gitloop
+extensions: []
+extra_rdoc_files: []
+files:
+- bin/git-loop
+- bin/gitloop
+- lib/gitloop/git_utils.rb
+- lib/gitloop/looper.rb
+- lib/gitloop/version.rb
+- lib/gitloop.rb
+- doc/AFTER.png
+- doc/BEFORE.png
+- doc/dev_notes.txt
+- doc/TODO.txt
+- LICENSE
+- README.markdown
+- Gemfile
+- Gemfile.lock
+- features/errors.feature
+- features/happy_path.feature
+- features/sandbox.feature
+- features/shell_command.feature
+- features/step_definitions/git_steps.rb
+- features/step_definitions/gitloop_steps.rb
+- features/step_definitions/sandbox_steps.rb
+- features/support/benchmarking.rb
+- features/support/env.rb
+- features/support/fixtures/sandbox-with-staged-changes.zip
+- features/support/fixtures/sandbox-with-unstaged-changes.zip
+- features/support/fixtures/sandbox.zip
+- features/support/git.rb
+- features/support/regexp.rb
+homepage: ''
+licenses: []
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -412658776607306167
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -412658776607306167
+requirements: []
+rubyforge_project: gitloop
+rubygems_version: 1.8.15
+signing_key: 
+specification_version: 3
+summary: easily merge and rebase flat git history
+test_files:
+- features/errors.feature
+- features/happy_path.feature
+- features/sandbox.feature
+- features/shell_command.feature
+- features/step_definitions/git_steps.rb
+- features/step_definitions/gitloop_steps.rb
+- features/step_definitions/sandbox_steps.rb
+- features/support/benchmarking.rb
+- features/support/env.rb
+- features/support/fixtures/sandbox-with-staged-changes.zip
+- features/support/fixtures/sandbox-with-unstaged-changes.zip
+- features/support/fixtures/sandbox.zip
+- features/support/git.rb
+- features/support/regexp.rb