gitscrub 0.0.4 → 0.0.5

data/levels/{2.rb → add.rb}

@@ -2,7 +2,6 @@ difficulty 1
 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

data/levels/commit.rb

@@ -0,0 +1,14 @@
+difficulty 1
+description "Make a commit"
+
+setup do
+  `git init`
+  `touch README`
+  `git add README`
+end
+
+solution do
+  repo = Grit::Repo.new(".")
+  return false if repo.commits.empty?
+  true
+end

data/levels/contribute.rb

@@ -0,0 +1,21 @@
+difficulty 3
+description "Contribute to this repository by making a pull request on Github"
+
+solution do
+  location = "/tmp/gitscrub"
+  FileUtils.rm_rf(location)
+  puts "Cloning repository to #{location}"
+  `git clone git@github.com:Gazler/gitscrub.git #{location}`
+
+  contributor = false
+
+  repo = Grit::Repo.new(location)
+  repo.commits.each do |commit|
+    if commit.author.name == repo.config["user.name"]
+      if commit.author.email == repo.config["user.email"]
+        contributor = true
+      end
+    end
+  end
+  contributor
+end

data/levels/{1.rb → init.rb}

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

data/lib/gitscrub.rb

@@ -5,6 +5,7 @@ require 'gitscrub/ui'
 require 'gitscrub/game'
 require 'gitscrub/profile'
 require 'gitscrub/level'
+require 'gitscrub/repository'
 
 Gitscrub::UI.in_stream = STDIN
 Gitscrub::UI.out_stream = STDOUT

data/lib/gitscrub/cli.rb

@@ -37,10 +37,18 @@ module Gitscrub
     no_tasks do
 
       def make_directory
-        unless File.exists?("./git_scrub") || Dir.pwd.split("/").last == "git_scrub"
+        if File.exists?("./git_scrub") 
+          UI.puts "Please change into the git_scrub directory"
+          exit
+        end
+
+        unless File.basename(Dir.pwd) == "git_scrub"
           if UI.ask("No gitscrub directory found, do you wish to create one?")
             Dir.mkdir("./git_scrub")
             Dir.chdir("git_scrub")
+            File.open(".gitignore", "w") do |file|
+              file.write(".profile.yml")
+            end
           else
             UI.puts("Exiting")
             exit

data/lib/gitscrub/game.rb

@@ -17,10 +17,10 @@ module Gitscrub
         level = Level.load(profile.level)
         if solve && level
           if level.solve  
-            UI.puts "Congratulations, you have solved the level"
+            UI.success "Congratulations, you have solved the level"
             level_bump
           else
-            UI.puts "Sorry, this solution is not quite right!"
+            UI.error "Sorry, this solution is not quite right!"
             UI.puts level.full_description
           end
         end

data/lib/gitscrub/level.rb

@@ -1,13 +1,16 @@
 module Gitscrub
   class Level
+    include UI
 
-    attr_accessor :ldifficulty, :ldescription, :lsolution, :level_no, :lsetup
+    LEVELS = [nil, "init", "add", "commit", "contribute"]
+
+    attr_accessor :level_no
     
     class << self
       
       def load(level_no)
         level = new
-        location = "#{File.dirname(__FILE__)}/../../levels/#{level_no}.rb"
+        location = "#{File.dirname(__FILE__)}/../../levels/#{LEVELS[level_no]}.rb"
         return false unless File.exists?(location)
         level.instance_eval(File.read(location))
         level.level_no = level_no
@@ -17,36 +20,41 @@ module Gitscrub
     end
 
     def difficulty(num)
-      @ldifficulty = num
+      @difficulty = num
     end
 
     def description(description)
-      @ldescription = description
+      @description = description
     end
 
     def solution(&block)
-      @lsolution = block
+      @solution = block
     end
 
     def setup(&block)
-      @lsetup = block 
+      @setup = block 
     end
 
     def full_description
       UI.puts
       UI.puts "Level: #{level_no}"
-      UI.puts "Difficulty: #{"*"*ldifficulty}"
+      UI.puts "Difficulty: #{"*"*@difficulty}"
       UI.puts
-      UI.puts ldescription
+      UI.puts @description
       UI.puts
     end
 
     def setup_level
-      lsetup.call
+      repo.reset
+      @setup.call if @setup
+    end
+
+    def repo
+      @repo ||= Repository.new
     end
 
     def solve
-      lsolution.call
+      @solution.call
     rescue
       false
     end

data/lib/gitscrub/repository.rb

@@ -0,0 +1,23 @@
+module Gitscrub
+  class Repository
+
+    attr_accessor :grit
+  
+    def initialize
+      @grit = Grit::Repo.new(".")
+    rescue Grit::InvalidGitRepositoryError
+      @grit = nil
+    end
+
+    def reset
+      dont_delete = ["..", ".", ".gitignore", ".profile.yml"]
+      if File.basename(Dir.pwd) == "git_scrub"
+        Dir.entries(Dir.pwd).each do |file|
+          FileUtils.rm_rf(file) unless dont_delete.include?(file) 
+        end
+      end
+    end
+
+
+  end
+end

data/lib/gitscrub/ui.rb

@@ -1,5 +1,5 @@
 module Gitscrub
-  class UI
+  module UI
 
     @@out_stream
     @@in_stream
@@ -50,6 +50,23 @@ module Gitscrub
         request("#{msg} [yn] ") == 'y'
       end
 
+      def colorize(text, color_code)
+        puts "#{color_code}#{text}\033[0m"
+      end
+
+      def error(text)
+        colorize(text, "\033[31m")
+      end
+
+      def success(text)
+        colorize(text, "\033[32m")
+      end
+
+    end
+
+    def method_missing(method, *args, &block)
+      return UI.send(method, *args) if UI.methods(false).include?(method)
+      super
     end
 
   end

data/lib/gitscrub/version.rb

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

data/spec/gitscrub/cli_spec.rb

@@ -19,6 +19,7 @@ describe Gitscrub::CLI do
     Gitscrub::UI.stub(:ask).and_return(true) 
     Dir.should_receive(:mkdir).with("./git_scrub")
     Dir.should_receive(:chdir).with("git_scrub")
+    File.should_receive(:open).with(".gitignore", "w").and_return(true)
     @cli.make_directory
   end
 
@@ -28,11 +29,17 @@ describe Gitscrub::CLI do
     @cli.make_directory 
   end
 
-  it "should create a directory if one does not exist" do
+  it "should exit if the user selects no" do
     Gitscrub::UI.stub(:ask).and_return(false) 
     lambda {@cli.make_directory}.should raise_error(SystemExit)
   end
 
+  it "should prompt to change into the directory if it exists" do
+    File.stub(:exists?).and_return(true) 
+    Gitscrub::UI.should_receive(:puts).with("Please change into the git_scrub directory")
+    lambda {@cli.make_directory}.should raise_error(SystemExit)
+  end
+
   it "should check the current solution" do
     @cli.check.should eql(true) 
   end

data/spec/gitscrub/game_spec.rb

@@ -31,13 +31,13 @@ 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")
+    Gitscrub::UI.should_receive(:success).with("Congratulations, you have solved the level")
     @game.play_level
   end
 
   it "should echo congratulations if the level is solved" do
     @level.stub(:solve).and_return(false)
-    Gitscrub::UI.should_receive(:puts).with("Sorry, this solution is not quite right!")
+    Gitscrub::UI.should_receive(:error).with("Sorry, this solution is not quite right!")
     @game.play_level
   end
 

data/spec/gitscrub/level_spec.rb

@@ -14,43 +14,92 @@ solution do
   Grit::Repo.new("gitscrub/notadir")
 end
     eof
+    File.stub(:exists?).and_return(true)
     File.stub(:read).and_return(@file)
     @level = Gitscrub::Level.load(1)
+    @repo = mock
+    @repo.stub(:reset) 
+    Gitscrub::Repository.stub(:new).and_return(@repo)
   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")
+  it "should mixin UI" do
+    Gitscrub::Level.ancestors.should include(Gitscrub::UI)
   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)
+
+  describe "load" do
+    
+    it "should load the level" do
+      File.stub(:dirname).and_return("")
+      File.should_receive(:read).with('/../../levels/init.rb').and_return(@file)
+      level = Gitscrub::Level.load(1)
+      level.instance_variable_get("@difficulty").should eql(1)
+      level.instance_variable_get("@description").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
+
   end
 
-  it "should solve the problem" do
-    @level.solve.should eql(false)
+
+  describe "solve" do
+    
+    it "should solve the problem" do
+      @level.solve.should eql(false)
+    end
+
+    it "should return true if the requirements have been met" do
+      Grit::Repo.stub(:new).and_return(true) 
+      @level.solve.should eql(true)
+    end
+
   end
 
-  it "should return true if the requirements have been met" do
-    Grit::Repo.stub(:new).and_return(true) 
-    @level.solve.should eql(true)
+
+  describe "full_description" do
+
+    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("A test description")
+      @level.full_description
+    end
+
   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
+  describe "setup" do
+
+    it "should call setup" do
+      @level.setup_level.should eql("test") 
+    end
+
+    it "should not call the setup if none exists" do
+      @level.instance_variable_set("@setup", nil)
+      lambda {@level.setup_level}.should_not raise_error(NoMethodError)
+    end
+
   end
+  
+
+  describe "repo" do
+      
+    it "should initialize a repository when repo is called" do
+      @level.repo.should equal(@repo)
+      Gitscrub::Repository.should_not_receive(:new)
+      @level.repo.should equal(@repo)
+    end
+
+    it "should call reset on setup_level" do
+      @repo.should_receive(:reset) 
+      @level.setup_level
+    end
 
-  it "should call setup" do
-    @level.setup_level.should eql("test") 
   end
+
+
   
 end

data/spec/gitscrub/repository_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe Gitscrub::Repository do
+    
+  before(:each) do
+    @grit = mock
+    Grit::Repo.stub(:new).and_return(@grit) 
+    @repository = Gitscrub::Repository.new
+  end
+
+  describe "initialize" do
+    
+    it "should call grit on initialize" do
+      Grit::Repo.should_receive(:new).and_return(@grit) 
+      repo = Gitscrub::Repository.new
+      repo.grit.should equal(@grit)
+    end
+
+    it "should contain a nil grit if the repo is invalid" do
+      Grit::Repo.should_receive(:new).and_raise(Grit::InvalidGitRepositoryError) 
+      repo = Gitscrub::Repository.new
+      repo.grit.should equal(nil)
+    end
+
+  end
+
+  describe "reset" do
+
+    before(:each) do
+      FileUtils.stub(:rm_rf) 
+    end
+
+    it "should do nothing if the current directory isn't git_scrub" do
+      Dir.stub(:pwd).and_return("/tmp/foo")
+      FileUtils.should_not_receive(:rm_rf)
+      @repository.reset
+    end
+    
+    it "should remove all the files except .gitignore and .profile.yml" do
+      Dir.stub(:pwd).and_return("/tmp/git_scrub")
+      Dir.stub(:entries).and_return([".profile.yml", ".gitignore", "..", ".", "README", ".git"])
+      FileUtils.should_receive(:rm_rf).with("README")
+      FileUtils.should_receive(:rm_rf).with(".git")
+      @repository.reset
+    end
+  end
+
+
+end

data/spec/gitscrub/ui_spec.rb

@@ -70,5 +70,15 @@ describe Gitscrub::UI do
     @ui.stub(:request).and_return('aklhasdf')
     @ui.ask("foo?").should be_false
   end
+
+  it "should print out a success message in green" do
+    @ui.success("success")
+    @out.string.should eql("\033[32msuccess\033[0m\n")
+  end
+
+  it "should print out a error message in red" do
+    @ui.error("error")
+    @out.string.should eql("\033[31merror\033[0m\n")
+  end
   
 end

metadata

@@ -2,7 +2,7 @@
 name: gitscrub
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Gary Rennie
@@ -62,19 +62,23 @@ files:
 - Rakefile
 - bin/gitscrub
 - gitscrub.gemspec
-- levels/1.rb
-- levels/2.rb
+- levels/add.rb
+- levels/commit.rb
+- levels/contribute.rb
+- levels/init.rb
 - lib/gitscrub.rb
 - lib/gitscrub/cli.rb
 - lib/gitscrub/game.rb
 - lib/gitscrub/level.rb
 - lib/gitscrub/profile.rb
+- lib/gitscrub/repository.rb
 - lib/gitscrub/ui.rb
 - lib/gitscrub/version.rb
 - spec/gitscrub/cli_spec.rb
 - spec/gitscrub/game_spec.rb
 - spec/gitscrub/level_spec.rb
 - spec/gitscrub/profile_spec.rb
+- spec/gitscrub/repository_spec.rb
 - spec/gitscrub/ui_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true