mygithug 0.5.3 → 0.5.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 07fd86a279f569a145a05f3847c6b2cd8c594008
4
- data.tar.gz: 0750c5439386f5d94275be5c685a3f8658730ded
3
+ metadata.gz: b6751dda6a22efa15518d78dbb043a6acfaad412
4
+ data.tar.gz: f4dcbf287169c697762397bbcc5f7ae4b10f7677
5
5
  SHA512:
6
- metadata.gz: a4a6916f8d9878ac99357e5597c76b93d6e92cbd11406bf1ae1113d90a6998d67055503900c703de57aa4effdc3effadece25307ff4ca91e7accdce5d32f1617
7
- data.tar.gz: c375e6ed79ebf976beb8e0962ca03e09f5398bf2cce689da145d85e4a13c47d5579324d3e9a767695bd43bcf58cc0a1200c842c30eb82f6daf803f13e4bf1da2
6
+ metadata.gz: 73a0e4c58b1234e74415f300cdf5ab6ae0a2dbc9a804dd81cbea8eee4713355e1200bf1e493ba4109b73548f3a69422fefa92804334f882a566b9ae2c5a46a23
7
+ data.tar.gz: 4c8be2a5c031a88d270aef536192b523cbe538f49eacb8b8c5fede9a5664e5720b6e4d9a1f292bfb90e5658437d4b21cde53feba77678711e3a86932e03d467d
data/README.md CHANGED
@@ -43,28 +43,28 @@ ruby --version
43
43
 
44
44
  默认命令 play
45
45
  ```
46
- > mygithug play
46
+ > mg play
47
47
  或者
48
- > mygithug
48
+ > mg
49
49
  ```
50
50
 
51
51
  提示信息 hint
52
52
 
53
53
  ```
54
- > mygithug hint
54
+ > mg hint
55
55
  ```
56
56
 
57
57
  重置第3级任务 reset
58
58
 
59
59
  ```
60
- > mygithug reset 3
60
+ > mg reset 3
61
61
  ```
62
62
 
63
63
  ### 开始游戏
64
64
 
65
65
  你为此游戏创建一个新的文件夹,然后在该文件夹下运行命令:
66
66
 
67
- mygithug
67
+ mg
68
68
 
69
69
  按照提示,系统默认会再次创建一个git_hug文件夹。
70
70
 
@@ -81,10 +81,10 @@ cd git_hug
81
81
  每完成一个任务,就执行命令:
82
82
 
83
83
  ```
84
- mygithug
84
+ mg
85
85
  ```
86
86
 
87
- 系统会检查你的任务是否成功完成,如果已经完成,则自动进入下一个任务,否则继续完成你的任务。遇到困难时,可以使用 `mygithug hint`命令获取帮助。
87
+ 系统会检查你的任务是否成功完成,如果已经完成,则自动进入下一个任务,否则继续完成你的任务。遇到困难时,可以使用 `mg hint`命令获取帮助。
88
88
 
89
89
 
90
90
 
File without changes
data/levels/add.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- encoding : utf-8 -*-
2
2
  difficulty 1
3
- description "你已经创建了文件 README, 请把它加到Stage区. 并且观察file2.txt在工作区-Stage-Head间有哪些变化。
3
+ description "你已经创建了文件 README, 请把它加到Stage区,注意保持另一个文件file2不变。观察file2.txt在工作区-Stage-Head间有哪些变化。
4
4
  Note: You start each level with a new repo. Don't look for files from the previous one."
5
5
 
6
6
  setup do
@@ -27,5 +27,5 @@ solution do
27
27
  end
28
28
 
29
29
  hint do
30
- puts "You can type `git` in your shell to get a list of available git commands."
30
+ puts "你需要使用`git add` 和`git diff`命令。必要时加上`--cached`参数."
31
31
  end
@@ -1,6 +1,6 @@
1
1
  # -*- encoding : utf-8 -*-
2
2
  difficulty 0
3
- description "恭喜!你已经通过了全部测试,祝工作顺利!"
3
+ description "恭喜!你已经通过了Git基础测试。你可以继续练习更多的Git命令。"
4
4
 
5
5
  solution do
6
6
  true
data/lib/githug/level.rb CHANGED
@@ -13,14 +13,22 @@ module Githug
13
13
  # "delete_branch", "push_branch", "merge", "fetch", "rebase", "rebase_onto", "repack", "cherry-pick",
14
14
  # "grep", "rename_commit", "squash", "merge_squash", "reorder", "bisect",
15
15
  # "stage_lines", "find_old_branch", "revert", "restore", "conflict",
16
- # "submodule","contribute"]
16
+ # "submodule","contribute"]
17
17
 
18
- LEVELS = [nil, "clone", "alias_st", "alias_lg", "config", "log",
18
+ LEVELS = [nil, "config", "clone", "alias_st", "alias_lg", "log",
19
19
  "add", "commit", "ignore", "stash", "unstash",
20
20
  "pull", "pull_rebase", "conflict", "rebase_conflict", "push_branch",
21
21
  # "fetch",
22
22
  "revert", "merge", "cherry-pick",
23
- "congratulation"
23
+ "congratulation", "rm", "rm_cached", "tag", "push_tags", "commit_amend",
24
+ "reset", "reset_soft", "checkout_file", "remote",
25
+ "remote_url", "remote_add", "push", "diff", "blame", "branch",
26
+ "checkout", "checkout_tag", "checkout_tag_over_branch", "branch_at",
27
+ "delete_branch", "fetch", "rebase", "rebase_onto",
28
+ # "repack",
29
+ "grep", "rename_commit", "squash", "merge_squash", "reorder", "bisect",
30
+ "stage_lines", "find_old_branch", "restore",
31
+ "submodule","contribute"
24
32
  ]
25
33
 
26
34
  attr_accessor :level_no, :level_path, :level_name
@@ -1,4 +1,4 @@
1
1
  # -*- encoding : utf-8 -*-
2
2
  module Githug
3
- VERSION = "0.5.3"
3
+ VERSION = "0.5.4"
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mygithug
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.3
4
+ version: 0.5.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gary Rennie & Mei Xuesong
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-04-17 00:00:00.000000000 Z
11
+ date: 2019-04-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec
@@ -70,7 +70,7 @@ description: An interactive way to learn git.
70
70
  email:
71
71
  - meixuesong@gmail.com
72
72
  executables:
73
- - mygithug
73
+ - mg
74
74
  extensions: []
75
75
  extra_rdoc_files: []
76
76
  files:
@@ -81,7 +81,7 @@ files:
81
81
  - LICENCE.txt
82
82
  - README.md
83
83
  - Rakefile
84
- - bin/mygithug
84
+ - bin/mg
85
85
  - levels/add.rb
86
86
  - levels/alias_lg.rb
87
87
  - levels/alias_st.rb