git-scripts 0.9.1 → 0.9.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (49) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +6 -55
  3. data/bin/feature +0 -12
  4. data/completion/_feature +1 -1
  5. data/completion/bash_completion.sh +2 -11
  6. data/lib/git.rb +1 -15
  7. data/lib/helpers.rb +1 -47
  8. data/man/feature-finish-issue.1 +2 -2
  9. data/man/feature-finish-issue.1.ronn +1 -1
  10. data/man/feature-finish.1 +2 -2
  11. data/man/feature-finish.1.ronn +1 -1
  12. data/man/feature-github-test.1 +1 -1
  13. data/man/feature-list.1 +2 -2
  14. data/man/feature-list.1.ronn +1 -1
  15. data/man/feature-merge.1 +2 -2
  16. data/man/feature-merge.1.ronn +1 -1
  17. data/man/feature-prune.1 +1 -1
  18. data/man/feature-start.1 +2 -2
  19. data/man/feature-start.1.ronn +1 -1
  20. data/man/feature-stashes.1 +1 -4
  21. data/man/feature-stashes.1.ronn +0 -2
  22. data/man/feature-status.1 +1 -4
  23. data/man/feature-status.1.ronn +0 -2
  24. data/man/feature-switch.1 +2 -2
  25. data/man/feature-switch.1.ronn +1 -1
  26. data/man/feature-url.1 +2 -2
  27. data/man/feature-url.1.ronn +1 -1
  28. data/man/feature.1 +3 -3
  29. data/man/feature.1.ronn +2 -3
  30. data/man/index.txt +0 -7
  31. metadata +4 -23
  32. data/bin/hotfix +0 -230
  33. data/completion/_hotfix +0 -28
  34. data/man/hotfix-finish-issue.1 +0 -22
  35. data/man/hotfix-finish-issue.1.ronn +0 -26
  36. data/man/hotfix-finish.1 +0 -22
  37. data/man/hotfix-finish.1.ronn +0 -25
  38. data/man/hotfix-list.1 +0 -28
  39. data/man/hotfix-list.1.ronn +0 -29
  40. data/man/hotfix-merge.1 +0 -25
  41. data/man/hotfix-merge.1.ronn +0 -29
  42. data/man/hotfix-start.1 +0 -22
  43. data/man/hotfix-start.1.ronn +0 -23
  44. data/man/hotfix-switch.1 +0 -38
  45. data/man/hotfix-switch.1.ronn +0 -33
  46. data/man/hotfix-url.1 +0 -22
  47. data/man/hotfix-url.1.ronn +0 -23
  48. data/man/hotfix.1 +0 -52
  49. data/man/hotfix.1.ronn +0 -41
@@ -1,28 +0,0 @@
1
- #compdef hotfix
2
-
3
- _hotfix() {
4
- local curcontext="$curcontext" state line
5
- typeset -A opt_args
6
-
7
- _arguments \
8
- '1: :->commands'\
9
- '2: :->params'
10
- case $state in
11
- commands)
12
- _arguments '1:Commands:(list start switch finish finish-issue merge)'
13
- ;;
14
- params)
15
- if [[ "$words[2]" != 'list' ||
16
- "$words[2]" != 'finish-issue' ]]; then
17
- local -a hotfixBranches args
18
- hotfixBranches="$(git branch -a | tr -d ' *' | grep 'hotfix-' | sed -e 's|remotes/origin/||' -e 's|hotfix-||')"
19
-
20
- args="$(echo ${hotfixBranches} | tr "\$\'\\n\'" " ")"
21
- _arguments '2:Branches:($(echo ${args}))'
22
- fi
23
- ;;
24
- *)
25
- esac
26
- }
27
-
28
- _hotfix "$@"
@@ -1,22 +0,0 @@
1
- .\" generated with Ronn/v0.7.3
2
- .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
- .
4
- .TH "HOTFIX\-FINISH\-ISSUE" "1" "February 2014" "iFixit" ""
5
- .
6
- .SH "NAME"
7
- \fBhotfix\-finish\-issue\fR \- Finish this hotfix branch and attach it to an issue\.
8
- .
9
- .SH "SYNOPSIS"
10
- \fBhotfix finish\-issue\fR \fIissue\-number\fR
11
- .
12
- .SH "DESCRIPTION"
13
- 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\.
14
- .
15
- .SH "COPYRIGHT"
16
- Copyright (c) 2012\-2013 iFixit\.
17
- .
18
- .SH "SEE ALSO"
19
- feature(1), feature\-finish(1), feature\-finish\-issue(1), hotfix\-finish(1)
20
- .
21
- .SH "WWW"
22
- https://github\.com/iFixit/git\-scripts
@@ -1,26 +0,0 @@
1
- hotfix-finish-issue(1) - Finish this hotfix branch and attach it to an issue.
2
- ===============================================
3
-
4
- ## SYNOPSIS
5
-
6
- `hotfix finish-issue` <issue-number>
7
-
8
- ## DESCRIPTION
9
-
10
- Finish the current hotfix branch and optionally convert an existing issue
11
- into a pull request. The pull's description defaults to the commit message
12
- from the last commit on the branch with the issue's original title and
13
- description underneath.
14
-
15
- ## COPYRIGHT
16
-
17
- Copyright (c) 2012-2013 iFixit.
18
-
19
- ## SEE ALSO
20
-
21
- feature(1), feature-finish(1), feature-finish-issue(1), hotfix-finish(1)
22
-
23
- ## WWW
24
-
25
- https://github.com/iFixit/git-scripts
26
-
@@ -1,22 +0,0 @@
1
- .\" generated with Ronn/v0.7.3
2
- .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
- .
4
- .TH "HOTFIX\-FINISH" "1" "February 2014" "iFixit" ""
5
- .
6
- .SH "NAME"
7
- \fBhotfix\-finish\fR \- Finish this hotfix branch\.
8
- .
9
- .SH "SYNOPSIS"
10
- \fBhotfix finish\fR \fIname\-of\-hotfix\fR
11
- .
12
- .SH "DESCRIPTION"
13
- Finish the current hotfix branch\. Push all remote commits to the remote and optionally open a pull request\. If a pull request is opened, the message will default to the commit message from the last commit on the branch\.
14
- .
15
- .SH "COPYRIGHT"
16
- Copyright (c) 2012\-2013 iFixit\.
17
- .
18
- .SH "SEE ALSO"
19
- hotfix(1), hotfix\-finish\-issue(1), feature\-finish(1), feature\-finish\-issue(1)
20
- .
21
- .SH "WWW"
22
- https://github\.com/iFixit/git\-scripts
@@ -1,25 +0,0 @@
1
- hotfix-finish(1) - Finish this hotfix branch.
2
- =============================================
3
-
4
- ## SYNOPSIS
5
-
6
- `hotfix finish` <name-of-hotfix>
7
-
8
- ## DESCRIPTION
9
-
10
- Finish the current hotfix branch. Push all remote commits to the remote and
11
- optionally open a pull request. If a pull request is opened, the message will
12
- default to the commit message from the last commit on the branch.
13
-
14
- ## COPYRIGHT
15
-
16
- Copyright (c) 2012-2013 iFixit.
17
-
18
- ## SEE ALSO
19
-
20
- hotfix(1), hotfix-finish-issue(1), feature-finish(1), feature-finish-issue(1)
21
-
22
- ## WWW
23
-
24
- https://github.com/iFixit/git-scripts
25
-
@@ -1,28 +0,0 @@
1
- .\" generated with Ronn/v0.7.3
2
- .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
- .
4
- .TH "HOTFIX\-LIST" "1" "September 2013" "iFixit" ""
5
- .
6
- .SH "NAME"
7
- \fBhotfix\-list\fR \- Lists the current branch and any available hotfix branches\.
8
- .
9
- .SH "SYNOPSIS"
10
- \fBhotfix list\fR [\-v]
11
- .
12
- .SH "DESCRIPTION"
13
- Lists the current branch and any available hotfix branches\. Shows the author, hash, and relative time of last commit on each branch\.
14
- .
15
- .SH "OPTIONS"
16
- .
17
- .TP
18
- \-v
19
- List merged branches\.
20
- .
21
- .SH "COPYRIGHT"
22
- Copyright (c) 2012\-2013 iFixit\.
23
- .
24
- .SH "SEE ALSO"
25
- hotfix(1), feature\-list(1)
26
- .
27
- .SH "WWW"
28
- https://github\.com/iFixit/git\-scripts
@@ -1,29 +0,0 @@
1
- hotfix-list(1) - Lists the current branch and any available hotfix branches.
2
- ==============================================================================
3
-
4
- ## SYNOPSIS
5
-
6
- `hotfix list` [-v]
7
-
8
- ## DESCRIPTION
9
-
10
- Lists the current branch and any available hotfix branches. Shows the author,
11
- hash, and relative time of last commit on each branch.
12
-
13
- ## OPTIONS
14
-
15
- * -v:
16
- List merged branches.
17
-
18
- ## COPYRIGHT
19
-
20
- Copyright (c) 2012-2013 iFixit.
21
-
22
- ## SEE ALSO
23
-
24
- hotfix(1), feature-list(1)
25
-
26
- ## WWW
27
-
28
- https://github.com/iFixit/git-scripts
29
-
@@ -1,25 +0,0 @@
1
- .\" generated with Ronn/v0.7.3
2
- .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
- .
4
- .TH "HOTFIX\-MERGE" "1" "September 2013" "iFixit" ""
5
- .
6
- .SH "NAME"
7
- \fBhotfix\-merge\fR \- Merge a hotfix branch into stable and the development branch\.
8
- .
9
- .SH "SYNOPSIS"
10
- \fBhotfix merge\fR [name\-of\-hotfix] \fBhotfix merge\fR \-n \fInumber\-of\-pull\fR
11
- .
12
- .SH "DESCRIPTION"
13
- Merge a hotfix branch into stable and \fIfeature\.development_branch\fR\. If \fBname\-of\-hotfix\fR is not specified, the current branch will be used\. \fBhotfix merge\fR will attempt to prefill the merge message with a link to and the text of the pull request associated with the branch\.
14
- .
15
- .P
16
- Deletes the local copy of the branch on success\.
17
- .
18
- .SH "COPYRIGHT"
19
- Copyright (c) 2012\-2013 iFixit\.
20
- .
21
- .SH "SEE ALSO"
22
- hotfix(1), feature\-merge(1)
23
- .
24
- .SH "WWW"
25
- https://github\.com/iFixit/git\-scripts
@@ -1,29 +0,0 @@
1
- hotfix-merge(1) - Merge a hotfix branch into stable and the development branch.
2
- ===============================================================================
3
-
4
- ## SYNOPSIS
5
-
6
- `hotfix merge` [name-of-hotfix]
7
- `hotfix merge` -n <number-of-pull>
8
-
9
- ## DESCRIPTION
10
-
11
- Merge a hotfix branch into stable and _feature.development_branch_. If
12
- `name-of-hotfix` is not specified, the current branch will be used. `hotfix
13
- merge` will attempt to prefill the merge message with a link to and the text of
14
- the pull request associated with the branch.
15
-
16
- Deletes the local copy of the branch on success.
17
-
18
- ## COPYRIGHT
19
-
20
- Copyright (c) 2012-2013 iFixit.
21
-
22
- ## SEE ALSO
23
-
24
- hotfix(1), feature-merge(1)
25
-
26
- ## WWW
27
-
28
- https://github.com/iFixit/git-scripts
29
-
@@ -1,22 +0,0 @@
1
- .\" generated with Ronn/v0.7.3
2
- .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
- .
4
- .TH "HOTFIX\-START" "1" "September 2013" "iFixit" ""
5
- .
6
- .SH "NAME"
7
- \fBhotfix\-start\fR \- Start a new hotfix branch\.
8
- .
9
- .SH "SYNOPSIS"
10
- \fBhotfix start\fR \fIname\-of\-hotfix\fR
11
- .
12
- .SH "DESCRIPTION"
13
- Start a new hotfix branch based off stable\.
14
- .
15
- .SH "COPYRIGHT"
16
- Copyright (c) 2012\-2013 iFixit\.
17
- .
18
- .SH "SEE ALSO"
19
- hotfix(1), feature\-start(1)
20
- .
21
- .SH "WWW"
22
- https://github\.com/iFixit/git\-scripts
@@ -1,23 +0,0 @@
1
- hotfix-start(1) - Start a new hotfix branch.
2
- ============================================
3
-
4
- ## SYNOPSIS
5
-
6
- `hotfix start` <name-of-hotfix>
7
-
8
- ## DESCRIPTION
9
-
10
- Start a new hotfix branch based off stable.
11
-
12
- ## COPYRIGHT
13
-
14
- Copyright (c) 2012-2013 iFixit.
15
-
16
- ## SEE ALSO
17
-
18
- hotfix(1), feature-start(1)
19
-
20
- ## WWW
21
-
22
- https://github.com/iFixit/git-scripts
23
-
@@ -1,38 +0,0 @@
1
- .\" generated with Ronn/v0.7.3
2
- .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
- .
4
- .TH "HOTFIX\-SWITCH" "1" "September 2013" "iFixit" ""
5
- .
6
- .SH "NAME"
7
- \fBhotfix\-switch\fR \- Switch to another hotfix branch\.
8
- .
9
- .SH "SYNOPSIS"
10
- \fBhotfix switch\fR \fIname\-of\-hotfix\fR \fIoptions\fR
11
- .
12
- .br
13
- \fBhotfix switch\fR \-n \fInumber\-of\-pull\fR \fIoptions\fR
14
- .
15
- .SH "DESCRIPTION"
16
- 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
17
- .
18
- .SH "OPTIONS"
19
- .
20
- .TP
21
- \fB\-\-clean\fR
22
- Remove files that aren\'t tracked in \fIname\-of\-feature\fR\.
23
- .
24
- .TP
25
- \fB\-\-pull\fR:
26
- .
27
- .br
28
- Pull the branch after switching to insure the local branch is up to date\.
29
-
30
- .
31
- .SH "COPYRIGHT"
32
- Copyright (c) 2012\-2013 iFixit\.
33
- .
34
- .SH "SEE ALSO"
35
- hotfix(1), feature\-switch(1)
36
- .
37
- .SH "WWW"
38
- https://github\.com/iFixit/git\-scripts
@@ -1,33 +0,0 @@
1
- hotfix-switch(1) - Switch to another hotfix branch.
2
- ===================================================
3
-
4
- ## SYNOPSIS
5
-
6
- `hotfix switch` <name-of-hotfix> [options]
7
- `hotfix switch` -n <number-of-pull> [options]
8
-
9
- ## DESCRIPTION
10
-
11
- Switch to the <name-of-hotfix> branch, or with the -n argument switch
12
- to the branch with a pull request numbered <number-of-pull>
13
-
14
- ## OPTIONS
15
-
16
- * `--clean`:
17
- Remove files that aren't tracked in <name-of-feature>.
18
-
19
- * `--pull`:
20
- Pull the branch after switching to insure the local branch is up to date.
21
-
22
- ## COPYRIGHT
23
-
24
- Copyright (c) 2012-2013 iFixit.
25
-
26
- ## SEE ALSO
27
-
28
- hotfix(1), feature-switch(1)
29
-
30
- ## WWW
31
-
32
- https://github.com/iFixit/git-scripts
33
-
@@ -1,22 +0,0 @@
1
- .\" generated with Ronn/v0.7.3
2
- .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
- .
4
- .TH "HOTFIX\-URL" "1" "August 2013" "iFixit" ""
5
- .
6
- .SH "NAME"
7
- \fBhotfix\-url\fR \- Grab the pull request url\.
8
- .
9
- .SH "SYNOPSIS"
10
- \fBhotfix url\fR [name\-of\-hotfix]
11
- .
12
- .SH "DESCRIPTION"
13
- Grab the url of the pull request for the current branch or the one specified\.
14
- .
15
- .SH "COPYRIGHT"
16
- Copyright (c) 2012\-2013 iFixit\.
17
- .
18
- .SH "SEE ALSO"
19
- hotfix(1), feature\-url(1)
20
- .
21
- .SH "WWW"
22
- https://github\.com/iFixit/git\-scripts
@@ -1,23 +0,0 @@
1
- hotfix-url(1) - Grab the pull request url.
2
- ==========================================
3
-
4
- ## SYNOPSIS
5
-
6
- `hotfix url` [name-of-hotfix]
7
-
8
- ## DESCRIPTION
9
-
10
- Grab the url of the pull request for the current branch or the one specified.
11
-
12
- ## COPYRIGHT
13
-
14
- Copyright (c) 2012-2013 iFixit.
15
-
16
- ## SEE ALSO
17
-
18
- hotfix(1), feature-url(1)
19
-
20
- ## WWW
21
-
22
- https://github.com/iFixit/git-scripts
23
-
@@ -1,52 +0,0 @@
1
- .\" generated with Ronn/v0.7.3
2
- .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
- .
4
- .TH "HOTFIX" "1" "February 2014" "iFixit" ""
5
- .
6
- .SH "NAME"
7
- \fBhotfix\fR \- Perform actions on a git hotfix branch\.
8
- .
9
- .SH "SYNOPSIS"
10
- \fBhotfix\fR \fIcommand\fR [\fIargs\fR]
11
- .
12
- .SH "DESCRIPTION"
13
- \fBhotfix\fR is a helper script for a modified git\-flow model, in which it and \fBfeature\fR are the primary actors\.
14
- .
15
- .SH "COMMANDS"
16
- .
17
- .TP
18
- hotfix\-list(1)
19
- List the current branch and any available hotfix branches\.
20
- .
21
- .TP
22
- hotfix\-url(1)
23
- Get the url of a branch\'s pull request\.
24
- .
25
- .TP
26
- hotfix\-start(1)
27
- Start a new hotfix branch\.
28
- .
29
- .TP
30
- hotfix\-switch(1)
31
- Switch to another hotfix branch\.
32
- .
33
- .TP
34
- hotfix\-finish(1)
35
- Finish this hotfix branch (push and open a pull request)\.
36
- .
37
- .TP
38
- hotfix\-finish\-issue(1)
39
- Finish this hotfix branch and attach it to an issue\.
40
- .
41
- .TP
42
- hotfix\-merge(1)
43
- Merge a hotfix branch into stable and the development branch\.
44
- .
45
- .SH "COPYRIGHT"
46
- Copyright (c) 2012\-2013 iFixit\.
47
- .
48
- .SH "SEE ALSO"
49
- feature(1), git(1)
50
- .
51
- .SH "WWW"
52
- https://github\.com/iFixit/git\-scripts