gitscrub 0.0.2 → 0.0.3

data/levels/2.rb

@@ -0,0 +1,8 @@
+difficulty 1
+description "Add a file called README to your repository"
+solution do
+  repo = Grit::Repo.new(".")
+  return false unless repo.status.files.keys == ["README"]
+  return false if repo.status.files["README"].untracked
+  true
+end

data/lib/gitscrub/cli.rb

@@ -31,8 +31,9 @@ module Gitscrub
 
       def make_directory
         unless File.exists?("./git_scrub") || Dir.pwd.split("/").last == "git_scrub"
-          if UI.ask("No gitscrubber directory found, do you wish to create one?")
+          if UI.ask("No gitscrub directory found, do you wish to create one?")
             Dir.mkdir("./git_scrub")
+            Dir.chdir("git_scrub")
           else
             UI.puts("Exiting")
             exit

data/lib/gitscrub/game.rb

@@ -11,20 +11,33 @@ module Gitscrub
       solve = true
       if profile.level == 0
         UI.puts("Welcome to Gitscrub")
-        profile.level = 1
-        profile.save
         solve = false
+        level_bump
       else
         level = Level.load(profile.level)
-        if solve
+        if solve && level
           if level.solve  
             UI.puts "Congratulations, you have solved the level"
+            level_bump
           else
             UI.puts "Sorry, this solution is not quite right!"
+            UI.puts
+            UI.puts level.ldescription
+            UI.puts
           end
         end
       end
     end
 
+    def level_bump
+      profile.level += 1
+      profile.save
+      if level = Level.load(profile.level)
+        UI.puts
+        UI.puts(level.ldescription)
+        UI.puts
+      end
+    end
+
   end
 end

data/lib/gitscrub/level.rb

@@ -8,6 +8,7 @@ module Gitscrub
       def load(level_no)
         level = new
         location = "#{File.dirname(__FILE__)}/../../levels/#{level_no}.rb"
+        return false unless File.exists?(location)
         level.instance_eval(File.read(location))
         level
       end
@@ -28,7 +29,6 @@ module Gitscrub
 
     def solve
       lsolution.call
-      true
     rescue
       false
     end

data/lib/gitscrub/ui.rb

@@ -14,7 +14,7 @@ module Gitscrub
         @@in_stream = in_stream
       end
 
-      def puts(string)
+      def puts(string = "")
         @@out_stream.puts(string)
       end
 

data/lib/gitscrub/version.rb

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

data/spec/gitscrub/cli_spec.rb

@@ -18,6 +18,7 @@ describe Gitscrub::CLI do
   it "should create a directory if one does not exist" do
     Gitscrub::UI.stub(:ask).and_return(true) 
     Dir.should_receive(:mkdir).with("./git_scrub")
+    Dir.should_receive(:chdir).with("git_scrub")
     @cli.make_directory
   end
 

data/spec/gitscrub/game_spec.rb

@@ -9,6 +9,7 @@ describe Gitscrub::Game do
     @profile.stub(:level).and_return(1)
     @profile.stub(:save)
     @level = mock
+    @level.stub(:ldescription)
     Gitscrub::UI.stub(:puts)
     Gitscrub::Level.stub(:load).and_return(@level)
   end
@@ -28,6 +29,7 @@ describe Gitscrub::Game do
 
   it "should echo congratulations if the level is solved" do
     @level.stub(:solve).and_return(true)
+    @profile.should_receive(:level=).with(2)
     Gitscrub::UI.should_receive(:puts).with("Congratulations, you have solved the level")
     @game.play_level
   end
@@ -37,5 +39,12 @@ describe Gitscrub::Game do
     Gitscrub::UI.should_receive(:puts).with("Sorry, this solution is not quite right!")
     @game.play_level
   end
+
+  it "should output the description of the next level" do
+    @level.stub(:ldescription).and_return("Description")  
+    @profile.stub(:level=)
+    Gitscrub::UI.should_receive(:puts).with("Description")
+    @game.level_bump
+  end
   
 end

data/spec/gitscrub/level_spec.rb

@@ -17,12 +17,18 @@ end
 
   it "should load the level" do
     File.stub(:dirname).and_return("")
+    File.stub(:exists?).and_return(true)
     File.should_receive(:read).with('/../../levels/1.rb').and_return(@file)
     level = Gitscrub::Level.load(1)
     level.ldifficulty.should eql(1)
     level.ldescription.should eql("A test description")
   end
 
+  it "should return false if the level does not exist" do
+    File.stub(:exists?).and_return(false)
+    Gitscrub::Level.load(1).should eql(false)
+  end
+
   it "should solve the problem" do
     @level.solve.should eql(false)
   end

data/spec/gitscrub/ui_spec.rb

@@ -17,6 +17,11 @@ describe Gitscrub::UI do
     @out.string.should eql("hello\n")
   end
 
+  it "should print an empty line with no arguments" do
+    @ui.puts 
+    @out.string.should eql("\n")
+  end
+
   it "should print without a new line" do
     @ui.print("hello")
     @out.string.should eql("hello")

metadata

@@ -2,7 +2,7 @@
 name: gitscrub
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Gary Rennie
@@ -63,6 +63,7 @@ files:
 - bin/gitscrub
 - gitscrub.gemspec
 - levels/1.rb
+- levels/2.rb
 - lib/gitscrub.rb
 - lib/gitscrub/cli.rb
 - lib/gitscrub/game.rb