githug 0.2.0 → 0.2.1

data/README.md

@@ -42,7 +42,6 @@ If you want to suggest a level or make a level that has been suggested, check ou
  * A better way of returning from the solution block
  * A follow up to the level, more information on a specific command, etc.
  * More levels!
- * [Windows support](https://github.com/Gazler/githug/wiki/Windows-Support)
 
 ## Writing Levels
 

data/levels/cherry-pick.rb

@@ -0,0 +1,16 @@
+difficulty 3
+description "Your new feature isn't worth the time and you're going to delete it. But it has one commit that fills in README file, and you want this commit to be on the master as well"
+
+setup do
+    init_from_level
+end
+
+solution do
+  return false unless repo.commits[1].message == "Added fancy branded output"
+  return false unless repo.commits[0].message == "Filled in README.md with proper input"
+  true
+end
+
+hint do
+  puts "Sneak a peek at the `cherry-pick` command"
+end

data/levels/cherry-pick/.githug/COMMIT_EDITMSG

@@ -0,0 +1 @@
+some small fixes

data/levels/cherry-pick/.githug/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

data/levels/cherry-pick/.githug/config

@@ -0,0 +1,6 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true

data/levels/cherry-pick/.githug/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

data/levels/cherry-pick/.githug/hooks/applypatch-msg.sample

@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:

data/levels/cherry-pick/.githug/hooks/commit-msg.sample

@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}

data/levels/cherry-pick/.githug/hooks/post-update.sample

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info

data/levels/cherry-pick/.githug/hooks/pre-applypatch.sample

@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+	exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
+:

data/levels/cherry-pick/.githug/hooks/pre-commit.sample

@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ascii filenames set this variable to true.
+allownonascii=$(git config hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ascii filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	echo "Error: Attempt to add a non-ascii file name."
+	echo
+	echo "This can cause problems if you want to work"
+	echo "with people on other platforms."
+	echo
+	echo "To be portable it is advisable to rename the file ..."
+	echo
+	echo "If you know what you are doing you can disable this"
+	echo "check using:"
+	echo
+	echo "  git config hooks.allownonascii true"
+	echo
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --

data/levels/cherry-pick/.githug/hooks/pre-rebase.sample

@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up-to-date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/opt/local/bin/perl5.12 -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+exit 0
+
+################################################################
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".

data/levels/cherry-pick/.githug/hooks/prepare-commit-msg.sample

@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples.  The first comments out the
+# "Conflicts:" part of a merge commit.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+case "$2,$3" in
+  merge,)
+    /opt/local/bin/perl5.12 -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+
+# ,|template,)
+#   /opt/local/bin/perl5.12 -i.bak -pe '
+#      print "\n" . `git diff --cached --name-status -r`
+#	 if /^#/ && $first++ == 0' "$1" ;;
+
+  *) ;;
+esac
+
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"

data/levels/cherry-pick/.githug/hooks/update.sample

@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to blocks unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "Usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --bool hooks.allowunannotated)
+allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --bool hooks.denycreatebranch)
+allowdeletetag=$(git config --bool hooks.allowdeletetag)
+allowmodifytag=$(git config --bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero="0000000000000000000000000000000000000000"
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0

data/levels/cherry-pick/.githug/info/exclude

@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

data/levels/cherry-pick/.githug/logs/HEAD

@@ -0,0 +1,14 @@
+0000000000000000000000000000000000000000 ea3dbcc5e2d2359698c3606b0ec44af9f76def54 Andrey <aslushnikov@gmail.com> 1332886832 +0400	commit (initial): Initial commit
+ea3dbcc5e2d2359698c3606b0ec44af9f76def54 b30c6a965415df6aef5f2903f9892fa5481152fc Andrey <aslushnikov@gmail.com> 1332886882 +0400	commit: Added a hardcore math module
+b30c6a965415df6aef5f2903f9892fa5481152fc 232d266a78d5ef7196f1ede14972ccf7ee19e587 Andrey <aslushnikov@gmail.com> 1332886949 +0400	commit: Renamed project.js -> herdcore-math.js
+232d266a78d5ef7196f1ede14972ccf7ee19e587 6edea632d9540e060bca97dda0897df2b7da0ec0 Andrey <aslushnikov@gmail.com> 1332887008 +0400	commit: Added fancy branded output
+6edea632d9540e060bca97dda0897df2b7da0ec0 ea3dbcc5e2d2359698c3606b0ec44af9f76def54 Andrey <aslushnikov@gmail.com> 1332887015 +0400	checkout: moving from master to ea3dbcc
+ea3dbcc5e2d2359698c3606b0ec44af9f76def54 ea3dbcc5e2d2359698c3606b0ec44af9f76def54 Andrey <aslushnikov@gmail.com> 1332887030 +0400	checkout: moving from ea3dbcc5e2d2359698c3606b0ec44af9f76def54 to new-feature
+ea3dbcc5e2d2359698c3606b0ec44af9f76def54 58a8c8edcfdd00c6d8cce9aada8f987a1677571f Andrey <aslushnikov@gmail.com> 1332887081 +0400	commit: Added a stub for the feature
+58a8c8edcfdd00c6d8cce9aada8f987a1677571f cfd8ce38c22c5fe83cc04e23f94646464f20d990 Andrey <aslushnikov@gmail.com> 1332887151 +0400	commit: README.md
+cfd8ce38c22c5fe83cc04e23f94646464f20d990 ca32a6dac7b6f97975edbe19a4296c2ee7682f68 Andrey <aslushnikov@gmail.com> 1332887177 +0400	commit (amend): Filled in README.md with proper input
+ca32a6dac7b6f97975edbe19a4296c2ee7682f68 4a1961bce62840eaef9c4392fe5cc799e38c9b7b Andrey <aslushnikov@gmail.com> 1332887238 +0400	commit: Fixed feature
+4a1961bce62840eaef9c4392fe5cc799e38c9b7b ea2a47c19b85fc321e2737ddc49db3deeba3a1b5 Andrey <aslushnikov@gmail.com> 1332887315 +0400	commit: some small fixes
+ea2a47c19b85fc321e2737ddc49db3deeba3a1b5 6edea632d9540e060bca97dda0897df2b7da0ec0 Andrey <aslushnikov@gmail.com> 1332887329 +0400	checkout: moving from new-feature to master
+6edea632d9540e060bca97dda0897df2b7da0ec0 ea2a47c19b85fc321e2737ddc49db3deeba3a1b5 Andrey <aslushnikov@gmail.com> 1332887695 +0400	checkout: moving from master to new-feature
+ea2a47c19b85fc321e2737ddc49db3deeba3a1b5 6edea632d9540e060bca97dda0897df2b7da0ec0 Andrey <aslushnikov@gmail.com> 1332887737 +0400	checkout: moving from new-feature to master

data/levels/cherry-pick/.githug/logs/refs/heads/master

@@ -0,0 +1,4 @@
+0000000000000000000000000000000000000000 ea3dbcc5e2d2359698c3606b0ec44af9f76def54 Andrey <aslushnikov@gmail.com> 1332886832 +0400	commit (initial): Initial commit
+ea3dbcc5e2d2359698c3606b0ec44af9f76def54 b30c6a965415df6aef5f2903f9892fa5481152fc Andrey <aslushnikov@gmail.com> 1332886882 +0400	commit: Added a hardcore math module
+b30c6a965415df6aef5f2903f9892fa5481152fc 232d266a78d5ef7196f1ede14972ccf7ee19e587 Andrey <aslushnikov@gmail.com> 1332886949 +0400	commit: Renamed project.js -> herdcore-math.js
+232d266a78d5ef7196f1ede14972ccf7ee19e587 6edea632d9540e060bca97dda0897df2b7da0ec0 Andrey <aslushnikov@gmail.com> 1332887008 +0400	commit: Added fancy branded output

data/levels/cherry-pick/.githug/logs/refs/heads/new-feature

@@ -0,0 +1,6 @@
+0000000000000000000000000000000000000000 ea3dbcc5e2d2359698c3606b0ec44af9f76def54 Andrey <aslushnikov@gmail.com> 1332887030 +0400	branch: Created from HEAD
+ea3dbcc5e2d2359698c3606b0ec44af9f76def54 58a8c8edcfdd00c6d8cce9aada8f987a1677571f Andrey <aslushnikov@gmail.com> 1332887081 +0400	commit: Added a stub for the feature
+58a8c8edcfdd00c6d8cce9aada8f987a1677571f cfd8ce38c22c5fe83cc04e23f94646464f20d990 Andrey <aslushnikov@gmail.com> 1332887151 +0400	commit: README.md
+cfd8ce38c22c5fe83cc04e23f94646464f20d990 ca32a6dac7b6f97975edbe19a4296c2ee7682f68 Andrey <aslushnikov@gmail.com> 1332887177 +0400	commit (amend): Filled in README.md with proper input
+ca32a6dac7b6f97975edbe19a4296c2ee7682f68 4a1961bce62840eaef9c4392fe5cc799e38c9b7b Andrey <aslushnikov@gmail.com> 1332887238 +0400	commit: Fixed feature
+4a1961bce62840eaef9c4392fe5cc799e38c9b7b ea2a47c19b85fc321e2737ddc49db3deeba3a1b5 Andrey <aslushnikov@gmail.com> 1332887315 +0400	commit: some small fixes

data/levels/cherry-pick/.githug/objects/6e/dea632d9540e060bca97dda0897df2b7da0ec0

@@ -0,0 +1,2 @@
+x
��A� E]s
+�&�����{��тAj�����y/��,�ܤ�̩Uf	���쉌K��j����`-�ʙ^�C�|����
N�&`b��nƄ���8amS�r�Ty���y��)���?�0�.�,7	]��C��<�^)���_��K11�r��XC>VY�{m�[�K(

data/levels/cherry-pick/.githug/refs/heads/master

@@ -0,0 +1 @@
+6edea632d9540e060bca97dda0897df2b7da0ec0

data/levels/cherry-pick/.githug/refs/heads/new-feature

@@ -0,0 +1 @@
+ea2a47c19b85fc321e2737ddc49db3deeba3a1b5

data/levels/cherry-pick/README.md

@@ -0,0 +1,2 @@
+I'll fill in the file some time later..
+

data/levels/cherry-pick/hardcore-math.js

@@ -0,0 +1,3 @@
+for(var i = 0; i < 10; i++) {
+    console.log(42 * i);
+}

data/levels/cherry-pick/nokia.js

@@ -0,0 +1 @@
+console.log("[NOKIA] Connecting people");

data/levels/merge_squash.rb

@@ -0,0 +1,48 @@
+difficulty 3
+description "Merge all commits from the long-feature-branch as a single commit."
+
+setup do
+  repo.init
+
+  FileUtils.touch "file1"
+  repo.add        "file1"
+  repo.commit_all "First commit"
+
+  repo.git.native :checkout, {b: true}, 'long-feature-branch'
+  File.open("file3", 'w') { |f| f << "some feature\n" }
+  repo.add        "file3"
+  repo.commit_all "Developing new features"
+
+  File.open("file3", 'a') { |f| f << "getting awesomer\n" }
+  repo.add        "file3"
+  repo.commit_all "Takes"
+
+  File.open("file3", 'a') { |f| f << "and awesomer!\n" }
+  repo.add        "file3"
+  repo.commit_all "Time"
+  
+  repo.git.native :checkout, {}, 'master'
+  
+  FileUtils.touch "file2"
+  repo.add        "file2"
+  repo.commit_all "Second commit"
+end
+
+solution do
+  result = true
+
+  # Check the number of commits in the repo (should be 4 - including initial .gitignore).
+  result = false unless repo.commits.size == 4
+  
+  # Check if changes from all the commits from long-feature-branch are included.
+  file = File.open('file3')
+  result = false unless file.readline =~ /some feature/
+  result = false unless file.readline =~ /getting awesomer/
+  result = false unless file.readline =~ /and awesomer!/
+  
+  result
+end
+
+hint do
+  puts "Take a look at the --squash option of the merge command. Don't forget to commit the merge!"
+end

data/levels/reset.rb

@@ -1,5 +1,5 @@
 difficulty 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"
+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)"
 
 setup do
   repo.init

data/levels/revert.rb

@@ -0,0 +1,30 @@
+difficulty 4
+description "You have committed several times but want to undo the middle commit."
+
+setup do
+  repo.init
+
+  FileUtils.touch "file1"
+  repo.add        "file1"
+  repo.commit_all "First commit"
+
+  FileUtils.touch "file3"
+  repo.add        "file3"
+  repo.commit_all "Bad commit"
+
+  FileUtils.touch "file2"
+  repo.add        "file2"
+  repo.commit_all "Second commit"
+end
+
+solution do
+  return false unless repo.commits[3].message == "Second commit"
+  return false unless repo.commits[2].message == "First commit"
+  return false unless repo.commits[1].message == "Bad commit"
+  return false unless repo.commits[0].message.split("\n").first == "Revert \"Bad commit\""
+  true
+end
+
+hint do
+  puts "Try the revert command."
+end

data/levels/rm.rb

@@ -1,6 +1,6 @@
 difficulty 2
 
-description "A file has been removed from this repository, however the file was not removed from git.  Find out what this file was and remove it."
+description "A file has been removed from the working tree, however the file was not removed from the repository.  Find out what this file was and remove it."
 
 setup do
   repo.init

data/levels/stage_lines.rb

@@ -21,7 +21,7 @@ setup do
 end
 
 solution do
-  `git diff --staged` =~ /\+This change belongs to the first feature/ && `git diff` =~ /\+This change belongs to the second feature/
+  `git diff --no-color --staged` =~ /\+This change belongs to the first feature/ && `git diff --no-color` =~ /\+This change belongs to the second feature/
 end
 
 hint do

data/lib/githug/cli.rb

@@ -72,6 +72,7 @@ module Githug
             Dir.chdir("git_hug")
             File.open(".gitignore", "w") do |file|
               file.write(".profile.yml")
+              file.write(".gitignore")
             end
           else
             UI.puts("Exiting")

data/lib/githug/level.rb

@@ -3,11 +3,12 @@ module Githug
     include UI
 
     LEVELS = [nil, "init", "add", "commit", "config", "clone",
-              "clone_to_folder", "ignore", "status", "rm", "rm_cached", "rename",
-              "log", "tag",  "commit_ammend", "reset", "checkout_file", "remote",
-              "remote_url", "pull", "remote_add", "diff", "blame", "branch", "checkout",
-              "branch_at", "merge", "rename_commit", "squash", 'reorder', "stage_lines",
-              "find_old_branch", "contribute"]
+              "clone_to_folder", "ignore", "status", "rm", "rm_cached",
+              "rename", "log", "tag",  "commit_ammend", "reset",
+              "checkout_file", "remote", "remote_url", "pull", "remote_add",
+              "diff", "blame", "branch", "checkout", "branch_at", "merge",
+              "cherry-pick", "rename_commit", "squash", "merge_squash", "reorder",
+              "stage_lines", "find_old_branch", "revert", "contribute"]
 
     attr_accessor :level_no, :level_path
     

data/lib/githug/version.rb

@@ -1,3 +1,3 @@
 module Githug
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,71 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: githug
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Gary Rennie
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-22 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &24707980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: grit
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *24707980
+- !ruby/object:Gem::Dependency
+  name: grit
+  requirement: &24707180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *24707180
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &24706420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.14.6
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *24706420
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &24706000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *24706000
 description: An interactive way to learn git.
-email: 
+email:
 - webmaster@gazler.com
-executables: 
+executables:
 - githug
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -115,6 +112,53 @@ files:
 - levels/branch_at.rb
 - levels/checkout.rb
 - levels/checkout_file.rb
+- levels/cherry-pick.rb
+- levels/cherry-pick/.githug/COMMIT_EDITMSG
+- levels/cherry-pick/.githug/HEAD
+- levels/cherry-pick/.githug/config
+- levels/cherry-pick/.githug/description
+- levels/cherry-pick/.githug/hooks/applypatch-msg.sample
+- levels/cherry-pick/.githug/hooks/commit-msg.sample
+- levels/cherry-pick/.githug/hooks/post-update.sample
+- levels/cherry-pick/.githug/hooks/pre-applypatch.sample
+- levels/cherry-pick/.githug/hooks/pre-commit.sample
+- levels/cherry-pick/.githug/hooks/pre-rebase.sample
+- levels/cherry-pick/.githug/hooks/prepare-commit-msg.sample
+- levels/cherry-pick/.githug/hooks/update.sample
+- levels/cherry-pick/.githug/index
+- levels/cherry-pick/.githug/info/exclude
+- levels/cherry-pick/.githug/logs/HEAD
+- levels/cherry-pick/.githug/logs/refs/heads/master
+- levels/cherry-pick/.githug/logs/refs/heads/new-feature
+- levels/cherry-pick/.githug/objects/05/aa97588aff673dcf00e0e1b835d6ec6207a7d9
+- levels/cherry-pick/.githug/objects/14/ad8f1413c40e0e5be6f6cbdec392a783c1d754
+- levels/cherry-pick/.githug/objects/1b/912962174dd58fbbf1627ec816fa6672c70854
+- levels/cherry-pick/.githug/objects/22/f99f3abfd02190a760388c8845c190247859fe
+- levels/cherry-pick/.githug/objects/23/2d266a78d5ef7196f1ede14972ccf7ee19e587
+- levels/cherry-pick/.githug/objects/31/68bdc3ae7e0ab987dda238beab9c0582c7fc07
+- levels/cherry-pick/.githug/objects/49/4fa3fc1c15986f9a950aba8607da591223614c
+- levels/cherry-pick/.githug/objects/4a/1961bce62840eaef9c4392fe5cc799e38c9b7b
+- levels/cherry-pick/.githug/objects/54/22c2405527c05c23b243b2535a97b6cefa1427
+- levels/cherry-pick/.githug/objects/54/f3308533fd4400c94c4cd5827cd38036a67a76
+- levels/cherry-pick/.githug/objects/58/a8c8edcfdd00c6d8cce9aada8f987a1677571f
+- levels/cherry-pick/.githug/objects/6e/dea632d9540e060bca97dda0897df2b7da0ec0
+- levels/cherry-pick/.githug/objects/85/4e7ac38b3e8df02ea1480ec45aa9e7865f03d7
+- levels/cherry-pick/.githug/objects/93/3a97260a11a5ee49bb8a4b7b097cb2fb38f85c
+- levels/cherry-pick/.githug/objects/9a/e59e88e6af362c069847e621b971bafff158ac
+- levels/cherry-pick/.githug/objects/a2/14badc644facc4722083aedf91d9339ffdffbf
+- levels/cherry-pick/.githug/objects/b3/0c6a965415df6aef5f2903f9892fa5481152fc
+- levels/cherry-pick/.githug/objects/c6/0c612734f25b9c989d954621491e9ca3c9e061
+- levels/cherry-pick/.githug/objects/ca/32a6dac7b6f97975edbe19a4296c2ee7682f68
+- levels/cherry-pick/.githug/objects/cf/d8ce38c22c5fe83cc04e23f94646464f20d990
+- levels/cherry-pick/.githug/objects/d5/02e68bfe397140e4ac2a819b138545abca604e
+- levels/cherry-pick/.githug/objects/d5/123e58b37fd886dff2b96bfe5ec08a498192aa
+- levels/cherry-pick/.githug/objects/ea/2a47c19b85fc321e2737ddc49db3deeba3a1b5
+- levels/cherry-pick/.githug/objects/ea/3dbcc5e2d2359698c3606b0ec44af9f76def54
+- levels/cherry-pick/.githug/refs/heads/master
+- levels/cherry-pick/.githug/refs/heads/new-feature
+- levels/cherry-pick/README.md
+- levels/cherry-pick/hardcore-math.js
+- levels/cherry-pick/nokia.js
 - levels/clone.rb
 - levels/clone_to_folder.rb
 - levels/commit.rb
@@ -215,6 +259,7 @@ files:
 - levels/merge/.githug/refs/heads/feature
 - levels/merge/.githug/refs/heads/master
 - levels/merge/file1
+- levels/merge_squash.rb
 - levels/pull.rb
 - levels/remote.rb
 - levels/remote_add.rb
@@ -223,6 +268,7 @@ files:
 - levels/rename_commit.rb
 - levels/reorder.rb
 - levels/reset.rb
+- levels/revert.rb
 - levels/rm.rb
 - levels/rm_cached.rb
 - levels/squash.rb
@@ -244,32 +290,28 @@ files:
 - spec/githug/repository_spec.rb
 - spec/githug/ui_spec.rb
 - spec/spec_helper.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: githug
-rubygems_version: 1.8.21
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: An interactive way to learn git.
 test_files: []
-