githug 0.1.8 → 0.2.0

data/README.md

@@ -1,17 +1,17 @@
-#Githug
+# Githug
 Git Your Game On [![Build Status](https://secure.travis-ci.org/Gazler/githug.png?branch=master)](http://travis-ci.org/Gazler/githug)
 
-##About
+## 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.
 
-##Installation
+## Installation
 To install Githug
 
     gem install githug
 
 After the gem is installed, you can run `githug` where you will be prompted to create a directory.  Githug should work on Linux and OS X.
 
-##Commands
+## Commands
 
 Githug has 4 commands:
 
@@ -20,8 +20,12 @@ Githug has 4 commands:
  * reset - Reset the current level
  * test - Used to test levels in development, please see the Testing Levels section.
 
+## Change Log
 
-##Contributing
+The change log is available on the wiki.  [Change log](https://github.com/Gazler/githug/wiki/Change-Log)
+
+
+## Contributing
 
 If you want to suggest a level or make a level that has been suggested, check out [the wiki](https://github.com/Gazler/githug/wiki).
 
@@ -33,14 +37,14 @@ If you want to suggest a level or make a level that has been suggested, check ou
  * Make sure your level works (covered below)
  * Submit a pull request
 
-##Todo List
+## 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!
  * [Windows support](https://github.com/Gazler/githug/wiki/Windows-Support)
 
-##Writing Levels
+## Writing Levels
 
 Githug has a DSL for writing levels
 
@@ -106,7 +110,7 @@ This will copy the contents of a repository specified in the levels folder for y
 
 After doing this, your level should be able to copy the contents from that git repository and use those for your level.  You can see the "blame" level for an example of this.
 
-##Testing Levels
+## Testing Levels
 
 The easiest way to test a level is:
 

data/githug.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec", "~>2.8.0"
 
-  s.add_dependency "grit", "~>2.4.1"
+  s.add_dependency "grit", "~>2.3.0"
   s.add_dependency "thor", "~>0.14.6"
   s.add_dependency "rake"
   # s.add_runtime_dependency "rest-client"

data/levels/branch_at.rb

@@ -15,7 +15,9 @@ setup do
 end
 
 solution do
-  repo.branches.map(&:name).include?("test_branch") and (repo.commits("test_branch").last.message ==  "Updating file1")
+  return false unless repo.branches.map(&:name).include?("test_branch")
+  repo.commits("test_branch").each { |commit| return false if commit.message ==  "Updating file1 again" }
+  true
 end
 
 hint do

data/levels/commit_ammend.rb

@@ -10,7 +10,8 @@ setup do
 end
 
 solution do
-  repo.commits.length == 2 && repo.commits.first.stats.files.length == 2
+		
+  repo.commits.length == 2 && Grit::CommitStats.find_all(repo, repo.commits.first.sha).first[1].files.length == 2
 end
 
 hint do

data/levels/find_old_branch/.githug/COMMIT_EDITMSG

@@ -0,0 +1 @@
+commit another todo

data/levels/find_old_branch/.githug/HEAD

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

data/levels/find_old_branch/.githug/ORIG_HEAD

@@ -0,0 +1 @@
+05e9c01bd3c9264761dd0cde477400a2c3104642

data/levels/find_old_branch/.githug/config

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

data/levels/find_old_branch/.githug/description

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

data/levels/find_old_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/find_old_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/find_old_branch/.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/find_old_branch/.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/find_old_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/find_old_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/find_old_branch/.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/find_old_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/find_old_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/find_old_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/find_old_branch/.githug/info/exclude

@@ -0,0 +1,7 @@
+# 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]
+# *~
+.DS_Store

data/levels/find_old_branch/.githug/logs/HEAD

@@ -0,0 +1,7 @@
+0000000000000000000000000000000000000000 6876e5b41fb693190df76b1baef6ef98623b4f1a mcramm <GMCramm@gmail.com> 1332283192 -0600	commit (initial): initial commit
+6876e5b41fb693190df76b1baef6ef98623b4f1a 6876e5b41fb693190df76b1baef6ef98623b4f1a mcramm <GMCramm@gmail.com> 1332283224 -0600	checkout: moving from cure_common_cold to kill_the_batman
+6876e5b41fb693190df76b1baef6ef98623b4f1a 6876e5b41fb693190df76b1baef6ef98623b4f1a mcramm <GMCramm@gmail.com> 1332283240 -0600	checkout: moving from kill_the_batman to blowup_sun_for_ransom
+6876e5b41fb693190df76b1baef6ef98623b4f1a 6876e5b41fb693190df76b1baef6ef98623b4f1a mcramm <GMCramm@gmail.com> 1332283272 -0600	checkout: moving from blowup_sun_for_ransom to solve_world_hunger
+6876e5b41fb693190df76b1baef6ef98623b4f1a 324336a8401afc8ca384eaafe6615c84d552dd2c mcramm <GMCramm@gmail.com> 1332283302 -0600	commit: commit todo
+324336a8401afc8ca384eaafe6615c84d552dd2c 6876e5b41fb693190df76b1baef6ef98623b4f1a mcramm <GMCramm@gmail.com> 1332283316 -0600	checkout: moving from solve_world_hunger to kill_the_batman
+6876e5b41fb693190df76b1baef6ef98623b4f1a 894a16d6f1a48224e9006b4a6f0fe3846da19bec mcramm <GMCramm@gmail.com> 1332283505 -0600	commit: commit another todo

data/levels/find_old_branch/.githug/logs/refs/heads/blowup_sun_for_ransom

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 6876e5b41fb693190df76b1baef6ef98623b4f1a mcramm <GMCramm@gmail.com> 1332283240 -0600	branch: Created from HEAD

data/levels/find_old_branch/.githug/logs/refs/heads/cure_common_cold

@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 6876e5b41fb693190df76b1baef6ef98623b4f1a mcramm <GMCramm@gmail.com> 1332283192 -0600	commit (initial): initial commit
+6876e5b41fb693190df76b1baef6ef98623b4f1a 6876e5b41fb693190df76b1baef6ef98623b4f1a mcramm <GMCramm@gmail.com> 1332283208 -0600	Branch: renamed refs/heads/master to refs/heads/cure_common_cold

data/levels/find_old_branch/.githug/logs/refs/heads/kill_the_batman

@@ -0,0 +1,4 @@
+0000000000000000000000000000000000000000 6876e5b41fb693190df76b1baef6ef98623b4f1a mcramm <GMCramm@gmail.com> 1332283224 -0600	branch: Created from HEAD
+6876e5b41fb693190df76b1baef6ef98623b4f1a 05e9c01bd3c9264761dd0cde477400a2c3104642 mcramm <GMCramm@gmail.com> 1332283348 -0600	commit: commit todo
+05e9c01bd3c9264761dd0cde477400a2c3104642 6876e5b41fb693190df76b1baef6ef98623b4f1a mcramm <GMCramm@gmail.com> 1332283385 -0600	reset: moving to HEAD~
+6876e5b41fb693190df76b1baef6ef98623b4f1a 894a16d6f1a48224e9006b4a6f0fe3846da19bec mcramm <GMCramm@gmail.com> 1332283505 -0600	commit: commit another todo

data/levels/find_old_branch/.githug/logs/refs/heads/solve_world_hunger

@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 6876e5b41fb693190df76b1baef6ef98623b4f1a mcramm <GMCramm@gmail.com> 1332283272 -0600	branch: Created from HEAD
+6876e5b41fb693190df76b1baef6ef98623b4f1a 324336a8401afc8ca384eaafe6615c84d552dd2c mcramm <GMCramm@gmail.com> 1332283302 -0600	commit: commit todo

data/levels/find_old_branch/.githug/refs/heads/blowup_sun_for_ransom

@@ -0,0 +1 @@
+6876e5b41fb693190df76b1baef6ef98623b4f1a

data/levels/find_old_branch/.githug/refs/heads/cure_common_cold

@@ -0,0 +1 @@
+6876e5b41fb693190df76b1baef6ef98623b4f1a

data/levels/find_old_branch/.githug/refs/heads/kill_the_batman

@@ -0,0 +1 @@
+894a16d6f1a48224e9006b4a6f0fe3846da19bec

data/levels/find_old_branch/.githug/refs/heads/solve_world_hunger

@@ -0,0 +1 @@
+324336a8401afc8ca384eaafe6615c84d552dd2c

data/levels/find_old_branch/TODO

@@ -0,0 +1 @@
+FIND THE JOKER

data/levels/find_old_branch/myfile.txt

@@ -0,0 +1 @@
+THIS TEXT DOESN'T MATTER

data/levels/find_old_branch.rb

@@ -0,0 +1,15 @@
+difficulty 4
+description "You have been working on a branch but got distracted by a major issue and forgot the name of it. Switch back to that branch"
+
+setup do
+  init_from_level
+end
+
+solution do
+  return false unless repo.head.name == "solve_world_hunger"
+  true
+end
+
+hint do
+  puts "Ever played with the `git reflog` command?"
+end

data/levels/merge.rb

@@ -2,11 +2,11 @@ difficulty 2
 description "We have a file in the branch 'feature'; Let's merge it to the master branch"
 
 setup do
-  init_from_level
+	init_from_level
 end
 
 solution do
-  `ls`.strip().split() == ["file1", "file2"]
+	File.exists?("file1")	&& File.exists?("file2") 
 end
 
 hint do

data/levels/reorder.rb

@@ -0,0 +1,29 @@
+difficulty 4
+description "You have committed several times but in the wrong order. Please reorder your commits"
+
+setup do
+  repo.init
+
+  FileUtils.touch "file1"
+  repo.add        "file1"
+  repo.commit_all "First commit"
+
+  FileUtils.touch "file3"
+  repo.add        "file3"
+  repo.commit_all "Third commit"
+
+  FileUtils.touch "file2"
+  repo.add        "file2"
+  repo.commit_all "Second commit"
+end
+
+solution do
+  return false unless repo.commits[2].message == "First commit"
+  return false unless repo.commits[1].message == "Second commit"
+  return false unless repo.commits[0].message == "Third commit"
+  true
+end
+
+hint do
+  puts "Take a look the -i flag of the rebase command."
+end

data/levels/rm.rb

@@ -5,6 +5,7 @@ description "A file has been removed from this repository, however the file was
 setup do
   repo.init
   file = File.new("deleteme.rb", "w") 
+	file.close
   repo.add("deleteme.rb")
   repo.commit_all("Added a temp file")
   File.delete("deleteme.rb")

data/levels/stage_lines.rb

@@ -1,6 +1,6 @@
 difficulty 4
 
-description "You've made changes within a single file that belong to two different features, but niether of the changes are yet staged. Stage and commit only the changes belonging to the first feature."
+description "You've made changes within a single file that belong to two different features, but neither of the changes are yet staged. Stage only the changes belonging to the first feature."
 
 setup do
   repo.init
@@ -25,5 +25,5 @@ solution do
 end
 
 hint do
-  puts "Read about the -p flag which can be passed to the 'add' command; man git-add. After that have a look the options available while using 'add -p' mode to manupulate hunks."
+  puts "You might want to try to manipulate the hunks of the diff to choose which lines of the diff get staged. Read about the flags which can be passed to the 'add' command; man git-add."
 end

data/lib/githug/level.rb

@@ -6,7 +6,8 @@ module Githug
               "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", "stage_lines", "contribute"]
+              "branch_at", "merge", "rename_commit", "squash", 'reorder', "stage_lines",
+              "find_old_branch", "contribute"]
 
     attr_accessor :level_no, :level_path
     

data/lib/githug/ui.rb

@@ -51,6 +51,7 @@ module Githug
       end
 
       def colorize(text, color_code)
+	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.1.8"
+  VERSION = "0.2.0"
 end

data/spec/githug/ui_spec.rb

@@ -71,14 +71,40 @@ describe Githug::UI do
     @ui.ask("foo?").should be_false
   end
 
-  it "should print out a success message in green" do
-    @ui.success("success")
-    @out.string.should eql("\033[32msuccess\033[0m\n")
+  describe "Non Windows Platform" do
+    before(:each) do
+      ENV.stub(:[]).with("OS").and_return(nil)
+    end
+
+    it "should print out a success message in green" do
+      @ui.success("success")
+      @out.string.should eql("\033[32msuccess\033[0m\n")
+    end
+
+    it "should print out a error message in red" do
+      @ui.error("error")
+      @out.string.should eql("\033[31merror\033[0m\n")
+    end
+
   end
 
-  it "should print out a error message in red" do
-    @ui.error("error")
-    @out.string.should eql("\033[31merror\033[0m\n")
+  describe "Non Windows Platform" do
+    
+    before(:each) do
+      ENV.stub(:[]).with("OS").and_return("Windows_NT")
+    end
+
+    it "should print out a success message in white" do
+      @ui.success("success")
+      @out.string.should eql("success\n")
+    end
+
+    it "should print out a error message in white" do
+      @ui.error("error")
+      @out.string.should eql("error\n")
+    end
+
   end
+
   
 end

metadata

@@ -2,7 +2,7 @@
 name: githug
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors: 
 - Gary Rennie
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-22 00:00:00 +00:00
-default_executable: 
+date: 2012-03-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -32,7 +31,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.4.1
+        version: 2.3.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -146,6 +145,45 @@ files:
 - levels/diff/.githug/objects/dc/aa55e97af34402e84d5336da37abcccc23cba6
 - levels/diff/.githug/refs/heads/master
 - levels/diff/app.rb
+- levels/find_old_branch.rb
+- levels/find_old_branch/.githug/COMMIT_EDITMSG
+- levels/find_old_branch/.githug/HEAD
+- levels/find_old_branch/.githug/ORIG_HEAD
+- levels/find_old_branch/.githug/config
+- levels/find_old_branch/.githug/description
+- levels/find_old_branch/.githug/hooks/applypatch-msg.sample
+- levels/find_old_branch/.githug/hooks/commit-msg.sample
+- levels/find_old_branch/.githug/hooks/post-commit.sample
+- levels/find_old_branch/.githug/hooks/post-receive.sample
+- levels/find_old_branch/.githug/hooks/post-update.sample
+- levels/find_old_branch/.githug/hooks/pre-applypatch.sample
+- levels/find_old_branch/.githug/hooks/pre-commit.sample
+- levels/find_old_branch/.githug/hooks/pre-rebase.sample
+- levels/find_old_branch/.githug/hooks/prepare-commit-msg.sample
+- levels/find_old_branch/.githug/hooks/update.sample
+- levels/find_old_branch/.githug/index
+- levels/find_old_branch/.githug/info/exclude
+- levels/find_old_branch/.githug/logs/HEAD
+- levels/find_old_branch/.githug/logs/refs/heads/blowup_sun_for_ransom
+- levels/find_old_branch/.githug/logs/refs/heads/cure_common_cold
+- levels/find_old_branch/.githug/logs/refs/heads/kill_the_batman
+- levels/find_old_branch/.githug/logs/refs/heads/solve_world_hunger
+- levels/find_old_branch/.githug/objects/05/e9c01bd3c9264761dd0cde477400a2c3104642
+- levels/find_old_branch/.githug/objects/1f/0a136ddd98f61934d15eb00444df32d8e8254b
+- levels/find_old_branch/.githug/objects/32/4336a8401afc8ca384eaafe6615c84d552dd2c
+- levels/find_old_branch/.githug/objects/50/72aab6bd73accec89ad3aa077f43aab8a5e507
+- levels/find_old_branch/.githug/objects/5d/130caf89f1a4bba6a1fffe72c484f3ab659e08
+- levels/find_old_branch/.githug/objects/68/76e5b41fb693190df76b1baef6ef98623b4f1a
+- levels/find_old_branch/.githug/objects/6a/7702145d1eb91c9f79583eabb984027b12e60c
+- levels/find_old_branch/.githug/objects/89/4a16d6f1a48224e9006b4a6f0fe3846da19bec
+- levels/find_old_branch/.githug/objects/b8/c67b45e5fe9e4b39ac7ade725673f7c90bdfc3
+- levels/find_old_branch/.githug/objects/bf/76434bc7e7346c6fef5a98aee0f7cfc0788f34
+- levels/find_old_branch/.githug/refs/heads/blowup_sun_for_ransom
+- levels/find_old_branch/.githug/refs/heads/cure_common_cold
+- levels/find_old_branch/.githug/refs/heads/kill_the_batman
+- levels/find_old_branch/.githug/refs/heads/solve_world_hunger
+- levels/find_old_branch/TODO
+- levels/find_old_branch/myfile.txt
 - levels/ignore.rb
 - levels/init.rb
 - levels/log.rb
@@ -183,6 +221,7 @@ files:
 - levels/remote_url.rb
 - levels/rename.rb
 - levels/rename_commit.rb
+- levels/reorder.rb
 - levels/reset.rb
 - levels/rm.rb
 - levels/rm_cached.rb
@@ -205,7 +244,6 @@ files:
 - spec/githug/repository_spec.rb
 - spec/githug/ui_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -229,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: githug
-rubygems_version: 1.5.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: An interactive way to learn git.