gitscrub 0.0.3 → 0.0.4

data/levels/1.rb

@@ -1,5 +1,10 @@
 difficulty 1
 description "Initialize an empty repository"
+
+setup do
+  `rm -rf .git`
+end
+
 solution do
   Grit::Repo.new(".")
 end

data/levels/2.rb

@@ -1,5 +1,12 @@
 difficulty 1
-description "Add a file called README to your repository"
+description "There is a file in your folder called README, you should add it to your staging area"
+
+setup do
+  `rm -rf .git`
+  `git init`
+  `touch README`
+end
+
 solution do
   repo = Grit::Repo.new(".")
   return false unless repo.status.files.keys == ["README"]

data/lib/gitscrub/cli.rb

@@ -24,7 +24,14 @@ module Gitscrub
     desc :reset, "reset the current level"
 
     def reset
-      true
+      profile = Profile.load
+      level = Level.load(profile.level)
+      if level
+        UI.word_box("Gitscrub")
+        UI.puts("resetting level")
+        level.setup_level
+        level.full_description
+      end
     end
 
     no_tasks do

data/lib/gitscrub/game.rb

@@ -21,9 +21,7 @@ module Gitscrub
             level_bump
           else
             UI.puts "Sorry, this solution is not quite right!"
-            UI.puts
-            UI.puts level.ldescription
-            UI.puts
+            UI.puts level.full_description
           end
         end
       end
@@ -33,9 +31,8 @@ module Gitscrub
       profile.level += 1
       profile.save
       if level = Level.load(profile.level)
-        UI.puts
-        UI.puts(level.ldescription)
-        UI.puts
+        UI.puts(level.full_description)
+        level.setup_level
       end
     end
 

data/lib/gitscrub/level.rb

@@ -1,7 +1,7 @@
 module Gitscrub
   class Level
 
-    attr_accessor :ldifficulty, :ldescription, :lsolution
+    attr_accessor :ldifficulty, :ldescription, :lsolution, :level_no, :lsetup
     
     class << self
       
@@ -10,6 +10,7 @@ module Gitscrub
         location = "#{File.dirname(__FILE__)}/../../levels/#{level_no}.rb"
         return false unless File.exists?(location)
         level.instance_eval(File.read(location))
+        level.level_no = level_no
         level
       end
 
@@ -27,6 +28,23 @@ module Gitscrub
       @lsolution = block
     end
 
+    def setup(&block)
+      @lsetup = block 
+    end
+
+    def full_description
+      UI.puts
+      UI.puts "Level: #{level_no}"
+      UI.puts "Difficulty: #{"*"*ldifficulty}"
+      UI.puts
+      UI.puts ldescription
+      UI.puts
+    end
+
+    def setup_level
+      lsetup.call
+    end
+
     def solve
       lsolution.call
     rescue

data/lib/gitscrub/version.rb

@@ -1,3 +1,3 @@
 module Gitscrub
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/gitscrub/cli_spec.rb

@@ -37,8 +37,32 @@ describe Gitscrub::CLI do
     @cli.check.should eql(true) 
   end
 
-  it "should reset the current level" do
-    @cli.check.should eql(true) 
-  end
+  describe "reset" do
+    
+    before(:each) do
+      @level = mock
+      @profile = mock
+      @profile.stub(:level).and_return(1)
+      Gitscrub::Profile.stub(:load).and_return(@profile)
+      Gitscrub::Level.stub(:load).and_return(@level)
+    end
+    
+    it "should reset the current level" do
+      @level.should_receive(:setup_level)
+      @level.should_receive(:full_description)
+      Gitscrub::UI.should_receive(:word_box).with("Gitscrub")
+      Gitscrub::UI.should_receive(:puts).with("resetting level")
+      @cli.reset
+    end
+
+    it "should not reset if the level cannot be loaded" do
+      Gitscrub::Level.stub(:load).and_return(false)
+      @level.should_not_receive(:setup_level)
+      @level.should_not_receive(:full_description)
+      Gitscrub::UI.should_not_receive(:word_box).with("Gitscrub")
+      Gitscrub::UI.should_not_receive(:puts).with("resetting level")
+      @cli.reset
+    end
+  end  
   
 end

data/spec/gitscrub/game_spec.rb

@@ -9,7 +9,8 @@ describe Gitscrub::Game do
     @profile.stub(:level).and_return(1)
     @profile.stub(:save)
     @level = mock
-    @level.stub(:ldescription)
+    @level.stub(:full_description)
+    @level.stub(:setup_level)
     Gitscrub::UI.stub(:puts)
     Gitscrub::Level.stub(:load).and_return(@level)
   end
@@ -41,9 +42,14 @@ describe Gitscrub::Game do
   end
 
   it "should output the description of the next level" do
-    @level.stub(:ldescription).and_return("Description")  
+    @level.should_receive(:full_description)
+    @profile.stub(:level=)
+    @game.level_bump
+  end
+
+  it "should call setup_level for the next level" do
+    @level.should_receive(:setup_level)  
     @profile.stub(:level=)
-    Gitscrub::UI.should_receive(:puts).with("Description")
     @game.level_bump
   end
   

data/spec/gitscrub/level_spec.rb

@@ -7,6 +7,9 @@ describe Gitscrub::Level do
     @file = <<-eof
 difficulty 1
 description "A test description"
+setup do
+  "test"
+end
 solution do
   Grit::Repo.new("gitscrub/notadir")
 end
@@ -37,5 +40,17 @@ end
     Grit::Repo.stub(:new).and_return(true) 
     @level.solve.should eql(true)
   end
+
+  it "should display a full description" do
+    Gitscrub::UI.stub(:puts)
+    Gitscrub::UI.should_receive(:puts).with("Level: 1")
+    Gitscrub::UI.should_receive(:puts).with("Difficulty: *")
+    Gitscrub::UI.should_receive(:puts).with(@level.ldescription)
+    @level.full_description
+  end
+
+  it "should call setup" do
+    @level.setup_level.should eql("test") 
+  end
   
 end

metadata

@@ -2,7 +2,7 @@
 name: gitscrub
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Gary Rennie
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-07 00:00:00 +00:00
+date: 2012-03-08 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency