octopolo 1.11.4 → 1.12.0
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 +5 -5
- data/.ruby-version +1 -1
- data/.soyuz.yml +4 -4
- data/CHANGELOG.markdown +1 -0
- data/Gemfile +0 -2
- data/bin/octopolo +1 -0
- data/lib/octopolo/commands/pull_request.rb +3 -0
- data/lib/octopolo/github/pull_request_creator.rb +15 -2
- data/lib/octopolo/scripts/pull_request.rb +2 -1
- data/lib/octopolo/version.rb +1 -1
- data/octopolo.gemspec +0 -2
- data/spec/octopolo/github/pull_request_creator_spec.rb +3 -1
- data/spec/octopolo/scripts/pull_request_spec.rb +2 -1
- metadata +39 -68
- data/bin/octopolo +0 -22
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: '0282df5e557fc60fc1ba3c327481fb19d7dbc345783b489b2b94f56bd0b663d9'
|
4
|
+
data.tar.gz: a6dc8e635242a0f9414e410d7ac1afede799868788852aab207465498cb114d7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 042ab96b2a9e518338c28dd9898221486e84de0c41fde51c700c20e881c2e601723a64104dd1f9184614f73e9b82833b91384513bf3afdd3a450e82efff20d03
|
7
|
+
data.tar.gz: 97913a3a1f5c3af9d4e978c9ee3dba4a286f4c43caa6faeae65a6ea73b865b6d79f89ca2e84cfdea3848137f0311401f641d4ce4b69776811a442788cd1416d8
|
data/.ruby-version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
2.
|
1
|
+
2.6.5
|
data/.soyuz.yml
CHANGED
@@ -1,10 +1,10 @@
|
|
1
1
|
defaults:
|
2
2
|
deploy_cmd: gem push *.gem
|
3
3
|
before_deploy_cmds:
|
4
|
-
- /usr/local/bin/op tag-release
|
5
|
-
- sed -i "" -e "s/\".*/\"$(git tag | sed s/v// | sort -n -t. -k1,1 -k2,2 -k3,3 | tail -1)\"/" lib/octopolo/version.rb
|
6
|
-
- git add lib/octopolo/version.rb
|
7
|
-
- git commit -m "Version Bump" && git push
|
4
|
+
# - /usr/local/bin/op tag-release
|
5
|
+
# - sed -i "" -e "s/\".*/\"$(git tag | sed s/v// | sort -n -t. -k1,1 -k2,2 -k3,3 | tail -1)\"/" lib/octopolo/version.rb
|
6
|
+
# - git add lib/octopolo/version.rb
|
7
|
+
# - git commit -m "Version Bump" && git push
|
8
8
|
- gem build octopolo.gemspec
|
9
9
|
after_deploy_cmds:
|
10
10
|
- rm *.gem
|
data/CHANGELOG.markdown
CHANGED
data/Gemfile
CHANGED
data/bin/octopolo
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
bin/op
|
@@ -3,6 +3,9 @@ command 'pull-request' do |c|
|
|
3
3
|
c.desc "Branch to create the pull request against"
|
4
4
|
c.flag [:d, :dest, :destination], :arg_name => "destination_branch", :default_value => Octopolo.config.deploy_branch
|
5
5
|
|
6
|
+
c.desc "Pass --sd to skip creating this pull request as a draft"
|
7
|
+
c.switch %i[sd skip-draft], :arg_name => "skip-draft"
|
8
|
+
|
6
9
|
c.desc "Pass -x to skip the prompt and infer from branch. Expects the branch to be in this format: JIRA-123_describe_pr OR JIRA_123_describe_pr"
|
7
10
|
c.switch [:x, :expedite], :arg_name => "expedite"
|
8
11
|
|
@@ -22,7 +22,14 @@ module Octopolo
|
|
22
22
|
# Returns an array with the first element being the pull request's
|
23
23
|
# number, the second being a Mash of the response from GitHub's API
|
24
24
|
def perform
|
25
|
-
result = GitHub.create_pull_request(
|
25
|
+
result = GitHub.create_pull_request(
|
26
|
+
repo_name,
|
27
|
+
destination_branch,
|
28
|
+
source_branch,
|
29
|
+
title,
|
30
|
+
body,
|
31
|
+
{draft: draft}
|
32
|
+
)
|
26
33
|
# capture the information
|
27
34
|
self.number = result.number
|
28
35
|
self.data = result
|
@@ -30,6 +37,13 @@ module Octopolo
|
|
30
37
|
raise CannotCreate, e.message
|
31
38
|
end
|
32
39
|
|
40
|
+
# Public: Draft Pull request
|
41
|
+
#
|
42
|
+
# Returns a boolean that marks the PR a draft PR
|
43
|
+
def draft
|
44
|
+
!options[:skip_draft]
|
45
|
+
end
|
46
|
+
|
33
47
|
# Public: Branch to merge the pull request into
|
34
48
|
#
|
35
49
|
# Returns a String with the branch name
|
@@ -51,7 +65,6 @@ module Octopolo
|
|
51
65
|
Renderer::PULL_REQUEST_BODY
|
52
66
|
end
|
53
67
|
|
54
|
-
|
55
68
|
# Public: Temporary file for body editing
|
56
69
|
#
|
57
70
|
# Returns Name of temporary file
|
@@ -110,7 +110,8 @@ module Octopolo
|
|
110
110
|
source_branch: git.current_branch,
|
111
111
|
pivotal_ids: pivotal_ids,
|
112
112
|
jira_ids: jira_ids,
|
113
|
-
editor: options[:editor]
|
113
|
+
editor: options[:editor],
|
114
|
+
skip_draft: options[:"skip-draft"]
|
114
115
|
}
|
115
116
|
end
|
116
117
|
private :pull_request_attributes
|
data/lib/octopolo/version.rb
CHANGED
data/octopolo.gemspec
CHANGED
@@ -27,9 +27,7 @@ Gem::Specification.new do |gem|
|
|
27
27
|
gem.add_dependency 'nokogiri-happymapper', '~> 0.6.0' # Lock down to 0.6.x for Ruby 2.0 compatibility.
|
28
28
|
|
29
29
|
gem.add_development_dependency 'rake', '~> 10.1'
|
30
|
-
gem.add_development_dependency 'bundler', '~> 1.16'
|
31
30
|
gem.add_development_dependency 'rspec', '~> 2.99'
|
32
|
-
gem.add_development_dependency 'guard', '~> 2.6'
|
33
31
|
gem.add_development_dependency 'guard-rspec', '~> 4.3'
|
34
32
|
gem.add_development_dependency 'hitimes', '~> 1.2.6'
|
35
33
|
gem.add_development_dependency 'octopolo-plugin-example', '~> 0'
|
@@ -46,7 +46,9 @@ module Octopolo
|
|
46
46
|
end
|
47
47
|
|
48
48
|
it "generates the pull request with the given details and retains the information" do
|
49
|
-
GitHub.should_receive(:create_pull_request).with(
|
49
|
+
GitHub.should_receive(:create_pull_request).with(
|
50
|
+
repo_name, destination_branch, source_branch, title, body, {draft: true}
|
51
|
+
) { data }
|
50
52
|
creator.perform.should == data
|
51
53
|
creator.number.should == data.number
|
52
54
|
creator.data.should == data
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: octopolo
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.12.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Patrick Byrne
|
@@ -10,230 +10,202 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2020-
|
13
|
+
date: 2020-09-22 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: gli
|
17
17
|
requirement: !ruby/object:Gem::Requirement
|
18
18
|
requirements:
|
19
|
-
- - ~>
|
19
|
+
- - "~>"
|
20
20
|
- !ruby/object:Gem::Version
|
21
21
|
version: '2.13'
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
24
|
version_requirements: !ruby/object:Gem::Requirement
|
25
25
|
requirements:
|
26
|
-
- - ~>
|
26
|
+
- - "~>"
|
27
27
|
- !ruby/object:Gem::Version
|
28
28
|
version: '2.13'
|
29
29
|
- !ruby/object:Gem::Dependency
|
30
30
|
name: hashie
|
31
31
|
requirement: !ruby/object:Gem::Requirement
|
32
32
|
requirements:
|
33
|
-
- - ~>
|
33
|
+
- - "~>"
|
34
34
|
- !ruby/object:Gem::Version
|
35
35
|
version: '1.2'
|
36
36
|
type: :runtime
|
37
37
|
prerelease: false
|
38
38
|
version_requirements: !ruby/object:Gem::Requirement
|
39
39
|
requirements:
|
40
|
-
- - ~>
|
40
|
+
- - "~>"
|
41
41
|
- !ruby/object:Gem::Version
|
42
42
|
version: '1.2'
|
43
43
|
- !ruby/object:Gem::Dependency
|
44
44
|
name: octokit
|
45
45
|
requirement: !ruby/object:Gem::Requirement
|
46
46
|
requirements:
|
47
|
-
- - ~>
|
47
|
+
- - "~>"
|
48
48
|
- !ruby/object:Gem::Version
|
49
49
|
version: '4.18'
|
50
50
|
type: :runtime
|
51
51
|
prerelease: false
|
52
52
|
version_requirements: !ruby/object:Gem::Requirement
|
53
53
|
requirements:
|
54
|
-
- - ~>
|
54
|
+
- - "~>"
|
55
55
|
- !ruby/object:Gem::Version
|
56
56
|
version: '4.18'
|
57
57
|
- !ruby/object:Gem::Dependency
|
58
58
|
name: public_suffix
|
59
59
|
requirement: !ruby/object:Gem::Requirement
|
60
60
|
requirements:
|
61
|
-
- - ~>
|
61
|
+
- - "~>"
|
62
62
|
- !ruby/object:Gem::Version
|
63
63
|
version: '2.0'
|
64
64
|
type: :runtime
|
65
65
|
prerelease: false
|
66
66
|
version_requirements: !ruby/object:Gem::Requirement
|
67
67
|
requirements:
|
68
|
-
- - ~>
|
68
|
+
- - "~>"
|
69
69
|
- !ruby/object:Gem::Version
|
70
70
|
version: '2.0'
|
71
71
|
- !ruby/object:Gem::Dependency
|
72
72
|
name: highline
|
73
73
|
requirement: !ruby/object:Gem::Requirement
|
74
74
|
requirements:
|
75
|
-
- - ~>
|
75
|
+
- - "~>"
|
76
76
|
- !ruby/object:Gem::Version
|
77
77
|
version: '1.6'
|
78
78
|
type: :runtime
|
79
79
|
prerelease: false
|
80
80
|
version_requirements: !ruby/object:Gem::Requirement
|
81
81
|
requirements:
|
82
|
-
- - ~>
|
82
|
+
- - "~>"
|
83
83
|
- !ruby/object:Gem::Version
|
84
84
|
version: '1.6'
|
85
85
|
- !ruby/object:Gem::Dependency
|
86
86
|
name: pivotal-tracker
|
87
87
|
requirement: !ruby/object:Gem::Requirement
|
88
88
|
requirements:
|
89
|
-
- - ~>
|
89
|
+
- - "~>"
|
90
90
|
- !ruby/object:Gem::Version
|
91
91
|
version: '0.5'
|
92
92
|
type: :runtime
|
93
93
|
prerelease: false
|
94
94
|
version_requirements: !ruby/object:Gem::Requirement
|
95
95
|
requirements:
|
96
|
-
- - ~>
|
96
|
+
- - "~>"
|
97
97
|
- !ruby/object:Gem::Version
|
98
98
|
version: '0.5'
|
99
99
|
- !ruby/object:Gem::Dependency
|
100
100
|
name: jiralicious
|
101
101
|
requirement: !ruby/object:Gem::Requirement
|
102
102
|
requirements:
|
103
|
-
- - ~>
|
103
|
+
- - "~>"
|
104
104
|
- !ruby/object:Gem::Version
|
105
105
|
version: '0.5'
|
106
106
|
type: :runtime
|
107
107
|
prerelease: false
|
108
108
|
version_requirements: !ruby/object:Gem::Requirement
|
109
109
|
requirements:
|
110
|
-
- - ~>
|
110
|
+
- - "~>"
|
111
111
|
- !ruby/object:Gem::Version
|
112
112
|
version: '0.5'
|
113
113
|
- !ruby/object:Gem::Dependency
|
114
114
|
name: semantic
|
115
115
|
requirement: !ruby/object:Gem::Requirement
|
116
116
|
requirements:
|
117
|
-
- - ~>
|
117
|
+
- - "~>"
|
118
118
|
- !ruby/object:Gem::Version
|
119
119
|
version: '1.3'
|
120
120
|
type: :runtime
|
121
121
|
prerelease: false
|
122
122
|
version_requirements: !ruby/object:Gem::Requirement
|
123
123
|
requirements:
|
124
|
-
- - ~>
|
124
|
+
- - "~>"
|
125
125
|
- !ruby/object:Gem::Version
|
126
126
|
version: '1.3'
|
127
127
|
- !ruby/object:Gem::Dependency
|
128
128
|
name: nokogiri-happymapper
|
129
129
|
requirement: !ruby/object:Gem::Requirement
|
130
130
|
requirements:
|
131
|
-
- - ~>
|
131
|
+
- - "~>"
|
132
132
|
- !ruby/object:Gem::Version
|
133
133
|
version: 0.6.0
|
134
134
|
type: :runtime
|
135
135
|
prerelease: false
|
136
136
|
version_requirements: !ruby/object:Gem::Requirement
|
137
137
|
requirements:
|
138
|
-
- - ~>
|
138
|
+
- - "~>"
|
139
139
|
- !ruby/object:Gem::Version
|
140
140
|
version: 0.6.0
|
141
141
|
- !ruby/object:Gem::Dependency
|
142
142
|
name: rake
|
143
143
|
requirement: !ruby/object:Gem::Requirement
|
144
144
|
requirements:
|
145
|
-
- - ~>
|
145
|
+
- - "~>"
|
146
146
|
- !ruby/object:Gem::Version
|
147
147
|
version: '10.1'
|
148
148
|
type: :development
|
149
149
|
prerelease: false
|
150
150
|
version_requirements: !ruby/object:Gem::Requirement
|
151
151
|
requirements:
|
152
|
-
- - ~>
|
152
|
+
- - "~>"
|
153
153
|
- !ruby/object:Gem::Version
|
154
154
|
version: '10.1'
|
155
|
-
- !ruby/object:Gem::Dependency
|
156
|
-
name: bundler
|
157
|
-
requirement: !ruby/object:Gem::Requirement
|
158
|
-
requirements:
|
159
|
-
- - ~>
|
160
|
-
- !ruby/object:Gem::Version
|
161
|
-
version: '1.16'
|
162
|
-
type: :development
|
163
|
-
prerelease: false
|
164
|
-
version_requirements: !ruby/object:Gem::Requirement
|
165
|
-
requirements:
|
166
|
-
- - ~>
|
167
|
-
- !ruby/object:Gem::Version
|
168
|
-
version: '1.16'
|
169
155
|
- !ruby/object:Gem::Dependency
|
170
156
|
name: rspec
|
171
157
|
requirement: !ruby/object:Gem::Requirement
|
172
158
|
requirements:
|
173
|
-
- - ~>
|
159
|
+
- - "~>"
|
174
160
|
- !ruby/object:Gem::Version
|
175
161
|
version: '2.99'
|
176
162
|
type: :development
|
177
163
|
prerelease: false
|
178
164
|
version_requirements: !ruby/object:Gem::Requirement
|
179
165
|
requirements:
|
180
|
-
- - ~>
|
166
|
+
- - "~>"
|
181
167
|
- !ruby/object:Gem::Version
|
182
168
|
version: '2.99'
|
183
|
-
- !ruby/object:Gem::Dependency
|
184
|
-
name: guard
|
185
|
-
requirement: !ruby/object:Gem::Requirement
|
186
|
-
requirements:
|
187
|
-
- - ~>
|
188
|
-
- !ruby/object:Gem::Version
|
189
|
-
version: '2.6'
|
190
|
-
type: :development
|
191
|
-
prerelease: false
|
192
|
-
version_requirements: !ruby/object:Gem::Requirement
|
193
|
-
requirements:
|
194
|
-
- - ~>
|
195
|
-
- !ruby/object:Gem::Version
|
196
|
-
version: '2.6'
|
197
169
|
- !ruby/object:Gem::Dependency
|
198
170
|
name: guard-rspec
|
199
171
|
requirement: !ruby/object:Gem::Requirement
|
200
172
|
requirements:
|
201
|
-
- - ~>
|
173
|
+
- - "~>"
|
202
174
|
- !ruby/object:Gem::Version
|
203
175
|
version: '4.3'
|
204
176
|
type: :development
|
205
177
|
prerelease: false
|
206
178
|
version_requirements: !ruby/object:Gem::Requirement
|
207
179
|
requirements:
|
208
|
-
- - ~>
|
180
|
+
- - "~>"
|
209
181
|
- !ruby/object:Gem::Version
|
210
182
|
version: '4.3'
|
211
183
|
- !ruby/object:Gem::Dependency
|
212
184
|
name: hitimes
|
213
185
|
requirement: !ruby/object:Gem::Requirement
|
214
186
|
requirements:
|
215
|
-
- - ~>
|
187
|
+
- - "~>"
|
216
188
|
- !ruby/object:Gem::Version
|
217
189
|
version: 1.2.6
|
218
190
|
type: :development
|
219
191
|
prerelease: false
|
220
192
|
version_requirements: !ruby/object:Gem::Requirement
|
221
193
|
requirements:
|
222
|
-
- - ~>
|
194
|
+
- - "~>"
|
223
195
|
- !ruby/object:Gem::Version
|
224
196
|
version: 1.2.6
|
225
197
|
- !ruby/object:Gem::Dependency
|
226
198
|
name: octopolo-plugin-example
|
227
199
|
requirement: !ruby/object:Gem::Requirement
|
228
200
|
requirements:
|
229
|
-
- - ~>
|
201
|
+
- - "~>"
|
230
202
|
- !ruby/object:Gem::Version
|
231
203
|
version: '0'
|
232
204
|
type: :development
|
233
205
|
prerelease: false
|
234
206
|
version_requirements: !ruby/object:Gem::Requirement
|
235
207
|
requirements:
|
236
|
-
- - ~>
|
208
|
+
- - "~>"
|
237
209
|
- !ruby/object:Gem::Version
|
238
210
|
version: '0'
|
239
211
|
description: A set of GitHub workflow scripts.
|
@@ -247,12 +219,12 @@ executables:
|
|
247
219
|
extensions: []
|
248
220
|
extra_rdoc_files: []
|
249
221
|
files:
|
250
|
-
- .gitignore
|
251
|
-
- .octopolo.yml
|
252
|
-
- .ruby-gemset
|
253
|
-
- .ruby-version
|
254
|
-
- .soyuz.yml
|
255
|
-
- .travis.yml
|
222
|
+
- ".gitignore"
|
223
|
+
- ".octopolo.yml"
|
224
|
+
- ".ruby-gemset"
|
225
|
+
- ".ruby-version"
|
226
|
+
- ".soyuz.yml"
|
227
|
+
- ".travis.yml"
|
256
228
|
- CHANGELOG.markdown
|
257
229
|
- Gemfile
|
258
230
|
- Guardfile
|
@@ -379,17 +351,16 @@ require_paths:
|
|
379
351
|
- lib
|
380
352
|
required_ruby_version: !ruby/object:Gem::Requirement
|
381
353
|
requirements:
|
382
|
-
- -
|
354
|
+
- - ">="
|
383
355
|
- !ruby/object:Gem::Version
|
384
356
|
version: '0'
|
385
357
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
386
358
|
requirements:
|
387
|
-
- -
|
359
|
+
- - ">="
|
388
360
|
- !ruby/object:Gem::Version
|
389
361
|
version: '0'
|
390
362
|
requirements: []
|
391
|
-
|
392
|
-
rubygems_version: 2.0.14.1
|
363
|
+
rubygems_version: 3.1.4
|
393
364
|
signing_key:
|
394
365
|
specification_version: 4
|
395
366
|
summary: A set of GitHub workflow scripts to provide a smooth development process
|
data/bin/octopolo
DELETED
@@ -1,22 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby
|
2
|
-
require 'rubygems'
|
3
|
-
require 'gli'
|
4
|
-
require_relative '../lib/octopolo'
|
5
|
-
|
6
|
-
include GLI::App
|
7
|
-
|
8
|
-
program_desc 'GitHub workflow scripts. From the Ngineers at Sport Ngin.'
|
9
|
-
version Octopolo::VERSION
|
10
|
-
|
11
|
-
autocomplete_commands false
|
12
|
-
wrap_help_text :verbatim
|
13
|
-
|
14
|
-
program_long_desc """
|
15
|
-
DOCUMENTATION
|
16
|
-
For documentation and help in setting up your configuration files,
|
17
|
-
see Octopolo's GitHub repo: https://github.com/sportngin/octopolo
|
18
|
-
"""
|
19
|
-
|
20
|
-
commands_from File.expand_path(File.dirname(__FILE__) + '/../lib/octopolo/commands')
|
21
|
-
|
22
|
-
exit run(ARGV)
|