mygithug 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32574daa79b1735c0ec65e5a4da4b71478d3cf1d
-  data.tar.gz: ab6e228f06875d4452ec1997c9c42801cd8a5ea4
+  metadata.gz: 62d787167c277a450a0d1eba48e0f54d3add9415
+  data.tar.gz: 20c4b32c0d6f0449c7706c1f5b86cf91cb81959b
 SHA512:
-  metadata.gz: 03f4f5b7917319290bcf26a9c6c84aee564ddb55d709dd7261abf674be1dd0d8907fc4f91be94b2441924ef4b0975141e045a82e9237e99252ba6060e94c4af0
-  data.tar.gz: 2e827d31bb8ddf6bd564dd3331e04a2a9af82bd7f019b97b40072ee9fd0f62b8ed90b42e7da393e774cab51865d4e84289019c84618f54bd975897c13de7a3dc
+  metadata.gz: 218caca027d11f692cb63de0cec81e1405763628eaa1f86e86fde9789e2e2f5947fa53787c5cfd93f90952e14ad9697332d04c133ccada1b69327895d86cb600
+  data.tar.gz: ce73b2bf121b3a51870b1b998a429c9ff91c15dcdb6255bcc3dfe9418ab3ecbd20d9d800e63050a756d95a25cea9356697462daf7b1642d2f421bb328be7272a

data/README.md

@@ -1,8 +1,6 @@
 # MyGithug
 玩游戏一样练习Git操作。 
 
-[![Build Status](https://travis-ci.org/meixuesong/githug?branch=master)](https://travis-ci.org/meixuesong/githug) 
-
 ## About
 
 MyGithub是基于 [Githug](https://github.com/Gazler/githug) 修改的一个练习Git的项目。
@@ -30,13 +28,13 @@ ruby --version
 
 如果没有权限，你可能需要以管理员身份运行。或者在Linux/Mac下 `sudo`:
 
-    sudo gem install githug
+    sudo gem install mygithug
 
 ### 开始游戏
 
 建议你为此游戏创建一个新的文件夹，然后在该文件夹下运行命令：
 
-    githug
+    mygithug
 
 按照提示，系统会创建一个git_hug文件夹。
 
@@ -53,3 +51,23 @@ Type `y` (yes) to continue, `n` (no) to cancel and quit Githug.
  * reset - 重置命令，将当前任务恢复到初始状态。
  * levels - 列出所有的游戏级别。
 
+常用命令示例：
+
+默认命令 play
+```
+> mygithug play
+或者
+> mygithug
+```
+
+提示信息 hint
+
+```
+> mygithug hint
+```
+
+重置第3关 reset
+
+```
+> mygithug reset 3
+```

data/levels/add.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 1
 description "你已经创建了文件 README, 请把它加到Stage区.
 Note: You start each level with a new repo. Don't look for files from the previous one."

data/levels/alias_lg.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 1
 description "使⽤git lg来查看带有树形结构的提交记录."
 

data/levels/alias_st.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 1
 description "使⽤短别名git st来查看git状态"
 

data/levels/bisect.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 3
 description "A bug was introduced somewhere along the way.  You know that running `ruby prog.rb 5` should output 15.  You can also run `make test`.  What are the first 7 chars of the hash of the commit that introduced the bug."
 

data/levels/bisect/prog.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 #!/usr/bin/env ruby
 
 puts Integer((Integer(ARGV[0])-3)*9)-1

data/levels/bisect/test.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 #!/usr/bin/env ruby
 
 line = gets

data/levels/blame.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 description "Someone has put a password inside the file `config.rb` find out who it was."
 

data/levels/blame/config.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Config
   attr_accessor :name, :password
   def initialize(name, password = nil, options = {})

data/levels/branch.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 1
 description "You want to work on a piece of code that has the potential to break things, create the branch test_code."
 

data/levels/branch_at.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 3
 description "You forgot to branch at the previous commit and made a commit on top of it. Create branch test_branch at the commit before the last."
 

data/levels/checkout.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 description "Create and switch to a new branch called my_branch.  You will need to create a branch like you did in the previous level."
 

data/levels/checkout_file.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 3
 
 description "A file has been modified, but you don't want to keep the modification.  Checkout the `config.rb` file from the last commit."

data/levels/checkout_tag.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 
 description "You need to fix a bug in the version 1.2 of your app. Checkout the tag `v1.2`."

data/levels/checkout_tag_over_branch.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 
 description "You need to fix a bug in the version 1.2 of your app. Checkout the tag `v1.2` (Note: There is also a branch named `v1.2`)."

data/levels/cherry-pick.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 3
 description "你在hotfix分支修复生产环境的紧急问题，现在你已经修复完成，需要单独将这个修复(Filled in README.md with proper input) 合并到master分支."
 

data/levels/clone.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 1
 description "Clone the repository at https://github.com/Gazler/cloneme."
 

data/levels/clone_to_folder.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 1
 description "Clone the repository at https://github.com/Gazler/cloneme to `my_cloned_repo`."
 

data/levels/commit.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 1
 description "The `README` file has been added to your staging area, now commit it."
 

data/levels/commit_amend.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 description "The `README` file has been committed, but it looks like the file `forgotten_file.rb` was missing from the commit.  Add the file and amend your previous commit to include it."
 

data/levels/commit_in_future.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'time'
 
 difficulty 2

data/levels/config.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 1
 description "Set up your git name and email, this is important so that your commits can be identified."
 

data/levels/conflict.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 4
 description "你需要将 `mybranch`分支的变更merge到当前分支 (master). 如果有冲突，请把它搞定."
 

data/levels/congratulation.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 0
 description "恭喜！你已经通过了全部测试，祝工作顺利！"
 

data/levels/contribute.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 3
 description "This is the final level, the goal is to contribute to this repository by making a pull request on GitHub.  Please note that this level is designed to encourage you to add a valid contribution to Githug, not testing your ability to create a pull request.  Contributions that are likely to be accepted are levels, bug fixes and improved documentation."
 

data/levels/delete_branch.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 
 description "You have created too many branches for your project. There is an old branch in your repo called 'delete_me', you should delete it."
@@ -12,4 +13,4 @@ end
 
 hint do
   puts "Running 'git --help branch' will give you a list of branch commands."
-end
+end

data/levels/diff.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 description "There have been modifications to the `app.rb` file since your last commit.  Find out which line has changed."
 

data/levels/diff/app.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'sinatra'
 require 'oauth2'
 require 'json'

data/levels/fetch.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 description "获取远程其他同事新创建的特性分⽀的代码，但是不要Merge.
 Looks like a new branch was pushed into our remote repository. Get the changes without merging them with the local repository "

data/levels/find_old_branch.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 4
 description "You have been working on a branch but got distracted by a major issue and forgot the name of it. Switch back to that branch."
 

data/levels/grep.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 description "Your project's deadline approaches, you should evaluate how many TODOs are left in your code"
 

data/levels/grep/app.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'sinatra'
 require 'oauth2'
 require 'json'

data/levels/grep/config.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Config
   attr_accessor :name, :password
   def initialize(name, password = nil, options = {})

data/levels/ignore.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 description "Java编译后会创建 `.class` 文件和 `target` 文件夹， 这些文件/夹并不需要放到代码库中，请配置Git忽略它们。"
 

data/levels/include.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 description "Notice a few files with the '.a' extension.  We want git to ignore all but the 'lib.a' file."
 

data/levels/init.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 1
 description "A new directory, `git_hug`, has been created; initialize an empty repository in it."
 

data/levels/log.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 
 description "你需要提供最近一次提交的commit id，并找出新增的内容是什么。"

data/levels/merge.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 description "你在 feature 分支开发完成了，现在需要合并到 Master分支。"
 

data/levels/merge_squash.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 3
 description "Merge all commits from the long-feature-branch as a single commit."
 

data/levels/number_of_files_committed.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 1
 description "There are some files in this repository, how many of the files will be committed?"
 

data/levels/pull.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 
 description "You need to pull changes from your origin repository."

data/levels/pull_rebase.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 description "你需获取远程所有分⽀最新代码，并让版本树尽量整洁（只有⼀个树⼲）."
 

data/levels/push.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 3
 description "Your local master branch has diverged from " +
   "the remote origin/master branch. Rebase your branch onto " +

data/levels/push_branch.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 description "你已经创建了本地分支 `test_branch`，开发已经完成，你需要将此分支 push 到远程代码库。
 注意：只能push `test_branch` 分支，不能push其它分支。"

data/levels/push_tags.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 description "There are tags in the repository that aren't pushed into remote repository. Push them now."
 

data/levels/rebase.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 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."

data/levels/rebase_conflict.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 description "你需获取远程的最新代码，请让版本树尽量整洁（只有⼀个树⼲）.过程中如果有冲突，请解决掉它！"
 

data/levels/rebase_onto.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 
 description "You have created your branch from `wrong_branch` and already made some commits, \

data/levels/remote.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 
 description "This project has a remote repository.  Identify it."

data/levels/remote_add.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 
 description "Add a remote repository called `origin` with the url https://github.com/githug/githug"

data/levels/remote_url.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 
 description "The remote repositories have a url associated to them.  Please enter the url of remote_location."

data/levels/rename.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 3
 
 description "We have a file called `oldfile.txt`. We want to rename it to `newfile.txt` and stage this change."

data/levels/rename_commit.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 3
 description "Correct the typo in the message of your first (non-root) commit."
 

data/levels/reorder.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 4
 description "You have committed several times but in the wrong order. Please reorder your commits."
 

data/levels/repack.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 description "Optimise how your repository is packaged ensuring that redundant packs are removed."
 

data/levels/reset.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 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)."
 

data/levels/reset_soft.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 description "You committed too soon. Now you want to undo the last commit, while keeping the index."
 

data/levels/restore.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 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."
 

data/levels/restructure.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 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."

data/levels/revert.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 4
 description "你已经在本地做了几次提交，而且所有提交都Push到了远程代码库。现在你发现有一次提交(Bad commit)包含了Bug, 你需要把它回滚掉。"
 

data/levels/rm.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 
 description "A file has been removed from the working tree, however the file was not removed from the repository.  Find out what this file was and remove it."

data/levels/rm_cached.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 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 from the file system, only from git."

data/levels/squash.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 4
 description "You have committed several times but would like all those changes to be one commit."
 

data/levels/stage_lines.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 4
 
 description "You've made changes within a single file that belong to two different features, but neither of the changes are yet staged. Stage only the changes belonging to the first feature."

data/levels/stash.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 description "你已经做了一些修改，现在请暂存它们，并切换到分支`featurehumans-txt`。"
 

data/levels/status.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 1
 description "There are some files in this repository, one of the files is untracked, which file is it?"
 

data/levels/submodule.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 description "You want to include the files from the following repo: `https://github.com/jackmaney/githug-include-me` into the folder `./githug-include-me`. Do this without manually cloning the repo or copying the files from the repo into this repo."
 

data/levels/tag.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 
 description "We have a git repo and we want to tag the current commit with `new_tag`."

data/levels/unstash.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 2
 description "你之前做了一些修改，并且暂存了它们，然后你又切换到了分支`featurehumans-txt`。
 现在请切回到master，并恢复你之前做的修改。

data/lib/githug.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'grit'
 
 require "githug/extensions/grit/ruby1.9"

data/lib/githug/cli.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'thor'
 require 'githug'
 module Githug

data/lib/githug/extensions/grit/ruby1.9.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class String
   if self.method_defined?(:ord)
     def getord(offset); self[offset].ord; end

data/lib/githug/game.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Githug
   class Game
 

data/lib/githug/level.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Githug
   class Level
     include UI

data/lib/githug/profile.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'yaml'
 module Githug
   class Profile

data/lib/githug/repository.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Githug
   class Repository
 

data/lib/githug/ui.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Githug
   module UI
 

data/lib/githug/version.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Githug
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/githug/cli_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 require 'githug/cli'
 

data/spec/githug/game_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe Githug::Game do

data/spec/githug/level_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 require 'grit'
 

data/spec/githug/profile_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe Githug::Profile do

data/spec/githug/repository_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe Githug::Repository do

data/spec/githug/ui_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 require 'spec_helper'

data/spec/githug_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 RSpec::Matchers.define :be_solved do

data/spec/spec_helper.rb

@@ -1 +1,2 @@
+# -*- encoding : utf-8 -*-
 require './lib/githug.rb'

data/spec/support/files/test_level.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 difficulty 1
 description "A test description"
 setup do

metadata

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