githug 0.0.9 → 0.0.10

data/levels/ignore.rb

@@ -0,0 +1,26 @@
+difficulty 2
+description "The text editor 'vim' creates files ending in .swp (swap files) for all files that are currently open.  We don't want them creeping into the repository.  Make this repository ignore .swp files."
+
+setup do
+  repo.init
+end
+
+solution do
+
+  valid = false
+ 
+
+  File.open(".gitignore", "r") do |file|
+    while line = file.gets
+      if line.chomp == "*.swp"
+        valid = true
+      end
+    end
+  end
+
+  valid
+end
+
+hint do
+  puts "You may have noticed there is a file named .gitignore in the repository"
+end

data/levels/log.rb

@@ -0,0 +1,18 @@
+difficulty 2
+
+description "You will be asked for the first 7 chars of the hash of most recent commit.  You will need to investigate the logs of the repository for this."
+
+setup do
+  repo.init
+  file = File.new("newfile.rb", "w") 
+  repo.add("newfile.rb")
+  repo.commit_all("THIS IS THE COMMIT YOU ARE LOOKING FOR!")
+end
+
+solution do
+  repo.commits.last.id_abbrev == request("What are the first 7 characters of the hash of the most recent commit?") 
+end
+
+hint do
+  puts "You need to investigate the logs.  There is probably a command for doing that!"
+end

data/levels/rm.rb

@@ -0,0 +1,19 @@
+difficulty 2
+
+description "A file has been removed from this repository, however the file was not removed from git.  Find out what this file was and remove it."
+
+setup do
+  repo.init
+  file = File.new("deleteme.rb", "w") 
+  repo.add("deleteme.rb")
+  repo.commit_all("Added a temp file")
+  File.delete("deleteme.rb")
+end
+
+solution do
+  repo.status.files["deleteme.rb"].nil? || repo.status.files["deleteme.rb"].stage.nil?
+end
+
+hint do
+  puts "You may need to use more than one command to complete this.  You have checked your staging area in a previous level.  Don't forget to run `git` for a list of commands."
+end

data/levels/rm_cached.rb

@@ -0,0 +1,17 @@
+difficulty 2
+
+description "A file has accidentally been added to your staging area, find out which file and remove it from the staging area.  *NOTE* Do not remove the file system, only from git."
+
+setup do
+  repo.init
+  file = File.new("deleteme.rb", "w") 
+  repo.add("deleteme.rb")
+end
+
+solution do
+  (repo.status.files["deleteme.rb"].nil? || repo.status.files["deleteme.rb"].stage.nil?) && File.exists?("deleteme.rb")
+end
+
+hint do
+  puts "You may need to use more than one command to complete this.  You have checked your staging area in a previous level.  Don't forget to run `git` for a list of commands."
+end

data/lib/githug/game.rb

@@ -9,7 +9,7 @@ module Githug
 
     def play_level
       solve = true
-      if profile.level == 0
+      if profile.level.nil?
         UI.puts("Welcome to Githug")
         solve = false
         level_bump
@@ -28,8 +28,7 @@ module Githug
     end
 
     def level_bump
-      profile.level += 1
-      profile.save
+      profile.level_bump
       if level = Level.load(profile.level)
         UI.puts(level.full_description)
         level.setup_level

data/lib/githug/level.rb

@@ -2,19 +2,21 @@ module Githug
   class Level
     include UI
 
-    LEVELS = [nil, "init", "add", "commit", "config", "clone", "clone_to_folder", "status", "diff", "blame",  "contribute"]
+    LEVELS = [nil, "init", "add", "commit", "config", "clone",
+              "clone_to_folder", "ignore", "status", "rm", "rm_cached", "log",
+              "diff", "blame", "contribute"]
 
     attr_accessor :level_no, :level_path
     
     class << self
       
-      def load(level_no)
+      def load(level_name)
         level = new
-        level_path = "#{File.dirname(__FILE__)}/../../levels/#{LEVELS[level_no]}"
+        level_path = "#{File.dirname(__FILE__)}/../../levels/#{level_name}"
         location = "#{level_path}.rb"
         return false unless File.exists?(location)
         level.instance_eval(File.read(location))
-        level.level_no = level_no
+        level.level_no = LEVELS.index(level_name)
         level.level_path = level_path
         level
       end

data/lib/githug/profile.rb

@@ -8,10 +8,13 @@ module Githug
     class << self
       def load
         settings = {
-          :level => 0
+          :level => nil,
+          :current_levels => [],
+          :completed_levels => [] 
         }
 
         settings.merge! YAML::load(File.open(PROFILE_FILE)) if File.exists?(PROFILE_FILE)
+
         self.new(settings)
       end
     end
@@ -36,6 +39,21 @@ module Githug
       end
     end
 
+    def level_bump
+      levels = Level::LEVELS
+      level_no = levels.index(settings[:level])
+
+      settings[:completed_levels] << level
+
+      settings[:current_levels] = levels
+
+      next_level = (levels - settings[:completed_levels]).first || levels.last
+
+      settings[:level] = next_level
+      save
+      next_level
+    end
+
 
   end
 end

data/lib/githug/repository.rb

@@ -26,7 +26,7 @@ module Githug
       @grit = Grit::Repo.init(".")
       if gitignore
         @grit.add(".gitignore")
-        @grit.commit("added .gitignore")
+        @grit.commit_all("added .gitignore")
       end
     end
 

data/lib/githug/version.rb

@@ -1,3 +1,3 @@
 module Githug
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/githug/game_spec.rb

@@ -8,6 +8,7 @@ describe Githug::Game do
     @game = Githug::Game.new
     @profile.stub(:level).and_return(1)
     @profile.stub(:save)
+    @profile.stub(:level_bump)
     @level = mock
     @level.stub(:full_description)
     @level.stub(:setup_level)
@@ -21,16 +22,15 @@ describe Githug::Game do
 
   it "should show a description if the level is 0" do
     @level.should_not_receive(:solve)
-    @profile.stub(:level).and_return(0) 
-    @profile.should_receive(:save)
+    @profile.stub(:level).and_return(nil)
+    @profile.should_receive(:level_bump)
     Githug::UI.should_receive(:puts).with("Welcome to Githug")
-    @profile.should_receive(:level=).with(1)
     @game.play_level
   end
 
   it "should echo congratulations if the level is solved" do
     @level.stub(:solve).and_return(true)
-    @profile.should_receive(:level=).with(2)
+    @profile.should_receive(:level_bump)
     Githug::UI.should_receive(:success).with("Congratulations, you have solved the level")
     @game.play_level
   end

data/spec/githug/level_spec.rb

@@ -20,7 +20,7 @@ end
     eof
     File.stub(:exists?).and_return(true)
     File.stub(:read).and_return(@file)
-    @level = Githug::Level.load(1)
+    @level = Githug::Level.load("init")
     @repo = mock
     @repo.stub(:reset) 
     Githug::Repository.stub(:new).and_return(@repo)
@@ -38,7 +38,7 @@ end
     it "should load the level" do
       File.stub(:dirname).and_return("")
       File.should_receive(:read).with('/../../levels/init.rb').and_return(@file)
-      level = Githug::Level.load(1)
+      level = Githug::Level.load("init")
       level.instance_variable_get("@difficulty").should eql(1)
       level.instance_variable_get("@description").should eql("A test description")
     end

data/spec/githug/profile_spec.rb

@@ -1,12 +1,9 @@
 require 'spec_helper'
 
 describe Githug::Profile do
-  
-  before(:each) do
-  end
 
   it "should load the profile" do
-    settings = {:level => 1}
+    settings = {:level => 1, :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)
@@ -15,14 +12,15 @@ describe Githug::Profile do
   end
 
   it "should load the defaults if the file does not exist" do
-    defaults = {:level => 0}
+    defaults = {:level => nil, :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
   end
 
   it "should allow method acces to getters and setters" do
     profile = Githug::Profile.load
-    profile.level.should eql(0)
+    profile.level.should eql(nil)
     profile.level = 1
     profile.level.should eql(1)
   end
@@ -32,5 +30,30 @@ describe Githug::Profile do
     File.should_receive(:open).with(Githug::Profile::PROFILE_FILE, "w")
     profile.save
   end
+
+  describe "level_bump" do
+    before(:each) do
+      @profile = Githug::Profile.load
+      @levels = Githug::Level::LEVELS 
+      Githug::Level::LEVELS = ["init", "add", "rm", "rm_cached", "diff"]
+      @profile.level = "init"
+      @profile.should_receive(:save)
+    end
+      
+    after(:each) do
+      Githug::Level::LEVELS = @levels
+    end
+      
+    it "should bump the level" do
+      @profile.level_bump.should eql("add")
+    end
+
+    it "should set the level to the first incomplete level" do
+      @profile.settings.stub(:[]).with(:level).and_return("rm_cached")
+      @profile.settings.stub(:[]).with(:completed_levels).and_return(["init", "add"])
+      @profile.level_bump.should eql("rm")
+    end
+  end
+
   
 end

data/spec/githug/repository_spec.rb

@@ -69,7 +69,7 @@ describe Githug::Repository do
 
     it "should initialize an empty repository and add .gitignore" do
       @repo.should_receive(:add).with(".gitignore")
-      @repo.should_receive(:commit).with("added .gitignore")
+      @repo.should_receive(:commit_all).with("added .gitignore")
       @repository.init
     end
 

metadata

@@ -2,7 +2,7 @@
 name: githug
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Gary Rennie
@@ -129,7 +129,11 @@ files:
 - levels/diff/.githug/objects/dc/aa55e97af34402e84d5336da37abcccc23cba6
 - levels/diff/.githug/refs/heads/master
 - levels/diff/app.rb
+- levels/ignore.rb
 - levels/init.rb
+- levels/log.rb
+- levels/rm.rb
+- levels/rm_cached.rb
 - levels/status.rb
 - lib/githug.rb
 - lib/githug/cli.rb