gitscrub 0.0.6 → 0.0.7

data/README.md

@@ -54,6 +54,15 @@ An example level:
 
  `difficulty`, `description` and `solution` are required.
 
+ **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.
+
+
+    solution do
+      solved = false
+      solved = true if repo.valid?
+      solved
+    end
+
  By default, `setup` will remove all files from the game folder.  You do not need to include a setup method if you don't want an initial git repository (if you are testing `git init` or only checking an answer.)
  
  You can call `repo.init` to initialize an empty repository with a .gitignore file. It takes a single parameter of false if you want to skip the initial commit of the .gitignore file.

data/levels/blame.rb

@@ -10,7 +10,7 @@ solution do
   solved = false
 
   offender = repo.commit("97bdd0cccf9f4b8730f78cb53a81a74f205dbcc2").author.name
-  solved = true if request("Who made the commit with the password?") == offender
+  solved = true if request("Who made the commit with the password?").downcase == offender.downcase
     
   solved
 end

data/levels/clone.rb

@@ -0,0 +1,10 @@
+difficulty 1
+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"
+end

data/lib/gitscrub/level.rb

@@ -2,7 +2,7 @@ module Gitscrub
   class Level
     include UI
 
-    LEVELS = [nil, "init", "add", "commit", "config", "blame",  "contribute"]
+    LEVELS = [nil, "init", "add", "commit", "config", "clone", "blame",  "contribute"]
 
     attr_accessor :level_no, :level_path
     
@@ -60,8 +60,8 @@ module Gitscrub
       @setup.call if @setup
     end
 
-    def repo
-      @repo ||= Repository.new
+    def repo(location = "")
+      @repo ||= Repository.new(location)
     end
 
     def solve

data/lib/gitscrub/repository.rb

@@ -3,8 +3,8 @@ module Gitscrub
 
     attr_accessor :grit
   
-    def initialize
-      @grit = Grit::Repo.new(".")
+    def initialize(location = ".")
+      @grit = Grit::Repo.new(location)
     rescue Grit::InvalidGitRepositoryError
       @grit = nil
     end

data/lib/gitscrub/version.rb

@@ -1,3 +1,3 @@
 module Gitscrub
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/gitscrub/repository_spec.rb

@@ -11,7 +11,7 @@ describe Gitscrub::Repository do
   describe "initialize" do
     
     it "should call grit on initialize" do
-      Grit::Repo.should_receive(:new).and_return(@grit) 
+      Grit::Repo.should_receive(:new).with(".").and_return(@grit) 
       repo = Gitscrub::Repository.new
       repo.grit.should equal(@grit)
     end
@@ -22,6 +22,11 @@ describe Gitscrub::Repository do
       repo.grit.should equal(nil)
     end
 
+    it "should initialize with a location" do
+      Grit::Repo.should_receive(:new).with("test").and_return(@grit) 
+      repo = Gitscrub::Repository.new("test")
+    end
+
   end
 
   describe "reset" do

metadata

@@ -2,7 +2,7 @@
 name: gitscrub
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Gary Rennie
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-08 00:00:00 +00:00
+date: 2012-03-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,6 +100,7 @@ files:
 - levels/blame/.gitscrub/objects/ff/d39c2dbfd94bdbca06d48686e0cbda642f3de7
 - levels/blame/.gitscrub/refs/heads/master
 - levels/blame/config.rb
+- levels/clone.rb
 - levels/commit.rb
 - levels/config.rb
 - levels/contribute.rb