circleci-cli 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90b6ab11da48868d2be56bf5dc12f260e4eccb095088c43afb1fff9e39ec547e
-  data.tar.gz: c7b1c2584bd04a9719d6e349c84f00f5b5d203412ebb537c774ae9d8ebdf6e24
+  metadata.gz: 48ac9fd488101c5ea586980d9c4d5aae4b227b5857e10fb9d618528e1dcd7f6b
+  data.tar.gz: 949fa9b4b2972939f2b1a19e50b76f49209b64fc2880718fe2cd1678adbe7b0d
 SHA512:
-  metadata.gz: 7e6ec3d626733e32229477cbe3fabcb11404b9014a4be827d49d0ce053b1a6079ee501c7d8f48b15ec2a7f44965ed8c7930df6c5086a706c2c6c9796be34b4e5
-  data.tar.gz: 2c779a15909f96203c82ebe5260e3770ae7079f5714e77462392e5f8f19b4457a804b1f3e36c872f29180655150819a8f26e348d69cdc8d9264cc79eb2e2d60b
+  metadata.gz: 5ada7004394b9515f32c5b8c77b65d43892ddcb7532d8463b9b30c27490ee4f254caeb3a7c78295087e918556032fb795e9568cabd45f64e4133c8d8325468f8
+  data.tar.gz: 7972c404010f3647726aa03b654996c1eb249345ea110052e4411060613b50f7cb1abcb340160568da7d2c192c06e6a66d21e7ece2a25b880b69574e54312617

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @unhappychoice

data/Gemfile

@@ -2,5 +2,17 @@
 
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in circle.gemspec
 gemspec
+
+gem 'abbrev'
+gem 'base64'
+gem 'bundler'
+gem 'codecov'
+gem 'github_changelog_generator'
+gem 'guard'
+gem 'guard-rspec'
+gem 'guard-rubocop'
+gem 'rake'
+gem 'rspec'
+gem 'rubocop'
+gem 'simplecov'

data/Gemfile.lock

@@ -1,22 +1,21 @@
 PATH
   remote: .
   specs:
-    circleci-cli (4.0.1)
+    circleci-cli (4.0.2)
       circleci (>= 2.1.0)
-      faraday (>= 0.14, < 2.14)
       highline (>= 1.7.8, < 3.2.0)
       launchy (>= 2.4.3, < 3.2.0)
       pusher-client (~> 0.6.2)
       rugged (>= 0.26, < 1.10)
       terminal-notifier (~> 2.0.0)
       terminal-table (>= 1.8, < 4.1)
-      thor (>= 0.20, < 1.4)
+      thor (>= 0.20, < 1.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
     abbrev (0.1.2)
-    activesupport (7.2.2.1)
+    activesupport (7.2.3)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -28,8 +27,8 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     async (2.24.0)
       console (~> 1.29)
@@ -53,16 +52,17 @@ GEM
     async-pool (0.10.3)
       async (>= 1.25)
     base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.2)
+    benchmark (0.5.0)
+    bigdecimal (4.0.1)
     childprocess (5.1.0)
       logger (~> 1.5)
     circleci (2.1.0)
-    codecov (0.6.0)
-      simplecov (>= 0.15, < 0.22)
+    codecov (0.2.12)
+      json
+      simplecov
     coderay (1.1.3)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    concurrent-ruby (1.3.6)
+    connection_pool (2.5.5)
     console (1.30.2)
       fiber-annotation
       fiber-local (~> 1.1)
@@ -70,20 +70,21 @@ GEM
     diff-lcs (1.6.2)
     docile (1.4.1)
     drb (2.2.3)
-    faraday (2.13.2)
+    faraday (2.14.0)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
     faraday-http-cache (2.5.1)
       faraday (>= 0.8)
-    faraday-net_http (3.4.1)
-      net-http (>= 0.5.0)
-    ffi (1.17.2)
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
+    ffi (1.17.3)
     fiber-annotation (0.2.0)
     fiber-local (1.1.0)
       fiber-storage
     fiber-storage (1.0.1)
-    formatador (1.1.0)
+    formatador (1.2.3)
+      reline
     github_changelog_generator (1.16.4)
       activesupport
       async (>= 1.25.0)
@@ -93,14 +94,13 @@ GEM
       octokit (~> 4.6)
       rainbow (>= 2.2.1)
       rake (>= 10.0)
-    guard (2.19.1)
+    guard (2.20.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       logger (~> 1.6)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      ostruct (~> 0.6)
       pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
@@ -114,43 +114,43 @@ GEM
       rubocop (< 2.0)
     highline (3.1.2)
       reline
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    io-console (0.8.0)
+    io-console (0.8.2)
     io-endpoint (0.15.2)
     io-event (1.11.2)
     io-stream (0.6.1)
-    json (2.12.2)
+    json (2.18.1)
     language_server-protocol (3.17.0.5)
     launchy (3.1.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
       logger (~> 1.6)
     lint_roller (1.1.0)
-    listen (3.9.0)
+    listen (3.10.0)
+      logger
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    lumberjack (1.2.10)
+    lumberjack (1.4.2)
     method_source (1.1.0)
     metrics (0.12.2)
-    minitest (5.25.5)
-    multi_json (1.15.0)
+    minitest (5.27.0)
+    multi_json (1.19.1)
     nenv (0.3.0)
-    net-http (0.6.0)
-      uri
+    net-http (0.9.1)
+      uri (>= 0.11.1)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    ostruct (0.6.2)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.10.1)
       ast (~> 2.4.1)
       racc
-    prism (1.4.0)
+    prism (1.9.0)
     protocol-hpack (1.5.1)
     protocol-http (0.49.0)
     protocol-http1 (0.34.0)
@@ -158,36 +158,37 @@ GEM
     protocol-http2 (0.22.1)
       protocol-hpack (~> 1.4)
       protocol-http (~> 0.47)
-    pry (0.15.2)
+    pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
+      reline (>= 0.6.0)
     public_suffix (6.0.2)
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.3.0)
+    rake (13.3.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    regexp_parser (2.10.0)
-    reline (0.6.1)
+    regexp_parser (2.11.3)
+    reline (0.6.3)
       io-console (~> 0.5)
-    rspec (3.13.1)
+    rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.5)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
+    rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.4)
-    rubocop (1.78.0)
+    rspec-support (3.13.7)
+    rubocop (1.84.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -195,36 +196,36 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.45.1, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.1)
+    rubocop-ast (1.49.0)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
+      prism (~> 1.7)
     ruby-progressbar (1.13.0)
     rugged (1.9.0)
-    sawyer (0.9.2)
+    sawyer (0.9.3)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     securerandom (0.4.1)
     shellany (0.0.1)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     terminal-notifier (2.0.0)
     terminal-table (4.0.0)
       unicode-display_width (>= 1.1.1, < 4)
-    thor (1.3.2)
+    thor (1.5.0)
     traces (0.15.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    uri (1.0.3)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
+    uri (1.1.1)
     websocket (1.2.11)
 
 PLATFORMS

data/circleci-cli.gemspec

@@ -6,29 +6,14 @@ require 'circleci/cli/version'
 
 def production_dependency(spec)
   spec.add_dependency 'circleci', '>= 2.1.0'
-  spec.add_dependency 'faraday', '>= 0.14', '< 2.14'
+
   spec.add_dependency 'highline', '>= 1.7.8', '< 3.2.0'
   spec.add_dependency 'launchy', '>= 2.4.3', '< 3.2.0'
   spec.add_dependency 'pusher-client', '~> 0.6.2'
   spec.add_dependency 'rugged', '>= 0.26', '< 1.10'
   spec.add_dependency 'terminal-notifier', '~> 2.0.0'
   spec.add_dependency 'terminal-table', '>= 1.8', '< 4.1'
-  spec.add_dependency 'thor', '>= 0.20', '< 1.4'
-end
-
-def development_dependency(spec)
-  spec.add_development_dependency 'abbrev'
-  spec.add_development_dependency 'base64'
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'codecov'
-  spec.add_development_dependency 'github_changelog_generator'
-  spec.add_development_dependency 'guard'
-  spec.add_development_dependency 'guard-rspec'
-  spec.add_development_dependency 'guard-rubocop'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'simplecov'
+  spec.add_dependency 'thor', '>= 0.20', '< 1.6'
 end
 
 def project_files
@@ -57,5 +42,4 @@ Gem::Specification.new do |spec|
   }
 
   production_dependency spec
-  development_dependency spec
 end

data/lib/circleci/cli/command/watch_command/build_watcher.rb

@@ -96,10 +96,11 @@ module CircleCI
         def update_actions
           return unless @current_step
 
-          response = Faraday.new(
-            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}",
-            headers: { Range: "bytes=#{@read_byte}-" }
-          ).get.body
+          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}"
+          headers = { 'Range' => "bytes=#{@read_byte}-" }
+          res = HTTPClient.get(url, headers)
+
+          response = res.body
 
           return if response.empty?
 

data/lib/circleci/cli/networking/http_client.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'net/http'
+require 'json'
+
+module CircleCI
+  module CLI
+    module Networking
+      module HTTPClient
+        def self.get(url, headers = {})
+          uri = URI(url)
+          req = Net::HTTP::Get.new(uri)
+          headers.each { |key, value| req[key] = value }
+          res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
+            http.request(req)
+          end
+          JSON.parse(res.body)
+        end
+
+        def self.post_form(url, params = {})
+          uri = URI(url)
+          res = Net::HTTP.post_form(uri, params)
+          JSON.parse(res.body)
+        end
+      end
+    end
+  end
+end

data/lib/circleci/cli/networking/pusher_client.rb

@@ -37,18 +37,9 @@ module CircleCI
 
         def auth(socket_id, channel)
           token = ENV.fetch('CIRCLE_CI_TOKEN', nil) || ask('Circle CI token ? :')
-          res = connection.post(
-            "/auth/pusher?circle-token=#{token}",
-            { socket_id:, channel_name: channel.name }
-          )
-          JSON.parse(res.body)['auth']
-        end
-
-        def connection
-          Faraday.new(url: 'https://circleci.com') do |f|
-            f.request :url_encoded
-            f.adapter Faraday.default_adapter
-          end
+          res = HTTPClient.post_form("https://circleci.com/auth/pusher?circle-token=#{token}",
+                                     { socket_id: socket_id, channel_name: channel.name })
+          res['auth']
         end
       end
     end

data/lib/circleci/cli/printer/step_printer.rb

@@ -15,9 +15,9 @@ module CircleCI
               @steps
                 .group_by(&:type)
                 .each do |key, steps|
-                t << :separator
-                t << [{ value: Printer.colorize_green(key), alignment: :center, colspan: 2 }]
-                steps.each { |s| print_actions(t, s) }
+                  t << :separator
+                  t << [{ value: Printer.colorize_green(key), alignment: :center, colspan: 2 }]
+                  steps.each { |s| print_actions(t, s) }
               end
             end.to_s
           else

data/lib/circleci/cli/response/action.rb

@@ -17,13 +17,13 @@ module CircleCI
         end
 
         def log
-          request(@hash['output_url'])
-            .map do |r|
-            r['message']
-              .gsub("\r\n", "\n")
-              .gsub("\e[A\r\e[2K", '')
-              .scan(/.{1,120}/)
-              .join("\n")
+          HTTPClient.get(@hash['output_url'])
+                    .map do |r|
+                      r['message']
+                        .gsub("\r\n", "\n")
+                        .gsub("\e[A\r\e[2K", '')
+                        .scan(/.{1,120}/)
+                        .join("\n")
           end
             .join("\n")
         end
@@ -31,12 +31,6 @@ module CircleCI
         def failed?
           @status == 'timedout' || @status == 'failed'
         end
-
-        private
-
-        def request(url)
-          JSON.parse(Faraday.new(url).get.body)
-        end
       end
     end
   end

data/lib/circleci/cli/version.rb

@@ -2,6 +2,6 @@
 
 module CircleCI
   module CLI
-    VERSION = '4.0.1'
+    VERSION = '4.0.2'
   end
 end

data/lib/circleci/cli.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'circleci'
-require 'faraday'
+
 require 'highline/import'
 require 'launchy'
 require 'ostruct'
@@ -14,6 +14,7 @@ require 'circleci/cli/version'
 require 'circleci/cli/command'
 require 'circleci/cli/response'
 require 'circleci/cli/printer'
+require 'circleci/cli/networking/http_client'
 require 'circleci/cli/networking'
 
 module CircleCI

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circleci-cli
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - unhappychoice
@@ -23,26 +23,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.14'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.14'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +140,7 @@ dependencies:
         version: '0.20'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,175 +150,7 @@ dependencies:
         version: '0.20'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: abbrev
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: base64
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: codecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 description: A command line tool for CircleCI
 email:
 - unhappychoice@gmail.com
@@ -348,6 +160,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".all-contributorsrc"
+- ".github/CODEOWNERS"
 - ".github/dependabot.yml"
 - ".github/workflows/release.yaml"
 - ".github/workflows/test.yml"
@@ -380,6 +193,7 @@ files:
 - lib/circleci/cli/command/watch_command/build_repository.rb
 - lib/circleci/cli/command/watch_command/build_watcher.rb
 - lib/circleci/cli/networking.rb
+- lib/circleci/cli/networking/http_client.rb
 - lib/circleci/cli/networking/pusher_client.rb
 - lib/circleci/cli/printer.rb
 - lib/circleci/cli/printer/build_printer.rb