git-scripts 0.1.0 → 0.2.0

data/lib/helpers.rb

@@ -3,7 +3,7 @@ HIGHLIGHT_OFF="\033[0m"
 
 def fail_on_local_changes
    if Git::has_uncommitted_changes
-      die "Cannot perform this action with a dirty working tree, " +
+      die "Cannot perform this action with a dirty working tree; " +
           "please stash your changes with 'git stash save \"Some message\"'."
    end
 end
@@ -18,6 +18,7 @@ def display_feature_help(command = nil, message = nil)
          :finish  => "feature finish name-of-feature",
          :merge   => "feature merge [name-of-feature]",
          :pull    => "feature pull",
+         :prune   => "feature prune <local | origin> <preview | clean>",
          :status  => "feature status",
          :stashes => "feature stashes [-v]",
          :clean   => "feature clean [--all]",
@@ -80,9 +81,10 @@ Look at the source to discover what each of these commands does.
 HELP
 end
 
-
-# prints out an error and the approprite help if there is not exactly one
-# commandline argument
+##
+# Prints out an error and the appropriate help if there is not exactly one
+# command-line argument
+##
 def require_argument(program, command = nil, min = 2, max = 2)
    help = lambda do |msg|
       if program == :hotfix
@@ -93,11 +95,11 @@ def require_argument(program, command = nil, min = 2, max = 2)
    end
 
    if (ARGV.length > max)
-      help.call "Too many arguments. This command accepts only one argument."
+      help.call "Too many arguments. This command accepts only #{max} arguments."
    end
 
    if (ARGV.length < min)
-      help.call "Missing argument. This command requires exactly one argument."
+      help.call "Missing argument. This command requires exactly #{min} arguments."
    end
 
    if (ARGV.last !~ /^[a-zA-z0-9-]+$/)
@@ -107,6 +109,7 @@ end
 
 ##
 # Repeatedly prints out a y/n question until a y or n is input
+##
 def confirm(question)
    loop do
       print(question)
@@ -130,8 +133,45 @@ def highlight(str)
    return HIGHLIGHT + str + HIGHLIGHT_OFF;
 end
 
+def hotfix_branch(name)
+   if is_hotfix_branch(name)
+     return name
+   else
+     return "hotfix-#{name}"
+   end
+end
+
+def current_hotfix_branch()
+   if ARGV[1]
+      branch = hotfix_branch(ARGV[1])
+   else
+      branch = Git::current_branch
+   end
+
+   unless is_hotfix_branch(branch)
+      puts "#{branch} is not a hotfix branch"
+      exit 1
+   end
+   return branch
+end
+
+def is_hotfix_branch(name)
+   name =~ /^hotfix-/
+end
+
 def wrap_text(txt, col = 80)
    txt.gsub(
     /(.{1,#{col}})(?: +|$)\n?|(.{#{col}})/,
     "\\1\\3\n")
 end
+
+##
+# Write the given string to the git-dir specific git-scripts command-log
+##
+def log_command(command)
+   require 'time'
+   filename = File.join(Git.git_dir, "git-scripts.log")
+   log = File.open(filename, "a")
+   log.puts "#{Time.now.iso8601}: #{command}"
+   log.close
+end

data/lib/signal_handlers.rb

@@ -0,0 +1,3 @@
+# On a Ctrl-C or a broken pipe, just exit instead of printing a stack strace
+trap "INT",  "EXIT"
+trap "PIPE", "EXIT"

data/man/feature-clean.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-CLEAN" "1" "February 2013" "iFixit" ""
+.TH "FEATURE\-CLEAN" "1" "April 2013" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-clean\fR \- Remove untracked files and submodules\.
@@ -26,3 +26,6 @@ Copyright (c) 2012\-2013 iFixit\.
 .
 .SH "SEE ALSO"
 feature(1)
+.
+.SH "WWW"
+https://github\.com/iFixit/git\-scripts

data/man/feature-clean.1.html

@@ -65,6 +65,7 @@
     <a href="#OPTIONS">OPTIONS</a>
     <a href="#COPYRIGHT">COPYRIGHT</a>
     <a href="#SEE-ALSO">SEE ALSO</a>
+    <a href="#WWW">WWW</a>
   </div>
 
   <ol class='man-decor man-head man head'>
@@ -103,10 +104,14 @@
 
 <p><a class="man-ref" href="feature.1.html">feature<span class="s">(1)</span></a></p>
 
+<h2 id="WWW">WWW</h2>
+
+<p>https://github.com/iFixit/git-scripts</p>
+
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>iFixit</li>
-    <li class='tc'>February 2013</li>
+    <li class='tc'>April 2013</li>
     <li class='tr'>feature-clean(1)</li>
   </ol>
 

data/man/feature-clean.1.markdown

@@ -24,6 +24,10 @@ Copyright (c) 2012-2013 iFixit.
 
 feature(1)
 
+## WWW
+
+https://github.com/iFixit/git-scripts
+
 
 
 [SYNOPSIS]: #SYNOPSIS "SYNOPSIS"
@@ -31,6 +35,7 @@ feature(1)
 [OPTIONS]: #OPTIONS "OPTIONS"
 [COPYRIGHT]: #COPYRIGHT "COPYRIGHT"
 [SEE ALSO]: #SEE-ALSO "SEE ALSO"
+[WWW]: #WWW "WWW"
 
 
 [feature(1)]: feature.1.html

data/man/feature-clean.1.ronn

@@ -24,3 +24,7 @@ Copyright (c) 2012-2013 iFixit.
 
 feature(1)
 
+## WWW
+
+https://github.com/iFixit/git-scripts
+

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" "February 2013" "iFixit" ""
+.TH "FEATURE\-FINISH" "1" "April 2013" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-finish\fR \- Finish this feature branch\.
@@ -17,3 +17,6 @@ Copyright (c) 2012\-2013 iFixit\.
 .
 .SH "SEE ALSO"
 feature(1), hotfix\-finish(1)
+.
+.SH "WWW"
+https://github\.com/iFixit/git\-scripts

data/man/feature-finish.1.html

@@ -64,6 +64,7 @@
     <a href="#DESCRIPTION">DESCRIPTION</a>
     <a href="#COPYRIGHT">COPYRIGHT</a>
     <a href="#SEE-ALSO">SEE ALSO</a>
+    <a href="#WWW">WWW</a>
   </div>
 
   <ol class='man-decor man-head man head'>
@@ -95,10 +96,14 @@ default to the commit message from the last commit on the branch.</p>
 
 <p><a class="man-ref" href="feature.1.html">feature<span class="s">(1)</span></a>, <a class="man-ref" href="hotfix-finish.1.html">hotfix-finish<span class="s">(1)</span></a></p>
 
+<h2 id="WWW">WWW</h2>
+
+<p>https://github.com/iFixit/git-scripts</p>
+
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>iFixit</li>
-    <li class='tc'>February 2013</li>
+    <li class='tc'>April 2013</li>
     <li class='tr'>feature-finish(1)</li>
   </ol>
 

data/man/feature-finish.1.markdown

@@ -19,12 +19,17 @@ Copyright (c) 2012-2013 iFixit.
 
 feature(1), hotfix-finish(1)
 
+## WWW
+
+https://github.com/iFixit/git-scripts
+
 
 
 [SYNOPSIS]: #SYNOPSIS "SYNOPSIS"
 [DESCRIPTION]: #DESCRIPTION "DESCRIPTION"
 [COPYRIGHT]: #COPYRIGHT "COPYRIGHT"
 [SEE ALSO]: #SEE-ALSO "SEE ALSO"
+[WWW]: #WWW "WWW"
 
 
 [feature(1)]: feature.1.html

data/man/feature-finish.1.ronn

@@ -19,3 +19,7 @@ Copyright (c) 2012-2013 iFixit.
 
 feature(1), hotfix-finish(1)
 
+## WWW
+
+https://github.com/iFixit/git-scripts
+

data/man/feature-github-test.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-GITHUB\-TEST" "1" "February 2013" "iFixit" ""
+.TH "FEATURE\-GITHUB\-TEST" "1" "April 2013" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-github\-test\fR \- Test Github authentication\.
@@ -17,3 +17,6 @@ Copyright (c) 2012\-2013 iFixit\.
 .
 .SH "SEE ALSO"
 feature(1)
+.
+.SH "WWW"
+https://github\.com/iFixit/git\-scripts

data/man/feature-github-test.1.html

@@ -64,6 +64,7 @@
     <a href="#DESCRIPTION">DESCRIPTION</a>
     <a href="#COPYRIGHT">COPYRIGHT</a>
     <a href="#SEE-ALSO">SEE ALSO</a>
+    <a href="#WWW">WWW</a>
   </div>
 
   <ol class='man-decor man-head man head'>
@@ -93,10 +94,14 @@
 
 <p><a class="man-ref" href="feature.1.html">feature<span class="s">(1)</span></a></p>
 
+<h2 id="WWW">WWW</h2>
+
+<p>https://github.com/iFixit/git-scripts</p>
+
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>iFixit</li>
-    <li class='tc'>February 2013</li>
+    <li class='tc'>April 2013</li>
     <li class='tr'>feature-github-test(1)</li>
   </ol>
 

data/man/feature-github-test.1.markdown

@@ -17,12 +17,17 @@ Copyright (c) 2012-2013 iFixit.
 
 feature(1)
 
+## WWW
+
+https://github.com/iFixit/git-scripts
+
 
 
 [SYNOPSIS]: #SYNOPSIS "SYNOPSIS"
 [DESCRIPTION]: #DESCRIPTION "DESCRIPTION"
 [COPYRIGHT]: #COPYRIGHT "COPYRIGHT"
 [SEE ALSO]: #SEE-ALSO "SEE ALSO"
+[WWW]: #WWW "WWW"
 
 
 [feature(1)]: feature.1.html

data/man/feature-github-test.1.ronn

@@ -17,3 +17,7 @@ Copyright (c) 2012-2013 iFixit.
 
 feature(1)
 
+## WWW
+
+https://github.com/iFixit/git-scripts
+

data/man/feature-list.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-LIST" "1" "February 2013" "iFixit" ""
+.TH "FEATURE\-LIST" "1" "April 2013" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-list\fR \- Lists the current branch and any available feature branches\.
@@ -17,3 +17,6 @@ Copyright (c) 2012\-2013 iFixit\.
 .
 .SH "SEE ALSO"
 feature(1), hotfix\-list(1)
+.
+.SH "WWW"
+https://github\.com/iFixit/git\-scripts

data/man/feature-list.1.html

@@ -64,6 +64,7 @@
     <a href="#DESCRIPTION">DESCRIPTION</a>
     <a href="#COPYRIGHT">COPYRIGHT</a>
     <a href="#SEE-ALSO">SEE ALSO</a>
+    <a href="#WWW">WWW</a>
   </div>
 
   <ol class='man-decor man-head man head'>
@@ -94,10 +95,14 @@ hash, and relative time of last commit on each branch.</p>
 
 <p><a class="man-ref" href="feature.1.html">feature<span class="s">(1)</span></a>, <a class="man-ref" href="hotfix-list.1.html">hotfix-list<span class="s">(1)</span></a></p>
 
+<h2 id="WWW">WWW</h2>
+
+<p>https://github.com/iFixit/git-scripts</p>
+
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>iFixit</li>
-    <li class='tc'>February 2013</li>
+    <li class='tc'>April 2013</li>
     <li class='tr'>feature-list(1)</li>
   </ol>
 

data/man/feature-list.1.markdown

@@ -18,12 +18,17 @@ Copyright (c) 2012-2013 iFixit.
 
 feature(1), hotfix-list(1)
 
+## WWW
+
+https://github.com/iFixit/git-scripts
+
 
 
 [SYNOPSIS]: #SYNOPSIS "SYNOPSIS"
 [DESCRIPTION]: #DESCRIPTION "DESCRIPTION"
 [COPYRIGHT]: #COPYRIGHT "COPYRIGHT"
 [SEE ALSO]: #SEE-ALSO "SEE ALSO"
+[WWW]: #WWW "WWW"
 
 
 [feature(1)]: feature.1.html

data/man/feature-list.1.ronn

@@ -18,3 +18,7 @@ Copyright (c) 2012-2013 iFixit.
 
 feature(1), hotfix-list(1)
 
+## WWW
+
+https://github.com/iFixit/git-scripts
+

data/man/feature-merge.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-MERGE" "1" "February 2013" "iFixit" ""
+.TH "FEATURE\-MERGE" "1" "April 2013" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-merge\fR \- Merge a feature branch into the development branch\.
@@ -20,3 +20,6 @@ Copyright (c) 2012\-2013 iFixit\.
 .
 .SH "SEE ALSO"
 feature(1), hotfix\-merge(1)
+.
+.SH "WWW"
+https://github\.com/iFixit/git\-scripts

data/man/feature-merge.1.html

@@ -64,6 +64,7 @@
     <a href="#DESCRIPTION">DESCRIPTION</a>
     <a href="#COPYRIGHT">COPYRIGHT</a>
     <a href="#SEE-ALSO">SEE ALSO</a>
+    <a href="#WWW">WWW</a>
   </div>
 
   <ol class='man-decor man-head man head'>
@@ -98,10 +99,14 @@ request associated with the branch.</p>
 
 <p><a class="man-ref" href="feature.1.html">feature<span class="s">(1)</span></a>, <a class="man-ref" href="hotfix-merge.1.html">hotfix-merge<span class="s">(1)</span></a></p>
 
+<h2 id="WWW">WWW</h2>
+
+<p>https://github.com/iFixit/git-scripts</p>
+
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>iFixit</li>
-    <li class='tc'>February 2013</li>
+    <li class='tc'>April 2013</li>
     <li class='tr'>feature-merge(1)</li>
   </ol>
 

data/man/feature-merge.1.markdown

@@ -22,12 +22,17 @@ Copyright (c) 2012-2013 iFixit.
 
 feature(1), hotfix-merge(1)
 
+## WWW
+
+https://github.com/iFixit/git-scripts
+
 
 
 [SYNOPSIS]: #SYNOPSIS "SYNOPSIS"
 [DESCRIPTION]: #DESCRIPTION "DESCRIPTION"
 [COPYRIGHT]: #COPYRIGHT "COPYRIGHT"
 [SEE ALSO]: #SEE-ALSO "SEE ALSO"
+[WWW]: #WWW "WWW"
 
 
 [feature(1)]: feature.1.html

data/man/feature-merge.1.ronn

@@ -22,3 +22,7 @@ Copyright (c) 2012-2013 iFixit.
 
 feature(1), hotfix-merge(1)
 
+## WWW
+
+https://github.com/iFixit/git-scripts
+

data/man/feature-prune.1

@@ -0,0 +1,37 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "FEATURE\-PRUNE" "1" "July 2013" "" ""
+.
+.SH "NAME"
+\fBfeature\-prune\fR \- Remove old branches on original or local\.
+.
+.SH "SYNOPSIS"
+\fBfeature prune\fR (local|origin) \fIoptions\fR
+.
+.SH "Description"
+Remove old branches on local or origin\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fBlocal\fR
+Remove branches locally\.
+.
+.TP
+\fBorigin\fR
+Remove branches on origin\.
+.
+.TP
+\fBpreview\fR
+Display what branches would be deleted\.
+.
+.TP
+\fBclean\fR
+Remove old branches\.
+.
+.SH "COPYRIGHT"
+Copyright (c) 2012\-2013 iFixit\.
+.
+.SH "SEE ALSO"
+feature(1)

data/man/feature-prune.1.ronn

@@ -0,0 +1,30 @@
+feature-prune(1) - Remove old branches on original or local.
+============================================================
+
+## SYNOPSIS
+
+`feature prune` (local|origin) [options]
+
+## Description
+
+Remove old branches on local or origin.
+
+
+## OPTIONS
+
+   * `local`:
+      Remove branches locally.
+   * `origin`:
+      Remove branches on origin.
+   * `preview`:
+      Display what branches would be deleted.
+   * `clean`:
+      Remove old branches.
+
+## COPYRIGHT
+
+Copyright (c) 2012-2013 iFixit.
+
+## SEE ALSO
+
+feature(1)

data/man/feature-start.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-START" "1" "February 2013" "iFixit" ""
+.TH "FEATURE\-START" "1" "April 2013" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-start\fR \- Start a new feature branch\.
@@ -17,3 +17,6 @@ Copyright (c) 2012\-2013 iFixit\.
 .
 .SH "SEE ALSO"
 feature(1), hotfix\-start(1)
+.
+.SH "WWW"
+https://github\.com/iFixit/git\-scripts

data/man/feature-start.1.html

@@ -64,6 +64,7 @@
     <a href="#DESCRIPTION">DESCRIPTION</a>
     <a href="#COPYRIGHT">COPYRIGHT</a>
     <a href="#SEE-ALSO">SEE ALSO</a>
+    <a href="#WWW">WWW</a>
   </div>
 
   <ol class='man-decor man-head man head'>
@@ -93,10 +94,14 @@
 
 <p><a class="man-ref" href="feature.1.html">feature<span class="s">(1)</span></a>, <a class="man-ref" href="hotfix-start.1.html">hotfix-start<span class="s">(1)</span></a></p>
 
+<h2 id="WWW">WWW</h2>
+
+<p>https://github.com/iFixit/git-scripts</p>
+
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>iFixit</li>
-    <li class='tc'>February 2013</li>
+    <li class='tc'>April 2013</li>
     <li class='tr'>feature-start(1)</li>
   </ol>
 

data/man/feature-start.1.markdown

@@ -17,12 +17,17 @@ Copyright (c) 2012-2013 iFixit.
 
 feature(1), hotfix-start(1)
 
+## WWW
+
+https://github.com/iFixit/git-scripts
+
 
 
 [SYNOPSIS]: #SYNOPSIS "SYNOPSIS"
 [DESCRIPTION]: #DESCRIPTION "DESCRIPTION"
 [COPYRIGHT]: #COPYRIGHT "COPYRIGHT"
 [SEE ALSO]: #SEE-ALSO "SEE ALSO"
+[WWW]: #WWW "WWW"
 
 
 [feature(1)]: feature.1.html

data/man/feature-start.1.ronn

@@ -17,3 +17,7 @@ Copyright (c) 2012-2013 iFixit.
 
 feature(1), hotfix-start(1)
 
+## WWW
+
+https://github.com/iFixit/git-scripts
+

data/man/feature-stashes.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-STASHES" "1" "February 2013" "iFixit" ""
+.TH "FEATURE\-STASHES" "1" "April 2013" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-stashes\fR \- Show stashes saved on the current branch\.
@@ -26,3 +26,6 @@ Copyright (c) 2012\-2013 iFixit\.
 .
 .SH "SEE ALSO"
 feature(1)
+.
+.SH "WWW"
+https://github\.com/iFixit/git\-scripts

data/man/feature-stashes.1.html

@@ -65,6 +65,7 @@
     <a href="#OPTIONS">OPTIONS</a>
     <a href="#COPYRIGHT">COPYRIGHT</a>
     <a href="#SEE-ALSO">SEE ALSO</a>
+    <a href="#WWW">WWW</a>
   </div>
 
   <ol class='man-decor man-head man head'>
@@ -105,10 +106,14 @@ stash.</p>
 
 <p><a class="man-ref" href="feature.1.html">feature<span class="s">(1)</span></a></p>
 
+<h2 id="WWW">WWW</h2>
+
+<p>https://github.com/iFixit/git-scripts</p>
+
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>iFixit</li>
-    <li class='tc'>February 2013</li>
+    <li class='tc'>April 2013</li>
     <li class='tr'>feature-stashes(1)</li>
   </ol>
 

data/man/feature-stashes.1.markdown

@@ -26,6 +26,10 @@ Copyright (c) 2012-2013 iFixit.
 
 feature(1)
 
+## WWW
+
+https://github.com/iFixit/git-scripts
+
 
 
 [SYNOPSIS]: #SYNOPSIS "SYNOPSIS"
@@ -33,6 +37,7 @@ feature(1)
 [OPTIONS]: #OPTIONS "OPTIONS"
 [COPYRIGHT]: #COPYRIGHT "COPYRIGHT"
 [SEE ALSO]: #SEE-ALSO "SEE ALSO"
+[WWW]: #WWW "WWW"
 
 
 [feature(1)]: feature.1.html

data/man/feature-stashes.1.ronn

@@ -26,3 +26,7 @@ Copyright (c) 2012-2013 iFixit.
 
 feature(1)
 
+## WWW
+
+https://github.com/iFixit/git-scripts
+

data/man/feature-status.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-STATUS" "1" "February 2013" "iFixit" ""
+.TH "FEATURE\-STATUS" "1" "April 2013" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-status\fR \- Determine if the current branch is up\-to\-date with the remote branch\.
@@ -20,3 +20,6 @@ Copyright (c) 2012\-2013 iFixit\.
 .
 .SH "SEE ALSO"
 feature(1)
+.
+.SH "WWW"
+https://github\.com/iFixit/git\-scripts