abt-cli 0.0.21 → 0.0.22

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

@@ -6,11 +6,11 @@ module Abt
       module Commands
         class HarvestTimeEntryData < BaseCommand
           def self.usage
-            'abt harvest-time-entry-data devops[:<organization-name>/<project-name>/<board-id>/<work-item-id>]'
+            "abt harvest-time-entry-data devops[:<organization-name>/<project-name>/<board-id>/<work-item-id>]"
           end
 
           def self.description
-            'Print Harvest time entry data for DevOps work item as json. Used by harvest start script.'
+            "Print Harvest time entry data for DevOps work item as json. Used by harvest start script."
           end
 
           def perform
@@ -19,9 +19,9 @@ module Abt
             body = {
               notes: notes,
               external_reference: {
-                id: work_item['id'],
-                group_id: 'AzureDevOpsWorkItem',
-                permalink: work_item['url']
+                id: work_item["id"],
+                group_id: "AzureDevOpsWorkItem",
+                permalink: work_item["url"]
               }
             }
 
@@ -30,27 +30,27 @@ module Abt
             args = [organization_name, project_name, board_id, work_item_id].compact
 
             error_message = [
-              'Unable to find work item for configuration:',
+              "Unable to find work item for configuration:",
               "devops:#{args.join('/')}"
             ].join("\n")
-            abort error_message
+            abort(error_message)
           end
 
           private
 
           def notes
             [
-              'Azure DevOps',
-              work_item['fields']['System.WorkItemType'],
+              "Azure DevOps",
+              work_item["fields"]["System.WorkItemType"],
               "##{work_item['id']}",
-              '-',
-              work_item['name']
-            ].join(' ')
+              "-",
+              work_item["name"]
+            ].join(" ")
           end
 
           def work_item
             @work_item ||= begin
-              work_item = api.get_paged('wit/workitems', ids: work_item_id)[0]
+              work_item = api.get_paged("wit/workitems", ids: work_item_id)[0]
               sanitize_work_item(work_item)
             end
           end

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

@@ -9,26 +9,26 @@ module Abt
           VS_URL_REGEX = %r{^https://(?<organization>[^.]+)\.visualstudio\.com/(?<project>[^/]+)}.freeze
 
           def self.usage
-            'abt init devops'
+            "abt init devops"
           end
 
           def self.description
-            'Pick DevOps board for current git repository'
+            "Pick DevOps board for current git repository"
           end
 
           def perform
-            abort 'Must be run inside a git repository' unless config.local_available?
+            abort("Must be run inside a git repository") unless config.local_available?
 
-            board = cli.prompt.choice 'Select a project work board', boards
+            board = cli.prompt.choice("Select a project work board", boards)
 
-            config.path = Path.from_ids(organization_name, project_name, board['id'])
+            config.path = Path.from_ids(organization_name, project_name, board["id"])
             print_board(organization_name, project_name, board)
           end
 
           private
 
           def boards
-            @boards ||= api.get_paged('work/boards')
+            @boards ||= api.get_paged("work/boards")
           end
 
           def project_name
@@ -52,19 +52,23 @@ module Abt
           def project_url
             @project_url ||= begin
               loop do
-                url = cli.prompt.text([
-                  'Please provide the URL for the devops project',
-                  'For instance https://{organization}.visualstudio.com/{project} or https://dev.azure.com/{organization}/{project}',
-                  '',
-                  'Enter URL'
-                ].join("\n"))
+                url = cli.prompt.text(project_url_prompt_text)
 
                 break url if AZURE_DEV_URL_REGEX =~ url || VS_URL_REGEX =~ url
 
-                warn 'Invalid URL'
+                warn("Invalid URL")
               end
             end
           end
+
+          def project_url_prompt_text
+            <<~TXT
+              Please provide the URL for the devops project
+              For instance https://{organization}.visualstudio.com/{project} or https://dev.azure.com/{organization}/{project}
+
+              Enter URL
+            TXT
+          end
         end
       end
     end

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

@@ -6,47 +6,47 @@ 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?
+            abort("Must be run inside a git repository") unless config.local_available?
             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'])
+            config.path = Path.from_ids(organization_name, project_name, board_id, work_item["id"])
           end
 
           private
 
           def select_work_item
             loop do
-              column = cli.prompt.choice 'Which column?', columns
-              warn 'Fetching work items...'
+              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'
+                warn("Section is empty")
                 next
               end
 
-              work_item = cli.prompt.choice 'Select a work item', work_items, true
+              work_item = cli.prompt.choice("Select a work item", work_items, nil_option: true)
               return work_item if work_item
             end
           end
@@ -65,7 +65,7 @@ module Abt
           end
 
           def columns
-            board['columns']
+            board["columns"]
           end
 
           def board

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

@@ -6,18 +6,18 @@ 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
-            if path != ''
-              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?'
+              warn("No configuration for project. Did you initialize DevOps?")
             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,29 @@ 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(access_token_prompt_text)
         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
+
+        def access_token_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
       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
 
-          new [organization_id, project_name, board_id, *work_item_id].join('/')
+          new([organization_id, 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
@@ -63,13 +63,11 @@ module Abt
           def branch_names_from_aris
             other_aris = cli.aris - [ari]
 
-            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
 
             output.string.lines.map(&:strip).compact
           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