mygithug 0.5.1

data/levels/push_branch.rb

@@ -0,0 +1,88 @@
+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

data/levels/push_tags.rb

@@ -0,0 +1,63 @@
+difficulty 2
+description "There are tags in the repository that aren't pushed into remote repository. Push them now."
+
+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 "First commit"
+  repo.git.tag({'f' => true}, "tag_to_be_pushed")
+
+  FileUtils.touch "file2"
+  repo.add        "file2"
+  repo.commit_all "Second commit"
+
+  # copy the repo to remote
+  FileUtils.cp_r ".", tmpdir
+
+  # 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 origin`
+
+  # delete tags from remote
+  Dir.chdir tmpdir
+  repo.git.tag({'d' => true}, "tag_to_be_pushed")
+
+  # change back to local repo
+  Dir.chdir cwd
+end
+
+solution do
+  solved = false
+
+  # a bit hacky solution to get tags from remote
+  remote_tags=
+    repo.git.raw_git_call("git ls-remote --tags .", repo.git.git_file_index).
+      first.
+      split("\n")
+
+  # see if we have the correct tag in the remote
+  remote_tags.each do |t|
+    solved=true if t.include?("refs/tags/tag_to_be_pushed")
+  end
+
+  solved
+end
+
+hint do
+  puts "Take a look at `--tags` flag of `git push`"
+end

data/levels/rebase/.githug/COMMIT_EDITMSG

@@ -0,0 +1 @@
+add content

data/levels/rebase/.githug/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

data/levels/rebase/.githug/ORIG_HEAD

@@ -0,0 +1 @@
+4419b972c0cd1b346ac90332aa7c5cc949589f78

data/levels/rebase/.githug/config

@@ -0,0 +1,7 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+	precomposeunicode = true

data/levels/rebase/.githug/logs/HEAD

@@ -0,0 +1,13 @@
+0000000000000000000000000000000000000000 a78bcab6232e9382a86436cdfcb2ed0391b1f0ac ipmsteven <steven.lyl147@gmail.com> 1418373185 -0800	commit (initial): init commit
+a78bcab6232e9382a86436cdfcb2ed0391b1f0ac a78bcab6232e9382a86436cdfcb2ed0391b1f0ac ipmsteven <steven.lyl147@gmail.com> 1418373194 -0800	checkout: moving from master to feature
+a78bcab6232e9382a86436cdfcb2ed0391b1f0ac ed0fdcf366b21b8984fb37ea34106978a2e5c5ba ipmsteven <steven.lyl147@gmail.com> 1418373239 -0800	commit: add feature
+ed0fdcf366b21b8984fb37ea34106978a2e5c5ba a78bcab6232e9382a86436cdfcb2ed0391b1f0ac ipmsteven <steven.lyl147@gmail.com> 1418373246 -0800	checkout: moving from feature to master
+a78bcab6232e9382a86436cdfcb2ed0391b1f0ac 98205e9faf10cf33d2ef7c0f66e402540c62613a ipmsteven <steven.lyl147@gmail.com> 1418373270 -0800	commit: add content
+98205e9faf10cf33d2ef7c0f66e402540c62613a ed0fdcf366b21b8984fb37ea34106978a2e5c5ba ipmsteven <steven.lyl147@gmail.com> 1418373282 -0800	checkout: moving from master to feature
+ed0fdcf366b21b8984fb37ea34106978a2e5c5ba 98205e9faf10cf33d2ef7c0f66e402540c62613a ipmsteven <steven.lyl147@gmail.com> 1418373314 -0800	rebase: checkout master
+98205e9faf10cf33d2ef7c0f66e402540c62613a 4419b972c0cd1b346ac90332aa7c5cc949589f78 ipmsteven <steven.lyl147@gmail.com> 1418373314 -0800	rebase: add feature
+4419b972c0cd1b346ac90332aa7c5cc949589f78 4419b972c0cd1b346ac90332aa7c5cc949589f78 ipmsteven <steven.lyl147@gmail.com> 1418373314 -0800	rebase finished: returning to refs/heads/feature
+4419b972c0cd1b346ac90332aa7c5cc949589f78 98205e9faf10cf33d2ef7c0f66e402540c62613a ipmsteven <steven.lyl147@gmail.com> 1418373423 -0800	checkout: moving from feature to master
+98205e9faf10cf33d2ef7c0f66e402540c62613a 4419b972c0cd1b346ac90332aa7c5cc949589f78 ipmsteven <steven.lyl147@gmail.com> 1418373435 -0800	checkout: moving from master to feature
+4419b972c0cd1b346ac90332aa7c5cc949589f78 ed0fdcf366b21b8984fb37ea34106978a2e5c5ba ipmsteven <steven.lyl147@gmail.com> 1418373492 -0800	reset: moving to ed0fdcf
+ed0fdcf366b21b8984fb37ea34106978a2e5c5ba 98205e9faf10cf33d2ef7c0f66e402540c62613a ipmsteven <steven.lyl147@gmail.com> 1418373509 -0800	checkout: moving from feature to master

data/levels/rebase/.githug/logs/refs/heads/feature

@@ -0,0 +1,4 @@
+0000000000000000000000000000000000000000 a78bcab6232e9382a86436cdfcb2ed0391b1f0ac ipmsteven <steven.lyl147@gmail.com> 1418373194 -0800	branch: Created from HEAD
+a78bcab6232e9382a86436cdfcb2ed0391b1f0ac ed0fdcf366b21b8984fb37ea34106978a2e5c5ba ipmsteven <steven.lyl147@gmail.com> 1418373239 -0800	commit: add feature
+ed0fdcf366b21b8984fb37ea34106978a2e5c5ba 4419b972c0cd1b346ac90332aa7c5cc949589f78 ipmsteven <steven.lyl147@gmail.com> 1418373314 -0800	rebase finished: refs/heads/feature onto 98205e9faf10cf33d2ef7c0f66e402540c62613a
+4419b972c0cd1b346ac90332aa7c5cc949589f78 ed0fdcf366b21b8984fb37ea34106978a2e5c5ba ipmsteven <steven.lyl147@gmail.com> 1418373492 -0800	reset: moving to ed0fdcf

data/levels/rebase/.githug/logs/refs/heads/master

@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 a78bcab6232e9382a86436cdfcb2ed0391b1f0ac ipmsteven <steven.lyl147@gmail.com> 1418373185 -0800	commit (initial): init commit
+a78bcab6232e9382a86436cdfcb2ed0391b1f0ac 98205e9faf10cf33d2ef7c0f66e402540c62613a ipmsteven <steven.lyl147@gmail.com> 1418373270 -0800	commit: add content

data/levels/rebase/.githug/objects/98/205e9faf10cf33d2ef7c0f66e402540c62613a

@@ -0,0 +1,2 @@
+x
��Q
+!@��^�P����2:c-��Y��[�}=x�����4�s��Έ`�1�Lbv�H�ce���a<�Zi�eh˜���I��(�p-�	H6�j�(z�G����琷,���i������h�O�����F@ph��Dc�n��!折u��؇�}�IY

data/levels/rebase/.githug/objects/a7/8bcab6232e9382a86436cdfcb2ed0391b1f0ac

@@ -0,0 +1,4 @@
+x
��Q
+!E�vo
+mE}R��1Y��f}]�p�V�S���FS�1GNkd�tT
+i���7���`,����;�g{���\�\귢��{�.��+�FG��8K'��픎�'.�6/#���;�

data/levels/rebase/.githug/refs/heads/feature

@@ -0,0 +1 @@
+ed0fdcf366b21b8984fb37ea34106978a2e5c5ba

data/levels/rebase/.githug/refs/heads/master

@@ -0,0 +1 @@
+98205e9faf10cf33d2ef7c0f66e402540c62613a

data/levels/rebase/README

@@ -0,0 +1 @@
+readme

data/levels/rebase.rb

@@ -0,0 +1,16 @@
+difficulty 2
+
+description "We are using a git rebase workflow and the feature branch is ready to go into master. Let's rebase the feature branch onto our master branch."
+
+setup do
+  init_from_level
+end
+
+solution do
+  return repo.commits('feature').last.id_abbrev != "ed0fdcf" &&
+    repo.commits("feature").map(&:message) == ['add feature','add content','init commit']
+end
+
+hint do
+  puts "You want to research the `git rebase` command"
+end

data/levels/rebase_conflict.rb

@@ -0,0 +1,55 @@
+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

data/levels/rebase_onto.rb

@@ -0,0 +1,45 @@
+difficulty 2
+
+description "You have created your branch from `wrong_branch` and already made some commits, \
+and you realise that you needed to create your branch from `master`. \
+Rebase your commits onto `master` branch so that you don't have `wrong_branch` commits."
+
+setup do
+  readme_file  = "README.md"
+  authors_file = "authors.md"
+
+  repo.init
+  FileUtils.touch(authors_file)
+  File.open(authors_file, "w") { |f| f << "https://github.com/janis-vitols\n" }
+  repo.add(authors_file)
+  repo.commit_all("Create authors file")
+
+  repo.git.native :checkout, { "b" => true }, "wrong_branch"
+  File.open(authors_file, "w") { |f| f << "None\n" }
+  repo.add(authors_file)
+  repo.commit_all("Wrong changes")
+
+  repo.git.native :checkout, { "b" => true }, "readme-update"
+  FileUtils.touch(readme_file)
+  File.open(readme_file, "a") { |f| f << "# SuperApp\n" }
+  repo.add(readme_file)
+  repo.commit_all("Add app name in readme")
+  File.open(readme_file, "a") { |f| f << "## About\n" }
+  repo.add(readme_file)
+  repo.commit_all("Add `About` header in readme")
+  File.open(readme_file, "a") { |f| f << "## Install\n" }
+  repo.add(readme_file)
+  repo.commit_all("Add `Install` header in readme")
+end
+
+solution do
+  repo.commits("readme-update").each { |commit| return false if commit.message ==  "Wrong changes" }
+  return false unless repo.commits("readme-update").length == 4
+  return false unless File.readlines("authors.md").include?("https://github.com/janis-vitols\n")
+
+  true
+end
+
+hint do
+  puts "You want to research the `git rebase` commands `--onto` argument"
+end

data/levels/remote.rb

@@ -0,0 +1,16 @@
+difficulty 2
+
+description "This project has a remote repository.  Identify it."
+
+setup do
+  repo.init
+  repo.remote_add("my_remote_repo", "https://github.com/Gazler/githug")
+end
+
+solution do
+  "my_remote_repo" == request("What is the name of the remote repository?")
+end
+
+hint do
+  puts "You are looking for a remote.  You can run `git` for a list of commands."
+end

data/levels/remote_add.rb

@@ -0,0 +1,16 @@
+difficulty 2
+
+description "Add a remote repository called `origin` with the url https://github.com/githug/githug"
+
+setup do
+  repo.init
+end
+
+solution do
+  result = `git remote -v`
+  result.include?("https://github.com/githug/githug")
+end
+
+hint do
+  puts "You can run `git remote --help` for the man pages."
+end

data/levels/remote_url.rb

@@ -0,0 +1,17 @@
+difficulty 2
+
+description "The remote repositories have a url associated to them.  Please enter the url of remote_location."
+
+setup do
+  repo.init
+  repo.remote_add("my_remote_repo", "https://github.com/Gazler/githug")
+  repo.remote_add("remote_location", "https://github.com/githug/not_a_repo")
+end
+
+solution do
+  !!(request("What is the url of the remote repository?") =~ /https:\/\/github.com\/githug\/not_a_repo\/?/)
+end
+
+hint do
+  puts "You can run `git remote --help` for the man pages."
+end

data/levels/rename.rb

@@ -0,0 +1,18 @@
+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")
+end
+
+solution do
+  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`."
+end

data/levels/rename_commit.rb

@@ -0,0 +1,25 @@
+difficulty 3
+description "Correct the typo in the message of your first (non-root) commit."
+
+setup do
+  repo.init
+  FileUtils.touch "README"
+  repo.add        "README"
+  repo.commit_all "Initial commit"
+
+  FileUtils.touch "file1"
+  repo.add        "file1"
+  repo.commit_all "First coommit"
+
+  FileUtils.touch "file2"
+  repo.add        "file2"
+  repo.commit_all "Second commit"
+end
+
+solution do
+  repo.commits[1].message == "First commit"
+end
+
+hint do
+  puts "Take a look the `-i` flag of the rebase command."
+end

data/levels/reorder.rb

@@ -0,0 +1,30 @@
+difficulty 4
+description "You have committed several times but in the wrong order. Please reorder your commits."
+
+setup do
+  repo.init
+
+  FileUtils.touch "README"
+  repo.add        "README"
+  repo.commit_all "Initial Setup"
+
+  FileUtils.touch "file1"
+  repo.add        "file1"
+  repo.commit_all "First commit"
+
+  FileUtils.touch "file3"
+  repo.add        "file3"
+  repo.commit_all "Third commit"
+
+  FileUtils.touch "file2"
+  repo.add        "file2"
+  repo.commit_all "Second commit"
+end
+
+solution do
+    `git log --format="%s"`.split.join("").match /Third.*Second.*First.*Initial/
+end
+
+hint do
+  puts "Take a look the `-i` flag of the rebase command."
+end

data/levels/repack.rb

@@ -0,0 +1,19 @@
+difficulty 2
+description "Optimise how your repository is packaged ensuring that redundant packs are removed."
+
+setup do
+  repo.init
+  FileUtils.touch("foo")
+  repo.add("foo")
+  repo.commit_all("Added foo")
+end
+
+solution do
+  result = `git count-objects -v`
+  required = ["count: 0", "prune-packable: 0"];
+  required.all? { |r| result.include?(r) }
+end
+
+hint do
+  puts "You want to research the `git repack` command."
+end

data/levels/reset.rb

@@ -0,0 +1,22 @@
+difficulty 2
+description "There are two files to be committed.  The goal was to add each file as a separate commit, however both were added by accident.  Unstage the file `to_commit_second.rb` using the reset command (don't commit anything)."
+
+setup do
+  repo.init
+  FileUtils.touch("README")
+  repo.add("README")
+  repo.commit_all("Initial commit")
+  FileUtils.touch("to_commit_first.rb")
+  FileUtils.touch("to_commit_second.rb")
+  repo.add(".")
+end
+
+solution do
+  return false unless (repo.status.files["to_commit_second.rb"].nil? || repo.status.files["to_commit_second.rb"].stage.nil?) && File.exists?("to_commit_second.rb")
+  return false if (repo.status.files["to_commit_first.rb"].nil? || repo.status.files["to_commit_first.rb"].stage.nil?)
+  true
+end
+
+hint do
+  puts "You can get some useful information for git status, it will tell you the command you need to run."
+end

data/levels/reset_soft.rb

@@ -0,0 +1,22 @@
+difficulty 2
+description "You committed too soon. Now you want to undo the last commit, while keeping the index."
+
+setup do
+  repo.init
+  FileUtils.touch("README")
+  repo.add("README")
+  repo.commit_all("Initial commit")
+  FileUtils.touch("newfile.rb")
+  repo.add("newfile.rb")
+  repo.commit_all("Premature commit")
+end
+
+solution do
+  return false unless File.exists?("newfile.rb") && repo.status.files.keys.include?("newfile.rb")
+  return false if repo.status.files["newfile.rb"].untracked || repo.commit_count > 1
+  true
+end
+
+hint do
+  puts "What are some options you can use with `git reset`?"
+end

data/levels/restore.rb

@@ -0,0 +1,28 @@
+difficulty 4
+description "You decided to delete your latest commit by running `git reset --hard HEAD^`.  (Not a smart thing to do.)  You then change your mind, and want that commit back.  Restore the deleted commit."
+
+setup do
+  repo.init
+  FileUtils.touch 'file1'
+  repo.add        'file1'
+  repo.commit_all 'Initial commit'
+
+  FileUtils.touch 'file2'
+  repo.add        'file2'
+  repo.commit_all 'First commit'
+
+  FileUtils.touch 'file3'
+  repo.add        'file3'
+  repo.commit_all 'Restore this commit'
+
+  repo.git.native :reset, { "hard" => true }, 'HEAD^'
+end
+
+solution do
+  return false unless File.exists?('file3')
+  true
+end
+
+hint do
+  puts "The commit is still floating around somewhere.  Have you checked out `git reflog`?"
+end

data/levels/restructure.rb

@@ -0,0 +1,40 @@
+difficulty 3
+
+description "You added some files to your repository, but now realize that your project needs to be restructured.  Make a new folder named `src` and using Git move all of the .html files into this folder."
+
+setup do
+  repo.init
+
+  FileUtils.touch("about.html")
+  FileUtils.touch("contact.html")
+  FileUtils.touch("index.html")
+
+  repo.add("about.html")
+  repo.add("contact.html")
+  repo.add("index.html")
+
+  repo.commit_all("adding web content.")
+end
+
+solution do
+  index =
+    repo.status["index.html"].type == "D" &&
+    repo.status["index.html"].stage.nil? &&
+    repo.status["src/index.html"].type == "A"
+
+  about =
+    repo.status["about.html"].type == "D" &&
+    repo.status["about.html"].stage.nil? &&
+    repo.status["src/about.html"].type == "A"
+
+  contact =
+    repo.status["contact.html"].type == "D" &&
+    repo.status["contact.html"].stage.nil? &&
+    repo.status["src/contact.html"].type == "A"
+
+  index && about && contact
+end
+
+hint do
+  puts "You'll have to use mkdir, and `git mv`."
+end

data/levels/revert.rb

@@ -0,0 +1,30 @@
+difficulty 4
+description "你已经在本地做了几次提交，而且所有提交都Push到了远程代码库。现在你发现有一次提交(Bad commit)包含了Bug, 你需要把它回滚掉。"
+
+setup do
+  repo.init
+
+  FileUtils.touch "file1"
+  repo.add        "file1"
+  repo.commit_all "First commit"
+
+  FileUtils.touch "file3"
+  repo.add        "file3"
+  repo.commit_all "Bad commit"
+
+  FileUtils.touch "file2"
+  repo.add        "file2"
+  repo.commit_all "Second commit"
+end
+
+solution do
+  valid = false
+  commit_messages = repo.commits.map(&:message)
+  valid = true if repo.commits.length > 3 &&
+    commit_messages.any? { |e| e =~ /(Revert )?"Bad commit"/ }
+  valid
+end
+
+hint do
+  puts "Try the revert command."
+end