git_reflow 0.8.10 → 0.9.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (70) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +2 -0
  3. data/.ruby-version +1 -1
  4. data/Appraisals +1 -6
  5. data/CHANGELOG.md +426 -348
  6. data/Gemfile.lock +15 -19
  7. data/LICENSE +20 -20
  8. data/README.md +27 -7
  9. data/Rakefile +8 -8
  10. data/bin/console +7 -7
  11. data/bin/setup +6 -6
  12. data/circle.yml +5 -5
  13. data/exe/git-reflow +9 -30
  14. data/git_reflow.gemspec +1 -2
  15. data/lib/git_reflow/config.rb +22 -13
  16. data/lib/git_reflow/git_helpers.rb +69 -22
  17. data/lib/git_reflow/git_server/base.rb +68 -68
  18. data/lib/git_reflow/git_server/git_hub/pull_request.rb +15 -13
  19. data/lib/git_reflow/git_server/pull_request.rb +4 -2
  20. data/lib/git_reflow/merge_error.rb +9 -9
  21. data/lib/git_reflow/rspec/command_line_helpers.rb +9 -1
  22. data/lib/git_reflow/rspec/stub_helpers.rb +13 -13
  23. data/lib/git_reflow/rspec/workflow_helpers.rb +18 -0
  24. data/lib/git_reflow/rspec.rb +1 -0
  25. data/lib/git_reflow/sandbox.rb +1 -0
  26. data/lib/git_reflow/version.rb +1 -1
  27. data/lib/git_reflow/workflow.rb +277 -9
  28. data/lib/git_reflow/workflows/FlatMergeWorkflow +38 -0
  29. data/lib/git_reflow/workflows/core.rb +208 -79
  30. data/lib/git_reflow.rb +3 -14
  31. data/spec/fixtures/awesome_workflow.rb +2 -6
  32. data/spec/fixtures/git/git_config +7 -7
  33. data/spec/fixtures/issues/comment.json.erb +27 -27
  34. data/spec/fixtures/issues/comments.json +29 -29
  35. data/spec/fixtures/issues/comments.json.erb +15 -15
  36. data/spec/fixtures/pull_requests/comment.json.erb +45 -45
  37. data/spec/fixtures/pull_requests/comments.json +47 -47
  38. data/spec/fixtures/pull_requests/comments.json.erb +15 -15
  39. data/spec/fixtures/pull_requests/commits.json +29 -29
  40. data/spec/fixtures/pull_requests/external_pull_request.json +145 -145
  41. data/spec/fixtures/pull_requests/pull_request.json +142 -142
  42. data/spec/fixtures/pull_requests/pull_request.json.erb +142 -142
  43. data/spec/fixtures/pull_requests/pull_request_branch_nonexistent_error.json +32 -0
  44. data/spec/fixtures/pull_requests/pull_request_exists_error.json +32 -32
  45. data/spec/fixtures/pull_requests/pull_requests.json +136 -136
  46. data/spec/fixtures/repositories/commit.json +53 -53
  47. data/spec/fixtures/repositories/commit.json.erb +53 -53
  48. data/spec/fixtures/repositories/commits.json.erb +13 -13
  49. data/spec/fixtures/repositories/statuses.json +31 -31
  50. data/spec/lib/git_reflow/git_helpers_spec.rb +115 -12
  51. data/spec/lib/git_reflow/git_server/git_hub/pull_request_spec.rb +6 -6
  52. data/spec/lib/git_reflow/git_server/pull_request_spec.rb +9 -3
  53. data/spec/lib/git_reflow/workflow_spec.rb +190 -11
  54. data/spec/lib/git_reflow/workflows/core_spec.rb +224 -65
  55. data/spec/lib/git_reflow/workflows/flat_merge_spec.rb +17 -6
  56. data/spec/lib/git_reflow_spec.rb +2 -25
  57. data/spec/spec_helper.rb +3 -0
  58. data/spec/support/github_helpers.rb +1 -1
  59. data/spec/support/mock_pull_request.rb +17 -17
  60. data/spec/support/web_mocks.rb +39 -39
  61. metadata +9 -28
  62. data/lib/git_reflow/commands/deliver.rb +0 -10
  63. data/lib/git_reflow/commands/refresh.rb +0 -20
  64. data/lib/git_reflow/commands/review.rb +0 -13
  65. data/lib/git_reflow/commands/setup.rb +0 -11
  66. data/lib/git_reflow/commands/stage.rb +0 -9
  67. data/lib/git_reflow/commands/start.rb +0 -18
  68. data/lib/git_reflow/commands/status.rb +0 -7
  69. data/lib/git_reflow/workflows/flat_merge.rb +0 -10
  70. data/spec/fixtures/workflow_with_super.rb +0 -8
data/spec/fixtures/pull_requests/pull_requests.json CHANGED
@@ -1,136 +1,136 @@
1
- [
2
- {
3
- "url": "https://api.github.com/reenhanced/repo/pulls/1",
4
- "html_url": "https://github.com/reenhanced/repo/pulls/1",
5
- "diff_url": "https://github.com/reenhanced/repo/pulls/1.diff",
6
- "patch_url": "https://github.com/reenhanced/repo/pulls/1.patch",
7
- "issue_url": "https://github.com/reenhanced/repo/issue/1",
8
- "number": 1,
9
- "state": "open",
10
- "title": "new-feature",
11
- "body": "Please pull these awesome changes",
12
- "created_at": "2011-01-26T19:01:12Z",
13
- "updated_at": "2011-01-26T19:01:12Z",
14
- "closed_at": "2011-01-26T19:01:12Z",
15
- "merged_at": "2011-01-26T19:01:12Z",
16
- "user": {
17
- "login": "reenhanced",
18
- "id": 1,
19
- "avatar_url": "https://github.com/images/error/octocat_happy.gif",
20
- "gravatar_id": "",
21
- "url": "https://api.github.com/users/reenhanced",
22
- "html_url": "https://github.com/reenhanced",
23
- "followers_url": "https://api.github.com/users/reenhanced/followers",
24
- "following_url": "https://api.github.com/users/reenhanced/following{/other_user}",
25
- "gists_url": "https://api.github.com/users/reenhanced/gists{/gist_id}",
26
- "starred_url": "https://api.github.com/users/reenhanced/starred{/owner}{/repo}",
27
- "subscriptions_url": "https://api.github.com/users/reenhanced/subscriptions",
28
- "organizations_url": "https://api.github.com/users/reenhanced/orgs",
29
- "repos_url": "https://api.github.com/users/reenhanced/repos",
30
- "events_url": "https://api.github.com/users/reenhanced/events{/privacy}",
31
- "received_events_url": "https://api.github.com/users/reenhanced/received_events",
32
- "type": "User",
33
- "site_admin": false
34
- },
35
- "head": {
36
- "label": "new-feature",
37
- "ref": "new-feature",
38
- "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
39
- "user": {
40
- "login": "reenhanced",
41
- "id": 1,
42
- "avatar_url": "https://github.com/images/error/reenhanced_happy.gif",
43
- "gravatar_id": "somehexcode",
44
- "url": "https://api.github.com/users/reenhanced"
45
- },
46
- "repo": {
47
- "url": "https://api.github.com/repos/reenhanced/repo",
48
- "html_url": "https://github.com/reenhanced/repo",
49
- "clone_url": "https://github.com/reenhanced/repo.git",
50
- "git_url": "git://github.com/reenhanced/repo.git",
51
- "ssh_url": "git@github.com:reenhanced/repo.git",
52
- "svn_url": "https://svn.github.com/reenhanced/repo",
53
- "mirror_url": "git://git.example.com/reenhanced/repo",
54
- "id": 1296269,
55
- "owner": {
56
- "login": "reenhanced",
57
- "id": 1,
58
- "avatar_url": "https://github.com/images/error/reenhanced_happy.gif",
59
- "gravatar_id": "somehexcode",
60
- "url": "https://api.github.com/users/reenhanced"
61
- },
62
- "name": "repo",
63
- "description": "This your first repo!",
64
- "homepage": "https://github.com",
65
- "language": null,
66
- "private": false,
67
- "fork": false,
68
- "forks": 9,
69
- "watchers": 80,
70
- "size": 108,
71
- "master_branch": "master",
72
- "open_issues": 0,
73
- "pushed_at": "2011-01-26T19:06:43Z",
74
- "created_at": "2011-01-26T19:01:12Z",
75
- "updated_at": "2011-01-26T19:14:43Z"
76
- }
77
- },
78
- "base": {
79
- "label": "master",
80
- "ref": "master",
81
- "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
82
- "user": {
83
- "login": "reenhanced",
84
- "id": 1,
85
- "avatar_url": "https://github.com/images/error/reenhanced_happy.gif",
86
- "gravatar_id": "somehexcode",
87
- "url": "https://api.github.com/users/reenhanced"
88
- },
89
- "repo": {
90
- "url": "https://api.github.com/repos/reenhanced/repo",
91
- "html_url": "https://github.com/reenhanced/repo",
92
- "clone_url": "https://github.com/reenhanced/repo.git",
93
- "git_url": "git://github.com/reenhanced/repo.git",
94
- "ssh_url": "git@github.com:reenhanced/repo.git",
95
- "svn_url": "https://svn.github.com/reenhanced/repo",
96
- "mirror_url": "git://git.example.com/reenhanced/repo",
97
- "id": 1296269,
98
- "owner": {
99
- "login": "reenhanced",
100
- "id": 1,
101
- "avatar_url": "https://github.com/images/error/reenhanced_happy.gif",
102
- "gravatar_id": "somehexcode",
103
- "url": "https://api.github.com/users/reenhanced"
104
- },
105
- "name": "repo",
106
- "description": "This your first repo!",
107
- "homepage": "https://github.com",
108
- "language": null,
109
- "private": false,
110
- "fork": false,
111
- "forks": 9,
112
- "watchers": 80,
113
- "size": 108,
114
- "master_branch": "master",
115
- "open_issues": 0,
116
- "pushed_at": "2011-01-26T19:06:43Z",
117
- "created_at": "2011-01-26T19:01:12Z",
118
- "updated_at": "2011-01-26T19:14:43Z"
119
- }
120
- },
121
- "_links": {
122
- "self": {
123
- "href": "https://api.github.com/reenhanced/repo/pulls/1"
124
- },
125
- "html": {
126
- "href": "https://github.com/reenhanced/repo/pull/1"
127
- },
128
- "comments": {
129
- "href": "https://api.github.com/reenhanced/repo/issues/1/comments"
130
- },
131
- "review_comments": {
132
- "href": "https://api.github.com/reenhanced/repo/pulls/1/comments"
133
- }
134
- }
135
- }
136
- ]
1
+ [
2
+ {
3
+ "url": "https://api.github.com/reenhanced/repo/pulls/1",
4
+ "html_url": "https://github.com/reenhanced/repo/pulls/1",
5
+ "diff_url": "https://github.com/reenhanced/repo/pulls/1.diff",
6
+ "patch_url": "https://github.com/reenhanced/repo/pulls/1.patch",
7
+ "issue_url": "https://github.com/reenhanced/repo/issue/1",
8
+ "number": 1,
9
+ "state": "open",
10
+ "title": "new-feature",
11
+ "body": "Please pull these awesome changes",
12
+ "created_at": "2011-01-26T19:01:12Z",
13
+ "updated_at": "2011-01-26T19:01:12Z",
14
+ "closed_at": "2011-01-26T19:01:12Z",
15
+ "merged_at": "2011-01-26T19:01:12Z",
16
+ "user": {
17
+ "login": "reenhanced",
18
+ "id": 1,
19
+ "avatar_url": "https://github.com/images/error/octocat_happy.gif",
20
+ "gravatar_id": "",
21
+ "url": "https://api.github.com/users/reenhanced",
22
+ "html_url": "https://github.com/reenhanced",
23
+ "followers_url": "https://api.github.com/users/reenhanced/followers",
24
+ "following_url": "https://api.github.com/users/reenhanced/following{/other_user}",
25
+ "gists_url": "https://api.github.com/users/reenhanced/gists{/gist_id}",
26
+ "starred_url": "https://api.github.com/users/reenhanced/starred{/owner}{/repo}",
27
+ "subscriptions_url": "https://api.github.com/users/reenhanced/subscriptions",
28
+ "organizations_url": "https://api.github.com/users/reenhanced/orgs",
29
+ "repos_url": "https://api.github.com/users/reenhanced/repos",
30
+ "events_url": "https://api.github.com/users/reenhanced/events{/privacy}",
31
+ "received_events_url": "https://api.github.com/users/reenhanced/received_events",
32
+ "type": "User",
33
+ "site_admin": false
34
+ },
35
+ "head": {
36
+ "label": "new-feature",
37
+ "ref": "new-feature",
38
+ "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
39
+ "user": {
40
+ "login": "reenhanced",
41
+ "id": 1,
42
+ "avatar_url": "https://github.com/images/error/reenhanced_happy.gif",
43
+ "gravatar_id": "somehexcode",
44
+ "url": "https://api.github.com/users/reenhanced"
45
+ },
46
+ "repo": {
47
+ "url": "https://api.github.com/repos/reenhanced/repo",
48
+ "html_url": "https://github.com/reenhanced/repo",
49
+ "clone_url": "https://github.com/reenhanced/repo.git",
50
+ "git_url": "git://github.com/reenhanced/repo.git",
51
+ "ssh_url": "git@github.com:reenhanced/repo.git",
52
+ "svn_url": "https://svn.github.com/reenhanced/repo",
53
+ "mirror_url": "git://git.example.com/reenhanced/repo",
54
+ "id": 1296269,
55
+ "owner": {
56
+ "login": "reenhanced",
57
+ "id": 1,
58
+ "avatar_url": "https://github.com/images/error/reenhanced_happy.gif",
59
+ "gravatar_id": "somehexcode",
60
+ "url": "https://api.github.com/users/reenhanced"
61
+ },
62
+ "name": "repo",
63
+ "description": "This your first repo!",
64
+ "homepage": "https://github.com",
65
+ "language": null,
66
+ "private": false,
67
+ "fork": false,
68
+ "forks": 9,
69
+ "watchers": 80,
70
+ "size": 108,
71
+ "master_branch": "master",
72
+ "open_issues": 0,
73
+ "pushed_at": "2011-01-26T19:06:43Z",
74
+ "created_at": "2011-01-26T19:01:12Z",
75
+ "updated_at": "2011-01-26T19:14:43Z"
76
+ }
77
+ },
78
+ "base": {
79
+ "label": "master",
80
+ "ref": "master",
81
+ "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
82
+ "user": {
83
+ "login": "reenhanced",
84
+ "id": 1,
85
+ "avatar_url": "https://github.com/images/error/reenhanced_happy.gif",
86
+ "gravatar_id": "somehexcode",
87
+ "url": "https://api.github.com/users/reenhanced"
88
+ },
89
+ "repo": {
90
+ "url": "https://api.github.com/repos/reenhanced/repo",
91
+ "html_url": "https://github.com/reenhanced/repo",
92
+ "clone_url": "https://github.com/reenhanced/repo.git",
93
+ "git_url": "git://github.com/reenhanced/repo.git",
94
+ "ssh_url": "git@github.com:reenhanced/repo.git",
95
+ "svn_url": "https://svn.github.com/reenhanced/repo",
96
+ "mirror_url": "git://git.example.com/reenhanced/repo",
97
+ "id": 1296269,
98
+ "owner": {
99
+ "login": "reenhanced",
100
+ "id": 1,
101
+ "avatar_url": "https://github.com/images/error/reenhanced_happy.gif",
102
+ "gravatar_id": "somehexcode",
103
+ "url": "https://api.github.com/users/reenhanced"
104
+ },
105
+ "name": "repo",
106
+ "description": "This your first repo!",
107
+ "homepage": "https://github.com",
108
+ "language": null,
109
+ "private": false,
110
+ "fork": false,
111
+ "forks": 9,
112
+ "watchers": 80,
113
+ "size": 108,
114
+ "master_branch": "master",
115
+ "open_issues": 0,
116
+ "pushed_at": "2011-01-26T19:06:43Z",
117
+ "created_at": "2011-01-26T19:01:12Z",
118
+ "updated_at": "2011-01-26T19:14:43Z"
119
+ }
120
+ },
121
+ "_links": {
122
+ "self": {
123
+ "href": "https://api.github.com/reenhanced/repo/pulls/1"
124
+ },
125
+ "html": {
126
+ "href": "https://github.com/reenhanced/repo/pull/1"
127
+ },
128
+ "comments": {
129
+ "href": "https://api.github.com/reenhanced/repo/issues/1/comments"
130
+ },
131
+ "review_comments": {
132
+ "href": "https://api.github.com/reenhanced/repo/pulls/1/comments"
133
+ }
134
+ }
135
+ }
136
+ ]
data/spec/fixtures/repositories/commit.json CHANGED
@@ -1,53 +1,53 @@
1
- {
2
- "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
3
- "commit": {
4
- "url": "https://api.github.com/repos/reenhanced/repo/git/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e",
5
- "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
6
- "author": {
7
- "name": "Monalisa Octocat",
8
- "email": "support@github.com",
9
- "date": "2011-04-14T16:00:49Z"
10
- },
11
- "committer": {
12
- "name": "Monalisa Octocat",
13
- "email": "support@github.com",
14
- "date": "2011-04-14T16:00:49Z"
15
- },
16
- "message": "Fix all the bugs",
17
- "tree": {
18
- "url": "https://api.github.com/repos/reenhanced/repo/tree/6dcb09b5b57875f334f61aebed695e2e4193db5e",
19
- "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e"
20
- }
21
- },
22
- "author": {
23
- "login": "reenhanced",
24
- "id": 1,
25
- "avatar_url": "https://github.com/images/error/octocat_happy.gif",
26
- "url": "https://api.github.com/users/reenhanced"
27
- },
28
- "committer": {
29
- "login": "reenhanced",
30
- "id": 1,
31
- "avatar_url": "https://github.com/images/error/octocat_happy.gif",
32
- "url": "https://api.github.com/users/reenhanced"
33
- },
34
- "parents": [
35
- {
36
- "url": "https://api.github.com/repos/reenhanced/repo/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e",
37
- "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e"
38
- }
39
- ],
40
- "stats": {
41
- "additions": 104,
42
- "deletions": 4,
43
- "total": 108
44
- },
45
- "files": [
46
- {
47
- "filename": "file1.txt",
48
- "additions": 10,
49
- "deletions": 2,
50
- "total": 12
51
- }
52
- ]
53
- }
1
+ {
2
+ "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
3
+ "commit": {
4
+ "url": "https://api.github.com/repos/reenhanced/repo/git/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e",
5
+ "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
6
+ "author": {
7
+ "name": "Monalisa Octocat",
8
+ "email": "support@github.com",
9
+ "date": "2011-04-14T16:00:49Z"
10
+ },
11
+ "committer": {
12
+ "name": "Monalisa Octocat",
13
+ "email": "support@github.com",
14
+ "date": "2011-04-14T16:00:49Z"
15
+ },
16
+ "message": "Fix all the bugs",
17
+ "tree": {
18
+ "url": "https://api.github.com/repos/reenhanced/repo/tree/6dcb09b5b57875f334f61aebed695e2e4193db5e",
19
+ "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e"
20
+ }
21
+ },
22
+ "author": {
23
+ "login": "reenhanced",
24
+ "id": 1,
25
+ "avatar_url": "https://github.com/images/error/octocat_happy.gif",
26
+ "url": "https://api.github.com/users/reenhanced"
27
+ },
28
+ "committer": {
29
+ "login": "reenhanced",
30
+ "id": 1,
31
+ "avatar_url": "https://github.com/images/error/octocat_happy.gif",
32
+ "url": "https://api.github.com/users/reenhanced"
33
+ },
34
+ "parents": [
35
+ {
36
+ "url": "https://api.github.com/repos/reenhanced/repo/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e",
37
+ "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e"
38
+ }
39
+ ],
40
+ "stats": {
41
+ "additions": 104,
42
+ "deletions": 4,
43
+ "total": 108
44
+ },
45
+ "files": [
46
+ {
47
+ "filename": "file1.txt",
48
+ "additions": 10,
49
+ "deletions": 2,
50
+ "total": 12
51
+ }
52
+ ]
53
+ }
data/spec/fixtures/repositories/commit.json.erb CHANGED
@@ -1,53 +1,53 @@
1
- {
2
- "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
3
- "commit": {
4
- "url": "https://api.github.com/repos/<%= repo_owner %>/<%= repo_name %>/git/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e",
5
- "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
6
- "author": {
7
- "name": "Monalisa Octocat",
8
- "email": "support@github.com",
9
- "date": "<%= created_at || "2011-04-14T16:00:49Z" %>"
10
- },
11
- "committer": {
12
- "name": "Monalisa Octocat",
13
- "email": "support@github.com",
14
- "date": "<%= created_at || "2011-04-14T16:00:49Z" %>"
15
- },
16
- "message": "Fix all the bugs",
17
- "tree": {
18
- "url": "https://api.github.com/repos/<%= repo_owner %>/<%= repo_name %>/tree/6dcb09b5b57875f334f61aebed695e2e4193db5e",
19
- "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e"
20
- }
21
- },
22
- "author": {
23
- "login": "<%= author %>",
24
- "id": 1,
25
- "avatar_url": "https://github.com/images/error/octocat_happy.gif",
26
- "url": "https://api.github.com/users/<%= author %>"
27
- },
28
- "committer": {
29
- "login": "<%= author %>",
30
- "id": 1,
31
- "avatar_url": "https://github.com/images/error/octocat_happy.gif",
32
- "url": "https://api.github.com/users/<%= author %>"
33
- },
34
- "parents": [
35
- {
36
- "url": "https://api.github.com/repos/<%= repo_owner %>/<%= repo_name %>/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e",
37
- "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e"
38
- }
39
- ],
40
- "stats": {
41
- "additions": 104,
42
- "deletions": 4,
43
- "total": 108
44
- },
45
- "files": [
46
- {
47
- "filename": "file1.txt",
48
- "additions": 10,
49
- "deletions": 2,
50
- "total": 12
51
- }
52
- ]
53
- }
1
+ {
2
+ "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
3
+ "commit": {
4
+ "url": "https://api.github.com/repos/<%= repo_owner %>/<%= repo_name %>/git/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e",
5
+ "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
6
+ "author": {
7
+ "name": "Monalisa Octocat",
8
+ "email": "support@github.com",
9
+ "date": "<%= created_at || "2011-04-14T16:00:49Z" %>"
10
+ },
11
+ "committer": {
12
+ "name": "Monalisa Octocat",
13
+ "email": "support@github.com",
14
+ "date": "<%= created_at || "2011-04-14T16:00:49Z" %>"
15
+ },
16
+ "message": "Fix all the bugs",
17
+ "tree": {
18
+ "url": "https://api.github.com/repos/<%= repo_owner %>/<%= repo_name %>/tree/6dcb09b5b57875f334f61aebed695e2e4193db5e",
19
+ "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e"
20
+ }
21
+ },
22
+ "author": {
23
+ "login": "<%= author %>",
24
+ "id": 1,
25
+ "avatar_url": "https://github.com/images/error/octocat_happy.gif",
26
+ "url": "https://api.github.com/users/<%= author %>"
27
+ },
28
+ "committer": {
29
+ "login": "<%= author %>",
30
+ "id": 1,
31
+ "avatar_url": "https://github.com/images/error/octocat_happy.gif",
32
+ "url": "https://api.github.com/users/<%= author %>"
33
+ },
34
+ "parents": [
35
+ {
36
+ "url": "https://api.github.com/repos/<%= repo_owner %>/<%= repo_name %>/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e",
37
+ "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e"
38
+ }
39
+ ],
40
+ "stats": {
41
+ "additions": 104,
42
+ "deletions": 4,
43
+ "total": 108
44
+ },
45
+ "files": [
46
+ {
47
+ "filename": "file1.txt",
48
+ "additions": 10,
49
+ "deletions": 2,
50
+ "total": 12
51
+ }
52
+ ]
53
+ }
data/spec/fixtures/repositories/commits.json.erb CHANGED
@@ -1,13 +1,13 @@
1
- [
2
- <% commits_json = [] %>
3
- <% commits.each_with_index do |commit, index| %>
4
- <% commits_json << Fixture.new('repositories/commit.json.erb',
5
- id: index,
6
- author: commit[:author],
7
- repo_owner: repo_owner,
8
- repo_name: repo_name,
9
- created_at: commit[:created_at] || Chronic.parse("October 21, 2015 07:28:00")
10
- ).to_s %>
11
- <% end %>
12
- <%= commits_json.join(", ") %>
13
- ]
1
+ [
2
+ <% commits_json = [] %>
3
+ <% commits.each_with_index do |commit, index| %>
4
+ <% commits_json << Fixture.new('repositories/commit.json.erb',
5
+ id: index,
6
+ author: commit[:author],
7
+ repo_owner: repo_owner,
8
+ repo_name: repo_name,
9
+ created_at: commit[:created_at] || Chronic.parse("October 21, 2015 07:28:00")
10
+ ).to_s %>
11
+ <% end %>
12
+ <%= commits_json.join(", ") %>
13
+ ]
data/spec/fixtures/repositories/statuses.json CHANGED
@@ -1,31 +1,31 @@
1
- [
2
- {
3
- "created_at": "2012-07-20T01:19:13Z",
4
- "updated_at": "2012-07-20T01:19:13Z",
5
- "state": "success",
6
- "target_url": "https://ci.example.com/1000/output",
7
- "description": "Build has completed successfully",
8
- "id": 1,
9
- "url": "https://api.github.com/repos/reenhanced/example/statuses/1",
10
- "context": "continuous-integration/jenkins",
11
- "creator": {
12
- "login": "reenhanced",
13
- "id": 1,
14
- "avatar_url": "https://github.com/images/error/octocat_happy.gif",
15
- "gravatar_id": "somehexcode",
16
- "url": "https://api.github.com/users/reenhanced",
17
- "html_url": "https://github.com/reenhanced",
18
- "followers_url": "https://api.github.com/users/reenhanced/followers",
19
- "following_url": "https://api.github.com/users/reenhanced/following{/other_user}",
20
- "gists_url": "https://api.github.com/users/reenhanced/gists{/gist_id}",
21
- "starred_url": "https://api.github.com/users/reenhanced/starred{/owner}{/repo}",
22
- "subscriptions_url": "https://api.github.com/users/reenhanced/subscriptions",
23
- "organizations_url": "https://api.github.com/users/reenhanced/orgs",
24
- "repos_url": "https://api.github.com/users/reenhanced/repos",
25
- "events_url": "https://api.github.com/users/reenhanced/events{/privacy}",
26
- "received_events_url": "https://api.github.com/users/reenhanced/received_events",
27
- "type": "User",
28
- "site_admin": false
29
- }
30
- }
31
- ]
1
+ [
2
+ {
3
+ "created_at": "2012-07-20T01:19:13Z",
4
+ "updated_at": "2012-07-20T01:19:13Z",
5
+ "state": "success",
6
+ "target_url": "https://ci.example.com/1000/output",
7
+ "description": "Build has completed successfully",
8
+ "id": 1,
9
+ "url": "https://api.github.com/repos/reenhanced/example/statuses/1",
10
+ "context": "continuous-integration/jenkins",
11
+ "creator": {
12
+ "login": "reenhanced",
13
+ "id": 1,
14
+ "avatar_url": "https://github.com/images/error/octocat_happy.gif",
15
+ "gravatar_id": "somehexcode",
16
+ "url": "https://api.github.com/users/reenhanced",
17
+ "html_url": "https://github.com/reenhanced",
18
+ "followers_url": "https://api.github.com/users/reenhanced/followers",
19
+ "following_url": "https://api.github.com/users/reenhanced/following{/other_user}",
20
+ "gists_url": "https://api.github.com/users/reenhanced/gists{/gist_id}",
21
+ "starred_url": "https://api.github.com/users/reenhanced/starred{/owner}{/repo}",
22
+ "subscriptions_url": "https://api.github.com/users/reenhanced/subscriptions",
23
+ "organizations_url": "https://api.github.com/users/reenhanced/orgs",
24
+ "repos_url": "https://api.github.com/users/reenhanced/repos",
25
+ "events_url": "https://api.github.com/users/reenhanced/events{/privacy}",
26
+ "received_events_url": "https://api.github.com/users/reenhanced/received_events",
27
+ "type": "User",
28
+ "site_admin": false
29
+ }
30
+ }
31
+ ]