circleci-cli 2.3.0 → 4.0.0

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

@@ -7,7 +7,6 @@ module CircleCI
         attr_reader :build
 
         def initialize(build, verbose: false)
-          @client = Networking::CircleCIPusherClient.new.tap(&:connect)
           @build = build
           @verbose = verbose
           @messages = Hash.new { |h, k| h[k] = [] }
@@ -19,14 +18,14 @@ module CircleCI
         end
 
         def stop(status)
-          @client.unsubscribe(@build.channel_name + '@0')
+          client.unsubscribe("#{@build.channel_name}@0")
           notify_stopped(status)
         end
 
         private
 
         def bind_event_handling(channel) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-          @client.bind_event_json(channel, 'newAction') do |json|
+          client.bind_event_json(channel, 'newAction') do |json|
             if @verbose
               print_bordered json['log']['name']
             else
@@ -34,7 +33,7 @@ module CircleCI
             end
           end
 
-          @client.bind_event_json(channel, 'appendAction') do |json|
+          client.bind_event_json(channel, 'appendAction') do |json|
             if @verbose
               Thor::Shell::Basic.new.say(json['out']['message'], nil, false)
             else
@@ -42,28 +41,32 @@ module CircleCI
             end
           end
 
-          @client.bind_event_json(channel, 'updateAction') do |json|
+          client.bind_event_json(channel, 'updateAction') do |json|
             next if @verbose
 
             case json['log']['status']
             when 'success'
-              puts "\e[2K\r#{json['log']['name'].green}"
+              puts "\e[2K\r#{Printer.colorize_green(json['log']['name'])}"
             when 'failed'
-              puts "\e[2K\r#{json['log']['name'].red}"
+              puts "\e[2K\r#{Printer.colorize_red(json['log']['name'])}"
               @messages[json['step']].each(&method(:say))
             end
           end
         end
 
         def notify_started
-          title = "👀 Start watching #{@build.project_name} ##{@build.build_number}"
-          say Printer::BuildPrinter.header_for(@build, title)
+          say Printer::BuildPrinter.header_for(
+            @build,
+            "👀 Start watching #{@build.project_name} ##{@build.build_number}"
+          )
         end
 
         def notify_stopped(status)
           text = case status
-                 when 'success' then "🎉 #{@build.project_name} ##{@build.build_number} has succeeded!".green
-                 when 'failed' then "😥 #{@build.project_name} ##{@build.build_number} has failed...".red
+                 when 'success'
+                   Printer.colorize_green("🎉 #{@build.project_name} ##{@build.build_number} has succeeded!")
+                 when 'failed'
+                   Printer.colorize_red("😥 #{@build.project_name} ##{@build.build_number} has failed...")
                  end
 
           @verbose ? print_bordered(text) : say(text)
@@ -72,6 +75,10 @@ module CircleCI
         def print_bordered(text)
           say Terminal::Table.new(rows: [[text]], style: { width: 120 }).to_s
         end
+
+        def client
+          @client ||= Networking::CircleCIPusherClient.new.tap(&:connect)
+        end
       end
     end
   end

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

@@ -13,7 +13,12 @@ module CircleCI
 
             username, reponame = project_name(options).split('/')
             @options = options
-            @repository = BuildRepository.new(username, reponame, branch: options.branch, user: options.user)
+            @repository = BuildRepository.new(
+              username,
+              reponame,
+              branch: branch_name(options),
+              user: options.user
+            )
             @client = Networking::CircleCIPusherClient.new.tap(&:connect)
             @build_watcher = nil
 

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

@@ -8,45 +8,39 @@ module CircleCI
       class CircleCIPusherClient
         def connect
           PusherClient.logger.level = Logger::ERROR
-          @socket = PusherClient::Socket.new(app_key, pusher_options)
-          @socket.connect(true)
+          socket.connect(true)
         end
 
-        def bind(channel, event)
-          @socket.subscribe(channel)
-          @socket[channel].bind(event) do |data|
-            yield data
-          end
+        def bind(channel, event, &)
+          socket.subscribe(channel)
+          socket[channel].bind(event, &)
         end
 
-        def bind_event_json(channel, event)
-          bind(channel, event) do |data|
-            JSON.parse(data).each { |json| yield(json) }
-          end
+        def bind_event_json(channel, event, &)
+          bind(channel, event) { |data| JSON.parse(data).each(&) }
         end
 
         def unsubscribe(channel)
-          @socket.unsubscribe(channel)
+          socket.unsubscribe(channel)
         end
 
         private
 
-        def app_key
-          '1cf6e0e755e419d2ac9a'
-        end
-
-        def pusher_options
-          {
+        def socket
+          @socket ||= PusherClient::Socket.new(
+            '1cf6e0e755e419d2ac9a',
             secure: true,
             auth_method: proc { |a, b| auth(a, b) },
             logger: Logger.new('/dev/null')
-          }
+          )
         end
 
         def auth(socket_id, channel)
-          data = { socket_id: socket_id, channel_name: channel.name }
-          token = ENV['CIRCLE_CI_TOKEN'] || ask('Circle CI token ? :')
-          res = connection.post("/auth/pusher?circle-token=#{token}", data)
+          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
 

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

@@ -7,17 +7,18 @@ module CircleCI
         class << self
           def header_for(build, title)
             texts = [
-              ['Project:  ' + build.project_name],
-              ['Build:    ' + build.build_number.to_s],
-              ['Author:   ' + build.author_name],
-              ['Workflow: ' + "#{build.workflow_name}/#{build.workflow_job_name}"]
+              ["Project:  #{build.project_name}"],
+              ["Build:    #{build.build_number}"],
+              ["Author:   #{build.author_name}"],
+              ["Workflow: #{build.workflow_name}/#{build.workflow_job_name}"]
             ]
-            Terminal::Table.new(title: title, rows: texts, style: { width: 120 }).to_s
+            Terminal::Table.new(title:, rows: texts, style: { width: 120 }).to_s
           end
         end
 
-        def initialize(builds, pretty: true)
+        def initialize(builds, project_name, pretty: true)
           @builds_to_show = builds
+          @project_name = project_name
           @pretty = pretty
         end
 
@@ -32,12 +33,11 @@ module CircleCI
         end
 
         def print_pretty
-          Terminal::Table.new(title: title, headings: headings, rows: rows).to_s
+          Terminal::Table.new(title:, headings:, rows:).to_s
         end
 
         def title
-          build = @builds_to_show.first
-          "Recent Builds / #{build.project_name}".green
+          Printer.colorize_green("Recent Builds / #{@project_name}")
         end
 
         def headings

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

@@ -5,6 +5,7 @@ module CircleCI
     module Printer
       class ProjectPrinter
         attr_accessor :compact
+
         def initialize(projects, pretty: true)
           @projects = projects
           @pretty = pretty
@@ -26,7 +27,7 @@ module CircleCI
 
         def print_pretty
           Terminal::Table.new(
-            title: 'Projects'.green,
+            title: Printer.colorize_green('Projects'),
             headings: ['User name', 'Repository name'],
             rows: @projects.map(&:information)
           ).to_s

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

@@ -9,14 +9,14 @@ module CircleCI
           @pretty = pretty
         end
 
-        def to_s # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        def to_s # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
           if @pretty
             Terminal::Table.new do |t|
               @steps
                 .group_by(&:type)
                 .each do |key, steps|
                 t << :separator
-                t << [{ value: key.green, alignment: :center, colspan: 2 }]
+                t << [{ value: Printer.colorize_green(key), alignment: :center, colspan: 2 }]
                 steps.each { |s| print_actions(t, s) }
               end
             end.to_s
@@ -26,7 +26,7 @@ module CircleCI
                 step.actions.map do |a|
                   "#{colorize_by_status(a.name.slice(0..120), a.status)}\n#{"#{a.log}\n" if a.failed? && a.log}"
                 end
-              end.flatten.join('')
+              end.flatten.join
             end.join("\n")
           end
         end
@@ -35,10 +35,10 @@ module CircleCI
 
         def colorize_by_status(string, status)
           case status
-          when 'success', 'fixed' then string.green
-          when 'canceled' then string.yellow
-          when 'failed', 'timedout' then string.red
-          when 'no_tests', 'not_run' then string.light_black
+          when 'success', 'fixed' then Printer.colorize_green(string)
+          when 'canceled' then Printer.colorize_yellow(string)
+          when 'failed', 'timedout' then Printer.colorize_red(string)
+          when 'no_tests', 'not_run' then Printer.colorize_light_black(string)
           else string
           end
         end
@@ -46,8 +46,8 @@ module CircleCI
         def format_time(time)
           return '' unless time
 
-          minute = format('%02d', time / 1000 / 60)
-          second = format('%02d', (time / 1000) % 60)
+          minute = format('%<time>02d', time: time / 1000 / 60)
+          second = format('%<time>02d', time: (time / 1000) % 60)
           "#{minute}:#{second}"
         end
 

data/lib/circleci/cli/printer.rb

@@ -6,6 +6,30 @@ require 'circleci/cli/printer/step_printer'
 
 module CircleCI
   module CLI
-    module Printer; end
+    module Printer
+      class << self
+        def colorize_red(string)
+          colorize(string, '0;31;49')
+        end
+
+        def colorize_green(string)
+          colorize(string, '0;32;49')
+        end
+
+        def colorize_yellow(string)
+          colorize(string, '0;33;49')
+        end
+
+        def colorize_light_black(string)
+          colorize(string, '0;90;49')
+        end
+
+        private
+
+        def colorize(string, color_code)
+          "\e[#{color_code}m#{string}\e[0m"
+        end
+      end
+    end
   end
 end

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

@@ -5,6 +5,7 @@ module CircleCI
     module Response
       class Action
         attr_reader :name, :status, :run_time_millis
+
         def initialize(hash)
           @hash = hash
           @name = hash['name']

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

@@ -39,7 +39,7 @@ module CircleCI
         attr_reader :username, :build_number, :reponame, :branch, :status, :author_name, :start_time,
                     :user, :workflow_name, :workflow_job_name
 
-        def initialize(hash)
+        def initialize(hash) # rubocop:disable Metrics/MethodLength
           @hash = hash
           @username = hash['username']
           @build_number = hash['build_num']
@@ -90,10 +90,10 @@ module CircleCI
 
         def colorize_by_status(string, status)
           case status
-          when 'success', 'fixed' then string.green
-          when 'canceled' then string.yellow
-          when 'failed' then string.red
-          when 'no_tests', 'not_run' then string.light_black
+          when 'success', 'fixed' then Printer.colorize_green(string)
+          when 'canceled' then Printer.colorize_yellow(string)
+          when 'failed' then Printer.colorize_red(string)
+          when 'no_tests', 'not_run' then Printer.colorize_light_black(string)
           else string
           end
         end
@@ -101,8 +101,8 @@ module CircleCI
         def format_time(time)
           return '' unless time
 
-          minute = format('%02d', time / 1000 / 60)
-          second = format('%02d', (time / 1000) % 60)
+          minute = format('%<time>02d', time: time / 1000 / 60)
+          second = format('%<time>02d', time: (time / 1000) % 60)
           "#{minute}:#{second}"
         end
       end

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

@@ -4,8 +4,7 @@ module CircleCI
   module CLI
     module Response
       class Step
-        attr_reader :type
-        attr_reader :status
+        attr_reader :type, :status
 
         def initialize(type, hash)
           @type = type

data/lib/circleci/cli/version.rb

@@ -2,6 +2,6 @@
 
 module CircleCI
   module CLI
-    VERSION = '2.3.0'
+    VERSION = '4.0.0'
   end
 end

data/lib/circleci/cli.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'thor'
+require 'circleci'
 require 'faraday'
-require 'launchy'
-require 'terminal-table'
 require 'highline/import'
-require 'colorize'
+require 'launchy'
+require 'ostruct'
 require 'rugged'
-require 'circleci'
 require 'terminal-notifier'
+require 'terminal-table'
+require 'thor'
 
 require 'circleci/cli/version'
 require 'circleci/cli/command'
@@ -18,61 +18,149 @@ require 'circleci/cli/networking'
 
 module CircleCI
   module CLI
-    class Runner < Thor
-      desc 'projects', 'list projects'
-      method_option :format, aliases: 'f', type: :string, banner: 'pretty/simple'
+    class Runner < Thor # rubocop:disable Metrics/ClassLength
+      package_name 'circleci-cli'
+
+      class << self
+        def project
+          repository = Rugged::Repository.new('.')
+          origin = repository.remotes.find { |r| r.name == 'origin' }
+          regexp = %r{(?:git@|https://)github.com(?::|/)([\w_-]+/[.\w_-]+?)(?:\.git)*$}
+          return Regexp.last_match(1) if origin.url =~ regexp
+
+          nil
+        end
+
+        def branch_name
+          repository = Rugged::Repository.new('.')
+          head = repository.head
+
+          return nil unless head.branch?
+
+          head.name.sub(%r{\Arefs/heads/}, '')
+        end
+      end
+
+      desc 'projects', 'List projects'
+      method_option :pretty, type: :boolean, default: true, desc: 'Make output pretty'
       def projects
         Command::ProjectsCommand.run(options)
       end
 
-      desc 'builds', 'list builds'
-      method_option :project, aliases: 'p', type: :string, banner: 'user/project'
-      method_option :branch, aliases: 'b', type: :string, banner: 'some-branch'
-      method_option :format, aliases: 'f', type: :string, banner: 'pretty/simple'
+      desc 'builds', 'List builds'
+      method_option :project,
+                    aliases: 'p',
+                    type: :string,
+                    banner: 'user/project',
+                    default: project,
+                    desc: 'A project you want to get.'
+      method_option :branch,
+                    aliases: 'b',
+                    type: :string,
+                    banner: 'some-branch',
+                    default: branch_name,
+                    desc: 'A branch name you want to filter with.'
+      method_option :all,
+                    aliases: 'a',
+                    type: :boolean,
+                    default: false,
+                    desc: 'Target all the branches. This option overwrites branch option.'
+      method_option :pretty, type: :boolean, banner: 'true/false', default: true, desc: 'Make output pretty.'
       def builds
         Command::BuildsCommand.run(options)
       end
 
-      desc 'build', 'show build description'
-      method_option :project, aliases: 'p', type: :string, banner: 'user/project'
-      method_option :build, aliases: 'n', type: :numeric, banner: 'build-number'
-      method_option :last, aliases: 'l', type: :boolean, banner: 'get last failed build'
+      desc 'build', 'Show the build result'
+      method_option :project,
+                    aliases: 'p',
+                    type: :string,
+                    banner: 'user/project',
+                    default: project,
+                    desc: 'A project you want to get.'
+      method_option :build, aliases: 'n', type: :numeric, banner: 'build-number', desc: 'Build number you want to get.'
+      method_option :last, aliases: 'l', type: :boolean, default: false, desc: 'Get last failed build.'
+      method_option :pretty, type: :boolean, banner: 'true/false', default: true, desc: 'Make output pretty.'
       def build
         Command::BuildCommand.run(options)
       end
 
-      desc 'browse', 'open circle ci website'
-      method_option :project, aliases: 'p', type: :string, banner: 'user/project'
-      method_option :build, aliases: 'n', type: :numeric, banner: 'build-number'
+      desc 'browse', 'Open CircleCI website'
+      method_option :project,
+                    aliases: 'p',
+                    type: :string,
+                    banner: 'user/project',
+                    default: project,
+                    desc: 'A project you want to get.'
+      method_option :build,
+                    aliases: 'n',
+                    type: :numeric,
+                    banner: 'build-number',
+                    desc: 'Build number you want to browse.'
       def browse
         Command::BrowseCommand.run(options)
       end
 
-      desc 'retry', 'retry a build'
-      method_option :project, aliases: 'p', type: :string, banner: 'user/project'
-      method_option :build, aliases: 'n', type: :numeric, banner: 'build-number'
-      method_option :last, aliases: 'l', type: :boolean, banner: 'retry last failed build'
+      desc 'retry', 'Retry a build'
+      method_option :project,
+                    aliases: 'p',
+                    type: :string,
+                    banner: 'user/project',
+                    default: project,
+                    desc: 'A project you want to get.'
+      method_option :build,
+                    aliases: 'n',
+                    type: :numeric,
+                    banner: 'build-number',
+                    desc: 'Build number you want to retry.'
+      method_option :last, aliases: 'l', type: :boolean, desc: 'Retry last failed build.'
       def retry
         Command::RetryCommand.run(options)
       end
 
-      desc 'cancel', 'cancel a build'
-      method_option :project, aliases: 'p', type: :string, banner: 'user/project'
-      method_option :build, aliases: 'n', type: :numeric, banner: 'build-number'
+      desc 'cancel', 'Cancel a build'
+      method_option :project,
+                    aliases: 'p',
+                    type: :string,
+                    default: project,
+                    desc: 'A project you want to get.'
+      method_option :build,
+                    aliases: 'n',
+                    type: :numeric,
+                    banner: 'build-number',
+                    desc: 'Build number you want to cancel.'
       def cancel
         Command::CancelCommand.run(options)
       end
 
-      desc 'watch', 'watch a build in real time'
-      method_option :project, aliases: 'p', type: :string, banner: 'user/project'
-      method_option :branch, aliases: 'b', type: :string, banner: 'branch'
+      desc 'watch', 'Watch builds in real time'
+      method_option :project,
+                    aliases: 'p',
+                    type: :string,
+                    banner: 'user/project',
+                    default: project,
+                    desc: 'A project you want to get.'
+      method_option :branch,
+                    aliases: 'b',
+                    type: :string,
+                    banner: 'some-branch',
+                    default: branch_name,
+                    desc: 'A branch name you want to filter with.'
+      method_option :all,
+                    aliases: 'a',
+                    type: :boolean,
+                    default: false,
+                    desc: 'Target all the branches. This option overwrites branch option.'
       method_option :user, aliases: 'u', type: :string, banner: 'user'
-      method_option :verbose, aliases: 'v', type: :boolean, banner: 'verbose'
+      method_option :verbose,
+                    aliases: 'v',
+                    type: :boolean,
+                    default: false,
+                    desc: 'Show all the build logs including successful build steps.'
       def watch
         Command::WatchCommand.run(options)
       end
 
-      desc 'version', 'show gem version'
+      desc 'version', 'Show gem version'
       def version
         say CircleCI::CLI::VERSION
       end