mygithug 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0650631b8e3a436a49338b44bc12d3d6afbd43f9
-  data.tar.gz: 8d67f8de34e9206de5e895b732277be32db9fbca
+  metadata.gz: 61dc29f7d047b967bef140e5e246cf7e46f4d899
+  data.tar.gz: 0e614ae2c7eee8efef06f79ab1ed7407a823d2f1
 SHA512:
-  metadata.gz: 531e4bd37129eee6bd74cb313642aa32a64a32241fef5cb084af0b550d18f837795ce2549a10c80f65510e59707c8c34bdabeae72b2ff98825980ae059a64f40
-  data.tar.gz: 9843fd85ae72ba12760685d64e9df4503e69f1c636926207ea9758cbd3d8019248248668107729ce89e5954ff2e40122376a9843fc8302ec87a4615ee1c8122b
+  metadata.gz: ae34fccda3f5e25e7e98bf85cf759cd9dec9a34eefefe041a52a21460ba7ce0ec3cc6980025bcd0da5bdb856f8b69b217a4c0b861e54ec01fe900fed41f6e283
+  data.tar.gz: 1ead678ba4cb8a723223eb5ddc4fa0e162fb8dd5e66ccc5c5d2328e6a9d08d273ed85e3b56bed8564820dd7abb2f3e4d71f31b11c8e3eafa4e9ddf41ceaf092c

data/bin/mg

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
 require 'githug/cli'
 
+STDOUT.sync = true
+
 Githug::CLI.start

data/levels/add.rb

@@ -1,31 +1,38 @@
-# -*- encoding : utf-8 -*-
-difficulty 1
-description "你已经创建了文件 README, 请把它加到Stage区，注意保持另一个文件file2不变。观察file2.txt在工作区-Stage-Head间有哪些变化。
-Note: You start each level with a new repo. Don't look for files from the previous one."
-
-setup do
-  repo.init
-  FileUtils.touch("README")
-  FileUtils.touch("file2.txt")
-
-  `echo "Hello" >> README`
-  `git add file2.txt && echo "NEWlINE" >> file2.txt`
-
-end
-
-solution do
-  return false unless repo.status.files.keys.include?("README")
-  return false if repo.status.files["README"].untracked
-  return false if "1" == request("在工作区(Workspace）与Stage之间，file2.txt有哪些变化：
-  	1. 无变化
-  	2. 增加了一行：NEWLINE
-  	")
-  "2" == request("在HEAD与Stage之间，file2.txt有哪些变化：
-  	1. 无变化
-  	2. 新增了文件file2.txt
-  	")
-end
-
-hint do
-  puts "你需要使用`git add` 和`git diff`命令。必要时加上`--cached`参数."
-end
+# -*- encoding : utf-8 -*-
+difficulty 1
+description "你已经创建了文件 README, 请把它加到Stage区，注意保持另一个文件file2不变。观察file2.txt在工作区-Stage-Head间有哪些变化。
+Note: You start each level with a new repo. Don't look for files from the previous one."
+
+setup do
+  repo.init
+  FileUtils.touch("README")
+  FileUtils.touch("file2.txt")
+
+  File.open("README", "w") do | f |
+    f.write "Hello\n"
+  end
+
+  repo.add("file2.txt")
+
+  File.open("file2.txt", "w") do | f |
+    f.write "NEWlINE\n"
+  end
+
+end
+
+solution do
+  return false unless repo.status.files.keys.include?("README")
+  return false if repo.status.files["README"].untracked
+  return false if "1" == request("在工作区(Workspace）与Stage之间，file2.txt有哪些变化：
+  	1. 无变化
+  	2. 增加了一行：NEWLINE
+  	")
+  "2" == request("在HEAD与Stage之间，file2.txt有哪些变化：
+  	1. 无变化
+  	2. 新增了文件file2.txt
+  	")
+end
+
+hint do
+  puts "你需要使用`git add` 和`git diff`命令。必要时加上`--cached`参数."
+end

data/levels/alias_lg.rb

@@ -1,60 +1,67 @@
-# -*- encoding : utf-8 -*-
-difficulty 1
-description "使⽤`git lg`来查看带有树形结构的提交记录. 使用`git fl`查看单个文件的提交记录和变更历史。"
-
-setup do
-  repo.init
-
-  FileUtils.touch "file1"
-  repo.add        "file1"
-  repo.commit_all "committed changes on master"
-
-  # add another file.
-  FileUtils.touch "file2"
-  repo.add        "file2"
-  repo.commit_all "add another file: file2"
-
-  `git checkout -b other_branch --quiet`
-  # add another file
-  FileUtils.touch "file3"
-  repo.add        "file3"
-  # `echo "hello" >> file2`
-  # repo.add        "file2"  
-  repo.commit_all "add another file: file3"
-
-  # `git checkout -b test_branch --quiet`
-
-  # FileUtils.touch "file4"
-  # repo.add        "file4"
-  # repo.commit_all "committed change on test_branch"
-
-  `git checkout master`
-
-  FileUtils.touch "file5"
-  repo.add        "file5"
-  repo.commit_all "add another file: file5"
-
-  `git merge other_branch -m "merge other_branch"`
-  # `git merge test_branch`
-  
-end
-
-solution do
-  valid = true
-
-  config_alias_lg = repo.config["alias.lg"]
-  config_alias_filelg = repo.config["alias.fl"]
-
-  return false unless "log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(dim)%ad%C(reset) %C(cyan)%s%C(reset) %C(dim)- %an%C(reset)%C(auto)%d%C(reset)'  --date=format:'%Y-%m-%d %H:%M:%S'" == config_alias_lg
-  return false unless "log -M --follow --stat --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(dim)%ad%C(reset) %C(cyan)%s%C(reset) %C(dim)- %an%C(reset)%C(auto)%d%C(reset)'  --date=format:'%Y-%m-%d %H:%M:%S'" == config_alias_filelg
-
-  valid
-end
-
-hint do
-  puts "增加两个别名：git lg 和git fl，分别如下：
-  lg: log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(dim)%ad%C(reset) %C(cyan)%s%C(reset) %C(dim)- %an%C(reset)%C(auto)%d%C(reset)'  --date=format:'%Y-%m-%d %H:%M:%S'
-  fl: log -M --follow --stat --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(dim)%ad%C(reset) %C(cyan)%s%C(reset) %C(dim)- %an%C(reset)%C(auto)%d%C(reset)'  --date=format:'%Y-%m-%d %H:%M:%S'
-
-  "
-end
+# -*- encoding : utf-8 -*-
+difficulty 1
+description "本关不做考核，仅用于提示您增加两个查看日志的别名，以方便查看日志。
+增加两个别名：git lg 和git fl，命令分别如下：
+  git config --global alias.lg \"log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(dim)%ad%C(reset) %C(cyan)%s%C(reset) %C(dim)- %an%C(reset)%C(auto)%d%C(reset)'  --date=format:'%Y-%m-%d %H:%M:%S'\"
+  git config --global alias.fl \"log -M --follow --stat --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(dim)%ad%C(reset) %C(cyan)%s%C(reset) %C(dim)- %an%C(reset)%C(auto)%d%C(reset)'  --date=format:'%Y-%m-%d %H:%M:%S'\"
+
+  之后，您可以通过`git lg` 查看日志，或者 `git lg -p`查看包括变更内容的日志。
+  通过`git fl <filename>` 或 `git fl -p <filename> 查看某个文件的日志。
+
+"
+
+setup do
+  repo.init
+
+  FileUtils.touch "file1"
+  repo.add        "file1"
+  repo.commit_all "committed changes on master"
+
+  # add another file.
+  FileUtils.touch "file2"
+  repo.add        "file2"
+  repo.commit_all "add another file: file2"
+
+  `git checkout -b other_branch --quiet`
+  # add another file
+  FileUtils.touch "file3"
+  repo.add        "file3"
+  # `echo "hello" >> file2`
+  # repo.add        "file2"  
+  repo.commit_all "add another file: file3"
+
+  # `git checkout -b test_branch --quiet`
+
+  # FileUtils.touch "file4"
+  # repo.add        "file4"
+  # repo.commit_all "committed change on test_branch"
+
+  `git checkout master --quiet`
+
+  FileUtils.touch "file5"
+  repo.add        "file5"
+  repo.commit_all "add another file: file5"
+
+  `git merge other_branch -m "merge other_branch"`
+  # `git merge test_branch`
+  
+end
+
+solution do
+  valid = true
+
+  # config_alias_lg = repo.config["alias.lg"]
+  # config_alias_filelg = repo.config["alias.fl"]
+  # valid = "log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(dim)%ad%C(reset) %C(cyan)%s%C(reset) %C(dim)- %an%C(reset)%C(auto)%d%C(reset)'  --date=format:'%Y-%m-%d %H:%M:%S'" == config_alias_lg
+  # valid2 = "log -M --follow --stat --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(dim)%ad%C(reset) %C(cyan)%s%C(reset) %C(dim)- %an%C(reset)%C(auto)%d%C(reset)'  --date=format:'%Y-%m-%d %H:%M:%S'" == config_alias_filelg
+
+  # valid && valid2
+end
+
+hint do
+  puts "增加两个别名：git lg 和git fl，分别如下：
+  lg: log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(dim)%ad%C(reset) %C(cyan)%s%C(reset) %C(dim)- %an%C(reset)%C(auto)%d%C(reset)'  --date=format:'%Y-%m-%d %H:%M:%S'
+  fl: log -M --follow --stat --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(dim)%ad%C(reset) %C(cyan)%s%C(reset) %C(dim)- %an%C(reset)%C(auto)%d%C(reset)'  --date=format:'%Y-%m-%d %H:%M:%S'
+
+  "
+end

data/levels/cherry-pick.rb

@@ -1,20 +1,22 @@
-# -*- encoding : utf-8 -*-
-difficulty 3
-description "你在hotfix分支修复生产环境的紧急问题，现在你已经修复完成，需要单独将这个修复(Filled in README.md with proper input) 合并到master分支."
-
-setup do
-    init_from_level
-    `git stash` #fix for README.md being in githug root an the level
-    `git checkout new-feature --quiet && git branch -m hotfix --quiet`
-    `git checkout master --quiet`
-end
-
-solution do
-  return false unless repo.commits[1].message == "Added fancy branded output"
-  return false unless repo.commits[0].message == "Filled in README.md with proper input"
-  true
-end
-
-hint do
-  puts "Sneak a peek at the `cherry-pick` command."
-end
+# -*- encoding : utf-8 -*-
+difficulty 3
+description "你在hotfix分支修复生产环境的紧急问题，现在你已经修复完成，需要单独将这个修复(Filled in README.md with proper input) 合并到master分支."
+
+setup do
+    init_from_level
+    `git stash` #fix for README.md being in githug root an the level
+    `git checkout new-feature --quiet`
+    `git branch -m hotfix --quiet`
+    `git checkout master --quiet`
+    
+end
+
+solution do
+  return false unless repo.commits[1].message == "Added fancy branded output"
+  return false unless repo.commits[0].message == "Filled in README.md with proper input"
+  true
+end
+
+hint do
+  puts "Sneak a peek at the `cherry-pick` command."
+end

data/levels/conflict.rb

@@ -1,24 +1,27 @@
-# -*- encoding : utf-8 -*-
-difficulty 4
-description "你需要将 `mybranch`分支的变更merge到当前分支 (master). 如果有冲突，请把它搞定."
-
-setup do
-  init_from_level
-end
-
-solution do
-  solved = true
-
-  solved = false unless repo.head.name == "master"
-  solved = false unless repo.commits("master")[0].parents.length == 2
-
-  txt = File.read("poem.txt")
-  solved = false if txt =~ /[<>=|]/
-  solved = false unless txt =~ /Sat on a wall/
-
-  solved
-end
-
-hint do
-  puts ["首先，你要merge，然后解决冲突。最后别忘了commit."]
-end
+# -*- encoding : utf-8 -*-
+difficulty 4
+description "你需要将 `mybranch`分支的变更merge到当前分支 (master). 如果有冲突，请把它搞定."
+
+setup do
+  init_from_level
+
+  `git add .`
+  `git commit -m "fix a bug" --quiet`
+end
+
+solution do
+  solved = true
+
+  solved = false unless repo.head.name == "master"
+  solved = false unless repo.commits("master")[0].parents.length == 2
+
+  txt = File.read("poem.txt")
+  solved = false if txt =~ /[<>=|]/
+  solved = false unless txt =~ /Sat on a wall/
+
+  solved
+end
+
+hint do
+  puts ["首先，你要merge，然后解决冲突。最后别忘了commit."]
+end

data/levels/log.rb

@@ -1,23 +1,25 @@
-# -*- encoding : utf-8 -*-
-difficulty 2
-
-description "你需要提供最近一次提交的commit id，并找出新增的内容是什么。"
-
-setup do
-  repo.init
-  file = File.new("newfile.txt", "w")
-  repo.add("newfile.txt")
-
-  `echo "Hello" >> newfile.txt`
-
-  repo.commit_all("THIS IS THE COMMIT YOU ARE LOOKING FOR!")
-end
-
-solution do
-  repo.commits.last.id_abbrev == request("最近一次提交的commit id是多少？")[0..6]
-  "Hello" == request("最近一次提交时，文件newfile.txt中新增的内容是什么？")
-end
-
-hint do
-  puts "你需要查看提交日志."
-end
+# -*- encoding : utf-8 -*-
+difficulty 2
+
+description "你需要提供最近一次提交的commit id，并找出新增的内容是什么。"
+
+setup do
+  repo.init
+
+    # begin
+  File.open("newfile.txt", "w") do | f |
+    f.write "Hello\n"
+  end
+
+  repo.add("newfile.txt")
+  repo.commit_all("THIS IS THE COMMIT YOU ARE LOOKING FOR!")
+end
+
+solution do
+  repo.commits.last.id_abbrev == request("最近一次提交的commit id是多少？")[0..6]
+  "Hello" == request("最近一次提交时，文件newfile.txt中新增的内容是什么？")
+end
+
+hint do
+  puts "你需要查看提交日志."
+end

data/levels/pull_rebase.rb

@@ -1,50 +1,67 @@
-# -*- encoding : utf-8 -*-
-difficulty 2
-description "你需获取远程所有分⽀最新代码，并让版本树尽量整洁（只有⼀个树⼲）."
-
-setup do
-  # remember the working directory so we can come back to it later
-  cwd = Dir.pwd
-  repo.init
-
-  # initialize another git repo to be used as a "remote"
-  # remote repo
-  tmpdir = Dir.mktmpdir
-  Dir.chdir tmpdir
-  repo.init
-  # make a 'non-bare' repo accept pushes
-  `git config receive.denyCurrentBranch ignore`
-
-  # add a different file and commit so remote and local would diverge
-  FileUtils.touch "file1"
-  repo.add        "file1"
-  repo.commit_all "first commit"
-
-  # change back to original repo to set up a remote
-  Dir.chdir cwd
-  `git remote add origin #{tmpdir}/.git  2> /dev/null`
-  `git fetch origin  2> /dev/null`
-  `git branch -u origin/master master  2> /dev/null`
-
-  # 处理本地repo
-  `git pull origin master --quiet`
-  `echo "Hello" >> file1 && git add file1  2> /dev/null && git commit -m "Second commit"  2> /dev/null`
-
-  Dir.chdir tmpdir
-  FileUtils.touch "file2"
-  `echo "Hello" >> file2 && git add file2  2> /dev/null && git commit -m "Third commit"  2> /dev/null`
-
-  Dir.chdir cwd
-  FileUtils.touch "file3"
-  `echo "Hello" >> file3  && git add file3  2> /dev/null && git commit -m "Forth commit"  2> /dev/null`
-  `git branch --set-upstream-to=origin/master master  2> /dev/null`
-
-end
-
-solution do
-  1 == repo.commits("master")[0].parents.length
-end
-
-hint do
-  puts "Take a look at `git fetch`, `git pull`, and `git push`."
-end
+# -*- encoding : utf-8 -*-
+difficulty 2
+description "你需获取远程所有分⽀最新代码，并让版本树尽量整洁（只有⼀个树⼲）."
+
+setup do
+  # remember the working directory so we can come back to it later
+  cwd = Dir.pwd
+  repo.init
+
+  # initialize another git repo to be used as a "remote"
+  # remote repo
+  tmpdir = Dir.mktmpdir
+  Dir.chdir tmpdir
+  repo.init
+  # make a 'non-bare' repo accept pushes
+  `git config receive.denyCurrentBranch ignore`
+
+  # add a different file and commit so remote and local would diverge
+  FileUtils.touch "file1"
+  repo.add        "file1"
+  repo.commit_all "first commit"
+
+
+  # change back to original repo to set up a remote
+  Dir.chdir cwd
+
+  `git remote add origin #{tmpdir}/.git `
+
+  `git fetch origin --quiet`
+  # `git branch -u origin/master master`
+
+  # 处理本地repo
+  `git pull origin master --quiet`
+
+  File.open("file1", "a") do | f |
+    f.write "Hello\n"
+  end
+
+  `git add file1`
+  `git commit -m "Second commit" --quiet`
+
+  Dir.chdir tmpdir
+  FileUtils.touch "file2"
+  File.open("#{tmpdir}/file2", "w") do | f |
+    f.write "Hello\n"
+  end
+  `git add file2`
+  `git commit -m "Third commit"  --quiet`
+
+  Dir.chdir cwd
+  FileUtils.touch "file3"
+  File.open("#{cwd}/file3", "w") do | f |
+    f.write "Hello\n"
+  end
+  `git add file3`
+  `git commit -m "Forth commit"  --quiet`
+  `git branch --set-upstream-to=origin/master master`
+
+end
+
+solution do
+  1 == repo.commits("master")[0].parents.length
+end
+
+hint do
+  puts "Take a look at `git fetch`, `git pull`, and `git push`."
+end

data/levels/push_branch.rb

@@ -1,89 +1,89 @@
-# -*- encoding : utf-8 -*-
-difficulty 2
-description "你已经创建了本地分支 `test_branch`，开发已经完成，你需要将此分支 push 到远程代码库。
-注意：只能push `test_branch` 分支，不能push其它分支。"
-
-setup do
-
-  # remember the working directory so we can come back to it later
-  cwd = Dir.pwd
-  # initialize another git repo to be used as a "remote"
-  tmpdir = Dir.mktmpdir
-
-  # local repo
-  repo.init
-
-  FileUtils.touch "file1"
-  repo.add        "file1"
-  repo.commit_all "committed changes on master"
-
-  # copy the repo to remote
-  FileUtils.cp_r ".", tmpdir
-
-  # add another file.  If successful this file won't be pushed to the remote repository
-  FileUtils.touch "file2"
-  repo.add        "file2"
-  repo.commit_all "If this commit gets pushed to repo, then you have lost the level :( "
-
-  #This branch should not be pushed to to the remote repository
-  `git checkout -b other_branch --quiet`
-  # add another file
-  FileUtils.touch "file3"
-  repo.add        "file3"
-  repo.commit_all "If this commit gets pushed to repo, then you have lost the level :( "
-
-  `git checkout -b test_branch --quiet`
-
-  #This file should get pushed if the level is successful
-  FileUtils.touch "file4"
-  repo.add        "file4"
-  repo.commit_all "committed change on test_branch"
-
-  # remote repo
-  Dir.chdir tmpdir
-
-  repo.init
-
-  # make a 'non-bare' repo accept pushes
-  `git config receive.denyCurrentBranch ignore`
-
-  # change back to original repo to set up a remote
-  Dir.chdir cwd
-  `git remote add origin #{tmpdir}/.git`
-  `git fetch --quiet origin`
-  `git branch -u origin/master master 2> /dev/null`
-
-  `git checkout master --quiet` #return to master branch
-end
-
-solution do
-  repo.init
-  result = false
-
-  #each branch consits of one line, `wc -l counts the number of lines in order to get the number of remote branches`
-  #At the moment Grit doesn't support remote branch references but is on the ToDo list.  This should be revisited when Grit implements the change
-  num_remote_branches = `git branch -r`.split("\n").count
-
-  # counts the number of commits in the remote master branch'
-  remote_master_commits = repo.commits('origin/master').count
-  remote_test_branch_commits = repo.commits('origin/test_branch').count #if returns 0 indicates that the remote test_branch doesn't exist
-
-  #Level will be successful if the remote master branch remains at 1 commit, the remote test_branch exits and the number of remote branches
-  if remote_master_commits == 1 and remote_test_branch_commits > 0 and num_remote_branches == 2
-    result = true
-
-  #User pushed up too many branches, level failed
-  elsif num_remote_branches > 2
-    puts "*** It looks like you pushed up too many branches. You need to make sure only 'test_branch' gets pushed. Please try again! ***"
-
-  #User pushed up the master banch, level failed
-  elsif remote_master_commits > 1
-    puts "*** It looks like you pushed up new master branch changes. You need to make sure only 'test_branch' gets pushed. Please try again! ***"
-  end
-
-  result
-end
-
-hint do
-  puts "研究一下 `git push` 命令吧，可以使用 `git push --help`"
-end
+# -*- encoding : utf-8 -*-
+difficulty 2
+description "你已经创建了本地分支 `test_branch`，开发已经完成，你需要将此分支 push 到远程代码库。
+注意：只能push `test_branch` 分支，不能push其它分支。"
+
+setup do
+
+  # remember the working directory so we can come back to it later
+  cwd = Dir.pwd
+  # initialize another git repo to be used as a "remote"
+  tmpdir = Dir.mktmpdir
+
+  # local repo
+  repo.init
+
+  FileUtils.touch "file1"
+  repo.add        "file1"
+  repo.commit_all "committed changes on master"
+
+  # copy the repo to remote
+  FileUtils.cp_r ".", tmpdir
+
+  # add another file.  If successful this file won't be pushed to the remote repository
+  FileUtils.touch "file2"
+  repo.add        "file2"
+  repo.commit_all "If this commit gets pushed to repo, then you have lost the level :( "
+
+  #This branch should not be pushed to to the remote repository
+  `git checkout -b other_branch --quiet`
+  # add another file
+  FileUtils.touch "file3"
+  repo.add        "file3"
+  repo.commit_all "If this commit gets pushed to repo, then you have lost the level :( "
+
+  `git checkout -b test_branch --quiet`
+
+  #This file should get pushed if the level is successful
+  FileUtils.touch "file4"
+  repo.add        "file4"
+  repo.commit_all "committed change on test_branch"
+
+  # remote repo
+  Dir.chdir tmpdir
+
+  repo.init
+
+  # make a 'non-bare' repo accept pushes
+  `git config receive.denyCurrentBranch ignore`
+
+  # change back to original repo to set up a remote
+  Dir.chdir cwd
+  `git remote add origin #{tmpdir}/.git`
+  `git fetch --quiet origin`
+  `git branch -u origin/master master`
+
+  `git checkout master --quiet` #return to master branch
+end
+
+solution do
+  repo.init
+  result = false
+
+  #each branch consits of one line, `wc -l counts the number of lines in order to get the number of remote branches`
+  #At the moment Grit doesn't support remote branch references but is on the ToDo list.  This should be revisited when Grit implements the change
+  num_remote_branches = `git branch -r`.split("\n").count
+
+  # counts the number of commits in the remote master branch'
+  remote_master_commits = repo.commits('origin/master').count
+  remote_test_branch_commits = repo.commits('origin/test_branch').count #if returns 0 indicates that the remote test_branch doesn't exist
+
+  #Level will be successful if the remote master branch remains at 1 commit, the remote test_branch exits and the number of remote branches
+  if remote_master_commits == 1 and remote_test_branch_commits > 0 and num_remote_branches == 2
+    result = true
+
+  #User pushed up too many branches, level failed
+  elsif num_remote_branches > 2
+    puts "*** It looks like you pushed up too many branches. You need to make sure only 'test_branch' gets pushed. Please try again! ***"
+
+  #User pushed up the master banch, level failed
+  elsif remote_master_commits > 1
+    puts "*** It looks like you pushed up new master branch changes. You need to make sure only 'test_branch' gets pushed. Please try again! ***"
+  end
+
+  result
+end
+
+hint do
+  puts "研究一下 `git push` 命令吧，可以使用 `git push --help`"
+end

data/levels/rebase_conflict.rb

@@ -1,56 +1,68 @@
-# -*- encoding : utf-8 -*-
-difficulty 2
-description "你需获取远程的最新代码，请让版本树尽量整洁（只有⼀个树⼲）.过程中如果有冲突，请解决掉它！"
-
-setup do
-  # remember the working directory so we can come back to it later
-  cwd = Dir.pwd
-  repo.init
-
-  # initialize another git repo to be used as a "remote"
-  # remote repo
-  tmpdir = Dir.mktmpdir
-  Dir.chdir tmpdir
-  repo.init
-  # make a 'non-bare' repo accept pushes
-  `git config receive.denyCurrentBranch ignore`
-
-  # add a different file and commit so remote and local would diverge
-  FileUtils.touch "file1"
-  repo.add        "file1"
-  repo.commit_all "first commit"
-
-  # change back to original repo to set up a remote
-  Dir.chdir cwd
-  `git remote add origin #{tmpdir}/.git  2> /dev/null`
-  `git fetch origin  2> /dev/null`
-  `git branch -u origin/master master  2> /dev/null`
-
-  # 处理本地repo
-  `git pull origin master --quiet`
-  `echo "My Hello" >> file1 && git add file1  2> /dev/null && git commit -m "Second commit"  2> /dev/null`
-
-  Dir.chdir tmpdir
-  FileUtils.touch "file1"
-  `echo "My teammate say Hello" >> file1 && git add file1  2> /dev/null && git commit -m "Third commit"  2> /dev/null`
-
-  #制造冲突
-  Dir.chdir cwd
-  FileUtils.touch "file1"
-  `echo "Hello" >> file1  && git add file1  2> /dev/null && git commit -m "Forth commit"  2> /dev/null`
-  `git branch --set-upstream-to=origin/master master  2> /dev/null`
-
-
-end
-
-solution do
-  return false if 1 != repo.commits("master")[0].parents.length
-
-  txt = File.read("file1")
-  return false if txt =~ /[<>=|]/
-  true
-end
-
-hint do
-  puts "Take a look at `git fetch`, `git pull`, and `git rebase` 你的日志应该只有4条记录，并且file1的冲突已经解决"
-end
+# -*- encoding : utf-8 -*-
+difficulty 2
+description "你需获取远程的最新代码，请让版本树尽量整洁（只有⼀个树⼲）.过程中如果有冲突，请解决掉它！"
+
+setup do
+  # remember the working directory so we can come back to it later
+  cwd = Dir.pwd
+  repo.init
+
+  # initialize another git repo to be used as a "remote"
+  # remote repo
+  tmpdir = Dir.mktmpdir
+  Dir.chdir tmpdir
+  repo.init
+  # make a 'non-bare' repo accept pushes
+  `git config receive.denyCurrentBranch ignore`
+
+  # add a different file and commit so remote and local would diverge
+  FileUtils.touch "file1"
+  repo.add        "file1"
+  repo.commit_all "first commit"
+
+  # change back to original repo to set up a remote
+  Dir.chdir cwd
+  `git remote add origin #{tmpdir}/.git`
+  `git fetch origin  --quiet`
+  # `git branch -u origin/master master  2> /dev/null`
+
+  # 处理本地repo
+  `git pull origin master --quiet`
+  File.open("#{cwd}/file1", "a") do | f |
+    f.write "My Hello\n"
+  end
+  `git add file1`
+  `git commit -m "Second commit"  --quiet`
+
+  Dir.chdir tmpdir
+  FileUtils.touch "file1"
+  File.open("#{tmpdir}/file1", "a") do | f |
+    f.write "My teammate say Hello\n"
+  end
+  `git add file1`
+  `git commit -m "Third commit" --quiet`
+
+  #制造冲突
+  Dir.chdir cwd
+  FileUtils.touch "file1"
+  File.open("#{cwd}/file1", "a") do | f |
+    f.write "Hello\n"
+  end
+  `git add file1`
+  `git commit -m "Forth commit" --quiet`
+  `git branch --set-upstream-to=origin/master master`
+
+
+end
+
+solution do
+  return false if 1 != repo.commits("master")[0].parents.length
+
+  txt = File.read("file1")
+  return false if txt =~ /[<>=|]/
+  true
+end
+
+hint do
+  puts "Take a look at `git fetch`, `git pull`, and `git rebase` 你的日志应该只有4条记录，并且file1的冲突已经解决"
+end

data/lib/githug/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Githug
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mygithug
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Gary Rennie & Mei Xuesong