githug 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2b24792d26cafa5f3343cf6896c1ed241bd0f97
-  data.tar.gz: a70f943872bc9a6983e07fff39300b8d7a8ac9b1
+  metadata.gz: e7d79d4ffee6020278723a688b4a55dc3dfba4ac
+  data.tar.gz: ee2e0f4be70b93e83e5f77d8160960e27ec36c6d
 SHA512:
-  metadata.gz: 0c00674dc3a3ecac0ec3a72545d724c85ff7661bf4200b8202627888fc5dc8a718752a57b4b2ed59ba51f702c9cff373f1394cb24e3aa54dc3318bd30165fc88
-  data.tar.gz: 07d27ecc1dad1a86e4e861e2cc0e51f26c2ceb5cf399b0521666a46348b00b7d7392e5874edbfd601da8788d3bfc5953b838ebe8f2c13ff039c107d71dc5eec7
+  metadata.gz: ab986424a092306825c2c11962ee68b643c5bc3384e3571839e220a354df25112c4f22bf8665c7b6ad8cb029e5b66d0aba3390f96156b487b6801fe75ea1d552
+  data.tar.gz: b44c21dec92e90bbb5241778b9455cad34ffa4894ab846fe3c0ecc4325c19c43329f13b4498b05f499f152385a1ee0b90f71843c9632b38f6d8877503a3d1dd8

data/.rspec

@@ -1 +1,2 @@
 --color
+--order default

data/README.md

@@ -13,11 +13,12 @@ After the gem is installed, you can run `githug` where you will be prompted to c
 
 ## Commands
 
-Githug has 4 commands:
+Githug has 5 commands:
 
  * play - This is the default command and it will check your solution for the current level.
  * hint - Gives you a hint (if available) for the current level
- * reset - Reset the current level
+ * reset - Reset the current level or reset the level to a given name or path
+ * levels - List all of the levels
  * test - Used to test levels in development, please see the Testing Levels section.
 
 ## Change Log
@@ -112,7 +113,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 reset PATH_TO_YOUR_LEVEL`
+ * Run `githug load PATH_TO_YOUR_LEVEL`
  * Solve the level
  * Run `githug test PATH_TO_YOUR_LEVEL`
 

data/levels/conflict.rb

@@ -1,5 +1,5 @@
 difficulty 4
-description "You need to merge the current branch (master) with mybranch. But there may be some incorrect changes in mybranch which may cause conflicts. Solve any merge-conflicts you come across and finish the merge."
+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."
 
 setup do
   init_from_level
@@ -11,7 +11,7 @@ solution do
   solved = false unless repo.head.name == "master"
   solved = false unless repo.commits("master")[0].parents.length == 2
 
-  txt = `cat poem.txt`
+  txt = File.read("poem.txt")
   solved = false if txt =~ /[<>=|]/
   solved = false unless txt =~ /Sat on a wall/
 

data/levels/grep.rb

@@ -0,0 +1,14 @@
+difficulty 2
+description "Your project's deadline approaches, you should evaluate how many TODOs are left in your code"
+
+setup do
+  init_from_level
+end
+
+solution do
+  request("How many items are there in your todolist?") == "4"
+end
+
+hint do
+  puts "You want to research the `git grep` command."
+end

data/levels/grep/.githug/COMMIT_EDITMSG

@@ -0,0 +1 @@
+Add application files.

data/levels/grep/.githug/HEAD

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

data/levels/grep/.githug/config

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

data/levels/grep/.githug/description

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

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

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script that is called after a successful
+# commit is made.
+#
+# To enable this hook, rename this file to "post-commit".
+
+: Nothing

data/levels/grep/.githug/hooks/post-receive.sample

@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script for the "post-receive" event.
+#
+# The "post-receive" script is run after receive-pack has accepted a pack
+# and the repository has been updated.  It is passed arguments in through
+# stdin in the form
+#  <oldrev> <newrev> <refname>
+# For example:
+#  aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master
+#
+# see contrib/hooks/ for a sample, or uncomment the next line and
+# rename the file to "post-receive".
+
+#. /usr/share/doc/git-core/contrib/hooks/post-receive-email

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

@@ -0,0 +1,46 @@
+#!/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)
+
+# 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')"
+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
+
+exec git diff-index --check --cached $against --

data/levels/grep/.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/grep/.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/grep/.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/grep/.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/grep/.githug/logs/HEAD

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 12c702f8b25b6b528cf904670b854dba3eba0f45 Thibaud Colas <thibaudcolas@gmail.com> 1384229258 +0100	commit (initial): Add application files.

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

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 12c702f8b25b6b528cf904670b854dba3eba0f45 Thibaud Colas <thibaudcolas@gmail.com> 1384229258 +0100	commit (initial): Add application files.

data/levels/grep/.githug/objects/12/c702f8b25b6b528cf904670b854dba3eba0f45

@@ -0,0 +1,3 @@
+x
��K
+�0@]��J�Ѐ�����dj�)mz+���{���՚;�O}
�f��[��1:���Dޙ�,D)r�d�}n+<�L�'x��\��K�W�\n�
+ƍ��h�gm�V�=�]�/�{J��R2c��

data/levels/grep/.githug/objects/6f/45753f4a16b69f5b2215f2dbe8245f073353cc

@@ -0,0 +1 @@
+x
e�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�&�%����４�j�h����)}N)��Ql�Gm�������h�

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

@@ -0,0 +1 @@
+12c702f8b25b6b528cf904670b854dba3eba0f45

data/levels/grep/app.rb

@@ -0,0 +1,45 @@
+require 'sinatra'
+require 'oauth2'
+require 'json'
+enable :sessions
+
+# TODO Make site url variable.
+def client
+  OAuth2::Client.new("mTeZFqkCmzc8JnjKXaSww95bFFxhUpp1wwmSi8vG", "a9OMyEdW7JvWThHmmvFcShR9P2dyad3EGuA2ULDh", :site => "http://localhost:3000")
+end
+
+get "/auth/test" do
+  redirect client.auth_code.authorize_url(:redirect_uri => redirect_uri)
+end
+
+get '/auth/test/callback' do
+  access_token = client.auth_code.get_token(params[:code], :redirect_uri => redirect_uri)
+  session[:access_token] = access_token.token
+  @message = "Successfully authenticated with the server"
+  erb :success
+end
+
+get '/yet_another' do
+  @message = get_response('data.json')
+  erb :success
+end
+
+get '/another_page' do
+  @message = get_response('server.json')
+  erb :another
+end
+
+# TODO Make API version variable.
+def get_response(url)
+  access_token = OAuth2::AccessToken.new(client, session[:access_token])
+  JSON.parse(access_token.get("/api/v1/#{url}").body)
+end
+
+# TODO Redirecting queries could be useful.
+def redirect_uri
+  uri = URI.parse(request.url)
+  uri.path = '/auth/test/callback'
+  uri.query = nil
+  uri.to_s
+end
+

data/levels/grep/config.rb

@@ -0,0 +1,17 @@
+class Config
+  attr_accessor :name, :password
+  def initialize(name, password = nil, options = {})
+    @name = name
+    # TODO Move password to a configuration file.
+    @password = password || "i<3evil"
+
+    if options[:downcase]
+      @name.downcase!
+    end
+
+    if options[:upcase]
+      @name.upcase!
+    end
+
+  end
+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 (don't commit anything)."
+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)."
 
 setup do
   repo.init

data/lib/githug/cli.rb

@@ -37,11 +37,7 @@ module Githug
     desc :reset, "Reset the current level"
 
     def reset(path = nil)
-      if path
-        level = Level.load_from_file(path)
-      else
-        level = load_level
-      end
+      level = load_level(path)
       UI.word_box("Githug")
       if level
         UI.puts("resetting level")
@@ -52,9 +48,24 @@ module Githug
       end
     end
 
+    desc :levels, "List all of the levels"
+
+    def levels
+      list_with_numbers = Level.list.each_with_index.map do |name, index|
+        "##{index + 1}: #{name}"
+      end
+      UI.puts(list_with_numbers)
+    end
+
     no_tasks do
 
-      def load_level
+      def load_level(path = nil)
+        return load_level_from_profile unless path
+        return Level.load(path) if Level.list.include?(path)
+        Level.load_from_file(path)
+      end
+
+      def load_level_from_profile
         profile = Profile.load
         Level.load(profile.level)
       end

data/lib/githug/level.rb

@@ -2,17 +2,17 @@ module Githug
   class Level
     include UI
 
-    LEVELS = [nil, "init", "add", "commit", "config", "clone",
+    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",
-              "rename_commit", "squash", "merge_squash", "reorder", "bisect",
-              "stage_lines", "find_old_branch", "revert", "restore",
-              "conflict", "contribute"]
+              "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"]
 
-    attr_accessor :level_no, :level_path
+    attr_accessor :level_no, :level_path, :level_name
 
     class << self
 
@@ -25,16 +25,19 @@ module Githug
         setup(path)
       end
 
+      def list
+        return LEVELS - [nil]
+      end
 
       def setup(path)
-        level_name = File.basename(path, File.extname(path))
         level_path = path.chomp(File.extname(path))
         level = self.new
 
         return false unless File.exists?(path)
 
         level.instance_eval(File.read(path))
-        level.level_no = LEVELS.index(level_name) || 1
+        level.level_name = File.basename(path, File.extname(path))
+        level.level_no = LEVELS.index(level.level_name) || 1
         level.level_path = level_path
         level
       end
@@ -73,6 +76,7 @@ module Githug
 
     def full_description
       UI.puts
+      UI.puts "Name: #{level_name}"
       UI.puts "Level: #{level_no}"
       UI.puts "Difficulty: #{"*"*@difficulty}"
       UI.puts

data/lib/githug/version.rb

@@ -1,3 +1,3 @@
 module Githug
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

data/spec/githug/cli_spec.rb

@@ -85,6 +85,15 @@ describe Githug::CLI do
         @cli.reset
       end
 
+      it "should reset the level with a level name" do
+        @level.should_receive(:setup_level)
+        @level.should_receive(:full_description)
+        Githug::Level.should_receive(:load).with("add").and_return(@level)
+        Githug::UI.should_receive(:word_box).with("Githug")
+        Githug::UI.should_receive(:puts).with("resetting level")
+        @cli.reset("add")
+      end
+
       it "should reset the level with a path" do
         @level.should_receive(:setup_level)
         @level.should_receive(:full_description)
@@ -96,4 +105,13 @@ describe Githug::CLI do
 
   end
 
+  describe "levels" do
+
+    it "should should print the levels and their numbers" do
+      Githug::Level.stub(:list).and_return(["commit", "add"])
+      Githug::UI.should_receive(:puts).with(["#1: commit", "#2: add"])
+      @cli.levels
+    end
+  end
+
 end

data/spec/githug/level_spec.rb

@@ -54,6 +54,12 @@ end
 
   end
 
+  describe "list" do
+    it "should list the levels without nil" do
+      Githug::Level.list.should eql(Githug::Level::LEVELS - [nil])
+    end
+  end
+
   describe "load_from_file" do
     it "should load the level" do
       File.stub(:dirname).and_return("")

data/spec/githug_spec.rb

@@ -33,17 +33,6 @@ describe "The Game" do
     `githug`.should be_solved
   end
 
-  it "should complete the add level" do
-    `git add README`
-    `githug`.should be_solved
-  end
-
-  it "should complete the commit level" do
-    `git commit -m "test message"`
-    `githug`.should be_solved
-  end
-
-
   it "should complete the config level" do
     skip_level #The CI server does not have git config set
     #full_name = `git config --get user.name`.chomp
@@ -54,6 +43,16 @@ describe "The Game" do
     #f.close
   end
 
+  it "should complete the add level" do
+    `git add README`
+    `githug`.should be_solved
+  end
+
+  it "should complete the commit level" do
+    `git commit -m "test message"`
+    `githug`.should be_solved
+  end
+
   it "should complete the clone level" do
     `git clone https://github.com/Gazler/cloneme`
     `githug`.should be_solved
@@ -204,6 +203,10 @@ describe "The Game" do
     `githug`.should be_solved
   end
 
+  it "should complete the grep level" do
+    `echo "4" | githug`.should be_solved
+  end
+
   it "should complete the rename_commit level" do
     skip_level
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: githug
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Gary Rennie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -312,6 +312,32 @@ files:
 - levels/find_old_branch/.githug/refs/heads/solve_world_hunger
 - levels/find_old_branch/TODO
 - levels/find_old_branch/myfile.txt
+- levels/grep.rb
+- levels/grep/.githug/COMMIT_EDITMSG
+- levels/grep/.githug/HEAD
+- levels/grep/.githug/config
+- levels/grep/.githug/description
+- levels/grep/.githug/hooks/applypatch-msg.sample
+- levels/grep/.githug/hooks/commit-msg.sample
+- levels/grep/.githug/hooks/post-commit.sample
+- levels/grep/.githug/hooks/post-receive.sample
+- levels/grep/.githug/hooks/post-update.sample
+- levels/grep/.githug/hooks/pre-applypatch.sample
+- levels/grep/.githug/hooks/pre-commit.sample
+- levels/grep/.githug/hooks/pre-rebase.sample
+- levels/grep/.githug/hooks/prepare-commit-msg.sample
+- levels/grep/.githug/hooks/update.sample
+- levels/grep/.githug/index
+- levels/grep/.githug/info/exclude
+- levels/grep/.githug/logs/HEAD
+- levels/grep/.githug/logs/refs/heads/master
+- levels/grep/.githug/objects/12/c702f8b25b6b528cf904670b854dba3eba0f45
+- levels/grep/.githug/objects/6f/45753f4a16b69f5b2215f2dbe8245f073353cc
+- levels/grep/.githug/objects/a4/1fe0c342be5c9930328cbb4315acebbd9c94b2
+- levels/grep/.githug/objects/d3/f53e82aa015d1eea3b06c3b62dfbacee83bbe1
+- levels/grep/.githug/refs/heads/master
+- levels/grep/app.rb
+- levels/grep/config.rb
 - levels/ignore.rb
 - levels/init.rb
 - levels/log.rb
@@ -423,7 +449,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: githug
-rubygems_version: 2.0.2
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: An interactive way to learn git.