git_reflow 0.2

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/Gemfile.lock

@@ -0,0 +1,91 @@
+PATH
+  remote: .
+  specs:
+    git_reflow (0.2)
+      github_api (= 0.6.5)
+      gli (= 2.0.0)
+      highline
+      httpclient
+      json_pure (= 1.7.5)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.3.2)
+    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.5)
+      ffi (~> 1.0, >= 1.0.6)
+    crack (0.3.1)
+    cucumber (1.2.1)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
+      json (>= 1.4.6)
+    diff-lcs (1.1.3)
+    faraday (0.8.4)
+      multipart-post (~> 1.1)
+    ffi (1.1.5)
+    gherkin (2.11.2)
+      json (>= 1.4.6)
+    git (1.2.5)
+    github_api (0.6.5)
+      faraday (~> 0.8.1)
+      hashie (~> 1.2.0)
+      multi_json (~> 1.3)
+      nokogiri (~> 1.5.2)
+      oauth2
+    gli (2.0.0)
+    hashie (1.2.0)
+    highline (1.6.14)
+    httpauth (0.1)
+    httpclient (2.2.7)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.7.5)
+    json_pure (1.7.5)
+    jwt (0.1.5)
+      multi_json (>= 1.0)
+    multi_json (1.3.6)
+    multipart-post (1.1.5)
+    nokogiri (1.5.5)
+    oauth2 (0.8.0)
+      faraday (~> 0.8)
+      httpauth (~> 0.1)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      rack (~> 1.2)
+    rack (1.4.1)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.2)
+    webmock (1.8.9)
+      addressable (>= 2.2.7)
+      crack (>= 0.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aruba (~> 0.4.6)
+  git_reflow!
+  jeweler
+  rake
+  rdoc
+  rspec
+  webmock

data/README.rdoc

@@ -0,0 +1,39 @@
+git-reflow
+==========
+Tools to help build software that just works.
+
+How it works
+-------------
+`$ git reflow setup`
+  Sets up your Github credentials
+
+`$ git reflow start branch-name`
+  Creates new branch
+  Prompts for PT ticket numbers? (Keep the PT stuff as a plugin?)
+
+`$ git reflow review [branch]`
+  Assumes remote 'origin'
+  Performs the following against [branch] or master if branch is not specified:
+    `git fetch origin`
+    - Are we up-to-date with changes from the destination?
+      - Fail with "origin/[branch] has newer changes" if no
+    - Run the test suite
+      - If fails, do not continue
+      - If not configured, fail with "Run test suite then use flag --green"
+    `git push origin current-branch` # Updates remote branch
+    - Do we have pull request?
+      - if no, create it and print "Pull request created at http://pull-url/"
+
+`$ git reflow deliver [branch]`
+    - Do we have lgtm after last commit?
+      - If no, print "Still waiting for review" (Maybe provide a way to skip this with `--lgtm`?)
+    - Prompt "Accepted by:" and get name/email/github username of person who does acceptance
+    - Checkout destination branch
+    - Update destination from origin (`git pull origin [branch]`)
+    - Merge squashed (`git merge --squash branch-name`)
+    - Prepare commit message (Adds Closes #pull-request-number)
+    - Perform the commit
+    - Push to branch
+    - Delete the remote branch
+    - Delete the local branch
+    - Deploy (Maybe with flag `--deploy`)

data/Rakefile

@@ -0,0 +1,13 @@
+require 'rake'
+require 'bundler/gem_tasks'
+require 'cucumber'
+require 'cucumber/rake/task'
+
+Dir[File.join(File.dirname(__FILE__),'lib/tasks/*.rake')].each { |f| load f }
+
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = "features --format pretty -x"
+  t.fork = false
+end
+
+task :default => [:spec, :cucumber]

data/bin/git-reflow

@@ -0,0 +1,125 @@
+#!/usr/bin/env ruby
+# 1.9 adds realpath to resolve symlinks; 1.8 doesn't
+# have this method, so we add it so we get resolved symlinks
+# and compatibility
+unless File.respond_to? :realpath
+  class File #:nodoc:
+    def self.realpath path
+      return realpath(File.readlink(path)) if symlink?(path)
+      path
+    end
+  end
+end
+$: << File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../lib')
+require 'rubygems'
+require 'gli'
+require 'git_reflow'
+require 'git_reflow/version'
+
+include GLI::App
+
+program_desc 'Git Reflow manages your git workflow.'
+
+version GitReflow::VERSION
+
+desc 'Describe some switch here'
+switch [:s,:switch]
+
+desc 'Describe some flag here'
+default_value 'the default'
+arg_name 'The name of the argument'
+flag [:f,:flagname]
+
+desc 'Setup your GitHub account'
+command :setup do |c|
+  c.action do |global_options,options,args|
+    GitReflow.setup
+  end
+end
+
+desc 'Start will create a new feature branch and setup remote tracking'
+arg_name 'Describe arguments to start here'
+command :start do |c|
+  c.desc 'Describe a switch to start'
+  c.switch :s
+
+  c.desc 'Describe a flag to start'
+  c.default_value 'default'
+  c.flag :f
+  c.action do |global_options,options,args|
+
+    # Your command logic here
+    if args.empty?
+      raise "usage: git-reflow start [new-branch-name]"
+    else
+      `git push origin master:refs/heads/#{args[0]}`
+      `git fetch origin`
+      `git checkout --track -b #{args[0]} origin/#{args[0]}`
+    end
+    # If you have any errors, just raise them
+    # raise "that command made no sense"
+  end
+end
+
+desc 'Describe review here'
+arg_name 'Describe arguments to review here'
+command :review do |c|
+  c.action do |global_options,options,args|
+    review_options = {'base' => nil, 'title' => nil, 'body' => nil}
+    case args.length
+    when 3
+      review_options['base'] = args[0]
+      review_options['title'] = args[1]
+      review_options['body'] = args[2]
+    when 2
+      review_options['base'] = args[0]
+      review_options['title'] = args[1]
+      review_options['body'] = review_options['title']
+    when 1
+      review_options['base'] = args[0]
+      review_options['title'] = review_options['body'] = GitReflow.get_first_commit_message
+    else
+      review_options['title'] = review_options['body'] = GitReflow.get_first_commit_message
+    end
+    GitReflow.review review_options
+  end
+end
+
+desc 'deliver will merge your feature branch down to your base branch'
+arg_name 'base_branch - the branch you want to merge into'
+command :deliver do |c|
+  c.action do |global_options,options,args|
+    deliver_options = {'base' => nil, 'head' => nil}
+    case args.length
+    when 2
+      deliver_options['base'] = args[0]
+      deliver_options['head'] = args[1]
+    when 1
+      deliver_options['base'] = args[0]
+    end
+    GitReflow.deliver deliver_options
+  end
+end
+
+pre do |global,command,options,args|
+  # Pre logic here
+  # Return true to proceed; false to abourt and not call the
+  # chosen command
+  # Use skips_pre before a command to skip this block
+  # on that command only
+  true
+end
+
+post do |global,command,options,args|
+  # Post logic here
+  # Use skips_post before a command to skip this
+  # block on that command only
+end
+
+on_error do |exception|
+  # Error logic here
+  # return false to skip default error handling
+  true
+end
+
+exit run(ARGV)

data/bin/gitreflow-common

@@ -0,0 +1,314 @@
+#!/bin/sh
+# git-flow -- A collection of Git extensions to provide high-level
+# repository operations for Vincent Driessen's branching model.
+#
+# Original blog post presenting this model is found at:
+#    http://nvie.com/git-model
+#
+# Feel free to contribute to this project at:
+#    http://github.com/nvie/gitreflow
+#
+# Copyright 2010 Vincent Driessen. All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+#    1. Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+# 
+#    2. Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY VINCENT DRIESSEN ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL VINCENT DRIESSEN OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# The views and conclusions contained in the software and documentation are
+# those of the authors and should not be interpreted as representing official
+# policies, either expressed or implied, of Vincent Driessen.
+#
+
+#
+# Common functionality
+#
+
+# shell output
+warn() { echo "$@" >&2; }
+die() { warn "$@"; exit 1; }
+
+escape() {
+  echo "$1" | sed 's/\([\.\+\$\*]\)/\\\1/g'
+}
+
+# set logic
+has() {
+  local item=$1; shift
+  echo " $@ " | grep -q " $(escape $item) "
+}
+
+# basic math
+min() { [ "$1" -le "$2" ] && echo "$1" || echo "$2"; }
+max() { [ "$1" -ge "$2" ] && echo "$1" || echo "$2"; }
+
+# basic string matching
+startswith() { [ "$1" != "${1#$2}" ]; }
+endswith() { [ "$1" != "${1%$2}" ]; }
+
+#
+# Git specific common functionality
+#
+
+git_local_branches() { git branch --no-color | sed 's/^[* ] //'; }
+git_remote_branches() { git branch -r --no-color | sed 's/^[* ] //'; }
+git_all_branches() { ( git branch --no-color; git branch -r --no-color) | sed 's/^[* ] //'; }
+git_all_tags() { git tag; }
+
+git_current_branch() {
+  git branch --no-color | grep '^\* ' | grep -v 'no branch' | sed 's/^* //g'
+}
+
+git_is_clean_working_tree() {
+  if ! git diff --no-ext-diff --ignore-submodules --quiet --exit-code; then
+    return 1
+  elif ! git diff-index --cached --quiet --ignore-submodules HEAD --; then
+    return 2
+  else
+    return 0
+  fi
+}
+
+git_repo_is_headless() {
+  ! git rev-parse --quiet --verify HEAD >/dev/null 2>&1
+}
+
+git_local_branch_exists() {
+  has $1 $(git_local_branches)
+}
+
+git_remote_branch_exists() {
+  has $1 $(git_remote_branches)
+}
+
+git_branch_exists() {
+  has $1 $(git_all_branches)
+}
+
+git_tag_exists() {
+  has $1 $(git_all_tags)
+}
+
+#
+# git_compare_branches()
+#
+# Tests whether branches and their "origin" counterparts have diverged and need
+# merging first. It returns error codes to provide more detail, like so:
+#
+# 0    Branch heads point to the same commit
+# 1    First given branch needs fast-forwarding
+# 2    Second given branch needs fast-forwarding
+# 3    Branch needs a real merge
+# 4    There is no merge base, i.e. the branches have no common ancestors
+#
+git_compare_branches() {
+  local commit1=$(git rev-parse "$1")
+  local commit2=$(git rev-parse "$2")
+  if [ "$commit1" != "$commit2" ]; then
+    local base=$(git merge-base "$commit1" "$commit2")
+    if [ $? -ne 0 ]; then
+      return 4
+    elif [ "$commit1" = "$base" ]; then
+      return 1
+    elif [ "$commit2" = "$base" ]; then
+      return 2
+    else
+      return 3
+    fi
+  else
+    return 0
+  fi
+}
+
+#
+# git_is_branch_merged_into()
+#
+# Checks whether branch $1 is succesfully merged into $2
+#
+git_is_branch_merged_into() {
+  local subject=$1
+  local base=$2
+  local all_merges="$(git branch --no-color --contains $subject | sed 's/^[* ] //')"
+  has $base $all_merges
+}
+
+#
+# gitreflow specific common functionality
+#
+
+# check if this repo has been inited for gitreflow
+gitreflow_has_master_configured() {
+  local master=$(git config --get gitreflow.branch.master)
+  [ "$master" != "" ] && git_local_branch_exists "$master"
+}
+
+gitreflow_has_develop_configured() {
+  local develop=$(git config --get gitreflow.branch.develop)
+  [ "$develop" != "" ] && git_local_branch_exists "$develop"
+}
+
+gitreflow_has_prefixes_configured() {
+  git config --get gitreflow.prefix.feature >/dev/null 2>&1     && \
+  git config --get gitreflow.prefix.release >/dev/null 2>&1     && \
+  git config --get gitreflow.prefix.hotfix >/dev/null 2>&1      && \
+  git config --get gitreflow.prefix.support >/dev/null 2>&1     && \
+  git config --get gitreflow.prefix.versiontag >/dev/null 2>&1
+}
+
+gitreflow_is_initialized() {
+  gitreflow_has_master_configured                    && \
+  gitreflow_has_develop_configured                   && \
+  [ "$(git config --get gitreflow.branch.master)" !=    \
+    "$(git config --get gitreflow.branch.develop)" ] && \
+  gitreflow_has_prefixes_configured
+}
+
+# loading settings that can be overridden using git config
+gitreflow_load_settings() {
+  export DOT_GIT_DIR=$(git rev-parse --git-dir 2>/dev/null)
+  export MASTER_BRANCH=$(git config --get gitreflow.branch.master)
+  export DEVELOP_BRANCH=$(git config --get gitreflow.branch.develop)
+  export ORIGIN=$(git config --get gitreflow.origin || echo origin)
+}
+
+#
+# gitreflow_resolve_nameprefix
+#
+# Inputs:
+# $1 = name prefix to resolve
+# $2 = branch prefix to use
+#
+# Searches branch names from git_local_branches() to look for a unique
+# branch name whose name starts with the given name prefix.
+#
+# There are multiple exit codes possible:
+# 0: The unambiguous full name of the branch is written to stdout
+#    (success)
+# 1: No match is found.
+# 2: Multiple matches found. These matches are written to stderr
+#
+gitreflow_resolve_nameprefix() {
+  local name=$1
+  local prefix=$2
+  local matches
+  local num_matches
+
+  # first, check if there is a perfect match
+  if git_local_branch_exists "$prefix$name"; then
+    echo "$name"
+    return 0
+  fi
+
+  matches=$(echo "$(git_local_branches)" | grep "^$(escape "$prefix$name")")
+  num_matches=$(echo "$matches" | wc -l)
+  if [ -z "$matches" ]; then
+    # no prefix match, so take it literally
+    warn "No branch matches prefix '$name'"
+    return 1
+  else
+    if [ $num_matches -eq 1 ]; then
+      echo "${matches#$prefix}"
+      return 0
+    else
+      # multiple matches, cannot decide
+      warn "Multiple branches match prefix '$name':"
+      for match in $matches; do
+        warn "- $match"
+      done
+      return 2
+    fi
+  fi
+}
+
+#
+# Assertions for use in git-flow subcommands
+#
+
+require_git_repo() {
+  if ! git rev-parse --git-dir >/dev/null 2>&1; then
+    die "fatal: Not a git repository"
+  fi
+}
+
+require_gitreflow_initialized() {
+  if ! gitreflow_is_initialized; then
+    die "fatal: Not a gitreflow-enabled repo yet. Please run \"git flow init\" first."
+  fi
+}
+
+require_clean_working_tree() {
+  git_is_clean_working_tree
+  local result=$?
+  if [ $result -eq 1 ]; then
+    die "fatal: Working tree contains unstaged changes. Aborting."
+  fi
+  if [ $result -eq 2 ]; then
+    die "fatal: Index contains uncommited changes. Aborting."
+  fi
+}
+
+require_local_branch() {
+  if ! git_local_branch_exists $1; then
+    die "fatal: Local branch '$1' does not exist and is required."
+  fi
+}
+
+require_remote_branch() {
+  if ! has $1 $(git_remote_branches); then
+    die "Remote branch '$1' does not exist and is required."
+  fi
+}
+
+require_branch() {
+  if ! has $1 $(git_all_branches); then
+    die "Branch '$1' does not exist and is required."
+  fi
+}
+
+require_branch_absent() {
+  if has $1 $(git_all_branches); then
+    die "Branch '$1' already exists. Pick another name."
+  fi
+}
+
+require_tag_absent() {
+  for tag in $(git_all_tags); do
+    if [ "$1" = "$tag" ]; then
+      die "Tag '$1' already exists. Pick another name."
+    fi
+  done
+}
+
+require_branches_equal() {
+  require_local_branch "$1"
+  require_remote_branch "$2"
+  git_compare_branches "$1" "$2"
+  local status=$?
+  if [ $status -gt 0 ]; then
+    warn "Branches '$1' and '$2' have diverged."
+    if [ $status -eq 1 ]; then
+      die "And branch '$1' may be fast-forwarded."
+    elif [ $status -eq 2 ]; then
+      # Warn here, since there is no harm in being ahead
+      warn "And local branch '$1' is ahead of '$2'."
+    else
+      die "Branches need merging first."
+    fi
+  fi
+}

data/features/step_definitions/debug_steps.rb

@@ -0,0 +1,4 @@
+When /^I debug$/ do
+  debugger
+end
+

data/features/step_definitions/gem_steps.rb

@@ -0,0 +1,3 @@
+When /^I build and install the gem$/ do
+  CukeGem.setup('./git_reflow.gemspec')
+end