githug 0.1.4 → 0.1.5

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/README.md

@@ -1,5 +1,5 @@
 #Githug
-Git Your Game On
+Git Your Game On [![Build Status](https://secure.travis-ci.org/Gazler/githug.png?branch=master)](http://travis-ci.org/Gazler/githug)
 
 ##About
 Githug is designed to give you a practical way of learning git.  It has a series of levels, each utilizing git commands to ensure a correct answer.
@@ -62,6 +62,12 @@ An example level:
 
  `difficulty`, `description` and `solution` are required.
 
+You can also include multiple hints like this:
+
+    hints [
+      "You can type `git` in your shell to get a list of available git commands",
+      "Check the man for `git add`"]
+
  **note** Because `solution` is a Proc, you cannot prematurely return out of it and as a result, must put an implicit return on the last line of the solution block.
 
 

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => [:spec]

data/githug.gemspec

@@ -23,5 +23,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency "grit", "~>2.4.1"
   s.add_dependency "thor", "~>0.14.6"
+  s.add_dependency "rake"
   # s.add_runtime_dependency "rest-client"
 end

data/levels/rename.rb

@@ -0,0 +1,18 @@
+difficulty 3
+
+description "We have a file called oldfile.txt. We want to rename it to newfile.txt and stage this change."
+
+setup do
+    repo.init
+    FileUtils.touch("oldfile.txt")
+    repo.add("oldfile.txt")
+    repo.commit_all("Commited oldfile.txt")
+end
+
+solution do
+    repo.status["oldfile.txt"].type == "D" && repo.status["newfile.txt"].type == "A" && repo.status["oldfile.txt"].stage.nil?
+end
+
+hint do
+    puts "Take a look at `git mv`"
+end

data/levels/squash.rb

@@ -0,0 +1,26 @@
+difficulty 4
+description "You have committed several times but would like all those changes to be one commit"
+
+setup do
+  repo.init
+  FileUtils.touch("README")
+  repo.add("README")
+  repo.commit_all("Adding README")
+  File.open("README", 'w') { |f| f.write("hey there") }
+  repo.add("README")
+  repo.commit_all("Updating README")
+  File.open("README", 'a') { |f| f.write("\nAdding some more text") }
+  repo.add("README")
+  repo.commit_all("Updating README")
+  File.open("README", 'a') { |f| f.write("\neven more text") }
+  repo.add("README")
+  repo.commit_all("Updating README")
+end
+
+solution do
+  repo.commits.length == 2
+end
+
+hint do
+  puts "Take a look the -i flag of the rebase command"
+end

data/lib/githug/game.rb

@@ -34,6 +34,11 @@ module Githug
       end
     end
 
+    def dry_run(level)
+      level = Level.load(level)
+
+    end
+
     def level_bump
       profile.level_bump
       if level = Level.load(profile.level)

data/lib/githug/level.rb

@@ -3,10 +3,10 @@ module Githug
     include UI
 
     LEVELS = [nil, "init", "add", "commit", "config", "clone",
-              "clone_to_folder", "ignore", "status", "rm", "rm_cached", "log",
-              "commit_ammend", "reset", "checkout_file", "remote", "remote_url",
-              "remote_add", "diff", "blame", "branch", "checkout", "merge",
-              "contribute"]
+              "clone_to_folder", "ignore", "status", "rm", "rm_cached", "rename",
+              "log", "commit_ammend", "reset", "checkout_file", "remote",
+              "remote_url", "remote_add", "diff", "blame", "branch", "checkout",
+              "merge", "squash", "contribute"]
 
     attr_accessor :level_no, :level_path
     
@@ -50,6 +50,10 @@ module Githug
       @hint = hint
     end
 
+    def hints(hints)
+      @hints = hints
+    end
+
     def full_description
       UI.puts
       UI.puts "Level: #{level_no}"
@@ -74,10 +78,20 @@ module Githug
       false
     end
 
-
     def show_hint
       UI.word_box("Githug")
-      if @hint
+      profile = Profile.load
+      current_hint_index = profile.current_hint_index
+      if @hints
+        puts @hints[current_hint_index]
+        if current_hint_index < @hints.size - 1
+          profile.current_hint_index += 1
+          profile.save
+        else
+          profile.current_hint_index = 0
+          profile.save
+        end
+      elsif @hint
         @hint.call
       else
         UI.puts("No hints available for this level")

data/lib/githug/profile.rb

@@ -10,6 +10,7 @@ module Githug
         settings = {
           :level => nil,
           :current_attempts => 0,
+          :current_hint_index => 0,
           :current_levels => [],
           :completed_levels => [] 
         }
@@ -50,6 +51,8 @@ module Githug
 
       settings[:current_attempts] = 0
 
+      settings[:current_hint_index] = 0
+
       next_level = (levels - settings[:completed_levels]).first || levels.last
 
       settings[:level] = next_level

data/lib/githug/version.rb

@@ -1,3 +1,3 @@
 module Githug
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/githug/game_spec.rb

@@ -61,6 +61,14 @@ describe Githug::Game do
 
   end
 
+
+  describe "dry run" do
+    it "should play the game without altering the profile" do
+      Level.should_receive(:load)
+      @level.dry_run  
+    end
+  end
+
   it "should output the description of the next level" do
     @level.should_receive(:full_description)
     @profile.stub(:level=)

data/spec/githug/level_spec.rb

@@ -14,6 +14,10 @@ solution do
   Grit::Repo.new("githug/notadir")
 end
 
+hints [
+  "this is hint 1",
+  "this is hint 2"]
+
 hint do
   puts "this is a hint"
 end
@@ -107,7 +111,26 @@ end
   end
 
   describe "hint" do
-    it "should display a hint" do
+    
+    before(:each) do
+      @profile = mock.as_null_object
+      Githug::Profile.stub(:load).and_return(@profile)
+      @profile.stub(:current_hint_index).and_return(0,0,1,0)
+    end
+
+    it "should return sequential hint if there are multiple" do
+      @level.should_receive(:puts).ordered.with("this is hint 1")
+      @level.show_hint
+      
+      @level.should_receive(:puts).ordered.with("this is hint 2")
+      @level.show_hint
+      
+      @level.should_receive(:puts).ordered.with("this is hint 1")
+      @level.show_hint
+    end
+
+    it "should display a hint if there are not multiple" do
+      @level.instance_variable_set("@hints", nil)
       @level.should_receive(:puts).with("this is a hint")
       @level.show_hint 
     end
@@ -125,7 +148,4 @@ end
       @level.init_from_level
     end  
   end
-
-
-  
-end
+end

data/spec/githug/profile_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Githug::Profile do
 
   it "should load the profile" do
-    settings = {:level => 1, :current_attempts => 0, :current_levels => [], :completed_levels => []}
+    settings = {:level => 1, :current_attempts => 0, :current_hint_index => 0, :current_levels => [], :completed_levels => []}
     File.should_receive(:exists?).with(Githug::Profile::PROFILE_FILE).and_return(true)
     File.should_receive(:open).with(Githug::Profile::PROFILE_FILE).and_return("settings")
     YAML.should_receive(:load).with("settings").and_return(settings)
@@ -12,7 +12,7 @@ describe Githug::Profile do
   end
 
   it "should load the defaults if the file does not exist" do
-    defaults = {:level => nil, :current_attempts => 0, :current_levels => [], :completed_levels => []}
+    defaults = {:level => nil, :current_attempts => 0, :current_hint_index => 0, :current_levels => [], :completed_levels => []}
     File.should_receive(:exists?).with(Githug::Profile::PROFILE_FILE).and_return(false)
     Githug::Profile.should_receive(:new).with(defaults)
     Githug::Profile.load

metadata

@@ -2,7 +2,7 @@
 name: githug
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Gary Rennie
@@ -46,6 +46,17 @@ dependencies:
         version: 0.14.6
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: An interactive way to learn git.
 email: 
 - webmaster@gazler.com
@@ -58,6 +69,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -167,9 +179,11 @@ files:
 - levels/remote.rb
 - levels/remote_add.rb
 - levels/remote_url.rb
+- levels/rename.rb
 - levels/reset.rb
 - levels/rm.rb
 - levels/rm_cached.rb
+- levels/squash.rb
 - levels/status.rb
 - lib/githug.rb
 - lib/githug/cli.rb