githug 0.2.2 → 0.2.3
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.
- data/levels/branch.rb +2 -0
- data/levels/checkout.rb +3 -0
- data/levels/checkout_file.rb +1 -1
- data/levels/commit_ammend.rb +1 -1
- data/levels/merge_squash.rb +1 -1
- data/levels/rename_commit.rb +3 -0
- data/levels/reorder.rb +4 -0
- data/levels/revert.rb +2 -2
- data/levels/squash.rb +3 -0
- data/lib/githug/version.rb +1 -1
- metadata +9 -9
data/levels/branch.rb
CHANGED
data/levels/checkout.rb
CHANGED
data/levels/checkout_file.rb
CHANGED
data/levels/commit_ammend.rb
CHANGED
@@ -11,7 +11,7 @@ end
|
|
11
11
|
|
12
12
|
solution do
|
13
13
|
|
14
|
-
repo.commits.length ==
|
14
|
+
repo.commits.length == 1 && Grit::CommitStats.find_all(repo, repo.commits.first.sha).first[1].files.length == 2
|
15
15
|
end
|
16
16
|
|
17
17
|
hint do
|
data/levels/merge_squash.rb
CHANGED
@@ -32,7 +32,7 @@ solution do
|
|
32
32
|
result = true
|
33
33
|
|
34
34
|
# Check the number of commits in the repo (should be 4 - including initial .gitignore).
|
35
|
-
result = false unless repo.commits.size ==
|
35
|
+
result = false unless repo.commits.size == 3
|
36
36
|
|
37
37
|
# Check if changes from all the commits from long-feature-branch are included.
|
38
38
|
file = File.open('file3')
|
data/levels/rename_commit.rb
CHANGED
data/levels/reorder.rb
CHANGED
@@ -4,6 +4,10 @@ description "You have committed several times but in the wrong order. Please reo
|
|
4
4
|
setup do
|
5
5
|
repo.init
|
6
6
|
|
7
|
+
FileUtils.touch "README"
|
8
|
+
repo.add "README"
|
9
|
+
repo.commit_all "Initial Setup"
|
10
|
+
|
7
11
|
FileUtils.touch "file1"
|
8
12
|
repo.add "file1"
|
9
13
|
repo.commit_all "First commit"
|
data/levels/revert.rb
CHANGED
@@ -18,8 +18,8 @@ setup do
|
|
18
18
|
end
|
19
19
|
|
20
20
|
solution do
|
21
|
-
return false unless repo.commits[3].message == "
|
22
|
-
return false unless repo.commits[2].message == "
|
21
|
+
return false unless repo.commits[3].message == "First commit"
|
22
|
+
return false unless repo.commits[2].message == "Second commit"
|
23
23
|
return false unless repo.commits[1].message == "Bad commit"
|
24
24
|
return false unless repo.commits[0].message.split("\n").first == "Revert \"Bad commit\""
|
25
25
|
true
|
data/levels/squash.rb
CHANGED
@@ -3,6 +3,9 @@ description "You have committed several times but would like all those changes t
|
|
3
3
|
|
4
4
|
setup do
|
5
5
|
repo.init
|
6
|
+
FileUtils.touch(".hidden")
|
7
|
+
repo.add("hidden")
|
8
|
+
repo.commit_all("Initial Commit")
|
6
9
|
FileUtils.touch("README")
|
7
10
|
repo.add("README")
|
8
11
|
repo.commit_all("Adding README")
|
data/lib/githug/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: githug
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.3
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -13,7 +13,7 @@ date: 2012-04-22 00:00:00.000000000Z
|
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rspec
|
16
|
-
requirement: &
|
16
|
+
requirement: &11608020 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ~>
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: 2.8.0
|
22
22
|
type: :development
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *11608020
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: grit
|
27
|
-
requirement: &
|
27
|
+
requirement: &11607140 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ~>
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: 2.3.0
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *11607140
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: thor
|
38
|
-
requirement: &
|
38
|
+
requirement: &11606540 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ~>
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: 0.14.6
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *11606540
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: rake
|
49
|
-
requirement: &
|
49
|
+
requirement: &11606100 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ! '>='
|
@@ -54,7 +54,7 @@ dependencies:
|
|
54
54
|
version: '0'
|
55
55
|
type: :runtime
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *11606100
|
58
58
|
description: An interactive way to learn git.
|
59
59
|
email:
|
60
60
|
- webmaster@gazler.com
|