git-scripts 0.4.0 → 0.5.0

data/lib/helpers.rb

@@ -13,8 +13,9 @@ def display_feature_help(command = nil, message = nil)
       :script_name => "Git Feature Branch Helper",
       :commands => {
          :list    => "feature list [-v]",
+         :url     => "feature url [name-of-feature]",
          :start   => "feature start name-of-feature",
-         :switch  => "feature switch (name-of-feature | -n number-of-feature) [--clean]",
+         :switch  => "feature switch (name-of-feature | -n number-of-feature) [options]",
          :finish  => "feature finish [name-of-feature]",
          :'finish-issue'  => "feature finish-issue issue-number",
          :merge   => "feature merge (name-of-feature | -n number-of-feature)",
@@ -36,8 +37,9 @@ def display_hotfix_help(command = nil, message = nil)
       :script_name => "Git Hotfix Helper",
       :commands => {
          :list    => "hotfix list [-v]",
+         :url     => "hotfix url [name-of-hotfix]",
          :start   => "hotfix start name-of-hotfix",
-         :switch  => "hotfix switch (name-of-hotfix | -n number-of-hotfix)",
+         :switch  => "hotfix switch (name-of-hotfix | -n number-of-hotfix) [options]",
          :finish  => "hotfix finish [name-of-hotfix]",
          :'finish-issue'  => "hotfix finish-issue issue-number",
          :merge   => "hotfix merge (name-of-hotfix | -n number-of-hotfix)",
@@ -157,10 +159,6 @@ def current_hotfix_branch()
       branch = Git::current_branch
    end
 
-   unless is_hotfix_branch(branch)
-      puts "#{branch} is not a hotfix branch"
-      exit 1
-   end
    return branch
 end
 
@@ -184,3 +182,16 @@ def log_command(command)
    log.puts "#{Time.now.iso8601}: #{command}"
    log.close
 end
+
+##
+# If the commandline arguments contain '--pull', perform a feature pull
+##
+def optional_pull
+   if ARGV.include?("--pull")
+      puts %x(feature pull)
+   end
+end
+
+def esc(str)
+   str.shellescape
+end

data/lib/plugins.rb

@@ -0,0 +1,25 @@
+module Plugins
+   def Plugins.register(plugin_module)
+      @@plugins << plugin_module
+   end
+
+   def Plugins.invoke(action, *arguments)
+      @@plugins.each do |plugin|
+         if plugin.respond_to?(action)
+            plugin.send(action, *arguments)
+         end
+      end
+   end
+
+   def Plugins.init
+      @@plugins = []
+   end
+end
+
+Plugins.init
+
+cwd = File.dirname(__FILE__)
+Dir.glob(File.join(cwd, '../plugins/*.rb')).each do |file|
+   require file
+end
+

data/man/feature-finish-issue.1

@@ -1,13 +1,13 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-FINISH\-ISSUE" "1" "September 2013" "iFixit" ""
+.TH "FEATURE\-FINISH\-ISSUE" "1" "February 2014" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-finish\-issue\fR \- Finish this feature branch and attach it to an issue\.
 .
 .SH "SYNOPSIS"
-\fBfeature finish\fR \fIissue\-number\fR
+\fBfeature finish\-issue\fR \fIissue\-number\fR
 .
 .SH "DESCRIPTION"
 Finish the current feature branch and optionally convert an existing issue into a pull request\. The pull\'s description defaults to the commit message from the last commit on the branch with the issue\'s original title and description underneath\.

data/man/feature-finish-issue.1.ronn

@@ -3,7 +3,7 @@ feature-finish-issue(1) - Finish this feature branch and attach it to an issue.
 
 ## SYNOPSIS
 
-`feature finish` <issue-number>
+`feature finish-issue` <issue-number>
 
 ## DESCRIPTION
 

data/man/feature-finish.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-FINISH" "1" "September 2013" "iFixit" ""
+.TH "FEATURE\-FINISH" "1" "February 2014" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-finish\fR \- Finish this feature branch\.

data/man/feature-switch.1

@@ -1,13 +1,16 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-SWITCH" "1" "September 2013" "iFixit" ""
+.TH "FEATURE\-SWITCH" "1" "September 2013" "" ""
 .
 .SH "NAME"
 \fBfeature\-switch\fR \- Switch to another feature branch\.
 .
 .SH "SYNOPSIS"
-\fBfeature switch\fR \fIname\-of\-feature\fR [\-\-clean] \fBfeature switch\fR \-n \fInumber\-of\-pull\fR [\-\-clean]
+\fBfeature switch\fR \fIname\-of\-feature\fR \fIoptions\fR
+.
+.br
+\fBfeature switch\fR \-n \fInumber\-of\-pull\fR \fIoptions\fR
 .
 .SH "DESCRIPTION"
 Switch to the \fIname\-of\-feature\fR branch, or with the \-n argument switch to the branch with a pull request numbered \fInumber\-of\-pull\fR
@@ -17,6 +20,13 @@ Switch to the \fIname\-of\-feature\fR branch, or with the \-n argument switch to
 .TP
 \fB\-\-clean\fR
 Remove files that aren\'t tracked in \fIname\-of\-feature\fR\.
+.
+.TP
+\fB\-\-pull\fR:
+.
+.br
+Pull the branch after switching to insure the local branch is up to date\.
+
 .
 .SH "COPYRIGHT"
 Copyright (c) 2012\-2013 iFixit\.

data/man/feature-switch.1.ronn

@@ -3,8 +3,8 @@ feature-switch(1) - Switch to another feature branch.
 
 ## SYNOPSIS
 
-`feature switch` <name-of-feature> [--clean]
-`feature switch` -n <number-of-pull> [--clean]
+`feature switch` <name-of-feature> [options]  
+`feature switch` -n <number-of-pull> [options]
 
 ## DESCRIPTION
 
@@ -16,6 +16,9 @@ to the branch with a pull request numbered <number-of-pull>
    * `--clean`:
       Remove files that aren't tracked in <name-of-feature>.
 
+   * `--pull`:  
+      Pull the branch after switching to insure the local branch is up to date.
+
 ## COPYRIGHT
 
 Copyright (c) 2012-2013 iFixit.

data/man/feature-url.1

@@ -0,0 +1,22 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "FEATURE\-URL" "1" "August 2013" "iFixit" ""
+.
+.SH "NAME"
+\fBfeature\-url\fR \- Grab the pull request url\.
+.
+.SH "SYNOPSIS"
+\fBfeature url\fR [name\-of\-feature]
+.
+.SH "DESCRIPTION"
+Grab the url of the pull request for the current branch or the one specified\.
+.
+.SH "COPYRIGHT"
+Copyright (c) 2012\-2013 iFixit\.
+.
+.SH "SEE ALSO"
+feature(1), hotfix\-url(1)
+.
+.SH "WWW"
+https://github\.com/iFixit/git\-scripts

data/man/feature-url.1.ronn

@@ -0,0 +1,23 @@
+feature-url(1) - Grab the pull request url.
+===========================================
+
+## SYNOPSIS
+
+`feature url` [name-of-feature]
+
+## DESCRIPTION
+
+Grab the url of the pull request for the current branch or the one specified.
+
+## COPYRIGHT
+
+Copyright (c) 2012-2013 iFixit.
+
+## SEE ALSO
+
+feature(1), hotfix-url(1)
+
+## WWW
+
+https://github.com/iFixit/git-scripts
+

data/man/feature.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE" "1" "September 2013" "iFixit" ""
+.TH "FEATURE" "1" "February 2014" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\fR \- Perform actions on a git feature branch\.
@@ -23,6 +23,10 @@ feature\-start(1)
 Start a new feature branch\.
 .
 .TP
+feature\-url(1)
+Get the url of a branch\'s pull request\.
+.
+.TP
 feature\-switch(1)
 Switch to another feature branch\.
 .
@@ -31,6 +35,10 @@ feature\-finish(1)
 Finish this feature branch (push and open a pull request)\.
 .
 .TP
+feature\-finish\-issue(1)
+Finish this feature branch and attach it to an issue\.
+.
+.TP
 feature\-merge(1)
 Merge a feature branch into the development branch\.
 .

data/man/feature.1.ronn

@@ -16,10 +16,14 @@ feature(1) - Perform actions on a git feature branch.
       List the current branch and any available feature branches.
    * feature-start(1):
       Start a new feature branch.
+   * feature-url(1):
+      Get the url of a branch's pull request.
    * feature-switch(1):
       Switch to another feature branch.
    * feature-finish(1):
       Finish this feature branch (push and open a pull request).
+   * feature-finish-issue(1):
+      Finish this feature branch and attach it to an issue.
    * feature-merge(1):
       Merge a feature branch into the development branch.
    * feature-pull(1):

data/man/hotfix-finish-issue.1

@@ -1,13 +1,13 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "HOTFIX\-FINISH\-ISSUE" "1" "September 2013" "iFixit" ""
+.TH "HOTFIX\-FINISH\-ISSUE" "1" "February 2014" "iFixit" ""
 .
 .SH "NAME"
 \fBhotfix\-finish\-issue\fR \- Finish this hotfix branch and attach it to an issue\.
 .
 .SH "SYNOPSIS"
-\fBhotfix finish\fR \fIissue\-number\fR
+\fBhotfix finish\-issue\fR \fIissue\-number\fR
 .
 .SH "DESCRIPTION"
 Finish the current hotfix branch and optionally convert an existing issue into a pull request\. The pull\'s description defaults to the commit message from the last commit on the branch with the issue\'s original title and description underneath\.

data/man/hotfix-finish-issue.1.ronn

@@ -3,7 +3,7 @@ hotfix-finish-issue(1) - Finish this hotfix branch and attach it to an issue.
 
 ## SYNOPSIS
 
-`hotfix finish` <issue-number>
+`hotfix finish-issue` <issue-number>
 
 ## DESCRIPTION
 

data/man/hotfix-finish.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "HOTFIX\-FINISH" "1" "September 2013" "iFixit" ""
+.TH "HOTFIX\-FINISH" "1" "February 2014" "iFixit" ""
 .
 .SH "NAME"
 \fBhotfix\-finish\fR \- Finish this hotfix branch\.

data/man/hotfix-switch.1

@@ -7,10 +7,26 @@
 \fBhotfix\-switch\fR \- Switch to another hotfix branch\.
 .
 .SH "SYNOPSIS"
-\fBhotfix switch\fR \fIname\-of\-hotfix\fR \fBhotfix switch\fR \-n \fInumber\-of\-pull\fR
+\fBhotfix switch\fR \fIname\-of\-hotfix\fR \fIoptions\fR
+.
+.br
+\fBhotfix switch\fR \-n \fInumber\-of\-pull\fR \fIoptions\fR
 .
 .SH "DESCRIPTION"
 Switch to the \fIname\-of\-hotfix\fR branch, or with the \-n argument switch to the branch with a pull request numbered \fInumber\-of\-pull\fR
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-clean\fR
+Remove files that aren\'t tracked in \fIname\-of\-feature\fR\.
+.
+.TP
+\fB\-\-pull\fR:
+.
+.br
+Pull the branch after switching to insure the local branch is up to date\.
+
 .
 .SH "COPYRIGHT"
 Copyright (c) 2012\-2013 iFixit\.

data/man/hotfix-switch.1.ronn

@@ -3,14 +3,22 @@ hotfix-switch(1) - Switch to another hotfix branch.
 
 ## SYNOPSIS
 
-`hotfix switch` <name-of-hotfix>
-`hotfix switch` -n <number-of-pull>
+`hotfix switch` <name-of-hotfix> [options]  
+`hotfix switch` -n <number-of-pull> [options]
 
 ## DESCRIPTION
 
 Switch to the <name-of-hotfix> branch, or with the -n argument switch
 to the branch with a pull request numbered <number-of-pull>
 
+## OPTIONS
+
+   * `--clean`:
+      Remove files that aren't tracked in <name-of-feature>.
+
+   * `--pull`:  
+      Pull the branch after switching to insure the local branch is up to date.
+
 ## COPYRIGHT
 
 Copyright (c) 2012-2013 iFixit.

data/man/hotfix-url.1

@@ -0,0 +1,22 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "HOTFIX\-URL" "1" "August 2013" "iFixit" ""
+.
+.SH "NAME"
+\fBhotfix\-url\fR \- Grab the pull request url\.
+.
+.SH "SYNOPSIS"
+\fBhotfix url\fR [name\-of\-hotfix]
+.
+.SH "DESCRIPTION"
+Grab the url of the pull request for the current branch or the one specified\.
+.
+.SH "COPYRIGHT"
+Copyright (c) 2012\-2013 iFixit\.
+.
+.SH "SEE ALSO"
+hotfix(1), feature\-url(1)
+.
+.SH "WWW"
+https://github\.com/iFixit/git\-scripts

data/man/hotfix-url.1.ronn

@@ -0,0 +1,23 @@
+hotfix-url(1) - Grab the pull request url.
+==========================================
+
+## SYNOPSIS
+
+`hotfix url` [name-of-hotfix]
+
+## DESCRIPTION
+
+Grab the url of the pull request for the current branch or the one specified.
+
+## COPYRIGHT
+
+Copyright (c) 2012-2013 iFixit.
+
+## SEE ALSO
+
+hotfix(1), feature-url(1)
+
+## WWW
+
+https://github.com/iFixit/git-scripts
+

data/man/hotfix.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "HOTFIX" "1" "September 2013" "iFixit" ""
+.TH "HOTFIX" "1" "February 2014" "iFixit" ""
 .
 .SH "NAME"
 \fBhotfix\fR \- Perform actions on a git hotfix branch\.
@@ -19,6 +19,10 @@ hotfix\-list(1)
 List the current branch and any available hotfix branches\.
 .
 .TP
+hotfix\-url(1)
+Get the url of a branch\'s pull request\.
+.
+.TP
 hotfix\-start(1)
 Start a new hotfix branch\.
 .
@@ -31,6 +35,10 @@ hotfix\-finish(1)
 Finish this hotfix branch (push and open a pull request)\.
 .
 .TP
+hotfix\-finish\-issue(1)
+Finish this hotfix branch and attach it to an issue\.
+.
+.TP
 hotfix\-merge(1)
 Merge a hotfix branch into stable and the development branch\.
 .

data/man/hotfix.1.ronn

@@ -14,12 +14,16 @@ hotfix(1) - Perform actions on a git hotfix branch.
 
    * hotfix-list(1):
       List the current branch and any available hotfix branches.
+   * hotfix-url(1):
+      Get the url of a branch's pull request.
    * hotfix-start(1):
       Start a new hotfix branch.
    * hotfix-switch(1):
       Switch to another hotfix branch.
    * hotfix-finish(1):
       Finish this hotfix branch (push and open a pull request).
+   * hotfix-finish-issue(1):
+      Finish this hotfix branch and attach it to an issue.
    * hotfix-merge(1):
       Merge a hotfix branch into stable and the development branch.