abt-cli 0.0.19 → 0.0.24

data/lib/abt/providers/devops/commands/pick.rb

@@ -6,48 +6,54 @@ module Abt
       module Commands
         class Pick < BaseCommand
           def self.usage
-            'abt pick devops[:<organization-name>/<project-name>/<board-id>]'
+            "abt pick devops[:<organization-name>/<project-name>/<board-id>]"
           end
 
           def self.description
-            'Pick work item for current git repository'
+            "Pick work item for current git repository"
           end
 
           def self.flags
             [
-              ['-d', '--dry-run', 'Keep existing configuration']
+              ["-d", "--dry-run", "Keep existing configuration"]
             ]
           end
 
           def perform
-            abort 'Must be run inside a git repository' unless config.local_available?
+            require_local_config!
             require_board!
 
-            warn "#{project_name} - #{board['name']}"
+            warn("#{project_name} - #{board['name']}")
 
             work_item = select_work_item
             print_work_item(organization_name, project_name, board, work_item)
 
             return if flags[:"dry-run"]
 
-            config.path = Path.from_ids(organization_name, project_name, board_id, work_item['id'])
+            update_config(work_item)
           end
 
           private
 
+          def update_config(work_item)
+            config.path = Path.from_ids(
+              organization_name: organization_name,
+              project_name: project_name,
+              board_id: board_id,
+              work_item_id: work_item["id"]
+            )
+          end
+
           def select_work_item
-            loop do
-              column = cli.prompt.choice 'Which column?', columns
-              warn 'Fetching work items...'
-              work_items = work_items_in_column(column)
-
-              if work_items.length.zero?
-                warn 'Section is empty'
-                next
-              end
-
-              work_item = cli.prompt.choice 'Select a work item', work_items, true
-              return work_item if work_item
+            column = cli.prompt.choice("Which column?", columns)
+            warn("Fetching work items...")
+            work_items = work_items_in_column(column)
+
+            if work_items.length.zero?
+              warn("Section is empty")
+              select_work_item
+            else
+              cli.prompt.choice("Select a work item", work_items, nil_option: true) || select_work_item
             end
           end
 
@@ -65,7 +71,7 @@ module Abt
           end
 
           def columns
-            board['columns']
+            board["columns"]
           end
 
           def board

data/lib/abt/providers/devops/commands/share.rb

@@ -6,17 +6,19 @@ module Abt
       module Commands
         class Share < BaseCommand
           def self.usage
-            'abt share devops[:<organization-name>/<project-name>/<board-id>[/<work-item-id>]]'
+            "abt share devops[:<organization-name>/<project-name>/<board-id>[/<work-item-id>]]"
           end
 
           def self.description
-            'Print DevOps ARI'
+            "Print DevOps ARI"
           end
 
           def perform
-            require_board!
-
-            cli.print_ari('devops', path)
+            if path != ""
+              cli.print_ari("devops", path)
+            elsif cli.output.isatty
+              warn("No configuration for project. Did you initialize DevOps?")
+            end
           end
         end
       end

data/lib/abt/providers/devops/commands/{work-items.rb → work_items.rb}

@@ -6,11 +6,11 @@ module Abt
       module Commands
         class WorkItems < BaseCommand
           def self.usage
-            'abt work-items devops'
+            "abt work-items devops"
           end
 
           def self.description
-            'List all work items on board - useful for piping into grep etc.'
+            "List all work items on board - useful for piping into grep etc."
           end
 
           def perform
@@ -25,7 +25,7 @@ module Abt
 
           def work_items
             @work_items ||= begin
-              warn 'Fetching work items...'
+              warn("Fetching work items...")
               api.work_item_query(
                 <<~WIQL
                   SELECT [System.Id]

data/lib/abt/providers/devops/configuration.rb

@@ -15,11 +15,11 @@ module Abt
         end
 
         def path
-          Path.new(local_available? && git['path'] || '')
+          Path.new(local_available? && git["path"] || "")
         end
 
         def path=(new_path)
-          git['path'] = new_path
+          git["path"] = new_path
         end
 
         def clear_local(verbose: true)
@@ -37,8 +37,8 @@ module Abt
 
           git_global[username_key] = cli.prompt.text([
             "Please provide your username for the DevOps organization (#{organization_name}).",
-            '',
-            'Enter username'
+            "",
+            "Enter username"
           ].join("\n"))
         end
 
@@ -47,25 +47,25 @@ module Abt
 
           return git_global[access_token_key] unless git_global[access_token_key].nil?
 
-          git_global[access_token_key] = cli.prompt.text([
-            "Please provide your personal access token for the DevOps organization (#{organization_name}).",
-            'If you don\'t have one, follow the guide here: https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate',
-            '',
-            'The token MUST have "Read" permission for Work Items',
-            'Future features will likely require "Write" or "Manage"',
-            '',
-            'Enter access token'
-          ].join("\n"))
+          git_global[access_token_key] = cli.prompt.text(<<~TXT)
+            Please provide your personal access token for the DevOps organization (#{organization_name}).
+            If you don't have one, follow the guide here: https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate
+
+            The token MUST have "Read" permission for Work Items
+            Future features will likely require "Write" or "Manage
+
+            Enter access token"
+          TXT
         end
 
         private
 
         def git
-          @git ||= GitConfig.new('local', 'abt.devops')
+          @git ||= GitConfig.new("local", "abt.devops")
         end
 
         def git_global
-          @git_global ||= GitConfig.new('global', 'abt.devops')
+          @git_global ||= GitConfig.new("global", "abt.devops")
         end
       end
     end

data/lib/abt/providers/devops/path.rb

@@ -9,16 +9,17 @@ module Abt
         BOARD_ID_REGEX = /(?<board_id>[a-z0-9\-]+)/.freeze
         WORK_ITEM_ID_REGEX = /(?<work_item_id>\d+)/.freeze
 
-        PATH_REGEX = %r{^(#{ORGANIZATION_NAME_REGEX}/#{PROJECT_NAME_REGEX}/#{BOARD_ID_REGEX})?(/#{WORK_ITEM_ID_REGEX})?}.freeze
+        PATH_REGEX =
+          %r{^(#{ORGANIZATION_NAME_REGEX}/#{PROJECT_NAME_REGEX}(/#{BOARD_ID_REGEX}(/#{WORK_ITEM_ID_REGEX})?)?)?}.freeze
 
-        def self.from_ids(organization_id = nil, project_name = nil, board_id = nil, work_item_id = nil)
-          return new unless organization_id && project_name && board_id
+        def self.from_ids(organization_name: nil, project_name: nil, board_id: nil, work_item_id: nil)
+          return new unless organization_name && project_name && board_id
 
-          new [organization_id, project_name, board_id, *work_item_id].join('/')
+          new([organization_name, project_name, board_id, *work_item_id].join("/"))
         end
 
-        def initialize(path = '')
-          raise Abt::Cli::Abort, "Invalid path: #{path}" unless path =~ PATH_REGEX
+        def initialize(path = "")
+          raise Abt::Cli::Abort, "Invalid path: #{path}" unless PATH_REGEX.match?(path)
 
           super
         end

data/lib/abt/providers/git/commands/branch.rb

@@ -6,16 +6,16 @@ module Abt
       module Commands
         class Branch < Abt::BaseCommand
           def self.usage
-            'abt branch git <scheme>[:<path>]'
+            "abt branch git <scheme>[:<path>]"
           end
 
           def self.description
-            'Switch branch. Uses a compatible scheme to generate the branch-name: E.g. `abt branch git asana`'
+            "Switch branch. Uses a compatible scheme to generate the branch-name: E.g. `abt branch git asana`"
           end
 
           def perform
             switch || create_and_switch
-            warn "Switched to #{branch_name}"
+            warn("Switched to #{branch_name}")
           end
 
           private
@@ -29,8 +29,8 @@ module Abt
           end
 
           def create_and_switch
-            warn "No such branch: #{branch_name}"
-            abort('Aborting') unless cli.prompt.boolean 'Create branch?'
+            warn("No such branch: #{branch_name}")
+            abort("Aborting") unless cli.prompt.boolean("Create branch?")
 
             Open3.popen3("git switch -c #{branch_name}") do |_i, _o, _e, thread|
               thread.value
@@ -40,20 +40,20 @@ module Abt
           def branch_name # rubocop:disable Metrics/MethodLength
             @branch_name ||= begin
               if branch_names_from_aris.empty?
-                abort [
-                  'None of the specified ARIs responded to `branch-name`.',
-                  'Did you add compatible scheme? e.g.:',
-                  '   abt branch git asana',
-                  '   abt branch git devops'
-                ].join("\n")
+                abort([
+                  "None of the specified ARIs responded to `branch-name`.",
+                  "Did you add compatible scheme? e.g.:",
+                  "   abt branch git asana",
+                  "   abt branch git devops"
+                ].join("\n"))
               end
 
               if branch_names_from_aris.length > 1
-                abort [
-                  'Got branch names from multiple ARIs, only one is supported',
-                  'Branch names were:',
+                abort([
+                  "Got branch names from multiple ARIs, only one is supported",
+                  "Branch names were:",
                   *branch_names_from_aris.map { |name| "   #{name}" }
-                ].join("\n")
+                ].join("\n"))
               end
 
               branch_names_from_aris.first
@@ -61,17 +61,19 @@ module Abt
           end
 
           def branch_names_from_aris
-            other_aris = cli.aris - [ari]
+            return @branch_names_from_aris if instance_variable_defined?(:@branch_names_from_aris)
 
-            if other_aris.empty?
-              abort 'You must provide an additional ARI that responds to: branch-name. E.g., asana'
-            end
+            abort("You must provide an additional ARI that responds to: branch-name. E.g., asana") if other_aris.empty?
 
             input = StringIO.new(cli.aris.to_s)
             output = StringIO.new
-            Abt::Cli.new(argv: ['branch-name'], output: output, input: input).perform
+            Abt::Cli.new(argv: ["branch-name"], output: output, input: input).perform
+
+            @branch_names_from_aris = output.string.lines.map(&:strip).compact
+          end
 
-            output.string.lines.map(&:strip).compact
+          def other_aris
+            @other_aris ||= cli.aris - [ari]
           end
         end
       end

data/lib/abt/providers/harvest/api.rb

@@ -4,8 +4,8 @@ module Abt
   module Providers
     module Harvest
       class Api
-        API_ENDPOINT = 'https://api.harvestapp.com/v2'
-        VERBS = %i[get post patch].freeze
+        API_ENDPOINT = "https://api.harvestapp.com/v2"
+        VERBS = [:get, :post, :patch].freeze
 
         attr_reader :access_token, :account_id
 
@@ -21,7 +21,7 @@ module Abt
         end
 
         def get_paged(path, query = {})
-          result_key = path.split('?').first.split('/').last
+          result_key = path.split("?").first.split("/").last
 
           page = 1
           records = []
@@ -29,7 +29,7 @@ module Abt
           loop do
             result = get(path, query.merge(page: page))
             records += result[result_key]
-            break if result['total_pages'] == page
+            break if result["total_pages"] == page
 
             page += 1
           end
@@ -44,16 +44,16 @@ module Abt
             Oj.load(response.body)
           else
             error_class = Abt::HttpError.error_class_for_status(response.status)
-            encoded_response_body = response.body.force_encoding('utf-8')
+            encoded_response_body = response.body.force_encoding("utf-8")
             raise error_class, "Code: #{response.status}, body: #{encoded_response_body}"
           end
         end
 
         def connection
           @connection ||= Faraday.new(API_ENDPOINT) do |connection|
-            connection.headers['Authorization'] = "Bearer #{access_token}"
-            connection.headers['Harvest-Account-Id'] = account_id
-            connection.headers['Content-Type'] = 'application/json'
+            connection.headers["Authorization"] = "Bearer #{access_token}"
+            connection.headers["Harvest-Account-Id"] = account_id
+            connection.headers["Content-Type"] = "application/json"
           end
         end
       end

data/lib/abt/providers/harvest/base_command.rb

@@ -19,31 +19,33 @@ module Abt
 
         private
 
+        def require_local_config!
+          abort("Must be run inside a git repository") unless config.local_available?
+        end
+
         def require_project!
           return if project_id
 
-          abort 'No current/specified project. Did you initialize Harvest?'
+          abort("No current/specified project. Did you initialize Harvest?")
         end
 
         def require_task!
-          unless project_id
-            abort 'No current/specified project. Did you initialize Harvest and pick a task?'
-          end
+          abort("No current/specified project. Did you initialize Harvest and pick a task?") unless project_id
 
-          abort 'No current/specified task. Did you pick a Harvest task?' if task_id.nil?
+          abort("No current/specified task. Did you pick a Harvest task?") if task_id.nil?
         end
 
         def print_project(project)
           cli.print_ari(
-            'harvest',
-            project['id'],
+            "harvest",
+            project["id"],
             "#{project['client']['name']} > #{project['name']}"
           )
         end
 
         def print_task(project, task)
           cli.print_ari(
-            'harvest',
+            "harvest",
             "#{project['id']}/#{task['id']}",
             "#{project['name']} > #{task['name']}"
           )

data/lib/abt/providers/harvest/commands/clear.rb

@@ -6,29 +6,28 @@ module Abt
       module Commands
         class Clear < BaseCommand
           def self.usage
-            'abt clear harvest'
+            "abt clear harvest"
           end
 
           def self.description
-            'Clear harvest configuration'
+            "Clear harvest configuration"
           end
 
           def self.flags
             [
-              ['-g', '--global', 'Clear global instead of local harvest configuration (credentials etc.)'],
-              ['-a', '--all', 'Clear all harvest configuration']
+              ["-g", "--global",
+               "Clear global instead of local harvest configuration (credentials etc.)"],
+              ["-a", "--all", "Clear all harvest configuration"]
             ]
           end
 
           def perform
-            if flags[:global] && flags[:all]
-              abort('Flags --global and --all cannot be used at the same time')
-            end
+            abort("Flags --global and --all cannot be used at the same time") if flags[:global] && flags[:all]
 
             config.clear_local unless flags[:global]
             config.clear_global if flags[:global] || flags[:all]
 
-            warn 'Configuration cleared'
+            warn("Configuration cleared")
           end
         end
       end

data/lib/abt/providers/harvest/commands/current.rb

@@ -6,22 +6,21 @@ module Abt
       module Commands
         class Current < BaseCommand
           def self.usage
-            'abt current harvest[:<project-id>[/<task-id>]]'
+            "abt current harvest[:<project-id>[/<task-id>]]"
           end
 
           def self.description
-            'Get or set project and or task for current git repository'
+            "Get or set project and or task for current git repository"
           end
 
           def perform
-            abort 'Must be run inside a git repository' unless config.local_available?
-
+            require_local_config!
             require_project!
             ensure_valid_configuration!
 
             if path != config.path
               config.path = path
-              warn 'Configuration updated'
+              warn("Configuration updated")
             end
 
             print_configuration
@@ -38,36 +37,36 @@ module Abt
           end
 
           def ensure_valid_configuration!
-            abort "Invalid project: #{project_id}" if project.nil?
-            abort "Invalid task: #{task_id}" if task_id && task.nil?
+            abort("Invalid project: #{project_id}") if project.nil?
+            abort("Invalid task: #{task_id}") if task_id && task.nil?
           end
 
           def project
-            return @project if instance_variable_defined? :@project
+            return @project if instance_variable_defined?(:@project)
 
             @project = if project_assignment
-                         project_assignment['project'].merge('client' => project_assignment['client'])
+                         project_assignment["project"].merge("client" => project_assignment["client"])
                        end
           end
 
           def task
-            return @task if instance_variable_defined? :@task
+            return @task if instance_variable_defined?(:@task)
 
             @task = if project_assignment
-                      project_assignment['task_assignments'].map { |ta| ta['task'] }.find do |task|
-                        task['id'].to_s == task_id
+                      project_assignment["task_assignments"].map { |ta| ta["task"] }.find do |task|
+                        task["id"].to_s == task_id
                       end
                     end
           end
 
           def project_assignment
             @project_assignment ||= begin
-              project_assignments.find { |pa| pa['project']['id'].to_s == project_id }
+              project_assignments.find { |pa| pa["project"]["id"].to_s == project_id }
             end
           end
 
           def project_assignments
-            @project_assignments ||= api.get_paged('users/me/project_assignments')
+            @project_assignments ||= api.get_paged("users/me/project_assignments")
           end
         end
       end