githug 0.1.7 → 0.1.8

data/README.md

@@ -38,6 +38,7 @@ If you want to suggest a level or make a level that has been suggested, check ou
  * A better way of returning from the solution block
  * A follow up to the level, more information on a specific command, etc.
  * More levels!
+ * [Windows support](https://github.com/Gazler/githug/wiki/Windows-Support)
 
 ##Writing Levels
 

data/levels/blame.rb

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

data/levels/branch_at.rb

@@ -15,9 +15,7 @@ setup do
 end
 
 solution do
-  solved = false
-  solved = true if repo.branches.map(&:name).include?("test_branch") and (repo.commits("test_branch").last.message ==  "Updating file1")
-  solved
+  repo.branches.map(&:name).include?("test_branch") and (repo.commits("test_branch").last.message ==  "Updating file1")
 end
 
 hint do

data/levels/merge.rb

@@ -2,13 +2,13 @@ difficulty 2
 description "We have a file in the branch 'feature'; Let's merge it to the master branch"
 
 setup do
-      init_from_level
+  init_from_level
 end
 
 solution do
-      `ls`.strip().split() == ["file1", "file2"]
+  `ls`.strip().split() == ["file1", "file2"]
 end
 
 hint do
-      puts "You want to research the `git merge` command"
+  puts "You want to research the `git merge` command"
 end

data/levels/pull.rb

@@ -0,0 +1,16 @@
+difficulty 2
+
+description "You need to pull changes from your origin repository."
+
+setup do
+  repo.init
+  repo.remote_add("origin", "https://github.com/pull-this/thing-to-pull")
+end
+
+solution do
+  repo.commits.last.id_abbrev == "1797a7c"
+end
+
+hint do
+  puts "Check out the remote repositories and research `git pull`."
+end

data/levels/rename.rb

@@ -3,16 +3,16 @@ difficulty 3
 description "We have a file called oldfile.txt. We want to rename it to newfile.txt and stage this change."
 
 setup do
-    repo.init
-    FileUtils.touch("oldfile.txt")
-    repo.add("oldfile.txt")
-    repo.commit_all("Commited oldfile.txt")
+  repo.init
+  FileUtils.touch("oldfile.txt")
+  repo.add("oldfile.txt")
+  repo.commit_all("Commited oldfile.txt")
 end
 
 solution do
-    repo.status["oldfile.txt"].type == "D" && repo.status["newfile.txt"].type == "A" && repo.status["oldfile.txt"].stage.nil?
+  repo.status["oldfile.txt"].type == "D" && repo.status["newfile.txt"].type == "A" && repo.status["oldfile.txt"].stage.nil?
 end
 
 hint do
-    puts "Take a look at `git mv`"
+  puts "Take a look at `git mv`"
 end

data/levels/rename_commit.rb

@@ -1,22 +1,22 @@
 difficulty 3
-description "Correct the typos in the message of your last commit."
+description "Correct the typo in the message of your first commit."
 
 setup do
   repo.init
 
-  FileUtils.touch "README"
-  repo.add        "README"
-  repo.commit_all "Adding README"
-
   FileUtils.touch "file1"
   repo.add        "file1"
-  repo.commit_all "A fresh commmit"
+  repo.commit_all "First commmit"
+
+  FileUtils.touch "file2"
+  repo.add        "file2"
+  repo.commit_all "Second commit"
 end
 
 solution do
-  repo.commits.first.message == "A fresh commit"
+  repo.commits[1].message == "First commit"
 end
 
 hint do
-  puts "Take a look the -i flag of the rebase command"
+  puts "Take a look the -i flag of the rebase command."
 end

data/levels/stage_lines.rb

@@ -0,0 +1,29 @@
+difficulty 4
+
+description "You've made changes within a single file that belong to two different features, but niether of the changes are yet staged. Stage and commit only the changes belonging to the first feature."
+
+setup do
+  repo.init
+  File.open("feature.rb", "w") do |file|
+    file.puts("this is the class of my feature")
+  end
+
+  repo.add("feature.rb")
+  repo.commit_all("Added initial feature file")
+
+  File.open("feature.rb", "a") do |file|
+    file.puts("This change belongs to the first feature")
+  end
+
+  File.open("feature.rb", "a") do |file|
+    file.puts("This change belongs to the second feature")
+  end
+end
+
+solution do
+  `git diff --staged` =~ /\+This change belongs to the first feature/ && `git diff` =~ /\+This change belongs to the second feature/
+end
+
+hint do
+  puts "Read about the -p flag which can be passed to the 'add' command; man git-add. After that have a look the options available while using 'add -p' mode to manupulate hunks."
+end

data/lib/githug/level.rb

@@ -5,8 +5,8 @@ module Githug
     LEVELS = [nil, "init", "add", "commit", "config", "clone",
               "clone_to_folder", "ignore", "status", "rm", "rm_cached", "rename",
               "log", "tag",  "commit_ammend", "reset", "checkout_file", "remote",
-              "remote_url", "remote_add", "diff", "blame", "branch", "checkout",
-              "branch_at", "merge", "rename_commit", "squash", "contribute"]
+              "remote_url", "pull", "remote_add", "diff", "blame", "branch", "checkout",
+              "branch_at", "merge", "rename_commit", "squash", "stage_lines", "contribute"]
 
     attr_accessor :level_no, :level_path
     

data/lib/githug/version.rb

@@ -1,3 +1,3 @@
 module Githug
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -2,7 +2,7 @@
 name: githug
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Gary Rennie
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-20 00:00:00 +00:00
+date: 2012-03-22 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -177,6 +177,7 @@ files:
 - levels/merge/.githug/refs/heads/feature
 - levels/merge/.githug/refs/heads/master
 - levels/merge/file1
+- levels/pull.rb
 - levels/remote.rb
 - levels/remote_add.rb
 - levels/remote_url.rb
@@ -186,13 +187,13 @@ files:
 - levels/rm.rb
 - levels/rm_cached.rb
 - levels/squash.rb
+- levels/stage_lines.rb
 - levels/status.rb
 - levels/tag.rb
 - lib/githug.rb
 - lib/githug/cli.rb
 - lib/githug/game.rb
 - lib/githug/level.rb
-- lib/githug/level.rb.orig
 - lib/githug/profile.rb
 - lib/githug/repository.rb
 - lib/githug/ui.rb

data/lib/githug/level.rb.orig

@@ -1,120 +0,0 @@
-module Githug
-  class Level
-    include UI
-
-    LEVELS = [nil, "init", "add", "commit", "config", "clone",
-              "clone_to_folder", "ignore", "status", "rm", "rm_cached", "rename",
-<<<<<<< HEAD
-              "log", "tag",  "commit_ammend", "reset", "checkout_file", "remote",
-              "remote_url", "remote_add", "diff", "blame", "branch", "checkout",
-=======
-              "log", "commit_ammend", "reset", "checkout_file", "remote",
-              "remote_url", "remote_add", "diff", "blame", "branch", "checkout", "branch_at",
->>>>>>> manojlds/master
-              "merge", "squash", "contribute"]
-
-    attr_accessor :level_no, :level_path
-    
-    class << self
-      
-      def load(level_name)
-        path = "#{File.dirname(__FILE__)}/../../levels/#{level_name}.rb"
-        setup(path)
-      end
-
-      def load_from_file(path)
-        setup(path)
-      end
-
-      def setup(path)
-        level_name = File.basename(path, File.extname(path))
-        #Remove .rb extension, WTB a better way to do this
-        level_path = path[0..-4]
-        level = new
-        return false unless File.exists?(path)
-        level.instance_eval(File.read(path))
-        level.level_no = LEVELS.index(level_name) || 1
-        level.level_path = level_path
-        level
-      end
-
-    end
-
-    def init_from_level
-      FileUtils.cp_r("#{level_path}/.", ".")
-      FileUtils.mv(".githug", ".git")
-    end
-
-    def difficulty(num)
-      @difficulty = num
-    end
-
-    def description(description)
-      @description = description
-    end
-
-    def solution(&block)
-      @solution = block
-    end
-
-    def setup(&block)
-      @setup = block 
-    end
-
-    def hint(&hint)
-      @hint = hint
-    end
-
-    def hints(hints)
-      @hints = hints
-    end
-
-    def full_description
-      UI.puts
-      UI.puts "Level: #{level_no}"
-      UI.puts "Difficulty: #{"*"*@difficulty}"
-      UI.puts
-      UI.puts @description
-      UI.puts
-    end
-
-    def setup_level
-      repo.reset
-      @setup.call if @setup
-    end
-
-    def repo(location = "")
-      @repo ||= Repository.new(location)
-    end
-
-    def solve
-      @solution.call
-    rescue
-      false
-    end
-
-    def test
-      @solution.call
-    end
-
-    def show_hint
-      UI.word_box("Githug")
-      profile = Profile.load
-      current_hint_index = profile.current_hint_index
-      if @hints
-        puts @hints[current_hint_index]
-        if current_hint_index < @hints.size - 1
-          profile.current_hint_index += 1
-          profile.save
-        else
-          profile.current_hint_index = 0
-          profile.save
-        end
-      elsif @hint
-        @hint.call
-      else
-        UI.puts("No hints available for this level")
-      end
-    end
-  end
-end