githug 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e9bf4cc4edb1340324308e6962db57c4f3d3d15
-  data.tar.gz: 88179cc894098286f09d5c0e9f4abedab122c7ac
+  metadata.gz: 5dce13542ce027da803b93c704387da3fcfb830f
+  data.tar.gz: 7d30594b86429ca28b6f8198d48a7877eb5f0fa2
 SHA512:
-  metadata.gz: 9b799abc8c24919db796761438a082c5c71698a5bce8e382795fd67a3864bcad2b1822f1f9b394d39b3655348cdf60a862b4f7679a63ec2b04df5ea73e80d561
-  data.tar.gz: eed02fe344c91defe7f5406733cd4ee6f4fb7930eb43d1d5dfde91af9e3fd981138a293236e860d13c82bcb67fde40f6962fa671851d7c94ca86d66fbf5f87dd
+  metadata.gz: 3623c1b9027ff1b5fcf49f378d76d6e44b945965596c24bc51b20ed9f55736be7f12b497862ddf590ec7c7658e4488eb804df28cf0f3d2e5fa02de92fb77731e
+  data.tar.gz: 1f3e59721590922b63eb375eb8c37ebce41a1c9f1e4ea7f9e0143f1cab7bc982b60a9de77f397eaec61d49ee6210cd9e97eff4d9fb53e76acd424c9c8301ffee

data/levels/add.rb

@@ -1,6 +1,6 @@
 difficulty 1
-description "There is a file in your folder called README, you should add it to your staging area
-Note: You start each level with a new repo. Don't look for files from the previous one"
+description "There is a file in your folder called `README`, you should add it to your staging area
+Note: You start each level with a new repo. Don't look for files from the previous one."
 
 setup do
   repo.init
@@ -14,5 +14,5 @@ solution do
 end
 
 hint do
-  puts "You can type `git` in your shell to get a list of available git commands"
+  puts "You can type `git` in your shell to get a list of available git commands."
 end

data/levels/bisect.rb

@@ -1,5 +1,5 @@
 difficulty 3
-description "A bug was introduced somewhere along the way.  You know that running 'ruby prog.rb 5' should output 15.  You can also run 'make test'.  What are the first 7 chars of the hash of the commit that introduced the bug."
+description "A bug was introduced somewhere along the way.  You know that running `ruby prog.rb 5` should output 15.  You can also run `make test`.  What are the first 7 chars of the hash of the commit that introduced the bug."
 
 setup do
   init_from_level
@@ -11,5 +11,5 @@ solution do
 end
 
 hint do
-  puts ["The fastest way to find the bug is with bisect.", "Don't forget to start bisect first, identify a good or bad commit, then run git bisect run make test."]
+  puts ["The fastest way to find the bug is with bisect.", "Don't forget to start bisect first, identify a good or bad commit, then run `git bisect run make test`."]
 end

data/levels/blame.rb

@@ -1,5 +1,5 @@
 difficulty 2
-description "Someone has put a password inside the file 'config.rb' find out who it was"
+description "Someone has put a password inside the file `config.rb` find out who it was."
 
 setup do
   init_from_level
@@ -11,5 +11,5 @@ solution do
 end
 
 hint do
-  puts "You want to research the `git blame` command"
+  puts "You want to research the `git blame` command."
 end

data/levels/branch.rb

@@ -1,5 +1,5 @@
 difficulty 1
-description "You want to work on a piece of code that has the potential to break things, create the branch test_code"
+description "You want to work on a piece of code that has the potential to break things, create the branch test_code."
 
 setup do
   repo.init
@@ -13,6 +13,6 @@ solution do
 end
 
 hint do
-  puts "git branch is what you want to investigate"
+  puts "`git branch` is what you want to investigate."
 end
 

data/levels/branch_at.rb

@@ -1,5 +1,5 @@
 difficulty 3
-description "You forgot to branch at the previous commit and made a commit on top of it. Create branch 'test_branch' at the commit before the last"
+description "You forgot to branch at the previous commit and made a commit on top of it. Create branch test_branch at the commit before the last."
 
 setup do
   repo.init
@@ -21,5 +21,5 @@ solution do
 end
 
 hint do
-  puts "Just like creating a branch, but you have to pass an extra argument"
+  puts "Just like creating a branch, but you have to pass an extra argument."
 end

data/levels/checkout.rb

@@ -1,5 +1,5 @@
 difficulty 2
-description "Create and switch to a new branch called 'my_branch'.  You will need to create a branch like you did in the previous level"
+description "Create and switch to a new branch called my_branch.  You will need to create a branch like you did in the previous level."
 
 setup do
   repo.init
@@ -14,5 +14,5 @@ solution do
 end
 
 hint do
-  puts "Try looking up `git checkout` and `git branch`"
+  puts "Try looking up `git checkout` and `git branch`."
 end

data/levels/checkout_tag.rb

@@ -1,6 +1,6 @@
 difficulty 2
 
-description "You need to fix a bug in the version 1.2 of your app. Checkout the tag v1.2"
+description "You need to fix a bug in the version 1.2 of your app. Checkout the tag `v1.2`."
 
 setup do
   repo.init
@@ -35,5 +35,5 @@ solution do
 end
 
 hint do
-  puts "There's no big difference between checking out a branch and checking out a tag"
+  puts "There's no big difference between checking out a branch and checking out a tag."
 end

data/levels/checkout_tag_over_branch.rb

@@ -1,6 +1,6 @@
 difficulty 2
 
-description "You need to fix a bug in the version 1.2 of your app. Checkout the tag v1.2 (Note: There is also a branch named v1.2)"
+description "You need to fix a bug in the version 1.2 of your app. Checkout the tag `v1.2` (Note: There is also a branch named `v1.2`)."
 
 setup do
   repo.init
@@ -42,5 +42,5 @@ solution do
 end
 
 hint do
-  puts "You should think about specifying you're after the tag named v1.2 (think tags/)"
+  puts "You should think about specifying you're after the tag named `v1.2` (think `tags/`)."
 end

data/levels/cherry-pick.rb

@@ -1,5 +1,5 @@
 difficulty 3
-description "Your new feature isn't worth the time and you're going to delete it. But it has one commit that fills in README file, and you want this commit to be on the master as well"
+description "Your new feature isn't worth the time and you're going to delete it. But it has one commit that fills in `README` file, and you want this commit to be on the master as well."
 
 setup do
     init_from_level
@@ -13,5 +13,5 @@ solution do
 end
 
 hint do
-  puts "Sneak a peek at the `cherry-pick` command"
+  puts "Sneak a peek at the `cherry-pick` command."
 end

data/levels/clone.rb

@@ -1,10 +1,10 @@
 difficulty 1
-description "Clone the repository at https://github.com/Gazler/cloneme"
+description "Clone the repository at https://github.com/Gazler/cloneme."
 
 solution do
   repo("cloneme").commit("157b2b61f29ab9df45f31c7cd9cb5d8ff06ecde4")
 end
 
 hint do
-  puts "You should have a look at this site: https://github.com/Gazler/cloneme"
+  puts "You should have a look at this site: https://github.com/Gazler/cloneme."
 end

data/levels/clone_to_folder.rb

@@ -1,10 +1,10 @@
 difficulty 1
-description "Clone the repository at https://github.com/Gazler/cloneme to 'my_cloned_repo'"
+description "Clone the repository at https://github.com/Gazler/cloneme to `my_cloned_repo`."
 
 solution do
   repo("my_cloned_repo").commit("157b2b61f29ab9df45f31c7cd9cb5d8ff06ecde4")
 end
 
 hint do
-  puts "This is like the last level, git clone has an optional argument."
+  puts "This is like the last level, `git clone` has an optional argument."
 end

data/levels/commit.rb

@@ -1,5 +1,5 @@
 difficulty 1
-description "The README file has been added to your staging area, now commit it."
+description "The `README` file has been added to your staging area, now commit it."
 
 setup do
   repo.init

data/levels/commit_amend.rb

@@ -1,5 +1,5 @@
 difficulty 2
-description "The README file has been committed, but it looks like the file `forgotten_file.rb` was missing from the commit.  Add the file and amend your previous commit to include it."
+description "The `README` file has been committed, but it looks like the file `forgotten_file.rb` was missing from the commit.  Add the file and amend your previous commit to include it."
 
 setup do
   repo.init

data/levels/config.rb

@@ -1,18 +1,23 @@
 difficulty 1
-description "Set up your git name and email, this is important so that your commits can be identified"
+description "Set up your git name and email, this is important so that your commits can be identified."
 
 setup do
   repo.init
 end
 
 solution do
-
   valid = false
 
   name = request("What is your name?")
   email = request("What is your email?")
   config_name = repo.config["user.name"]
   config_email = repo.config["user.email"]
+
+  if name.respond_to?(:force_encoding)
+    config_name = config_name.force_encoding("UTF-8")
+    config_email = config_email.force_encoding("UTF-8")
+  end
+
   if name == config_name && email == config_email
     valid = true
   end
@@ -24,5 +29,5 @@ solution do
 end
 
 hint do
-  puts "These settings are config settings.  You should run `git help config` if you are stuck"
+  puts "These settings are config settings.  You should run `git help config` if you are stuck."
 end

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 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."
 
 setup do
   init_from_level
@@ -12,12 +12,12 @@ solution do
   solved = false unless repo.commits("master")[0].parents.length == 2
 
   txt = `cat poem.txt`
-  solved = false if txt =~ /[<>=]/
-  solved = false unless txt =~ /cool poem/
+  solved = false if txt =~ /[<>=|]/
+  solved = false unless txt =~ /Sat on a wall/
 
   solved
 end
 
 hint do
-  puts ["First you have to do a merge. Then resolve any conflicts and finish the merge", "Take a look at the sections on merge conflicts in 'git merge'.", "Remove the unnecessary lines in poem.txt."]
+  puts ["First you have to do a merge. Then resolve any conflicts and finish the merge", "Take a look at the sections on merge conflicts in 'git merge'.", "Remove the unnecessary lines in `poem.txt`, so only the correct poem remains."]
 end

data/levels/conflict/.githug/COMMIT_EDITMSG

@@ -1,3 +1,14 @@
-Added comment
+Updated the poem
 
-Signed-off-by: Thameera Senanayaka <thameera123@gmail.com>
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# Author:    Thameera Senanayaka <thameera123@gmail.com>
+# Committer: Alex <snooz@localhost.localdomain>
+#
+# On branch master
+# Changes to be committed:
+#   (use "git reset HEAD^1 <file>..." to unstage)
+#
+#	modified:   poem.txt
+#

data/levels/conflict/.githug/logs/HEAD

@@ -4,3 +4,9 @@
 306868e3258be1f35ae43db71e3a6d7edf42ffe7 50a127cb066eb903a6fa59d71802c10cb442fb3b Thameera Senanayaka <thameera123@gmail.com> 1352041213 +0530	commit: Added lines
 50a127cb066eb903a6fa59d71802c10cb442fb3b 75179304f4fab00613f08a9412b6cb0965bfa564 Thameera Senanayaka <thameera123@gmail.com> 1352041234 +0530	commit: Added comment
 75179304f4fab00613f08a9412b6cb0965bfa564 40e20a455ac2731ad25c297b03aa543d7eedf6ab Thameera Senanayaka <thameera123@gmail.com> 1352041240 +0530	checkout: moving from mybranch to master
+40e20a455ac2731ad25c297b03aa543d7eedf6ab 75179304f4fab00613f08a9412b6cb0965bfa564 Alex <snooz@localhost.localdomain> 1382868220 -0700	checkout: moving from master to mybranch
+75179304f4fab00613f08a9412b6cb0965bfa564 bdc7bec8acae9b3eabf0a15b223a48211b7a89a1 Alex <snooz@localhost.localdomain> 1382868333 -0700	commit: Changed the poem
+bdc7bec8acae9b3eabf0a15b223a48211b7a89a1 3d7aec017559be2b61cab850dafdcb2b6212f1c3 Alex <snooz@localhost.localdomain> 1382868450 -0700	commit (amend): Changed the poem
+3d7aec017559be2b61cab850dafdcb2b6212f1c3 40e20a455ac2731ad25c297b03aa543d7eedf6ab Alex <snooz@localhost.localdomain> 1382868483 -0700	checkout: moving from mybranch to master
+40e20a455ac2731ad25c297b03aa543d7eedf6ab 30cc28e66966109bb5bfbe96d6c817c367d2050a Alex <snooz@localhost.localdomain> 1382868518 -0700	commit: Updated the poem
+30cc28e66966109bb5bfbe96d6c817c367d2050a c797f979cf24ba148bf10d5e26f5d7402dd5f2e1 Alex <snooz@localhost.localdomain> 1382868533 -0700	commit (amend): Updated the poem

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

@@ -1,2 +1,4 @@
 0000000000000000000000000000000000000000 306868e3258be1f35ae43db71e3a6d7edf42ffe7 Thameera Senanayaka <thameera123@gmail.com> 1352041121 +0530	commit (initial): Initial commit
 306868e3258be1f35ae43db71e3a6d7edf42ffe7 40e20a455ac2731ad25c297b03aa543d7eedf6ab Thameera Senanayaka <thameera123@gmail.com> 1352041153 +0530	commit: Added two lines
+40e20a455ac2731ad25c297b03aa543d7eedf6ab 30cc28e66966109bb5bfbe96d6c817c367d2050a Alex <snooz@localhost.localdomain> 1382868518 -0700	commit: Updated the poem
+30cc28e66966109bb5bfbe96d6c817c367d2050a c797f979cf24ba148bf10d5e26f5d7402dd5f2e1 Alex <snooz@localhost.localdomain> 1382868533 -0700	commit (amend): Updated the poem

data/levels/conflict/.githug/logs/refs/heads/mybranch

@@ -1,3 +1,5 @@
 0000000000000000000000000000000000000000 306868e3258be1f35ae43db71e3a6d7edf42ffe7 Thameera Senanayaka <thameera123@gmail.com> 1352041133 +0530	branch: Created from master
 306868e3258be1f35ae43db71e3a6d7edf42ffe7 50a127cb066eb903a6fa59d71802c10cb442fb3b Thameera Senanayaka <thameera123@gmail.com> 1352041213 +0530	commit: Added lines
 50a127cb066eb903a6fa59d71802c10cb442fb3b 75179304f4fab00613f08a9412b6cb0965bfa564 Thameera Senanayaka <thameera123@gmail.com> 1352041234 +0530	commit: Added comment
+75179304f4fab00613f08a9412b6cb0965bfa564 bdc7bec8acae9b3eabf0a15b223a48211b7a89a1 Alex <snooz@localhost.localdomain> 1382868333 -0700	commit: Changed the poem
+bdc7bec8acae9b3eabf0a15b223a48211b7a89a1 3d7aec017559be2b61cab850dafdcb2b6212f1c3 Alex <snooz@localhost.localdomain> 1382868450 -0700	commit (amend): Changed the poem

data/levels/conflict/.githug/objects/3d/7aec017559be2b61cab850dafdcb2b6212f1c3

@@ -0,0 +1 @@
+x
=�[JC1E��(�,'���8����ISz��4�:z/R��,X���Z/�QOs0C"b�Q!r��D9e�s(=��5b��{q��m�[�M6�"��:��`��v��3-�����(T��;7j�MW��|@���\��^_@j���ZkxF�(v���<�u�/8�[�?�����~�����^h��Y�a��B��	fa�u����M

data/levels/conflict/.githug/objects/bd/c7bec8acae9b3eabf0a15b223a48211b7a89a1

@@ -0,0 +1,2 @@
+x
��A
+�0@Q�9�\@�d�d"�'�4[h���=���y���,SGth�*d%F��٫����!�e�R1��l���� �6D®tE��T�%v�%?$��OEz�y��np����Z��:�A汾�i�\��XbǞ��Ͱ?6�O��(�C3�Q�Yu1?6lJ�

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

@@ -1 +1 @@
-40e20a455ac2731ad25c297b03aa543d7eedf6ab
+c797f979cf24ba148bf10d5e26f5d7402dd5f2e1

data/levels/conflict/.githug/refs/heads/mybranch

@@ -1 +1 @@
-75179304f4fab00613f08a9412b6cb0965bfa564
+3d7aec017559be2b61cab850dafdcb2b6212f1c3

data/levels/conflict/poem.txt

@@ -1,5 +1,5 @@
 Humpty dumpty
-Sat on a wall
+Categorized shoes by color
 Humpty dumpty
 Had a great fall
 

data/levels/diff.rb

@@ -1,5 +1,5 @@
 difficulty 2
-description "There have been modifications to the app.rb file since your last commit.  Find out which line has changed."
+description "There have been modifications to the `app.rb` file since your last commit.  Find out which line has changed."
 
 setup do
   init_from_level

data/levels/find_old_branch.rb

@@ -1,5 +1,5 @@
 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"
+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

data/levels/ignore.rb

@@ -1,5 +1,5 @@
 difficulty 2
-description "The text editor 'vim' creates files ending in .swp (swap files) for all files that are currently open.  We don't want them creeping into the repository.  Make this repository ignore .swp files."
+description "The text editor 'vim' creates files ending in `.swp` (swap files) for all files that are currently open.  We don't want them creeping into the repository.  Make this repository ignore `.swp` files."
 
 setup do
   repo.init
@@ -26,5 +26,5 @@ solution do
 end
 
 hint do
-  puts "You may have noticed there is a file named .gitignore in the repository"
+  puts "You may have noticed there is a file named `.gitignore` in the repository."
 end

data/levels/init.rb

@@ -1,10 +1,10 @@
 difficulty 1
-description "A new directory, git_hug, has been created; initialize an empty repository in it"
+description "A new directory, `git_hug`, has been created; initialize an empty repository in it."
 
 solution do
   repo.valid?
 end
 
 hint do
-  puts "You can type `git` in your shell to get a list of available git commands"
+  puts "You can type `git` in your shell to get a list of available git commands."
 end

data/levels/merge.rb

@@ -1,5 +1,5 @@
 difficulty 2
-description "We have a file in the branch 'feature'; Let's merge it to the master branch"
+description "We have a file in the branch 'feature'; Let's merge it to the master branch."
 
 setup do
 	init_from_level
@@ -10,5 +10,5 @@ solution do
 end
 
 hint do
-  puts "You want to research the `git merge` command"
+  puts "You want to research the `git merge` command."
 end

data/levels/merge_squash.rb

@@ -44,5 +44,5 @@ solution do
 end
 
 hint do
-  puts "Take a look at the --squash option of the merge command. Don't forget to commit the merge!"
+  puts "Take a look at the `--squash` option of the merge command. Don't forget to commit the merge!"
 end

data/levels/push.rb

@@ -60,5 +60,5 @@ solution do
 end
 
 hint do
-  puts "Take a look at 'git fetch', 'git pull', and 'git push'"
+  puts "Take a look at `git fetch`, `git pull`, and `git push`."
 end

data/levels/push_tags.rb

@@ -59,5 +59,5 @@ solution do
 end
 
 hint do
-  puts "Take a look at '--tags' flag of 'git push'"
+  puts "Take a look at `--tags` flag of `git push`"
 end

data/levels/remote.rb

@@ -12,5 +12,5 @@ solution do
 end
 
 hint do
-  puts "You are looking for a remote.  You can run `git` for a list of commands"
+  puts "You are looking for a remote.  You can run `git` for a list of commands."
 end

data/levels/remote_add.rb

@@ -1,6 +1,6 @@
 difficulty 2
 
-description "Add a remote repository called `origin` with the url `https://github.com/githug/githug`"
+description "Add a remote repository called `origin` with the url https://github.com/githug/githug"
 
 setup do
   repo.init
@@ -12,5 +12,5 @@ solution do
 end
 
 hint do
-  puts "You can run `git remote --help` for the man pages"
+  puts "You can run `git remote --help` for the man pages."
 end

data/levels/remote_url.rb

@@ -1,6 +1,6 @@
 difficulty 2
 
-description "The remote repositories have a url associated to them.  Please enter the url of remote_location"
+description "The remote repositories have a url associated to them.  Please enter the url of remote_location."
 
 setup do
   repo.init
@@ -13,5 +13,5 @@ solution do
 end
 
 hint do
-  puts "You can run `git remote --help` for the man pages"
+  puts "You can run `git remote --help` for the man pages."
 end

data/levels/rename.rb

@@ -1,6 +1,6 @@
 difficulty 3
 
-description "We have a file called oldfile.txt. We want to rename it to newfile.txt and stage this change."
+description "We have a file called `oldfile.txt`. We want to rename it to `newfile.txt` and stage this change."
 
 setup do
   repo.init
@@ -14,5 +14,5 @@ solution do
 end
 
 hint do
-  puts "Take a look at `git mv`"
+  puts "Take a look at `git mv`."
 end

data/levels/rename_commit.rb

@@ -21,5 +21,5 @@ solution do
 end
 
 hint do
-  puts "Take a look the -i flag of the rebase command."
+  puts "Take a look the `-i` flag of the rebase command."
 end

data/levels/reorder.rb

@@ -1,5 +1,5 @@
 difficulty 4
-description "You have committed several times but in the wrong order. Please reorder your commits"
+description "You have committed several times but in the wrong order. Please reorder your commits."
 
 setup do
   repo.init
@@ -29,5 +29,5 @@ solution do
 end
 
 hint do
-  puts "Take a look the -i flag of the rebase command."
+  puts "Take a look the `-i` flag of the rebase command."
 end

data/levels/repack.rb

@@ -1,5 +1,5 @@
 difficulty 2
-description "Optimise how your repository is packaged ensuring that redundant packs are removed"
+description "Optimise how your repository is packaged ensuring that redundant packs are removed."
 
 setup do
   repo.init
@@ -15,5 +15,5 @@ solution do
 end
 
 hint do
-  puts "You want to research the `git repack` command"
+  puts "You want to research the `git repack` command."
 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` using the reset command (don't commit anything)."
 
 setup do
   repo.init
@@ -18,5 +18,5 @@ solution do
 end
 
 hint do
-  puts "You can get some useful information for git status, it will tell you the command you need to run"
+  puts "You can get some useful information for git status, it will tell you the command you need to run."
 end

data/levels/reset_soft.rb

@@ -18,5 +18,5 @@ solution do
 end
 
 hint do
-  puts "What are some options you can use with 'git reset'?"
+  puts "What are some options you can use with `git reset`?"
 end

data/levels/squash.rb

@@ -1,5 +1,5 @@
 difficulty 4
-description "You have committed several times but would like all those changes to be one commit"
+description "You have committed several times but would like all those changes to be one commit."
 
 setup do
   repo.init
@@ -25,5 +25,5 @@ solution do
 end
 
 hint do
-  puts "Take a look the -i flag of the rebase command"
+  puts "Take a look the `-i` flag of the rebase command."
 end

data/levels/stage_lines.rb

@@ -25,5 +25,5 @@ solution do
 end
 
 hint do
-  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."
+  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/levels/stash.rb

@@ -1,5 +1,5 @@
 difficulty 2
-description "You've made some changes and want to work on them later. You should save them, but don't commit them"
+description "You've made some changes and want to work on them later. You should save them, but don't commit them."
 
 setup do
   init_from_level
@@ -12,5 +12,5 @@ solution do
 end
 
 hint do
-  puts "It's like stashing. Try finding appropriate git command"
+  puts "It's like stashing. Try finding appropriate git command."
 end

data/levels/tag.rb

@@ -1,6 +1,6 @@
 difficulty 2
 
-description "We have a git repo and we want to tag the current commit with new_tag."
+description "We have a git repo and we want to tag the current commit with `new_tag`."
 
 setup do
     repo.init
@@ -14,5 +14,5 @@ solution do
 end
 
 hint do
-    puts "Take a look at `git tag`"
+    puts "Take a look at `git tag`."
 end

data/lib/githug/game.rb

@@ -10,14 +10,14 @@ module Githug
     def play_level
       solve = true
       if profile.level.nil?
-        UI.puts("Welcome to Githug")
+        UI.puts("Welcome to Githug!")
         solve = false
         level_bump
       else
         level = Level.load(profile.level)
         if solve && level
           if level.solve
-            UI.success "Congratulations, you have solved the level"
+            UI.success "Congratulations, you have solved the level!"
             level_bump
           else
             UI.error "Sorry, this solution is not quite right!"
@@ -25,7 +25,7 @@ module Githug
             profile.save
 
             if (profile.current_attempts > 2 && profile.current_attempts % 3 == 0)
-              UI.error "Don't forget you can type `githug hint` for a hint and `githug reset` to reset the current level"
+              UI.error "Don't forget you can type `githug hint` for a hint and `githug reset` to reset the current level."
             end
 
             UI.puts level.full_description

data/lib/githug/level.rb

@@ -115,7 +115,7 @@ module Githug
       elsif @hint
         @hint.call
       else
-        UI.puts("No hints available for this level")
+        UI.puts("No hints available for this level.")
       end
     end
   end

data/lib/githug/version.rb

@@ -1,3 +1,3 @@
 module Githug
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/githug/game_spec.rb

@@ -25,7 +25,7 @@ describe Githug::Game do
     level.should_not_receive(:solve)
     profile.stub(:level).and_return(nil)
     profile.should_receive(:level_bump)
-    Githug::UI.should_receive(:puts).with("Welcome to Githug")
+    Githug::UI.should_receive(:puts).with("Welcome to Githug!")
     game.play_level
   end
 
@@ -34,7 +34,7 @@ describe Githug::Game do
     it "should echo congratulations if the level is solved" do
       level.stub(:solve).and_return(true)
       profile.should_receive(:level_bump)
-      Githug::UI.should_receive(:success).with("Congratulations, you have solved the level")
+      Githug::UI.should_receive(:success).with("Congratulations, you have solved the level!")
       game.play_level
     end
 
@@ -55,7 +55,7 @@ describe Githug::Game do
       profile.stub(:current_attempts).and_return(3)
       level.stub(:solve).and_return(false)
       Githug::UI.should_receive(:error).with("Sorry, this solution is not quite right!")
-      Githug::UI.should_receive(:error).with("Don't forget you can type `githug hint` for a hint and `githug reset` to reset the current level")
+      Githug::UI.should_receive(:error).with("Don't forget you can type `githug hint` for a hint and `githug reset` to reset the current level.")
       game.play_level
     end
 

data/spec/githug_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec::Matchers.define :be_solved do
   match do |actual|
-    !actual.match("Congratulations, you have solved the level").nil?
+    !actual.match("Congratulations, you have solved the level!").nil?
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: githug
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Gary Rennie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -225,18 +225,26 @@ files:
 - levels/conflict/.githug/logs/HEAD
 - levels/conflict/.githug/logs/refs/heads/master
 - levels/conflict/.githug/logs/refs/heads/mybranch
+- levels/conflict/.githug/objects/1d/b9aa5013e47f1482ec90323d926171a99c28af
 - levels/conflict/.githug/objects/25/b3f9c339430b35ae5822b2ef90e763284dc007
 - levels/conflict/.githug/objects/2d/0d90051e320215f54f357e746c9838490557e7
 - levels/conflict/.githug/objects/30/6868e3258be1f35ae43db71e3a6d7edf42ffe7
+- levels/conflict/.githug/objects/30/cc28e66966109bb5bfbe96d6c817c367d2050a
 - levels/conflict/.githug/objects/38/21e4362c5a76db1112b46b9210670cd5bab482
+- levels/conflict/.githug/objects/3c/b65bef44ae724ddf9e89640e7e2754dea1a47f
+- levels/conflict/.githug/objects/3d/7aec017559be2b61cab850dafdcb2b6212f1c3
 - levels/conflict/.githug/objects/40/e20a455ac2731ad25c297b03aa543d7eedf6ab
 - levels/conflict/.githug/objects/44/30fd3f45c832e685350417600a9862c94d20f1
 - levels/conflict/.githug/objects/46/677964e679f3e727356d0860c643a12a87902b
 - levels/conflict/.githug/objects/50/a127cb066eb903a6fa59d71802c10cb442fb3b
+- levels/conflict/.githug/objects/55/ad5af2a93afa778971e3d04faf20f6c368b6ba
 - levels/conflict/.githug/objects/6b/0c0b32bdca3af9beb831744cb755d6fdc7c7c0
 - levels/conflict/.githug/objects/75/179304f4fab00613f08a9412b6cb0965bfa564
 - levels/conflict/.githug/objects/7c/36daf29660ae4a2f09345427ef76f1d38f902f
 - levels/conflict/.githug/objects/88/e0473c9da347c6311f5f8eca8d256bf25402b6
+- levels/conflict/.githug/objects/bd/c7bec8acae9b3eabf0a15b223a48211b7a89a1
+- levels/conflict/.githug/objects/c7/97f979cf24ba148bf10d5e26f5d7402dd5f2e1
+- levels/conflict/.githug/objects/da/ae380200ed6eeaafd926177018e8ff3009b988
 - levels/conflict/.githug/refs/heads/master
 - levels/conflict/.githug/refs/heads/mybranch
 - levels/conflict/poem.txt
@@ -415,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: githug
-rubygems_version: 2.0.6
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: An interactive way to learn git.