git-process 1.0.4 → 1.0.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (36) hide show
  1. data/CHANGELOG.md +11 -1
  2. data/README.md +2 -8
  3. data/lib/git-process/abstract_error_builder.rb +2 -2
  4. data/lib/git-process/changed_file_helper.rb +1 -1
  5. data/lib/git-process/git_abstract_merge_error_builder.rb +2 -1
  6. data/lib/git-process/git_branch.rb +3 -2
  7. data/lib/git-process/git_branches.rb +9 -8
  8. data/lib/git-process/git_lib.rb +18 -19
  9. data/lib/git-process/git_merge_error.rb +2 -1
  10. data/lib/git-process/git_process.rb +8 -6
  11. data/lib/git-process/git_process_error.rb +1 -1
  12. data/lib/git-process/git_process_options.rb +6 -8
  13. data/lib/git-process/git_rebase_error.rb +2 -1
  14. data/lib/git-process/git_status.rb +37 -36
  15. data/lib/git-process/github_client.rb +8 -10
  16. data/lib/git-process/github_pull_request.rb +9 -7
  17. data/lib/git-process/github_service.rb +7 -7
  18. data/lib/git-process/new_fb.rb +1 -1
  19. data/lib/git-process/parked_changes_error.rb +2 -1
  20. data/lib/git-process/pull_request.rb +1 -1
  21. data/lib/git-process/rebase_to_master.rb +10 -9
  22. data/lib/git-process/sync.rb +17 -5
  23. data/lib/git-process/uncommitted_changes_error.rb +1 -1
  24. data/lib/git-process/version.rb +2 -2
  25. data/spec/FileHelpers.rb +1 -0
  26. data/spec/GitRepoHelper.rb +3 -3
  27. data/spec/changed_file_helper_spec.rb +2 -2
  28. data/spec/git_abstract_merge_error_builder_spec.rb +32 -28
  29. data/spec/git_lib_spec.rb +16 -13
  30. data/spec/git_process_spec.rb +2 -1
  31. data/spec/git_status_spec.rb +5 -4
  32. data/spec/github_pull_request_spec.rb +9 -8
  33. data/spec/github_service_spec.rb +10 -8
  34. data/spec/rebase_to_master_spec.rb +7 -6
  35. data/spec/sync_spec.rb +56 -22
  36. metadata +30 -17
metadata CHANGED
@@ -1,12 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: git-process
3
3
  version: !ruby/object:Gem::Version
4
- prerelease: false
4
+ hash: 29
5
+ prerelease:
5
6
  segments:
6
7
  - 1
7
8
  - 0
8
- - 4
9
- version: 1.0.4
9
+ - 5
10
+ version: 1.0.5
10
11
  platform: ruby
11
12
  authors:
12
13
  - Jim Moore
@@ -14,65 +15,73 @@ autorequire:
14
15
  bindir: bin
15
16
  cert_chain: []
16
17
 
17
- date: 2012-09-11 00:00:00 -06:00
18
+ date: 2012-09-23 00:00:00 -06:00
18
19
  default_executable:
19
20
  dependencies:
20
21
  - !ruby/object:Gem::Dependency
21
- type: :runtime
22
- version_requirements: &id001 !ruby/object:Gem::Requirement
22
+ requirement: &id001 !ruby/object:Gem::Requirement
23
+ none: false
23
24
  requirements:
24
25
  - - ~>
25
26
  - !ruby/object:Gem::Version
27
+ hash: 7
26
28
  segments:
27
29
  - 1
28
30
  - 4
29
31
  - 0
30
32
  version: 1.4.0
33
+ version_requirements: *id001
31
34
  name: octokit
32
- requirement: *id001
33
35
  prerelease: false
34
- - !ruby/object:Gem::Dependency
35
36
  type: :runtime
36
- version_requirements: &id002 !ruby/object:Gem::Requirement
37
+ - !ruby/object:Gem::Dependency
38
+ requirement: &id002 !ruby/object:Gem::Requirement
39
+ none: false
37
40
  requirements:
38
41
  - - ~>
39
42
  - !ruby/object:Gem::Version
43
+ hash: 13
40
44
  segments:
41
45
  - 1
42
46
  - 7
43
47
  - 3
44
48
  version: 1.7.3
49
+ version_requirements: *id002
45
50
  name: json
46
- requirement: *id002
47
51
  prerelease: false
48
- - !ruby/object:Gem::Dependency
49
52
  type: :runtime
50
- version_requirements: &id003 !ruby/object:Gem::Requirement
53
+ - !ruby/object:Gem::Dependency
54
+ requirement: &id003 !ruby/object:Gem::Requirement
55
+ none: false
51
56
  requirements:
52
57
  - - ~>
53
58
  - !ruby/object:Gem::Version
59
+ hash: 83
54
60
  segments:
55
61
  - 1
56
62
  - 16
57
63
  - 2
58
64
  version: 1.16.2
65
+ version_requirements: *id003
59
66
  name: trollop
60
- requirement: *id003
61
67
  prerelease: false
62
- - !ruby/object:Gem::Dependency
63
68
  type: :runtime
64
- version_requirements: &id004 !ruby/object:Gem::Requirement
69
+ - !ruby/object:Gem::Dependency
70
+ requirement: &id004 !ruby/object:Gem::Requirement
71
+ none: false
65
72
  requirements:
66
73
  - - "="
67
74
  - !ruby/object:Gem::Version
75
+ hash: 21
68
76
  segments:
69
77
  - 1
70
78
  - 6
71
79
  - 13
72
80
  version: 1.6.13
81
+ version_requirements: *id004
73
82
  name: highline
74
- requirement: *id004
75
83
  prerelease: false
84
+ type: :runtime
76
85
  description: A set of scripts to make working with git easier and more consistent
77
86
  email:
78
87
  - moore.jim@gmail.com
@@ -142,25 +151,29 @@ rdoc_options: []
142
151
  require_paths:
143
152
  - lib
144
153
  required_ruby_version: !ruby/object:Gem::Requirement
154
+ none: false
145
155
  requirements:
146
156
  - - ">="
147
157
  - !ruby/object:Gem::Version
158
+ hash: 57
148
159
  segments:
149
160
  - 1
150
161
  - 8
151
162
  - 7
152
163
  version: 1.8.7
153
164
  required_rubygems_version: !ruby/object:Gem::Requirement
165
+ none: false
154
166
  requirements:
155
167
  - - ">="
156
168
  - !ruby/object:Gem::Version
169
+ hash: 3
157
170
  segments:
158
171
  - 0
159
172
  version: "0"
160
173
  requirements: []
161
174
 
162
175
  rubyforge_project:
163
- rubygems_version: 1.3.6
176
+ rubygems_version: 1.6.2
164
177
  signing_key:
165
178
  specification_version: 3
166
179
  summary: A set of scripts for a good git process