githug 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ef20410caf64b37405990b315bcb0a6c0534d77
-  data.tar.gz: da283777c0e13586c8ba42ac8c93461ec4274bbc
+  metadata.gz: a94e3f45e86a99703cd503e3fc9f7f7d8d0dc41f
+  data.tar.gz: bb3df4d8a23fc33c75b0b2d35bcdce7bfea96701
 SHA512:
-  metadata.gz: 9b32b0a9ddf2f78aeaa865b6f26b01a25e926476dc965b770f39d80ac5bf75cf740fbb4e700ca2dbcaa3c883df8a6a4740ccae7f0a0e63f4dd34eeede7217f96
-  data.tar.gz: 06ee6264ed7517a8d14de09acd95ab31b4b418d712f9eb7c1b258d70a6ce4e77855df6ce3be055f266392553313623c478a57cf42e7b7ebf23fb4e5189a3a541
+  metadata.gz: 0135f1e9543ca8a4b47c055a9e60208944ded20cd857ddd357263fc2268820c20d72d3b275a0f9db8e40db6a00b3c358d6b352a754d9474984b75f4fd562f3ce
+  data.tar.gz: 8113e0f346dd092f6b3e056c51ec8941084b602573a156b881d79cde62a50cda03e36a9c1eb8f93d89bd8b8051832eb587873624c5f6833af8d92ce560b0a1e0

data/.gitignore

@@ -5,4 +5,4 @@ pkg/*
 *.swp
 .rvmrc
 git_hug/*
-.profile.yml
+.profile.yml

data/.travis.yml

@@ -5,5 +5,6 @@ rvm:
   - 1.9.3
   - 2.0.0
 before_install:
+  - gem update --system 2.1.11
   - git config --global user.email 'user@example.com'
   - git config --global user.name 'Test User'

data/README.md

@@ -1,6 +1,5 @@
 # Githug
-Git Your Game On [![Build Status](https://travis-ci.org/Gazler/githug.png?branch=master)](https://travis-ci.org/Gazler/githug)
-
+Git Your Game On [![Build Status](https://travis-ci.org/Gazler/githug.png?branch=master)](https://travis-ci.org/Gazler/githug) [![Code Climate](https://codeclimate.com/github/Gazler/githug.png)](https://codeclimate.com/github/Gazler/githug)
 ## About
 Githug is designed to give you a practical way of learning git.  It has a series of levels, each utilizing git commands to ensure a correct answer.
 
@@ -40,7 +39,6 @@ If you want to suggest a level or make a level that has been suggested, check ou
 
 ## Todo List
 
- * A better way of returning from the solution block
  * A follow up to the level, more information on a specific command, etc.
  * More levels!
 
@@ -113,7 +111,7 @@ After doing this, your level should be able to copy the contents from that git r
 The easiest way to test a level is:
 
  * change into your git_hug repository
- * Run `githug load PATH_TO_YOUR_LEVEL`
+ * Run `githug reset PATH_TO_YOUR_LEVEL`
  * Solve the level
  * Run `githug test PATH_TO_YOUR_LEVEL`
 

data/levels/commit_in_future.rb

@@ -0,0 +1,19 @@
+require 'time'
+
+difficulty 2
+description "Commit your changes with the future date (e.g. tomorrow)."
+
+setup do
+  repo.init
+
+  FileUtils.touch("README")
+  repo.add("README")
+end
+
+solution do
+  repo.commits.length == 1 && repo.commits.first.authored_date > Time.now
+end
+
+hint do
+  puts "Build a time machine, move to the future and commit your changes, then go back and verify results ;)."
+end

data/levels/delete_branch.rb

@@ -0,0 +1,15 @@
+difficulty 2
+
+description "You have created too many branches for your project. There is an old branch in your repo called 'delete_me', you should delete it."
+
+setup do
+    init_from_level
+end
+
+solution do
+  return true unless repo.branches.map(&:name).include?('delete_me')
+end
+
+hint do
+  puts "Running 'git --help branch' will give you a list of branch commands."
+end

data/levels/delete_branch/.githug/COMMIT_EDITMSG

@@ -0,0 +1 @@
+delete_me branch

data/levels/delete_branch/.githug/HEAD

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

data/levels/delete_branch/.githug/config

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

data/levels/delete_branch/.githug/description

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

data/levels/delete_branch/.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/delete_branch/.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/delete_branch/.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/delete_branch/.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/delete_branch/.githug/hooks/pre-commit.sample

@@ -0,0 +1,49 @@
+#!/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
+	cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+  git config hooks.allownonascii true
+EOF
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --

data/levels/delete_branch/.githug/hooks/pre-push.sample

@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local sha1> <remote ref> <remote sha1>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+z40=0000000000000000000000000000000000000000
+
+IFS=' '
+while read local_ref local_sha remote_ref remote_sha
+do
+	if [ "$local_sha" = $z40 ]
+	then
+		# Handle delete
+	else
+		if [ "$remote_sha" = $z40 ]
+		then
+			# New branch, examine all commits
+			range="$local_sha"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_sha..$local_sha"
+		fi
+
+		# Check for WIP commit
+		commit=`git rev-list -n 1 --grep '^WIP' "$range"`
+		if [ -n "$commit" ]
+		then
+			echo "Found WIP commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0

data/levels/delete_branch/.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"`
+	/usr/bin/perl -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/delete_branch/.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,)
+    /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+
+# ,|template,)
+#   /usr/bin/perl -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/delete_branch/.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/delete_branch/.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/delete_branch/.githug/logs/HEAD

@@ -0,0 +1,4 @@
+0000000000000000000000000000000000000000 b60afe294eb3c200d646995c9e0234470157c1b0 Daniel Smilansky <dsmilansky@gmail.com> 1386225561 -0800	commit (initial): first commit
+b60afe294eb3c200d646995c9e0234470157c1b0 b60afe294eb3c200d646995c9e0234470157c1b0 Daniel Smilansky <dsmilansky@gmail.com> 1386225573 -0800	checkout: moving from master to master
+b60afe294eb3c200d646995c9e0234470157c1b0 b60afe294eb3c200d646995c9e0234470157c1b0 Daniel Smilansky <dsmilansky@gmail.com> 1386225580 -0800	checkout: moving from master to delete_me
+b60afe294eb3c200d646995c9e0234470157c1b0 b60afe294eb3c200d646995c9e0234470157c1b0 Daniel Smilansky <dsmilansky@gmail.com> 1386225584 -0800	checkout: moving from delete_me to master

data/levels/delete_branch/.githug/logs/refs/heads/delete_me

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 b60afe294eb3c200d646995c9e0234470157c1b0 Daniel Smilansky <dsmilansky@gmail.com> 1386225568 -0800	branch: Created from master

data/levels/delete_branch/.githug/logs/refs/heads/master

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 b60afe294eb3c200d646995c9e0234470157c1b0 Daniel Smilansky <dsmilansky@gmail.com> 1386225561 -0800	commit (initial): first commit

data/levels/delete_branch/.githug/objects/b6/0afe294eb3c200d646995c9e0234470157c1b0

@@ -0,0 +1,2 @@
+x
���
+�|�
�ǘg���NJ���x�����|%��1?Q

data/levels/delete_branch/.githug/refs/heads/delete_me

@@ -0,0 +1 @@
+b60afe294eb3c200d646995c9e0234470157c1b0

data/levels/delete_branch/.githug/refs/heads/master

@@ -0,0 +1 @@
+b60afe294eb3c200d646995c9e0234470157c1b0

data/levels/fetch.rb

@@ -0,0 +1,70 @@
+difficulty 2
+description "Looks like a new branch was pushed into our remote repository. Get the changes without merging them with the local repository "
+
+setup do
+  # remember the working directory so we can come back to it later
+  cwd = Dir.pwd
+  # initialize another git repo to be used as a "remote"
+  tmpdir = Dir.mktmpdir
+
+  # local repo
+  repo.init
+
+    #adds a file to origin/master
+  FileUtils.touch "master_file"
+  repo.add        "master_file"
+  repo.commit_all 'Commits master_file'
+
+  # remote repo
+  Dir.chdir tmpdir
+  repo.init
+
+  #adds a file to origin/master
+  FileUtils.touch "master_file"
+  repo.add        "master_file"
+  repo.commit_all 'Commits master_file'
+  
+  #adds remote repo
+  Dir.chdir cwd
+  `git remote add origin #{tmpdir}/.git`
+  `git fetch origin --quiet`
+  `git branch -u origin/master master`
+
+  Dir.chdir tmpdir
+  # create a new branch in the remote repo
+  `git checkout -b new_branch --quiet`
+
+  # adds a file into the new branch.  Should not be pulled into the local
+  FileUtils.touch "file1"
+  repo.add        "file1"
+  repo.commit_all 'Commits file 1'
+  
+end
+
+solution do
+  repo.init
+  result = true
+
+
+  # counts the number of local branches. Should equal 1
+  local_branches = repo.branches.size
+
+  # after a git fetch command, each branch will be stored in in the .git/FETCH_HEAD file. Each branch is on its own line
+  # This command will count the number of lines, which will give the number of branches 
+  if File.file?('.git/FETCH_HEAD') #checks for file existance
+  	num_remote = `wc -l < .git/FETCH_HEAD`
+  else
+  	num_remote = '0'
+  end
+
+  # there should be 1 local branch and 2 remote branches for a success condition
+  if local_branches == 1 and num_remote.to_i == 2
+  	result = true
+  else
+  	result = false
+  end 
+end
+
+hint do
+  puts "Look up the 'git fetch' command"
+end

data/levels/include.rb

@@ -0,0 +1,21 @@
+difficulty 2
+description "Notice a few files with the '.a' extension.  We want git to ignore all but the 'lib.a' file."
+
+setup do
+  repo.init
+  FileUtils.touch("first.a")
+  FileUtils.touch("second.a")
+  FileUtils.touch("lib.a")
+  file = File.open(".git/config", "w") do |file|
+    file.puts "[core]\nexcludesfile="
+  end
+end
+
+solution do
+  entries = File.readlines('.gitignore').map(&:chomp)
+  entries.include? '*.a' and entries.include? '!lib.a'
+end
+
+hint do
+  puts "Using `git gitignore --help`, read about the optional prefix to negate a pattern."
+end

data/levels/number_of_files_committed.rb

@@ -0,0 +1,51 @@
+difficulty 1
+description "There are some files in this repository, how many of the files will be committed?"
+
+setup do
+  repo.init
+
+  #Modified files
+  %w{rubyfile4.rb rubyfile5.rb}.each do |file|
+    FileUtils.touch(file)
+    repo.add(file)
+  end
+  repo.commit_all "Commit"
+
+  #Staged file
+  File.open("rubyfile4.rb", 'w') { |f| f << "#Changes" }
+  repo.add("rubyfile4.rb")
+
+  #Not staged file
+  File.open("rubyfile5.rb", 'w') { |f| f << "#Changes" }
+
+  #Changes to be committed
+  %w{rubyfile1.rb}.each do |file|
+    FileUtils.touch(file)
+    repo.add(file)
+  end  
+
+  #Untrached files
+  %w{rubyfile6.rb rubyfile7.rb}.each do |file|
+    FileUtils.touch(file)
+  end
+end
+
+solution do
+  numberOfFilesThereWillBeCommit = request("How many changes are going to be committed?")
+
+  isInteger = !!(numberOfFilesThereWillBeCommit =~ /^[-+]?[0-9]+$/)
+
+  if !isInteger
+    return false
+  end
+
+  if numberOfFilesThereWillBeCommit.to_i == 2
+    return true
+  end
+
+  return false
+end
+
+hint do
+  puts "You are looking for a command to identify the status of the repository."
+end

data/levels/push_branch.rb

@@ -0,0 +1,87 @@
+difficulty 2
+description "You've made some changes to a local branch and want to share it, but aren't yet ready to merge it with the 'master' branch.  Push only 'test_branch' to the remote repository"
+
+setup do
+
+  # remember the working directory so we can come back to it later
+  cwd = Dir.pwd
+  # initialize another git repo to be used as a "remote"
+  tmpdir = Dir.mktmpdir
+
+  # local repo
+  repo.init
+
+  FileUtils.touch "file1"
+  repo.add        "file1"
+  repo.commit_all "committed changes on master"
+
+  # copy the repo to remote
+  FileUtils.cp_r ".", tmpdir
+
+  # add another file.  If successful this file won't be pushed to the remote repository
+  FileUtils.touch "file2"
+  repo.add        "file2"
+  repo.commit_all "If this commit gets pushed to repo, then you have lost the level :( "
+
+  #This branch should not be pushed to to the remote repository
+  `git checkout -b other_branch --quiet`
+  # add another file
+  FileUtils.touch "file3"
+  repo.add        "file3"
+  repo.commit_all "If this commit gets pushed to repo, then you have lost the level :( "
+
+  `git checkout -b test_branch --quiet`
+
+  #This file should get pushed if the level is successful
+  FileUtils.touch "file4"
+  repo.add        "file4"
+  repo.commit_all "committed change on test_branch"
+
+  # remote repo
+  Dir.chdir tmpdir
+
+  repo.init
+
+  # make a 'non-bare' repo accept pushes
+  `git config receive.denyCurrentBranch ignore`
+
+  # change back to original repo to set up a remote
+  Dir.chdir cwd
+  `git remote add origin #{tmpdir}/.git`
+  `git fetch --quiet origin`
+  `git branch -u origin/master master`
+
+  `git checkout master --quiet` #return to master branch
+end
+
+solution do
+  repo.init
+  result = false
+
+  #each branch consits of one line, `wc -l counts the number of lines in order to get the number of remote branches`
+  #At the moment Grit doesn't support remote branch references but is on the ToDo list.  This should be revisited when Grit implements the change
+  num_remote_branches = `git branch -r | wc -l`.to_i
+
+  # counts the number of commits in the remote master branch'
+  remote_master_commits = repo.commits('origin/master').count
+  remote_test_branch_commits = repo.commits('origin/test_branch').count #if returns 0 indicates that the remote test_branch doesn't exist
+
+  #Level will be successful if the remote master branch remains at 1 commit, the remote test_branch exits and the number of remote branches
+  if remote_master_commits == 1 and remote_test_branch_commits > 0 and num_remote_branches == 2
+    result = true
+
+  #User pushed up too many branches, level failed
+  elsif num_remote_branches > 2
+    puts "*** It looks like you pushed up too many branches. You need to make sure only 'test_branch' gets pushed. Please try again! ***"
+
+  #User pushed up the master banch, level failed
+  elsif remote_master_commits > 1
+    puts "*** It looks like you pushed up new master branch changes. You need to make sure only 'test_branch' gets pushed. Please try again! ***"
+  end
+
+  result
+end
+
+hint do
+  puts "Investigate the options in `git push` using `git push --help`"
+end

data/levels/push_tags.rb

@@ -46,7 +46,7 @@ solution do
 
   # a bit hacky solution to get tags from remote
   remote_tags=
-    repo.git.raw_git_call("git ls-remote --tags -q", repo.git.git_file_index).
+    repo.git.raw_git_call("git ls-remote --tags .", repo.git.git_file_index).
       first.
       split("\n")
 

data/levels/restructure.rb

@@ -0,0 +1,40 @@
+difficulty 3
+
+description "You added some files to your repository, but now realize that your project needs to be restructured.  Make a new folder named `src`, and move all of the .html files into this folder."
+
+setup do
+  repo.init
+
+  FileUtils.touch("about.html")
+  FileUtils.touch("contact.html")
+  FileUtils.touch("index.html")
+
+  repo.add("about.html")
+  repo.add("contact.html")
+  repo.add("index.html")
+
+  repo.commit_all("adding web content.")
+end
+
+solution do
+  index =
+    repo.status["index.html"].type == "D" &&
+    repo.status["index.html"].stage.nil? &&
+    repo.status["src/index.html"].type == "A"
+
+  about =
+    repo.status["about.html"].type == "D" &&
+    repo.status["about.html"].stage.nil? &&
+    repo.status["src/about.html"].type == "A"
+
+  contact =
+    repo.status["contact.html"].type == "D" &&
+    repo.status["contact.html"].stage.nil? &&
+    repo.status["src/contact.html"].type == "A"
+
+  index && about && contact
+end
+
+hint do
+  puts "You'll have to use mkdir, and `git mv`."
+end

data/lib/githug/level.rb

@@ -3,14 +3,15 @@ module Githug
     include UI
 
     LEVELS = [nil, "init", "config", "add", "commit", "clone",
-              "clone_to_folder", "ignore", "status", "rm", "rm_cached",
-              "stash", "rename", "log", "tag", "push_tags", "commit_amend",
-              "reset", "reset_soft", "checkout_file", "remote", "remote_url",
-              "pull", "remote_add", "push", "diff", "blame", "branch", "checkout",
-              "checkout_tag", "checkout_tag_over_branch", "branch_at", "merge",
-              "repack", "cherry-pick", "grep", "rename_commit", "squash",
-              "merge_squash", "reorder", "bisect", "stage_lines",
-              "find_old_branch", "revert", "restore", "conflict", "contribute"]
+              "clone_to_folder", "ignore", "include", "status",
+              "number_of_files_committed", "rm", "rm_cached", "stash", "rename",
+              "restructure", "log", "tag", "push_tags", "commit_amend",
+              "commit_in_future", "reset", "reset_soft", "checkout_file", "remote",
+              "remote_url", "pull", "remote_add", "push", "diff", "blame", "branch",
+              "checkout", "checkout_tag", "checkout_tag_over_branch", "branch_at",
+              "delete_branch", "push_branch", "merge", "fetch", "repack", "cherry-pick",
+              "grep", "rename_commit", "squash", "merge_squash", "reorder", "bisect",
+              "stage_lines", "find_old_branch", "revert", "restore", "conflict", "contribute"]
 
     attr_accessor :level_no, :level_path, :level_name
 

data/lib/githug/ui.rb

@@ -42,7 +42,7 @@ module Githug
       end
 
       def colorize(text, color_code)
-	return puts text if ENV['OS'] && ENV['OS'].downcase.include?("windows")
+        return puts text if ENV['OS'] && ENV['OS'].downcase.include?("windows")
         puts "#{color_code}#{text}\033[0m"
       end
 

data/lib/githug/version.rb

@@ -1,3 +1,3 @@
 module Githug
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/githug_spec.rb

@@ -67,11 +67,20 @@ describe "The Game" do
     `echo "*.swp" >> .gitignore`
     `githug`.should be_solved
   end
+  
+  it "should complete the include level" do
+    `echo "*.a\n!lib.a" >> .gitignore`
+    `githug`.should be_solved
+  end
 
   it "should complete the status level" do
     `git ls-files --other --exclude-standard | githug`.should be_solved
   end
 
+  it "should complete the number of files committed level" do
+    `git diff --name-only --cached | wc -l | githug`.should be_solved
+  end
+
   it "should complete the rm level" do
     file_name = `git status | grep deleted | cut -d " " -f 5`
     `git rm #{file_name}`
@@ -94,6 +103,12 @@ describe "The Game" do
     `githug`.should be_solved
   end
 
+  it "should complete the restructure level" do
+    `mkdir src`
+    `git mv *.html src`
+    `githug`.should be_solved
+  end
+
   it "should complete the log level" do
     `git log --pretty=short | grep commit | cut -c 8-14 | githug`.should be_solved
   end
@@ -114,6 +129,14 @@ describe "The Game" do
     `githug`.should be_solved
   end
 
+  it "should complete the commit_in_future level" do
+    authored_date = Time.now + 14
+    authored_date = authored_date.rfc2822
+
+    `git commit -m "Test of future date" --date="#{authored_date}"`
+    `githug`.should be_solved
+  end
+
   it "should complete the reset level" do
     `git reset HEAD to_commit_second.rb`
     `githug`.should be_solved
@@ -187,11 +210,26 @@ describe "The Game" do
     `githug`.should be_solved
   end
 
+  it "should complete the delete_branch level" do
+    `git branch -d delete_me`
+    `githug`.should be_solved
+  end
+
+  it "should complete the push_branch level" do
+    `git push origin test_branch`
+    `githug`.should be_solved
+  end
+
   it "should commit the merge level" do
     `git merge feature`
     `githug`.should be_solved
   end
 
+  it "should complete the fetch level" do
+    `git fetch`
+    `githug`.should be_solved
+  end
+
   it "should complete the repack level" do
     `git repack -d`
     `githug`.should be_solved

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: githug
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Gary Rennie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -206,6 +206,7 @@ files:
 - levels/clone_to_folder.rb
 - levels/commit.rb
 - levels/commit_amend.rb
+- levels/commit_in_future.rb
 - levels/config.rb
 - levels/conflict.rb
 - levels/conflict/.githug/COMMIT_EDITMSG
@@ -249,6 +250,31 @@ files:
 - levels/conflict/.githug/refs/heads/mybranch
 - levels/conflict/poem.txt
 - levels/contribute.rb
+- levels/delete_branch.rb
+- levels/delete_branch/.githug/COMMIT_EDITMSG
+- levels/delete_branch/.githug/HEAD
+- levels/delete_branch/.githug/config
+- levels/delete_branch/.githug/description
+- levels/delete_branch/.githug/hooks/applypatch-msg.sample
+- levels/delete_branch/.githug/hooks/commit-msg.sample
+- levels/delete_branch/.githug/hooks/post-update.sample
+- levels/delete_branch/.githug/hooks/pre-applypatch.sample
+- levels/delete_branch/.githug/hooks/pre-commit.sample
+- levels/delete_branch/.githug/hooks/pre-push.sample
+- levels/delete_branch/.githug/hooks/pre-rebase.sample
+- levels/delete_branch/.githug/hooks/prepare-commit-msg.sample
+- levels/delete_branch/.githug/hooks/update.sample
+- levels/delete_branch/.githug/index
+- levels/delete_branch/.githug/info/exclude
+- levels/delete_branch/.githug/logs/HEAD
+- levels/delete_branch/.githug/logs/refs/heads/delete_me
+- levels/delete_branch/.githug/logs/refs/heads/master
+- levels/delete_branch/.githug/objects/b6/0afe294eb3c200d646995c9e0234470157c1b0
+- levels/delete_branch/.githug/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
+- levels/delete_branch/.githug/objects/e8/0ad49ace82167de62e498622d70377d913c79e
+- levels/delete_branch/.githug/refs/heads/delete_me
+- levels/delete_branch/.githug/refs/heads/master
+- levels/delete_branch/readme
 - levels/diff.rb
 - levels/diff/.githug/COMMIT_EDITMSG
 - levels/diff/.githug/HEAD
@@ -273,6 +299,7 @@ files:
 - levels/diff/.githug/objects/dc/aa55e97af34402e84d5336da37abcccc23cba6
 - levels/diff/.githug/refs/heads/master
 - levels/diff/app.rb
+- levels/fetch.rb
 - levels/find_old_branch.rb
 - levels/find_old_branch/.githug/COMMIT_EDITMSG
 - levels/find_old_branch/.githug/HEAD
@@ -339,6 +366,7 @@ files:
 - levels/grep/app.rb
 - levels/grep/config.rb
 - levels/ignore.rb
+- levels/include.rb
 - levels/init.rb
 - levels/log.rb
 - levels/merge.rb
@@ -370,8 +398,10 @@ files:
 - levels/merge/.githug/refs/heads/master
 - levels/merge/file1
 - levels/merge_squash.rb
+- levels/number_of_files_committed.rb
 - levels/pull.rb
 - levels/push.rb
+- levels/push_branch.rb
 - levels/push_tags.rb
 - levels/remote.rb
 - levels/remote_add.rb
@@ -383,6 +413,7 @@ files:
 - levels/reset.rb
 - levels/reset_soft.rb
 - levels/restore.rb
+- levels/restructure.rb
 - levels/revert.rb
 - levels/rm.rb
 - levels/rm_cached.rb