githug 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8d94eb08289627d4acc9a7af8b5fcfdd2994501
-  data.tar.gz: 4be2995f158cee6c89acbce3e9a6414a7df071d5
+  metadata.gz: 5e6b48271a2bda230ebd1706f27995f9fee4a28e
+  data.tar.gz: 0d3dbd6ed1913a20478bac74f0820cbc007e0715
 SHA512:
-  metadata.gz: 7891476804389f2a977ed64fab255f8623ae9aa7777e7f71ccb2111e5b9b111fb639c5c0d4ee72a110d2313f54a5acb49ec5536384f997f18269301b4e5c002b
-  data.tar.gz: 604b7ae4993d21505ae5851335103334d1a6d390ca035c65cca3322833853e649c87deb506385c83d6310937834e039dfb77ff8c63af86b4134436a31c779911
+  metadata.gz: 377a4ac9ee7cd899df4f6a0672c5122543299a6bef70d5d6d946b8f8a3cbdd5351f4a209f5a20d6782eba3fa09f03bc7ef105d3a1608d4eff243061fe9e3101f
+  data.tar.gz: 7892ecf73c3fdf941c72f1879a2f0dbd41f03abd12428d183e2bfba1562bfc1ea92efd3c5db6f441842e306eb2ebca26390c4f17b0e3ef1ab7218ef819e92c17

data/README.md

@@ -3,28 +3,58 @@ Git Your Game On [![Build Status](https://travis-ci.org/Gazler/githug.png?branch
 ## About
 Githug is designed to give you a practical way of learning git.  It has a series of levels, each requiring you to use git commands to arrive at a correct answer.
 
-## Installation
+## Playing Githug
+
+Githug should work on Linux, OS X and Windows.
+
+### Prerequisites
+
+Githug requires Ruby 1.8.7 or higher.
+
+You can check which version of Ruby is installed with the following command:
+
+```
+ruby --version
+```
+
+If ruby is not installed, follow the installation instructions on [ruby-lang.org](https://www.ruby-lang.org/en/documentation/installation/).
+
+### Installation
+
 To install Githug, run
 
     gem install githug
 
-After the gem is installed, run `githug`.  You will be prompted to create a directory. Githug should work on Linux, OS X and Windows.
+If you get a complaint about permissions, you can rerun the command with `sudo`:
+
+    sudo gem install githug
+
+### Starting the Game
+
+After the gem is installed change directory to the location where you want the game-related assets to be stored.
+Then run `githug`:
+
+    githug
 
-## Commands
+You will be prompted to create a directory.
 
-Githug has 5 commands:
+    No githug directory found, do you wish to create one? [yn]
+
+Type `y` (yes) to continue, `n` (no) to cancel and quit Githug.
+
+### Commands
+
+Githug has 4 game commands:
 
  * play - The default command, checks your solution for the current level
  * hint - Gives you a hint (if available) for the current level
  * reset - Reset the current level or reset the level to a given name or path
  * levels - List all the levels
- * test - Test levels in development (please see the "Testing Levels" section below)
 
 ## Change Log
 
 The change log is available on the wiki.  [Change log](https://github.com/Gazler/githug/wiki/Change-Log)
 
-
 ## Contributing
 
 To suggest a level or create a level that has been suggested, check out [the wiki](https://github.com/Gazler/githug/wiki).

data/levels/remote_url.rb

@@ -9,7 +9,7 @@ setup do
 end
 
 solution do
-  "https://github.com/githug/not_a_repo" == request("What is the url of the remote repository?")
+  !!(request("What is the url of the remote repository?") =~ /https:\/\/github.com\/githug\/not_a_repo\/?/)
 end
 
 hint do

data/levels/revert.rb

@@ -20,11 +20,9 @@ end
 
 solution do
   valid = false
+  commit_messages = repo.commits.map(&:message)
   valid = true if repo.commits.length > 3 &&
-    repo.commits[3].message == "First commit" &&
-    repo.commits[2].message == "Second commit" &&
-    repo.commits[1].message == "Bad commit" &&
-    repo.commits[0].message.split("\n").first == "Revert \"Bad commit\""
+    commit_messages.any? { |e| e =~ /(Revert )?"Bad commit"/ }
   valid
 end
 

data/levels/squash.rb

@@ -11,13 +11,13 @@ setup do
   repo.commit_all("Adding README")
   File.open("README", 'w') { |f| f.write("hey there") }
   repo.add("README")
-  repo.commit_all("Updating README")
+  repo.commit_all("Updating README (squash this commit into Adding README)")
   File.open("README", 'a') { |f| f.write("\nAdding some more text") }
   repo.add("README")
-  repo.commit_all("Updating README")
+  repo.commit_all("Updating README (squash this commit into Adding README)")
   File.open("README", 'a') { |f| f.write("\neven more text") }
   repo.add("README")
-  repo.commit_all("Updating README")
+  repo.commit_all("Updating README (squash this commit into Adding README)")
 end
 
 solution do

data/lib/githug/version.rb

@@ -1,3 +1,3 @@
 module Githug
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: githug
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Gary Rennie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2016-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -504,7 +504,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: githug
-rubygems_version: 2.2.2
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: An interactive way to learn git.