githug 0.3.5 → 0.4.0
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.
- checksums.yaml +4 -4
- data/.rspec +1 -0
- data/README.md +4 -3
- data/levels/conflict.rb +2 -2
- data/levels/grep.rb +14 -0
- data/levels/grep/.githug/COMMIT_EDITMSG +1 -0
- data/levels/grep/.githug/HEAD +1 -0
- data/levels/grep/.githug/config +6 -0
- data/levels/grep/.githug/description +1 -0
- data/levels/grep/.githug/hooks/applypatch-msg.sample +15 -0
- data/levels/grep/.githug/hooks/commit-msg.sample +24 -0
- data/levels/grep/.githug/hooks/post-commit.sample +8 -0
- data/levels/grep/.githug/hooks/post-receive.sample +15 -0
- data/levels/grep/.githug/hooks/post-update.sample +8 -0
- data/levels/grep/.githug/hooks/pre-applypatch.sample +14 -0
- data/levels/grep/.githug/hooks/pre-commit.sample +46 -0
- data/levels/grep/.githug/hooks/pre-rebase.sample +169 -0
- data/levels/grep/.githug/hooks/prepare-commit-msg.sample +36 -0
- data/levels/grep/.githug/hooks/update.sample +128 -0
- data/levels/grep/.githug/index +0 -0
- data/levels/grep/.githug/info/exclude +6 -0
- data/levels/grep/.githug/logs/HEAD +1 -0
- data/levels/grep/.githug/logs/refs/heads/master +1 -0
- data/levels/grep/.githug/objects/12/c702f8b25b6b528cf904670b854dba3eba0f45 +3 -0
- data/levels/grep/.githug/objects/6f/45753f4a16b69f5b2215f2dbe8245f073353cc +1 -0
- data/levels/grep/.githug/objects/a4/1fe0c342be5c9930328cbb4315acebbd9c94b2 +0 -0
- data/levels/grep/.githug/objects/d3/f53e82aa015d1eea3b06c3b62dfbacee83bbe1 +0 -0
- data/levels/grep/.githug/refs/heads/master +1 -0
- data/levels/grep/app.rb +45 -0
- data/levels/grep/config.rb +17 -0
- data/levels/reset.rb +1 -1
- data/lib/githug/cli.rb +17 -6
- data/lib/githug/level.rb +15 -11
- data/lib/githug/version.rb +1 -1
- data/spec/githug/cli_spec.rb +18 -0
- data/spec/githug/level_spec.rb +6 -0
- data/spec/githug_spec.rb +14 -11
- metadata +29 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e7d79d4ffee6020278723a688b4a55dc3dfba4ac
|
4
|
+
data.tar.gz: ee2e0f4be70b93e83e5f77d8160960e27ec36c6d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ab986424a092306825c2c11962ee68b643c5bc3384e3571839e220a354df25112c4f22bf8665c7b6ad8cb029e5b66d0aba3390f96156b487b6801fe75ea1d552
|
7
|
+
data.tar.gz: b44c21dec92e90bbb5241778b9455cad34ffa4894ab846fe3c0ecc4325c19c43329f13b4498b05f499f152385a1ee0b90f71843c9632b38f6d8877503a3d1dd8
|
data/.rspec
CHANGED
data/README.md
CHANGED
@@ -13,11 +13,12 @@ After the gem is installed, you can run `githug` where you will be prompted to c
|
|
13
13
|
|
14
14
|
## Commands
|
15
15
|
|
16
|
-
Githug has
|
16
|
+
Githug has 5 commands:
|
17
17
|
|
18
18
|
* play - This is the default command and it will check your solution for the current level.
|
19
19
|
* hint - Gives you a hint (if available) for the current level
|
20
|
-
* reset - Reset the current level
|
20
|
+
* reset - Reset the current level or reset the level to a given name or path
|
21
|
+
* levels - List all of the levels
|
21
22
|
* test - Used to test levels in development, please see the Testing Levels section.
|
22
23
|
|
23
24
|
## Change Log
|
@@ -112,7 +113,7 @@ After doing this, your level should be able to copy the contents from that git r
|
|
112
113
|
The easiest way to test a level is:
|
113
114
|
|
114
115
|
* change into your git_hug repository
|
115
|
-
* Run `githug
|
116
|
+
* Run `githug load PATH_TO_YOUR_LEVEL`
|
116
117
|
* Solve the level
|
117
118
|
* Run `githug test PATH_TO_YOUR_LEVEL`
|
118
119
|
|
data/levels/conflict.rb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
difficulty 4
|
2
|
-
description "You need to merge the current branch (master)
|
2
|
+
description "You need to merge mybranch into the current branch (master). But there may be some incorrect changes in mybranch which may cause conflicts. Solve any merge-conflicts you come across and finish the merge."
|
3
3
|
|
4
4
|
setup do
|
5
5
|
init_from_level
|
@@ -11,7 +11,7 @@ solution do
|
|
11
11
|
solved = false unless repo.head.name == "master"
|
12
12
|
solved = false unless repo.commits("master")[0].parents.length == 2
|
13
13
|
|
14
|
-
txt =
|
14
|
+
txt = File.read("poem.txt")
|
15
15
|
solved = false if txt =~ /[<>=|]/
|
16
16
|
solved = false unless txt =~ /Sat on a wall/
|
17
17
|
|
data/levels/grep.rb
ADDED
@@ -0,0 +1,14 @@
|
|
1
|
+
difficulty 2
|
2
|
+
description "Your project's deadline approaches, you should evaluate how many TODOs are left in your code"
|
3
|
+
|
4
|
+
setup do
|
5
|
+
init_from_level
|
6
|
+
end
|
7
|
+
|
8
|
+
solution do
|
9
|
+
request("How many items are there in your todolist?") == "4"
|
10
|
+
end
|
11
|
+
|
12
|
+
hint do
|
13
|
+
puts "You want to research the `git grep` command."
|
14
|
+
end
|
@@ -0,0 +1 @@
|
|
1
|
+
Add application files.
|
@@ -0,0 +1 @@
|
|
1
|
+
ref: refs/heads/master
|
@@ -0,0 +1 @@
|
|
1
|
+
Unnamed repository; edit this file 'description' to name the repository.
|
@@ -0,0 +1,15 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to check the commit log message taken by
|
4
|
+
# applypatch from an e-mail message.
|
5
|
+
#
|
6
|
+
# The hook should exit with non-zero status after issuing an
|
7
|
+
# appropriate message if it wants to stop the commit. The hook is
|
8
|
+
# allowed to edit the commit message file.
|
9
|
+
#
|
10
|
+
# To enable this hook, rename this file to "applypatch-msg".
|
11
|
+
|
12
|
+
. git-sh-setup
|
13
|
+
test -x "$GIT_DIR/hooks/commit-msg" &&
|
14
|
+
exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
|
15
|
+
:
|
@@ -0,0 +1,24 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to check the commit log message.
|
4
|
+
# Called by "git commit" with one argument, the name of the file
|
5
|
+
# that has the commit message. The hook should exit with non-zero
|
6
|
+
# status after issuing an appropriate message if it wants to stop the
|
7
|
+
# commit. The hook is allowed to edit the commit message file.
|
8
|
+
#
|
9
|
+
# To enable this hook, rename this file to "commit-msg".
|
10
|
+
|
11
|
+
# Uncomment the below to add a Signed-off-by line to the message.
|
12
|
+
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
|
13
|
+
# hook is more suited to it.
|
14
|
+
#
|
15
|
+
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
16
|
+
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
|
17
|
+
|
18
|
+
# This example catches duplicate Signed-off-by lines.
|
19
|
+
|
20
|
+
test "" = "$(grep '^Signed-off-by: ' "$1" |
|
21
|
+
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
|
22
|
+
echo >&2 Duplicate Signed-off-by lines.
|
23
|
+
exit 1
|
24
|
+
}
|
@@ -0,0 +1,15 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script for the "post-receive" event.
|
4
|
+
#
|
5
|
+
# The "post-receive" script is run after receive-pack has accepted a pack
|
6
|
+
# and the repository has been updated. It is passed arguments in through
|
7
|
+
# stdin in the form
|
8
|
+
# <oldrev> <newrev> <refname>
|
9
|
+
# For example:
|
10
|
+
# aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master
|
11
|
+
#
|
12
|
+
# see contrib/hooks/ for a sample, or uncomment the next line and
|
13
|
+
# rename the file to "post-receive".
|
14
|
+
|
15
|
+
#. /usr/share/doc/git-core/contrib/hooks/post-receive-email
|
@@ -0,0 +1,14 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to verify what is about to be committed
|
4
|
+
# by applypatch from an e-mail message.
|
5
|
+
#
|
6
|
+
# The hook should exit with non-zero status after issuing an
|
7
|
+
# appropriate message if it wants to stop the commit.
|
8
|
+
#
|
9
|
+
# To enable this hook, rename this file to "pre-applypatch".
|
10
|
+
|
11
|
+
. git-sh-setup
|
12
|
+
test -x "$GIT_DIR/hooks/pre-commit" &&
|
13
|
+
exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
|
14
|
+
:
|
@@ -0,0 +1,46 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to verify what is about to be committed.
|
4
|
+
# Called by "git commit" with no arguments. The hook should
|
5
|
+
# exit with non-zero status after issuing an appropriate message if
|
6
|
+
# it wants to stop the commit.
|
7
|
+
#
|
8
|
+
# To enable this hook, rename this file to "pre-commit".
|
9
|
+
|
10
|
+
if git rev-parse --verify HEAD >/dev/null 2>&1
|
11
|
+
then
|
12
|
+
against=HEAD
|
13
|
+
else
|
14
|
+
# Initial commit: diff against an empty tree object
|
15
|
+
against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
|
16
|
+
fi
|
17
|
+
|
18
|
+
# If you want to allow non-ascii filenames set this variable to true.
|
19
|
+
allownonascii=$(git config hooks.allownonascii)
|
20
|
+
|
21
|
+
# Cross platform projects tend to avoid non-ascii filenames; prevent
|
22
|
+
# them from being added to the repository. We exploit the fact that the
|
23
|
+
# printable range starts at the space character and ends with tilde.
|
24
|
+
if [ "$allownonascii" != "true" ] &&
|
25
|
+
# Note that the use of brackets around a tr range is ok here, (it's
|
26
|
+
# even required, for portability to Solaris 10's /usr/bin/tr), since
|
27
|
+
# the square bracket bytes happen to fall in the designated range.
|
28
|
+
test "$(git diff --cached --name-only --diff-filter=A -z $against |
|
29
|
+
LC_ALL=C tr -d '[ -~]\0')"
|
30
|
+
then
|
31
|
+
echo "Error: Attempt to add a non-ascii file name."
|
32
|
+
echo
|
33
|
+
echo "This can cause problems if you want to work"
|
34
|
+
echo "with people on other platforms."
|
35
|
+
echo
|
36
|
+
echo "To be portable it is advisable to rename the file ..."
|
37
|
+
echo
|
38
|
+
echo "If you know what you are doing you can disable this"
|
39
|
+
echo "check using:"
|
40
|
+
echo
|
41
|
+
echo " git config hooks.allownonascii true"
|
42
|
+
echo
|
43
|
+
exit 1
|
44
|
+
fi
|
45
|
+
|
46
|
+
exec git diff-index --check --cached $against --
|
@@ -0,0 +1,169 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# Copyright (c) 2006, 2008 Junio C Hamano
|
4
|
+
#
|
5
|
+
# The "pre-rebase" hook is run just before "git rebase" starts doing
|
6
|
+
# its job, and can prevent the command from running by exiting with
|
7
|
+
# non-zero status.
|
8
|
+
#
|
9
|
+
# The hook is called with the following parameters:
|
10
|
+
#
|
11
|
+
# $1 -- the upstream the series was forked from.
|
12
|
+
# $2 -- the branch being rebased (or empty when rebasing the current branch).
|
13
|
+
#
|
14
|
+
# This sample shows how to prevent topic branches that are already
|
15
|
+
# merged to 'next' branch from getting rebased, because allowing it
|
16
|
+
# would result in rebasing already published history.
|
17
|
+
|
18
|
+
publish=next
|
19
|
+
basebranch="$1"
|
20
|
+
if test "$#" = 2
|
21
|
+
then
|
22
|
+
topic="refs/heads/$2"
|
23
|
+
else
|
24
|
+
topic=`git symbolic-ref HEAD` ||
|
25
|
+
exit 0 ;# we do not interrupt rebasing detached HEAD
|
26
|
+
fi
|
27
|
+
|
28
|
+
case "$topic" in
|
29
|
+
refs/heads/??/*)
|
30
|
+
;;
|
31
|
+
*)
|
32
|
+
exit 0 ;# we do not interrupt others.
|
33
|
+
;;
|
34
|
+
esac
|
35
|
+
|
36
|
+
# Now we are dealing with a topic branch being rebased
|
37
|
+
# on top of master. Is it OK to rebase it?
|
38
|
+
|
39
|
+
# Does the topic really exist?
|
40
|
+
git show-ref -q "$topic" || {
|
41
|
+
echo >&2 "No such branch $topic"
|
42
|
+
exit 1
|
43
|
+
}
|
44
|
+
|
45
|
+
# Is topic fully merged to master?
|
46
|
+
not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
|
47
|
+
if test -z "$not_in_master"
|
48
|
+
then
|
49
|
+
echo >&2 "$topic is fully merged to master; better remove it."
|
50
|
+
exit 1 ;# we could allow it, but there is no point.
|
51
|
+
fi
|
52
|
+
|
53
|
+
# Is topic ever merged to next? If so you should not be rebasing it.
|
54
|
+
only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
|
55
|
+
only_next_2=`git rev-list ^master ${publish} | sort`
|
56
|
+
if test "$only_next_1" = "$only_next_2"
|
57
|
+
then
|
58
|
+
not_in_topic=`git rev-list "^$topic" master`
|
59
|
+
if test -z "$not_in_topic"
|
60
|
+
then
|
61
|
+
echo >&2 "$topic is already up-to-date with master"
|
62
|
+
exit 1 ;# we could allow it, but there is no point.
|
63
|
+
else
|
64
|
+
exit 0
|
65
|
+
fi
|
66
|
+
else
|
67
|
+
not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
|
68
|
+
/usr/bin/perl -e '
|
69
|
+
my $topic = $ARGV[0];
|
70
|
+
my $msg = "* $topic has commits already merged to public branch:\n";
|
71
|
+
my (%not_in_next) = map {
|
72
|
+
/^([0-9a-f]+) /;
|
73
|
+
($1 => 1);
|
74
|
+
} split(/\n/, $ARGV[1]);
|
75
|
+
for my $elem (map {
|
76
|
+
/^([0-9a-f]+) (.*)$/;
|
77
|
+
[$1 => $2];
|
78
|
+
} split(/\n/, $ARGV[2])) {
|
79
|
+
if (!exists $not_in_next{$elem->[0]}) {
|
80
|
+
if ($msg) {
|
81
|
+
print STDERR $msg;
|
82
|
+
undef $msg;
|
83
|
+
}
|
84
|
+
print STDERR " $elem->[1]\n";
|
85
|
+
}
|
86
|
+
}
|
87
|
+
' "$topic" "$not_in_next" "$not_in_master"
|
88
|
+
exit 1
|
89
|
+
fi
|
90
|
+
|
91
|
+
exit 0
|
92
|
+
|
93
|
+
################################################################
|
94
|
+
|
95
|
+
This sample hook safeguards topic branches that have been
|
96
|
+
published from being rewound.
|
97
|
+
|
98
|
+
The workflow assumed here is:
|
99
|
+
|
100
|
+
* Once a topic branch forks from "master", "master" is never
|
101
|
+
merged into it again (either directly or indirectly).
|
102
|
+
|
103
|
+
* Once a topic branch is fully cooked and merged into "master",
|
104
|
+
it is deleted. If you need to build on top of it to correct
|
105
|
+
earlier mistakes, a new topic branch is created by forking at
|
106
|
+
the tip of the "master". This is not strictly necessary, but
|
107
|
+
it makes it easier to keep your history simple.
|
108
|
+
|
109
|
+
* Whenever you need to test or publish your changes to topic
|
110
|
+
branches, merge them into "next" branch.
|
111
|
+
|
112
|
+
The script, being an example, hardcodes the publish branch name
|
113
|
+
to be "next", but it is trivial to make it configurable via
|
114
|
+
$GIT_DIR/config mechanism.
|
115
|
+
|
116
|
+
With this workflow, you would want to know:
|
117
|
+
|
118
|
+
(1) ... if a topic branch has ever been merged to "next". Young
|
119
|
+
topic branches can have stupid mistakes you would rather
|
120
|
+
clean up before publishing, and things that have not been
|
121
|
+
merged into other branches can be easily rebased without
|
122
|
+
affecting other people. But once it is published, you would
|
123
|
+
not want to rewind it.
|
124
|
+
|
125
|
+
(2) ... if a topic branch has been fully merged to "master".
|
126
|
+
Then you can delete it. More importantly, you should not
|
127
|
+
build on top of it -- other people may already want to
|
128
|
+
change things related to the topic as patches against your
|
129
|
+
"master", so if you need further changes, it is better to
|
130
|
+
fork the topic (perhaps with the same name) afresh from the
|
131
|
+
tip of "master".
|
132
|
+
|
133
|
+
Let's look at this example:
|
134
|
+
|
135
|
+
o---o---o---o---o---o---o---o---o---o "next"
|
136
|
+
/ / / /
|
137
|
+
/ a---a---b A / /
|
138
|
+
/ / / /
|
139
|
+
/ / c---c---c---c B /
|
140
|
+
/ / / \ /
|
141
|
+
/ / / b---b C \ /
|
142
|
+
/ / / / \ /
|
143
|
+
---o---o---o---o---o---o---o---o---o---o---o "master"
|
144
|
+
|
145
|
+
|
146
|
+
A, B and C are topic branches.
|
147
|
+
|
148
|
+
* A has one fix since it was merged up to "next".
|
149
|
+
|
150
|
+
* B has finished. It has been fully merged up to "master" and "next",
|
151
|
+
and is ready to be deleted.
|
152
|
+
|
153
|
+
* C has not merged to "next" at all.
|
154
|
+
|
155
|
+
We would want to allow C to be rebased, refuse A, and encourage
|
156
|
+
B to be deleted.
|
157
|
+
|
158
|
+
To compute (1):
|
159
|
+
|
160
|
+
git rev-list ^master ^topic next
|
161
|
+
git rev-list ^master next
|
162
|
+
|
163
|
+
if these match, topic has not merged in next at all.
|
164
|
+
|
165
|
+
To compute (2):
|
166
|
+
|
167
|
+
git rev-list master..topic
|
168
|
+
|
169
|
+
if this is empty, it is fully merged to "master".
|
@@ -0,0 +1,36 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to prepare the commit log message.
|
4
|
+
# Called by "git commit" with the name of the file that has the
|
5
|
+
# commit message, followed by the description of the commit
|
6
|
+
# message's source. The hook's purpose is to edit the commit
|
7
|
+
# message file. If the hook fails with a non-zero status,
|
8
|
+
# the commit is aborted.
|
9
|
+
#
|
10
|
+
# To enable this hook, rename this file to "prepare-commit-msg".
|
11
|
+
|
12
|
+
# This hook includes three examples. The first comments out the
|
13
|
+
# "Conflicts:" part of a merge commit.
|
14
|
+
#
|
15
|
+
# The second includes the output of "git diff --name-status -r"
|
16
|
+
# into the message, just before the "git status" output. It is
|
17
|
+
# commented because it doesn't cope with --amend or with squashed
|
18
|
+
# commits.
|
19
|
+
#
|
20
|
+
# The third example adds a Signed-off-by line to the message, that can
|
21
|
+
# still be edited. This is rarely a good idea.
|
22
|
+
|
23
|
+
case "$2,$3" in
|
24
|
+
merge,)
|
25
|
+
/usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
|
26
|
+
|
27
|
+
# ,|template,)
|
28
|
+
# /usr/bin/perl -i.bak -pe '
|
29
|
+
# print "\n" . `git diff --cached --name-status -r`
|
30
|
+
# if /^#/ && $first++ == 0' "$1" ;;
|
31
|
+
|
32
|
+
*) ;;
|
33
|
+
esac
|
34
|
+
|
35
|
+
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
36
|
+
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
|
@@ -0,0 +1,128 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to blocks unannotated tags from entering.
|
4
|
+
# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
|
5
|
+
#
|
6
|
+
# To enable this hook, rename this file to "update".
|
7
|
+
#
|
8
|
+
# Config
|
9
|
+
# ------
|
10
|
+
# hooks.allowunannotated
|
11
|
+
# This boolean sets whether unannotated tags will be allowed into the
|
12
|
+
# repository. By default they won't be.
|
13
|
+
# hooks.allowdeletetag
|
14
|
+
# This boolean sets whether deleting tags will be allowed in the
|
15
|
+
# repository. By default they won't be.
|
16
|
+
# hooks.allowmodifytag
|
17
|
+
# This boolean sets whether a tag may be modified after creation. By default
|
18
|
+
# it won't be.
|
19
|
+
# hooks.allowdeletebranch
|
20
|
+
# This boolean sets whether deleting branches will be allowed in the
|
21
|
+
# repository. By default they won't be.
|
22
|
+
# hooks.denycreatebranch
|
23
|
+
# This boolean sets whether remotely creating branches will be denied
|
24
|
+
# in the repository. By default this is allowed.
|
25
|
+
#
|
26
|
+
|
27
|
+
# --- Command line
|
28
|
+
refname="$1"
|
29
|
+
oldrev="$2"
|
30
|
+
newrev="$3"
|
31
|
+
|
32
|
+
# --- Safety check
|
33
|
+
if [ -z "$GIT_DIR" ]; then
|
34
|
+
echo "Don't run this script from the command line." >&2
|
35
|
+
echo " (if you want, you could supply GIT_DIR then run" >&2
|
36
|
+
echo " $0 <ref> <oldrev> <newrev>)" >&2
|
37
|
+
exit 1
|
38
|
+
fi
|
39
|
+
|
40
|
+
if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
|
41
|
+
echo "Usage: $0 <ref> <oldrev> <newrev>" >&2
|
42
|
+
exit 1
|
43
|
+
fi
|
44
|
+
|
45
|
+
# --- Config
|
46
|
+
allowunannotated=$(git config --bool hooks.allowunannotated)
|
47
|
+
allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
|
48
|
+
denycreatebranch=$(git config --bool hooks.denycreatebranch)
|
49
|
+
allowdeletetag=$(git config --bool hooks.allowdeletetag)
|
50
|
+
allowmodifytag=$(git config --bool hooks.allowmodifytag)
|
51
|
+
|
52
|
+
# check for no description
|
53
|
+
projectdesc=$(sed -e '1q' "$GIT_DIR/description")
|
54
|
+
case "$projectdesc" in
|
55
|
+
"Unnamed repository"* | "")
|
56
|
+
echo "*** Project description file hasn't been set" >&2
|
57
|
+
exit 1
|
58
|
+
;;
|
59
|
+
esac
|
60
|
+
|
61
|
+
# --- Check types
|
62
|
+
# if $newrev is 0000...0000, it's a commit to delete a ref.
|
63
|
+
zero="0000000000000000000000000000000000000000"
|
64
|
+
if [ "$newrev" = "$zero" ]; then
|
65
|
+
newrev_type=delete
|
66
|
+
else
|
67
|
+
newrev_type=$(git cat-file -t $newrev)
|
68
|
+
fi
|
69
|
+
|
70
|
+
case "$refname","$newrev_type" in
|
71
|
+
refs/tags/*,commit)
|
72
|
+
# un-annotated tag
|
73
|
+
short_refname=${refname##refs/tags/}
|
74
|
+
if [ "$allowunannotated" != "true" ]; then
|
75
|
+
echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
|
76
|
+
echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
|
77
|
+
exit 1
|
78
|
+
fi
|
79
|
+
;;
|
80
|
+
refs/tags/*,delete)
|
81
|
+
# delete tag
|
82
|
+
if [ "$allowdeletetag" != "true" ]; then
|
83
|
+
echo "*** Deleting a tag is not allowed in this repository" >&2
|
84
|
+
exit 1
|
85
|
+
fi
|
86
|
+
;;
|
87
|
+
refs/tags/*,tag)
|
88
|
+
# annotated tag
|
89
|
+
if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
|
90
|
+
then
|
91
|
+
echo "*** Tag '$refname' already exists." >&2
|
92
|
+
echo "*** Modifying a tag is not allowed in this repository." >&2
|
93
|
+
exit 1
|
94
|
+
fi
|
95
|
+
;;
|
96
|
+
refs/heads/*,commit)
|
97
|
+
# branch
|
98
|
+
if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
|
99
|
+
echo "*** Creating a branch is not allowed in this repository" >&2
|
100
|
+
exit 1
|
101
|
+
fi
|
102
|
+
;;
|
103
|
+
refs/heads/*,delete)
|
104
|
+
# delete branch
|
105
|
+
if [ "$allowdeletebranch" != "true" ]; then
|
106
|
+
echo "*** Deleting a branch is not allowed in this repository" >&2
|
107
|
+
exit 1
|
108
|
+
fi
|
109
|
+
;;
|
110
|
+
refs/remotes/*,commit)
|
111
|
+
# tracking branch
|
112
|
+
;;
|
113
|
+
refs/remotes/*,delete)
|
114
|
+
# delete tracking branch
|
115
|
+
if [ "$allowdeletebranch" != "true" ]; then
|
116
|
+
echo "*** Deleting a tracking branch is not allowed in this repository" >&2
|
117
|
+
exit 1
|
118
|
+
fi
|
119
|
+
;;
|
120
|
+
*)
|
121
|
+
# Anything else (is there anything else?)
|
122
|
+
echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
|
123
|
+
exit 1
|
124
|
+
;;
|
125
|
+
esac
|
126
|
+
|
127
|
+
# --- Finished
|
128
|
+
exit 0
|
Binary file
|
@@ -0,0 +1 @@
|
|
1
|
+
0000000000000000000000000000000000000000 12c702f8b25b6b528cf904670b854dba3eba0f45 Thibaud Colas <thibaudcolas@gmail.com> 1384229258 +0100 commit (initial): Add application files.
|
@@ -0,0 +1 @@
|
|
1
|
+
0000000000000000000000000000000000000000 12c702f8b25b6b528cf904670b854dba3eba0f45 Thibaud Colas <thibaudcolas@gmail.com> 1384229258 +0100 commit (initial): Add application files.
|
@@ -0,0 +1 @@
|
|
1
|
+
xe�1k�0�;�W�:K!CC�@�]��n%E>�Eg,ن����8!dB�}��F�X����Q��]lŧ��oJkrN�V�i��L/M��*�e�������c�f�=�u����$`�X�+s|>�#\u/P�i��Qq*6�G\���d�YQ�&�%����4�j�h����)}N)��Ql�Gm�������h�
|
@@ -0,0 +1 @@
|
|
1
|
+
12c702f8b25b6b528cf904670b854dba3eba0f45
|
data/levels/grep/app.rb
ADDED
@@ -0,0 +1,45 @@
|
|
1
|
+
require 'sinatra'
|
2
|
+
require 'oauth2'
|
3
|
+
require 'json'
|
4
|
+
enable :sessions
|
5
|
+
|
6
|
+
# TODO Make site url variable.
|
7
|
+
def client
|
8
|
+
OAuth2::Client.new("mTeZFqkCmzc8JnjKXaSww95bFFxhUpp1wwmSi8vG", "a9OMyEdW7JvWThHmmvFcShR9P2dyad3EGuA2ULDh", :site => "http://localhost:3000")
|
9
|
+
end
|
10
|
+
|
11
|
+
get "/auth/test" do
|
12
|
+
redirect client.auth_code.authorize_url(:redirect_uri => redirect_uri)
|
13
|
+
end
|
14
|
+
|
15
|
+
get '/auth/test/callback' do
|
16
|
+
access_token = client.auth_code.get_token(params[:code], :redirect_uri => redirect_uri)
|
17
|
+
session[:access_token] = access_token.token
|
18
|
+
@message = "Successfully authenticated with the server"
|
19
|
+
erb :success
|
20
|
+
end
|
21
|
+
|
22
|
+
get '/yet_another' do
|
23
|
+
@message = get_response('data.json')
|
24
|
+
erb :success
|
25
|
+
end
|
26
|
+
|
27
|
+
get '/another_page' do
|
28
|
+
@message = get_response('server.json')
|
29
|
+
erb :another
|
30
|
+
end
|
31
|
+
|
32
|
+
# TODO Make API version variable.
|
33
|
+
def get_response(url)
|
34
|
+
access_token = OAuth2::AccessToken.new(client, session[:access_token])
|
35
|
+
JSON.parse(access_token.get("/api/v1/#{url}").body)
|
36
|
+
end
|
37
|
+
|
38
|
+
# TODO Redirecting queries could be useful.
|
39
|
+
def redirect_uri
|
40
|
+
uri = URI.parse(request.url)
|
41
|
+
uri.path = '/auth/test/callback'
|
42
|
+
uri.query = nil
|
43
|
+
uri.to_s
|
44
|
+
end
|
45
|
+
|
@@ -0,0 +1,17 @@
|
|
1
|
+
class Config
|
2
|
+
attr_accessor :name, :password
|
3
|
+
def initialize(name, password = nil, options = {})
|
4
|
+
@name = name
|
5
|
+
# TODO Move password to a configuration file.
|
6
|
+
@password = password || "i<3evil"
|
7
|
+
|
8
|
+
if options[:downcase]
|
9
|
+
@name.downcase!
|
10
|
+
end
|
11
|
+
|
12
|
+
if options[:upcase]
|
13
|
+
@name.upcase!
|
14
|
+
end
|
15
|
+
|
16
|
+
end
|
17
|
+
end
|
data/levels/reset.rb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
difficulty 2
|
2
|
-
description "There are two files to be committed. The goal was to add each file as a separate commit, however both were added by accident. Unstage the file `to_commit_second` using the reset command (don't commit anything)."
|
2
|
+
description "There are two files to be committed. The goal was to add each file as a separate commit, however both were added by accident. Unstage the file `to_commit_second.rb` using the reset command (don't commit anything)."
|
3
3
|
|
4
4
|
setup do
|
5
5
|
repo.init
|
data/lib/githug/cli.rb
CHANGED
@@ -37,11 +37,7 @@ module Githug
|
|
37
37
|
desc :reset, "Reset the current level"
|
38
38
|
|
39
39
|
def reset(path = nil)
|
40
|
-
|
41
|
-
level = Level.load_from_file(path)
|
42
|
-
else
|
43
|
-
level = load_level
|
44
|
-
end
|
40
|
+
level = load_level(path)
|
45
41
|
UI.word_box("Githug")
|
46
42
|
if level
|
47
43
|
UI.puts("resetting level")
|
@@ -52,9 +48,24 @@ module Githug
|
|
52
48
|
end
|
53
49
|
end
|
54
50
|
|
51
|
+
desc :levels, "List all of the levels"
|
52
|
+
|
53
|
+
def levels
|
54
|
+
list_with_numbers = Level.list.each_with_index.map do |name, index|
|
55
|
+
"##{index + 1}: #{name}"
|
56
|
+
end
|
57
|
+
UI.puts(list_with_numbers)
|
58
|
+
end
|
59
|
+
|
55
60
|
no_tasks do
|
56
61
|
|
57
|
-
def load_level
|
62
|
+
def load_level(path = nil)
|
63
|
+
return load_level_from_profile unless path
|
64
|
+
return Level.load(path) if Level.list.include?(path)
|
65
|
+
Level.load_from_file(path)
|
66
|
+
end
|
67
|
+
|
68
|
+
def load_level_from_profile
|
58
69
|
profile = Profile.load
|
59
70
|
Level.load(profile.level)
|
60
71
|
end
|
data/lib/githug/level.rb
CHANGED
@@ -2,17 +2,17 @@ module Githug
|
|
2
2
|
class Level
|
3
3
|
include UI
|
4
4
|
|
5
|
-
LEVELS = [nil, "init", "
|
5
|
+
LEVELS = [nil, "init", "config", "add", "commit", "clone",
|
6
6
|
"clone_to_folder", "ignore", "status", "rm", "rm_cached",
|
7
|
-
"stash", "rename", "log", "tag", "push_tags", "commit_amend",
|
8
|
-
"reset_soft", "checkout_file", "remote", "remote_url",
|
9
|
-
"remote_add", "push", "diff", "blame", "branch", "checkout",
|
10
|
-
"checkout_tag", "checkout_tag_over_branch", "branch_at", "merge",
|
11
|
-
"
|
12
|
-
"
|
13
|
-
"conflict", "contribute"]
|
7
|
+
"stash", "rename", "log", "tag", "push_tags", "commit_amend",
|
8
|
+
"reset", "reset_soft", "checkout_file", "remote", "remote_url",
|
9
|
+
"pull", "remote_add", "push", "diff", "blame", "branch", "checkout",
|
10
|
+
"checkout_tag", "checkout_tag_over_branch", "branch_at", "merge",
|
11
|
+
"repack", "cherry-pick", "grep", "rename_commit", "squash",
|
12
|
+
"merge_squash", "reorder", "bisect", "stage_lines",
|
13
|
+
"find_old_branch", "revert", "restore", "conflict", "contribute"]
|
14
14
|
|
15
|
-
attr_accessor :level_no, :level_path
|
15
|
+
attr_accessor :level_no, :level_path, :level_name
|
16
16
|
|
17
17
|
class << self
|
18
18
|
|
@@ -25,16 +25,19 @@ module Githug
|
|
25
25
|
setup(path)
|
26
26
|
end
|
27
27
|
|
28
|
+
def list
|
29
|
+
return LEVELS - [nil]
|
30
|
+
end
|
28
31
|
|
29
32
|
def setup(path)
|
30
|
-
level_name = File.basename(path, File.extname(path))
|
31
33
|
level_path = path.chomp(File.extname(path))
|
32
34
|
level = self.new
|
33
35
|
|
34
36
|
return false unless File.exists?(path)
|
35
37
|
|
36
38
|
level.instance_eval(File.read(path))
|
37
|
-
level.
|
39
|
+
level.level_name = File.basename(path, File.extname(path))
|
40
|
+
level.level_no = LEVELS.index(level.level_name) || 1
|
38
41
|
level.level_path = level_path
|
39
42
|
level
|
40
43
|
end
|
@@ -73,6 +76,7 @@ module Githug
|
|
73
76
|
|
74
77
|
def full_description
|
75
78
|
UI.puts
|
79
|
+
UI.puts "Name: #{level_name}"
|
76
80
|
UI.puts "Level: #{level_no}"
|
77
81
|
UI.puts "Difficulty: #{"*"*@difficulty}"
|
78
82
|
UI.puts
|
data/lib/githug/version.rb
CHANGED
data/spec/githug/cli_spec.rb
CHANGED
@@ -85,6 +85,15 @@ describe Githug::CLI do
|
|
85
85
|
@cli.reset
|
86
86
|
end
|
87
87
|
|
88
|
+
it "should reset the level with a level name" do
|
89
|
+
@level.should_receive(:setup_level)
|
90
|
+
@level.should_receive(:full_description)
|
91
|
+
Githug::Level.should_receive(:load).with("add").and_return(@level)
|
92
|
+
Githug::UI.should_receive(:word_box).with("Githug")
|
93
|
+
Githug::UI.should_receive(:puts).with("resetting level")
|
94
|
+
@cli.reset("add")
|
95
|
+
end
|
96
|
+
|
88
97
|
it "should reset the level with a path" do
|
89
98
|
@level.should_receive(:setup_level)
|
90
99
|
@level.should_receive(:full_description)
|
@@ -96,4 +105,13 @@ describe Githug::CLI do
|
|
96
105
|
|
97
106
|
end
|
98
107
|
|
108
|
+
describe "levels" do
|
109
|
+
|
110
|
+
it "should should print the levels and their numbers" do
|
111
|
+
Githug::Level.stub(:list).and_return(["commit", "add"])
|
112
|
+
Githug::UI.should_receive(:puts).with(["#1: commit", "#2: add"])
|
113
|
+
@cli.levels
|
114
|
+
end
|
115
|
+
end
|
116
|
+
|
99
117
|
end
|
data/spec/githug/level_spec.rb
CHANGED
@@ -54,6 +54,12 @@ end
|
|
54
54
|
|
55
55
|
end
|
56
56
|
|
57
|
+
describe "list" do
|
58
|
+
it "should list the levels without nil" do
|
59
|
+
Githug::Level.list.should eql(Githug::Level::LEVELS - [nil])
|
60
|
+
end
|
61
|
+
end
|
62
|
+
|
57
63
|
describe "load_from_file" do
|
58
64
|
it "should load the level" do
|
59
65
|
File.stub(:dirname).and_return("")
|
data/spec/githug_spec.rb
CHANGED
@@ -33,17 +33,6 @@ describe "The Game" do
|
|
33
33
|
`githug`.should be_solved
|
34
34
|
end
|
35
35
|
|
36
|
-
it "should complete the add level" do
|
37
|
-
`git add README`
|
38
|
-
`githug`.should be_solved
|
39
|
-
end
|
40
|
-
|
41
|
-
it "should complete the commit level" do
|
42
|
-
`git commit -m "test message"`
|
43
|
-
`githug`.should be_solved
|
44
|
-
end
|
45
|
-
|
46
|
-
|
47
36
|
it "should complete the config level" do
|
48
37
|
skip_level #The CI server does not have git config set
|
49
38
|
#full_name = `git config --get user.name`.chomp
|
@@ -54,6 +43,16 @@ describe "The Game" do
|
|
54
43
|
#f.close
|
55
44
|
end
|
56
45
|
|
46
|
+
it "should complete the add level" do
|
47
|
+
`git add README`
|
48
|
+
`githug`.should be_solved
|
49
|
+
end
|
50
|
+
|
51
|
+
it "should complete the commit level" do
|
52
|
+
`git commit -m "test message"`
|
53
|
+
`githug`.should be_solved
|
54
|
+
end
|
55
|
+
|
57
56
|
it "should complete the clone level" do
|
58
57
|
`git clone https://github.com/Gazler/cloneme`
|
59
58
|
`githug`.should be_solved
|
@@ -204,6 +203,10 @@ describe "The Game" do
|
|
204
203
|
`githug`.should be_solved
|
205
204
|
end
|
206
205
|
|
206
|
+
it "should complete the grep level" do
|
207
|
+
`echo "4" | githug`.should be_solved
|
208
|
+
end
|
209
|
+
|
207
210
|
it "should complete the rename_commit level" do
|
208
211
|
skip_level
|
209
212
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: githug
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.4.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Gary Rennie
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-
|
11
|
+
date: 2013-11-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|
@@ -312,6 +312,32 @@ files:
|
|
312
312
|
- levels/find_old_branch/.githug/refs/heads/solve_world_hunger
|
313
313
|
- levels/find_old_branch/TODO
|
314
314
|
- levels/find_old_branch/myfile.txt
|
315
|
+
- levels/grep.rb
|
316
|
+
- levels/grep/.githug/COMMIT_EDITMSG
|
317
|
+
- levels/grep/.githug/HEAD
|
318
|
+
- levels/grep/.githug/config
|
319
|
+
- levels/grep/.githug/description
|
320
|
+
- levels/grep/.githug/hooks/applypatch-msg.sample
|
321
|
+
- levels/grep/.githug/hooks/commit-msg.sample
|
322
|
+
- levels/grep/.githug/hooks/post-commit.sample
|
323
|
+
- levels/grep/.githug/hooks/post-receive.sample
|
324
|
+
- levels/grep/.githug/hooks/post-update.sample
|
325
|
+
- levels/grep/.githug/hooks/pre-applypatch.sample
|
326
|
+
- levels/grep/.githug/hooks/pre-commit.sample
|
327
|
+
- levels/grep/.githug/hooks/pre-rebase.sample
|
328
|
+
- levels/grep/.githug/hooks/prepare-commit-msg.sample
|
329
|
+
- levels/grep/.githug/hooks/update.sample
|
330
|
+
- levels/grep/.githug/index
|
331
|
+
- levels/grep/.githug/info/exclude
|
332
|
+
- levels/grep/.githug/logs/HEAD
|
333
|
+
- levels/grep/.githug/logs/refs/heads/master
|
334
|
+
- levels/grep/.githug/objects/12/c702f8b25b6b528cf904670b854dba3eba0f45
|
335
|
+
- levels/grep/.githug/objects/6f/45753f4a16b69f5b2215f2dbe8245f073353cc
|
336
|
+
- levels/grep/.githug/objects/a4/1fe0c342be5c9930328cbb4315acebbd9c94b2
|
337
|
+
- levels/grep/.githug/objects/d3/f53e82aa015d1eea3b06c3b62dfbacee83bbe1
|
338
|
+
- levels/grep/.githug/refs/heads/master
|
339
|
+
- levels/grep/app.rb
|
340
|
+
- levels/grep/config.rb
|
315
341
|
- levels/ignore.rb
|
316
342
|
- levels/init.rb
|
317
343
|
- levels/log.rb
|
@@ -423,7 +449,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
423
449
|
version: '0'
|
424
450
|
requirements: []
|
425
451
|
rubyforge_project: githug
|
426
|
-
rubygems_version: 2.0.
|
452
|
+
rubygems_version: 2.0.6
|
427
453
|
signing_key:
|
428
454
|
specification_version: 4
|
429
455
|
summary: An interactive way to learn git.
|