circleci-cli 4.0.1 → 4.0.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.
Files changed (16) hide show
  1. checksums.yaml +4 -4
  2. data/.github/CODEOWNERS +1 -0
  3. data/.github/dependabot.yml +10 -36
  4. data/.github/workflows/test.yml +7 -2
  5. data/.rubocop.yml +1 -1
  6. data/Gemfile +16 -1
  7. data/Gemfile.lock +85 -93
  8. data/README.md +4 -1
  9. data/circleci-cli.gemspec +3 -19
  10. data/lib/circleci/cli/command/watch_command/build_watcher.rb +5 -4
  11. data/lib/circleci/cli/networking/http_client.rb +28 -0
  12. data/lib/circleci/cli/networking/pusher_client.rb +3 -12
  13. data/lib/circleci/cli/response/action.rb +2 -8
  14. data/lib/circleci/cli/version.rb +1 -1
  15. data/lib/circleci/cli.rb +2 -1
  16. metadata +6 -192
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 90b6ab11da48868d2be56bf5dc12f260e4eccb095088c43afb1fff9e39ec547e
4
- data.tar.gz: c7b1c2584bd04a9719d6e349c84f00f5b5d203412ebb537c774ae9d8ebdf6e24
3
+ metadata.gz: 859fc0ed20521d04297d38a838250bbf4795c1282f61019af0984061af39f183
4
+ data.tar.gz: ffff78fdfe8e648d5ab582e9240479eeb1e45bc6bdece12feb9020210dcd032d
5
5
  SHA512:
6
- metadata.gz: 7e6ec3d626733e32229477cbe3fabcb11404b9014a4be827d49d0ce053b1a6079ee501c7d8f48b15ec2a7f44965ed8c7930df6c5086a706c2c6c9796be34b4e5
7
- data.tar.gz: 2c779a15909f96203c82ebe5260e3770ae7079f5714e77462392e5f8f19b4457a804b1f3e36c872f29180655150819a8f26e348d69cdc8d9264cc79eb2e2d60b
6
+ metadata.gz: 8d80b94d00e7a9d56d6ede21380cc9ae99172887c310a519f70db90c6f2362331074904bf5a496c6ccd3c53dcfe36618939fe959bc4a94559d595bf390dc1fa6
7
+ data.tar.gz: 17fb22d74d527bdff84343a60752c8add81058b62b011a8c3ab0d7953be0719771446916fa3e7b08a41928bbe1016897a39f1a99131b1db6d76a4bab880cee7f
data/.github/CODEOWNERS ADDED
@@ -0,0 +1 @@
1
+ * @unhappychoice
data/.github/dependabot.yml CHANGED
@@ -1,38 +1,12 @@
1
1
  version: 2
2
2
  updates:
3
- - package-ecosystem: bundler
4
- directory: "/"
5
- schedule:
6
- interval: daily
7
- time: "12:00"
8
- timezone: Asia/Tokyo
9
- open-pull-requests-limit: 20
10
- reviewers:
11
- - unhappychoice
12
- allow:
13
- - dependency-type: direct
14
- - dependency-type: indirect
15
- ignore:
16
- - dependency-name: codecov
17
- versions:
18
- - ">= 0.2.14.a, < 0.2.15"
19
- - dependency-name: rubocop
20
- versions:
21
- - 1.12.1
22
- - dependency-name: listen
23
- versions:
24
- - 3.5.0
25
- - dependency-name: github_changelog_generator
26
- versions:
27
- - 1.16.0
28
- - 1.16.1
29
- - dependency-name: codecov
30
- versions:
31
- - 0.5.0
32
- - dependency-name: regexp_parser
33
- versions:
34
- - 2.1.0
35
- - 2.1.1
36
- - dependency-name: activesupport
37
- versions:
38
- - 6.1.2
3
+ - package-ecosystem: bundler
4
+ directory: "/"
5
+ schedule:
6
+ interval: daily
7
+ time: "12:00"
8
+ timezone: Asia/Tokyo
9
+ open-pull-requests-limit: 20
10
+ allow:
11
+ - dependency-type: direct
12
+ - dependency-type: indirect
data/.github/workflows/test.yml CHANGED
@@ -21,7 +21,7 @@ jobs:
21
21
  runs-on: ubuntu-latest
22
22
  strategy:
23
23
  matrix:
24
- ruby: ['3.4.4', '3.3.8', '3.2.8', '3.1.7']
24
+ ruby: ['3.4.4', '3.3.8']
25
25
  steps:
26
26
  - uses: actions/checkout@master
27
27
  - name: Set up Ruby
@@ -35,5 +35,10 @@ jobs:
35
35
  - name: Run test
36
36
  env:
37
37
  COVERAGE: true
38
- CODECOV_TOKEN: efe02ed0-e754-42a6-bb90-bbf345747bdc
39
38
  run: bundle exec rspec
39
+ - name: Upload coverage to Codecov
40
+ if: matrix.ruby == '3.4.4'
41
+ uses: codecov/codecov-action@v5
42
+ with:
43
+ token: efe02ed0-e754-42a6-bb90-bbf345747bdc
44
+ files: coverage/.resultset.json
data/.rubocop.yml CHANGED
@@ -1,6 +1,6 @@
1
1
  AllCops:
2
2
  NewCops: enable
3
- TargetRubyVersion: 3.1
3
+ TargetRubyVersion: 3.3
4
4
 
5
5
  Style/Documentation:
6
6
  Enabled: false
data/Gemfile CHANGED
@@ -2,5 +2,20 @@
2
2
 
3
3
  source 'https://rubygems.org'
4
4
 
5
- # Specify your gem's dependencies in circle.gemspec
6
5
  gemspec
6
+
7
+ gem 'abbrev'
8
+ gem 'base64'
9
+ gem 'bundler'
10
+ gem 'github_changelog_generator'
11
+ gem 'guard'
12
+ gem 'guard-rspec'
13
+ gem 'guard-rubocop'
14
+ # Keep in sync with the openssl default gem of the Ruby in .ruby-version:
15
+ # rubygems/release-gem activates it via RUBYOPT before Bundler.setup, and a
16
+ # version mismatch aborts the release with Gem::LoadError.
17
+ gem 'openssl', '3.3.0'
18
+ gem 'rake'
19
+ gem 'rspec'
20
+ gem 'rubocop'
21
+ gem 'simplecov'
data/Gemfile.lock CHANGED
@@ -1,106 +1,100 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- circleci-cli (4.0.1)
4
+ circleci-cli (4.0.3)
5
5
  circleci (>= 2.1.0)
6
- faraday (>= 0.14, < 2.14)
7
6
  highline (>= 1.7.8, < 3.2.0)
8
7
  launchy (>= 2.4.3, < 3.2.0)
9
8
  pusher-client (~> 0.6.2)
10
9
  rugged (>= 0.26, < 1.10)
11
10
  terminal-notifier (~> 2.0.0)
12
11
  terminal-table (>= 1.8, < 4.1)
13
- thor (>= 0.20, < 1.4)
12
+ thor (>= 0.20, < 1.6)
14
13
 
15
14
  GEM
16
15
  remote: https://rubygems.org/
17
16
  specs:
18
17
  abbrev (0.1.2)
19
- activesupport (7.2.2.1)
18
+ activesupport (8.1.3)
20
19
  base64
21
- benchmark (>= 0.3)
22
20
  bigdecimal
23
21
  concurrent-ruby (~> 1.0, >= 1.3.1)
24
22
  connection_pool (>= 2.2.5)
25
23
  drb
26
24
  i18n (>= 1.6, < 2)
25
+ json
27
26
  logger (>= 1.4.2)
28
27
  minitest (>= 5.1)
29
28
  securerandom (>= 0.3)
30
29
  tzinfo (~> 2.0, >= 2.0.5)
31
- addressable (2.8.7)
32
- public_suffix (>= 2.0.2, < 7.0)
30
+ uri (>= 0.13.1)
31
+ addressable (2.9.0)
32
+ public_suffix (>= 2.0.2, < 8.0)
33
33
  ast (2.4.3)
34
- async (2.24.0)
34
+ async (2.43.0)
35
35
  console (~> 1.29)
36
36
  fiber-annotation
37
- io-event (~> 1.9)
38
- metrics (~> 0.12)
39
- traces (~> 0.15)
40
- async-http (0.88.0)
41
- async (>= 2.10.2)
42
- async-pool (~> 0.9)
37
+ io-event (~> 1.11)
38
+ async-http (0.97.0)
39
+ async (>= 2.35.1)
40
+ async-pool (~> 0.11)
43
41
  io-endpoint (~> 0.14)
44
42
  io-stream (~> 0.6)
45
- metrics (~> 0.12)
46
- protocol-http (~> 0.49)
47
- protocol-http1 (~> 0.30)
48
- protocol-http2 (~> 0.22)
49
- traces (~> 0.10)
50
- async-http-faraday (0.22.0)
43
+ protocol-http (~> 0.62)
44
+ protocol-http1 (~> 0.39)
45
+ protocol-http2 (~> 0.26)
46
+ protocol-url (~> 0.2)
47
+ async-http-faraday (0.22.2)
51
48
  async-http (~> 0.42)
52
49
  faraday
53
- async-pool (0.10.3)
54
- async (>= 1.25)
50
+ async-pool (0.11.2)
51
+ async (>= 2.0)
55
52
  base64 (0.3.0)
56
- benchmark (0.4.1)
57
- bigdecimal (3.2.2)
53
+ benchmark (0.5.0)
54
+ bigdecimal (4.1.2)
58
55
  childprocess (5.1.0)
59
56
  logger (~> 1.5)
60
57
  circleci (2.1.0)
61
- codecov (0.6.0)
62
- simplecov (>= 0.15, < 0.22)
63
58
  coderay (1.1.3)
64
- concurrent-ruby (1.3.5)
65
- connection_pool (2.5.3)
66
- console (1.30.2)
59
+ concurrent-ruby (1.3.8)
60
+ connection_pool (3.0.2)
61
+ console (1.37.0)
67
62
  fiber-annotation
68
63
  fiber-local (~> 1.1)
69
64
  json
70
65
  diff-lcs (1.6.2)
71
- docile (1.4.1)
72
66
  drb (2.2.3)
73
- faraday (2.13.2)
67
+ faraday (2.14.3)
74
68
  faraday-net_http (>= 2.0, < 3.5)
75
69
  json
76
70
  logger
77
- faraday-http-cache (2.5.1)
71
+ faraday-http-cache (2.7.0)
78
72
  faraday (>= 0.8)
79
- faraday-net_http (3.4.1)
80
- net-http (>= 0.5.0)
81
- ffi (1.17.2)
73
+ faraday-net_http (3.4.4)
74
+ net-http (~> 0.5)
75
+ ffi (1.17.4)
82
76
  fiber-annotation (0.2.0)
83
77
  fiber-local (1.1.0)
84
78
  fiber-storage
85
79
  fiber-storage (1.0.1)
86
- formatador (1.1.0)
87
- github_changelog_generator (1.16.4)
80
+ formatador (1.2.3)
81
+ reline
82
+ github_changelog_generator (1.18.0)
88
83
  activesupport
89
84
  async (>= 1.25.0)
90
85
  async-http-faraday
86
+ benchmark
91
87
  faraday-http-cache
92
- multi_json
93
88
  octokit (~> 4.6)
94
89
  rainbow (>= 2.2.1)
95
90
  rake (>= 10.0)
96
- guard (2.19.1)
91
+ guard (2.20.2)
97
92
  formatador (>= 0.2.4)
98
93
  listen (>= 2.7, < 4.0)
99
94
  logger (~> 1.6)
100
95
  lumberjack (>= 1.0.12, < 2.0)
101
96
  nenv (~> 0.1)
102
97
  notiffany (~> 0.0)
103
- ostruct (~> 0.6)
104
98
  pry (>= 0.13.0)
105
99
  shellany (~> 0.0)
106
100
  thor (>= 0.18.1)
@@ -114,117 +108,115 @@ GEM
114
108
  rubocop (< 2.0)
115
109
  highline (3.1.2)
116
110
  reline
117
- i18n (1.14.7)
111
+ i18n (1.15.2)
118
112
  concurrent-ruby (~> 1.0)
119
- io-console (0.8.0)
120
- io-endpoint (0.15.2)
121
- io-event (1.11.2)
122
- io-stream (0.6.1)
123
- json (2.12.2)
124
- language_server-protocol (3.17.0.5)
113
+ io-console (0.8.2)
114
+ io-endpoint (0.17.2)
115
+ io-event (1.19.3)
116
+ io-stream (0.13.2)
117
+ openssl (>= 3.3)
118
+ json (2.21.1)
119
+ language_server-protocol (3.17.0.6)
125
120
  launchy (3.1.1)
126
121
  addressable (~> 2.8)
127
122
  childprocess (~> 5.0)
128
123
  logger (~> 1.6)
129
124
  lint_roller (1.1.0)
130
- listen (3.9.0)
125
+ listen (3.10.0)
126
+ logger
131
127
  rb-fsevent (~> 0.10, >= 0.10.3)
132
128
  rb-inotify (~> 0.9, >= 0.9.10)
133
129
  logger (1.7.0)
134
- lumberjack (1.2.10)
130
+ lumberjack (1.4.2)
135
131
  method_source (1.1.0)
136
- metrics (0.12.2)
137
- minitest (5.25.5)
138
- multi_json (1.15.0)
132
+ minitest (6.0.6)
133
+ drb (~> 2.0)
134
+ prism (~> 1.5)
139
135
  nenv (0.3.0)
140
- net-http (0.6.0)
141
- uri
136
+ net-http (0.9.1)
137
+ uri (>= 0.11.1)
142
138
  notiffany (0.1.3)
143
139
  nenv (~> 0.1)
144
140
  shellany (~> 0.0)
145
141
  octokit (4.25.1)
146
142
  faraday (>= 1, < 3)
147
143
  sawyer (~> 0.9)
148
- ostruct (0.6.2)
149
- parallel (1.27.0)
150
- parser (3.3.8.0)
144
+ openssl (3.3.0)
145
+ parallel (2.1.0)
146
+ parser (3.3.12.0)
151
147
  ast (~> 2.4.1)
152
148
  racc
153
- prism (1.4.0)
149
+ prism (1.9.0)
154
150
  protocol-hpack (1.5.1)
155
- protocol-http (0.49.0)
156
- protocol-http1 (0.34.0)
157
- protocol-http (~> 0.22)
158
- protocol-http2 (0.22.1)
151
+ protocol-http (0.63.0)
152
+ protocol-http1 (0.39.0)
153
+ protocol-http (~> 0.62)
154
+ protocol-http2 (0.26.1)
159
155
  protocol-hpack (~> 1.4)
160
- protocol-http (~> 0.47)
161
- pry (0.15.2)
156
+ protocol-http (~> 0.62)
157
+ protocol-url (0.4.0)
158
+ pry (0.16.0)
162
159
  coderay (~> 1.1)
163
160
  method_source (~> 1.0)
164
- public_suffix (6.0.2)
161
+ reline (>= 0.6.0)
162
+ public_suffix (7.0.5)
165
163
  pusher-client (0.6.2)
166
164
  json
167
165
  websocket (~> 1.0)
168
166
  racc (1.8.1)
169
167
  rainbow (3.1.1)
170
- rake (13.3.0)
168
+ rake (13.4.2)
171
169
  rb-fsevent (0.11.2)
172
170
  rb-inotify (0.11.1)
173
171
  ffi (~> 1.0)
174
- regexp_parser (2.10.0)
175
- reline (0.6.1)
172
+ regexp_parser (2.12.0)
173
+ reline (0.6.3)
176
174
  io-console (~> 0.5)
177
- rspec (3.13.1)
175
+ rspec (3.13.2)
178
176
  rspec-core (~> 3.13.0)
179
177
  rspec-expectations (~> 3.13.0)
180
178
  rspec-mocks (~> 3.13.0)
181
- rspec-core (3.13.5)
179
+ rspec-core (3.13.6)
182
180
  rspec-support (~> 3.13.0)
183
181
  rspec-expectations (3.13.5)
184
182
  diff-lcs (>= 1.2.0, < 2.0)
185
183
  rspec-support (~> 3.13.0)
186
- rspec-mocks (3.13.5)
184
+ rspec-mocks (3.13.8)
187
185
  diff-lcs (>= 1.2.0, < 2.0)
188
186
  rspec-support (~> 3.13.0)
189
- rspec-support (3.13.4)
190
- rubocop (1.78.0)
187
+ rspec-support (3.13.7)
188
+ rubocop (1.88.2)
191
189
  json (~> 2.3)
192
190
  language_server-protocol (~> 3.17.0.2)
193
191
  lint_roller (~> 1.1.0)
194
- parallel (~> 1.10)
192
+ parallel (>= 1.10)
195
193
  parser (>= 3.3.0.2)
196
194
  rainbow (>= 2.2.2, < 4.0)
197
195
  regexp_parser (>= 2.9.3, < 3.0)
198
- rubocop-ast (>= 1.45.1, < 2.0)
196
+ rubocop-ast (>= 1.49.0, < 2.0)
199
197
  ruby-progressbar (~> 1.7)
200
198
  unicode-display_width (>= 2.4.0, < 4.0)
201
- rubocop-ast (1.45.1)
199
+ rubocop-ast (1.50.0)
202
200
  parser (>= 3.3.7.2)
203
- prism (~> 1.4)
201
+ prism (~> 1.7)
204
202
  ruby-progressbar (1.13.0)
205
- rugged (1.9.0)
206
- sawyer (0.9.2)
203
+ rugged (1.9.6)
204
+ sawyer (0.9.3)
207
205
  addressable (>= 2.3.5)
208
206
  faraday (>= 0.17.3, < 3)
209
207
  securerandom (0.4.1)
210
208
  shellany (0.0.1)
211
- simplecov (0.21.2)
212
- docile (~> 1.1)
213
- simplecov-html (~> 0.11)
214
- simplecov_json_formatter (~> 0.1)
215
- simplecov-html (0.13.1)
216
- simplecov_json_formatter (0.1.4)
209
+ simplecov (1.0.2)
217
210
  terminal-notifier (2.0.0)
218
211
  terminal-table (4.0.0)
219
212
  unicode-display_width (>= 1.1.1, < 4)
220
- thor (1.3.2)
221
- traces (0.15.2)
213
+ thor (1.5.0)
222
214
  tzinfo (2.0.6)
223
215
  concurrent-ruby (~> 1.0)
224
- unicode-display_width (3.1.4)
225
- unicode-emoji (~> 4.0, >= 4.0.4)
226
- unicode-emoji (4.0.4)
227
- uri (1.0.3)
216
+ unicode-display_width (3.2.0)
217
+ unicode-emoji (~> 4.1)
218
+ unicode-emoji (4.2.0)
219
+ uri (1.1.1)
228
220
  websocket (1.2.11)
229
221
 
230
222
  PLATFORMS
@@ -235,15 +227,15 @@ DEPENDENCIES
235
227
  base64
236
228
  bundler
237
229
  circleci-cli!
238
- codecov
239
230
  github_changelog_generator
240
231
  guard
241
232
  guard-rspec
242
233
  guard-rubocop
234
+ openssl (= 3.3.0)
243
235
  rake
244
236
  rspec
245
237
  rubocop
246
238
  simplecov
247
239
 
248
240
  BUNDLED WITH
249
- 2.4.18
241
+ 2.7.2
data/README.md CHANGED
@@ -1,7 +1,6 @@
1
1
  # circleci-cli
2
2
  [![All Contributors](https://img.shields.io/badge/all_contributors-3-orange.svg?style=flat-square)](#contributors-)
3
3
  [![Gem Version](https://badge.fury.io/rb/circleci-cli.svg)](https://badge.fury.io/rb/circleci-cli)
4
- [![Code Climate](https://codeclimate.com/github/circleci-tools/circleci-cli/badges/gpa.svg)](https://codeclimate.com/github/circleci-tools/circleci-cli)
5
4
  [![codecov](https://codecov.io/gh/circleci-tools/circleci-cli/branch/master/graph/badge.svg)](https://codecov.io/gh/circleci-tools/circleci-cli)
6
5
  [![Libraries.io dependency status for GitHub repo](https://img.shields.io/librariesio/github/circleci-tools/circleci-cli.svg)](https://libraries.io/github/circleci-tools/circleci-cli)
7
6
  ![](http://ruby-gem-downloads-badge.herokuapp.com/circleci-cli?type=total)
@@ -110,3 +109,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
110
109
  <!-- ALL-CONTRIBUTORS-LIST:END -->
111
110
 
112
111
  This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
112
+
113
+ ## Author
114
+
115
+ [@unhappychoice](https://unhappychoice.com)
data/circleci-cli.gemspec CHANGED
@@ -6,29 +6,14 @@ require 'circleci/cli/version'
6
6
 
7
7
  def production_dependency(spec)
8
8
  spec.add_dependency 'circleci', '>= 2.1.0'
9
- spec.add_dependency 'faraday', '>= 0.14', '< 2.14'
9
+
10
10
  spec.add_dependency 'highline', '>= 1.7.8', '< 3.2.0'
11
11
  spec.add_dependency 'launchy', '>= 2.4.3', '< 3.2.0'
12
12
  spec.add_dependency 'pusher-client', '~> 0.6.2'
13
13
  spec.add_dependency 'rugged', '>= 0.26', '< 1.10'
14
14
  spec.add_dependency 'terminal-notifier', '~> 2.0.0'
15
15
  spec.add_dependency 'terminal-table', '>= 1.8', '< 4.1'
16
- spec.add_dependency 'thor', '>= 0.20', '< 1.4'
17
- end
18
-
19
- def development_dependency(spec)
20
- spec.add_development_dependency 'abbrev'
21
- spec.add_development_dependency 'base64'
22
- spec.add_development_dependency 'bundler'
23
- spec.add_development_dependency 'codecov'
24
- spec.add_development_dependency 'github_changelog_generator'
25
- spec.add_development_dependency 'guard'
26
- spec.add_development_dependency 'guard-rspec'
27
- spec.add_development_dependency 'guard-rubocop'
28
- spec.add_development_dependency 'rake'
29
- spec.add_development_dependency 'rspec'
30
- spec.add_development_dependency 'rubocop'
31
- spec.add_development_dependency 'simplecov'
16
+ spec.add_dependency 'thor', '>= 0.20', '< 1.6'
32
17
  end
33
18
 
34
19
  def project_files
@@ -40,7 +25,7 @@ end
40
25
  Gem::Specification.new do |spec|
41
26
  spec.name = 'circleci-cli'
42
27
  spec.version = CircleCI::CLI::VERSION
43
- spec.required_ruby_version = '>= 3.1'
28
+ spec.required_ruby_version = '>= 3.3'
44
29
  spec.authors = ['unhappychoice']
45
30
  spec.email = ['unhappychoice@gmail.com']
46
31
 
@@ -57,5 +42,4 @@ Gem::Specification.new do |spec|
57
42
  }
58
43
 
59
44
  production_dependency spec
60
- development_dependency spec
61
45
  end
data/lib/circleci/cli/command/watch_command/build_watcher.rb CHANGED
@@ -96,10 +96,11 @@ module CircleCI
96
96
  def update_actions
97
97
  return unless @current_step
98
98
 
99
- response = Faraday.new(
100
- url: "https://circleci.com/api/private/output/raw/github/#{@build.username}/#{@build.reponame}/#{@build.build_number}/output/#{@current_step.actions.first.index}/#{@current_step.actions.first.step}",
101
- headers: { Range: "bytes=#{@read_byte}-" }
102
- ).get.body
99
+ url = "https://circleci.com/api/private/output/raw/github/#{@build.username}/#{@build.reponame}/#{@build.build_number}/output/#{@current_step.actions.first.index}/#{@current_step.actions.first.step}"
100
+ headers = { 'Range' => "bytes=#{@read_byte}-" }
101
+ res = HTTPClient.get(url, headers)
102
+
103
+ response = res.body
103
104
 
104
105
  return if response.empty?
105
106
 
data/lib/circleci/cli/networking/http_client.rb ADDED
@@ -0,0 +1,28 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'net/http'
4
+ require 'json'
5
+
6
+ module CircleCI
7
+ module CLI
8
+ module Networking
9
+ module HTTPClient
10
+ def self.get(url, headers = {})
11
+ uri = URI(url)
12
+ req = Net::HTTP::Get.new(uri)
13
+ headers.each { |key, value| req[key] = value }
14
+ res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
15
+ http.request(req)
16
+ end
17
+ JSON.parse(res.body)
18
+ end
19
+
20
+ def self.post_form(url, params = {})
21
+ uri = URI(url)
22
+ res = Net::HTTP.post_form(uri, params)
23
+ JSON.parse(res.body)
24
+ end
25
+ end
26
+ end
27
+ end
28
+ end
data/lib/circleci/cli/networking/pusher_client.rb CHANGED
@@ -37,18 +37,9 @@ module CircleCI
37
37
 
38
38
  def auth(socket_id, channel)
39
39
  token = ENV.fetch('CIRCLE_CI_TOKEN', nil) || ask('Circle CI token ? :')
40
- res = connection.post(
41
- "/auth/pusher?circle-token=#{token}",
42
- { socket_id:, channel_name: channel.name }
43
- )
44
- JSON.parse(res.body)['auth']
45
- end
46
-
47
- def connection
48
- Faraday.new(url: 'https://circleci.com') do |f|
49
- f.request :url_encoded
50
- f.adapter Faraday.default_adapter
51
- end
40
+ res = HTTPClient.post_form("https://circleci.com/auth/pusher?circle-token=#{token}",
41
+ { socket_id: socket_id, channel_name: channel.name })
42
+ res['auth']
52
43
  end
53
44
  end
54
45
  end
data/lib/circleci/cli/response/action.rb CHANGED
@@ -17,8 +17,8 @@ module CircleCI
17
17
  end
18
18
 
19
19
  def log
20
- request(@hash['output_url'])
21
- .map do |r|
20
+ HTTPClient.get(@hash['output_url'])
21
+ .map do |r|
22
22
  r['message']
23
23
  .gsub("\r\n", "\n")
24
24
  .gsub("\e[A\r\e[2K", '')
@@ -31,12 +31,6 @@ module CircleCI
31
31
  def failed?
32
32
  @status == 'timedout' || @status == 'failed'
33
33
  end
34
-
35
- private
36
-
37
- def request(url)
38
- JSON.parse(Faraday.new(url).get.body)
39
- end
40
34
  end
41
35
  end
42
36
  end
data/lib/circleci/cli/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module CircleCI
4
4
  module CLI
5
- VERSION = '4.0.1'
5
+ VERSION = '4.0.3'
6
6
  end
7
7
  end
data/lib/circleci/cli.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'circleci'
4
- require 'faraday'
4
+
5
5
  require 'highline/import'
6
6
  require 'launchy'
7
7
  require 'ostruct'
@@ -14,6 +14,7 @@ require 'circleci/cli/version'
14
14
  require 'circleci/cli/command'
15
15
  require 'circleci/cli/response'
16
16
  require 'circleci/cli/printer'
17
+ require 'circleci/cli/networking/http_client'
17
18
  require 'circleci/cli/networking'
18
19
 
19
20
  module CircleCI
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: circleci-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.1
4
+ version: 4.0.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - unhappychoice
@@ -23,26 +23,6 @@ dependencies:
23
23
  - - ">="
24
24
  - !ruby/object:Gem::Version
25
25
  version: 2.1.0
26
- - !ruby/object:Gem::Dependency
27
- name: faraday
28
- requirement: !ruby/object:Gem::Requirement
29
- requirements:
30
- - - ">="
31
- - !ruby/object:Gem::Version
32
- version: '0.14'
33
- - - "<"
34
- - !ruby/object:Gem::Version
35
- version: '2.14'
36
- type: :runtime
37
- prerelease: false
38
- version_requirements: !ruby/object:Gem::Requirement
39
- requirements:
40
- - - ">="
41
- - !ruby/object:Gem::Version
42
- version: '0.14'
43
- - - "<"
44
- - !ruby/object:Gem::Version
45
- version: '2.14'
46
26
  - !ruby/object:Gem::Dependency
47
27
  name: highline
48
28
  requirement: !ruby/object:Gem::Requirement
@@ -160,7 +140,7 @@ dependencies:
160
140
  version: '0.20'
161
141
  - - "<"
162
142
  - !ruby/object:Gem::Version
163
- version: '1.4'
143
+ version: '1.6'
164
144
  type: :runtime
165
145
  prerelease: false
166
146
  version_requirements: !ruby/object:Gem::Requirement
@@ -170,175 +150,7 @@ dependencies:
170
150
  version: '0.20'
171
151
  - - "<"
172
152
  - !ruby/object:Gem::Version
173
- version: '1.4'
174
- - !ruby/object:Gem::Dependency
175
- name: abbrev
176
- requirement: !ruby/object:Gem::Requirement
177
- requirements:
178
- - - ">="
179
- - !ruby/object:Gem::Version
180
- version: '0'
181
- type: :development
182
- prerelease: false
183
- version_requirements: !ruby/object:Gem::Requirement
184
- requirements:
185
- - - ">="
186
- - !ruby/object:Gem::Version
187
- version: '0'
188
- - !ruby/object:Gem::Dependency
189
- name: base64
190
- requirement: !ruby/object:Gem::Requirement
191
- requirements:
192
- - - ">="
193
- - !ruby/object:Gem::Version
194
- version: '0'
195
- type: :development
196
- prerelease: false
197
- version_requirements: !ruby/object:Gem::Requirement
198
- requirements:
199
- - - ">="
200
- - !ruby/object:Gem::Version
201
- version: '0'
202
- - !ruby/object:Gem::Dependency
203
- name: bundler
204
- requirement: !ruby/object:Gem::Requirement
205
- requirements:
206
- - - ">="
207
- - !ruby/object:Gem::Version
208
- version: '0'
209
- type: :development
210
- prerelease: false
211
- version_requirements: !ruby/object:Gem::Requirement
212
- requirements:
213
- - - ">="
214
- - !ruby/object:Gem::Version
215
- version: '0'
216
- - !ruby/object:Gem::Dependency
217
- name: codecov
218
- requirement: !ruby/object:Gem::Requirement
219
- requirements:
220
- - - ">="
221
- - !ruby/object:Gem::Version
222
- version: '0'
223
- type: :development
224
- prerelease: false
225
- version_requirements: !ruby/object:Gem::Requirement
226
- requirements:
227
- - - ">="
228
- - !ruby/object:Gem::Version
229
- version: '0'
230
- - !ruby/object:Gem::Dependency
231
- name: github_changelog_generator
232
- requirement: !ruby/object:Gem::Requirement
233
- requirements:
234
- - - ">="
235
- - !ruby/object:Gem::Version
236
- version: '0'
237
- type: :development
238
- prerelease: false
239
- version_requirements: !ruby/object:Gem::Requirement
240
- requirements:
241
- - - ">="
242
- - !ruby/object:Gem::Version
243
- version: '0'
244
- - !ruby/object:Gem::Dependency
245
- name: guard
246
- requirement: !ruby/object:Gem::Requirement
247
- requirements:
248
- - - ">="
249
- - !ruby/object:Gem::Version
250
- version: '0'
251
- type: :development
252
- prerelease: false
253
- version_requirements: !ruby/object:Gem::Requirement
254
- requirements:
255
- - - ">="
256
- - !ruby/object:Gem::Version
257
- version: '0'
258
- - !ruby/object:Gem::Dependency
259
- name: guard-rspec
260
- requirement: !ruby/object:Gem::Requirement
261
- requirements:
262
- - - ">="
263
- - !ruby/object:Gem::Version
264
- version: '0'
265
- type: :development
266
- prerelease: false
267
- version_requirements: !ruby/object:Gem::Requirement
268
- requirements:
269
- - - ">="
270
- - !ruby/object:Gem::Version
271
- version: '0'
272
- - !ruby/object:Gem::Dependency
273
- name: guard-rubocop
274
- requirement: !ruby/object:Gem::Requirement
275
- requirements:
276
- - - ">="
277
- - !ruby/object:Gem::Version
278
- version: '0'
279
- type: :development
280
- prerelease: false
281
- version_requirements: !ruby/object:Gem::Requirement
282
- requirements:
283
- - - ">="
284
- - !ruby/object:Gem::Version
285
- version: '0'
286
- - !ruby/object:Gem::Dependency
287
- name: rake
288
- requirement: !ruby/object:Gem::Requirement
289
- requirements:
290
- - - ">="
291
- - !ruby/object:Gem::Version
292
- version: '0'
293
- type: :development
294
- prerelease: false
295
- version_requirements: !ruby/object:Gem::Requirement
296
- requirements:
297
- - - ">="
298
- - !ruby/object:Gem::Version
299
- version: '0'
300
- - !ruby/object:Gem::Dependency
301
- name: rspec
302
- requirement: !ruby/object:Gem::Requirement
303
- requirements:
304
- - - ">="
305
- - !ruby/object:Gem::Version
306
- version: '0'
307
- type: :development
308
- prerelease: false
309
- version_requirements: !ruby/object:Gem::Requirement
310
- requirements:
311
- - - ">="
312
- - !ruby/object:Gem::Version
313
- version: '0'
314
- - !ruby/object:Gem::Dependency
315
- name: rubocop
316
- requirement: !ruby/object:Gem::Requirement
317
- requirements:
318
- - - ">="
319
- - !ruby/object:Gem::Version
320
- version: '0'
321
- type: :development
322
- prerelease: false
323
- version_requirements: !ruby/object:Gem::Requirement
324
- requirements:
325
- - - ">="
326
- - !ruby/object:Gem::Version
327
- version: '0'
328
- - !ruby/object:Gem::Dependency
329
- name: simplecov
330
- requirement: !ruby/object:Gem::Requirement
331
- requirements:
332
- - - ">="
333
- - !ruby/object:Gem::Version
334
- version: '0'
335
- type: :development
336
- prerelease: false
337
- version_requirements: !ruby/object:Gem::Requirement
338
- requirements:
339
- - - ">="
340
- - !ruby/object:Gem::Version
341
- version: '0'
153
+ version: '1.6'
342
154
  description: A command line tool for CircleCI
343
155
  email:
344
156
  - unhappychoice@gmail.com
@@ -348,6 +160,7 @@ extensions: []
348
160
  extra_rdoc_files: []
349
161
  files:
350
162
  - ".all-contributorsrc"
163
+ - ".github/CODEOWNERS"
351
164
  - ".github/dependabot.yml"
352
165
  - ".github/workflows/release.yaml"
353
166
  - ".github/workflows/test.yml"
@@ -380,6 +193,7 @@ files:
380
193
  - lib/circleci/cli/command/watch_command/build_repository.rb
381
194
  - lib/circleci/cli/command/watch_command/build_watcher.rb
382
195
  - lib/circleci/cli/networking.rb
196
+ - lib/circleci/cli/networking/http_client.rb
383
197
  - lib/circleci/cli/networking/pusher_client.rb
384
198
  - lib/circleci/cli/printer.rb
385
199
  - lib/circleci/cli/printer/build_printer.rb
@@ -406,7 +220,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
406
220
  requirements:
407
221
  - - ">="
408
222
  - !ruby/object:Gem::Version
409
- version: '3.1'
223
+ version: '3.3'
410
224
  required_rubygems_version: !ruby/object:Gem::Requirement
411
225
  requirements:
412
226
  - - ">="