abt-cli 0.0.17 → 0.0.22

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

@@ -6,27 +6,28 @@ module Abt
       module Commands
         class Clear < BaseCommand
           def self.usage
-            'abt clear devops'
+            "abt clear devops"
           end
 
           def self.description
-            'Clear DevOps configuration'
+            "Clear DevOps configuration"
           end
 
           def self.flags
             [
-              ['-g', '--global', 'Clear global instead of local DevOp configuration (credentials etc.)'],
-              ['-a', '--all', 'Clear all DevOp configuration']
+              ["-g", "--global",
+               "Clear global instead of local DevOp configuration (credentials etc.)"],
+              ["-a", "--all", "Clear all DevOp 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")
           end
         end
       end

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

@@ -6,85 +6,61 @@ module Abt
       module Commands
         class Current < BaseCommand
           def self.usage
-            'abt current devops[:<organization-name>/<project-name>/<board-id>[/<work-item-id>]]'
+            "abt current devops[:<organization-name>/<project-name>/<board-id>[/<work-item-id>]]"
           end
 
           def self.description
-            'Get or set DevOps configuration for current git repository'
+            "Get or set DevOps configuration for current git repository"
           end
 
           def perform
+            abort("Must be run inside a git repository") unless config.local_available?
+
             require_board!
+            ensure_valid_configuration!
 
-            if same_args_as_config? || !config.local_available?
-              show_current_configuration
-            else
-              cli.warn 'Updating configuration'
-              update_configuration
+            if path != config.path && config.local_available?
+              config.path = path
+              warn("Configuration updated")
             end
-          end
-
-          private
 
-          def show_current_configuration
-            if work_item_id.nil?
-              print_board(organization_name, project_name, board)
-            else
-              print_work_item(organization_name, project_name, board, work_item)
-            end
+            print_configuration
           end
 
-          def update_configuration
-            ensure_board_is_valid!
+          private
 
+          def print_configuration
             if work_item_id.nil?
-              update_board_config
-              config.work_item_id = nil
-
               print_board(organization_name, project_name, board)
             else
-              ensure_work_item_is_valid!
-
-              update_board_config
-              config.work_item_id = work_item_id
-
               print_work_item(organization_name, project_name, board, work_item)
             end
           end
 
-          def update_board_config
-            config.organization_name = organization_name
-            config.project_name = project_name
-            config.board_id = board_id
-          end
-
-          def ensure_board_is_valid!
+          def ensure_valid_configuration!
             if board.nil?
-              cli.abort 'Board could not be found, ensure that settings for organization, project, and board are correct'
+              abort("Board could not be found, ensure that settings for organization, project, and board are correct")
             end
-          end
-
-          def ensure_work_item_is_valid!
-            cli.abort "No such work item: ##{work_item_id}" if work_item.nil?
+            abort("No such work item: ##{work_item_id}") if work_item_id && work_item.nil?
           end
 
           def board
             @board ||= begin
-                         cli.warn 'Fetching board...'
-                         api.get("work/boards/#{board_id}")
-                       rescue HttpError::NotFoundError
-                         nil
-                       end
+              warn("Fetching board...")
+              api.get("work/boards/#{board_id}")
+            rescue HttpError::NotFoundError
+              nil
+            end
           end
 
           def work_item
             @work_item ||= begin
-                             cli.warn 'Fetching work item...'
-                             work_item = api.get_paged('wit/workitems', ids: work_item_id)[0]
-                             sanitize_work_item(work_item)
-                           rescue HttpError::NotFoundError
-                             nil
-                           end
+              warn("Fetching work item...")
+              work_item = api.get_paged("wit/workitems", ids: work_item_id)[0]
+              sanitize_work_item(work_item)
+            rescue HttpError::NotFoundError
+              nil
+            end
           end
         end
       end

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,30 +19,38 @@ 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"]
               }
             }
 
-            cli.puts Oj.dump(body, mode: :json)
+            puts Oj.dump(body, mode: :json)
+          rescue HttpError::NotFoundError
+            args = [organization_name, project_name, board_id, work_item_id].compact
+
+            error_message = [
+              "Unable to find work item for configuration:",
+              "devops:#{args.join('/')}"
+            ].join("\n")
+            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,62 +9,66 @@ 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
-            cli.abort 'Must be run inside a git repository' unless config.local_available?
+            abort("Must be run inside a git repository") unless config.local_available?
 
-            @organization_name = config.organization_name = organization_name_from_url
-            @project_name = config.project_name = project_name_from_url
-
-            board = cli.prompt.choice 'Select a project work board', boards
-
-            config.board_id = board['id']
+            board = cli.prompt.choice("Select a project work board", boards)
 
+            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_from_url
-            if (match = AZURE_DEV_URL_REGEX.match(project_url)) ||
-               (match = VS_URL_REGEX.match(project_url))
-              match[:project]
+          def project_name
+            @project_name ||= begin
+              if (match = AZURE_DEV_URL_REGEX.match(project_url)) ||
+                 (match = VS_URL_REGEX.match(project_url))
+                match[:project]
+              end
             end
           end
 
-          def organization_name_from_url
-            if (match = AZURE_DEV_URL_REGEX.match(project_url)) ||
-               (match = VS_URL_REGEX.match(project_url))
-              match[:organization]
+          def organization_name
+            @organization_name ||= begin
+              if (match = AZURE_DEV_URL_REGEX.match(project_url)) ||
+                 (match = VS_URL_REGEX.match(project_url))
+                match[:organization]
+              end
             end
           end
 
           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
 
-                cli.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,54 +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
-            cli.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!
 
-            cli.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"]
 
-            update_config!(work_item)
+            config.path = Path.from_ids(organization_name, project_name, board_id, work_item["id"])
           end
 
           private
 
-          def update_config!(work_item)
-            config.organization_name = organization_name
-            config.project_name = project_name
-            config.board_id = board_id
-            config.work_item_id = work_item['id']
-          end
-
           def select_work_item
             loop do
-              column = cli.prompt.choice 'Which column?', columns
-              cli.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?
-                cli.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
@@ -72,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,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 config string'
+            "Print DevOps ARI"
           end
 
           def perform
-            require_work_item!
-
-            args = [organization_name, project_name, board_id, work_item_id].compact
-            cli.print_scheme_argument('devops', args.join('/'))
+            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
-              cli.warn 'Fetching work items...'
+              warn("Fetching work items...")
               api.work_item_query(
                 <<~WIQL
                   SELECT [System.Id]

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

@@ -8,53 +8,18 @@ module Abt
 
         def initialize(cli:)
           @cli = cli
-          @git = GitConfig.new(namespace: 'abt.devops')
         end
 
         def local_available?
-          GitConfig.local_available?
+          git.available?
         end
 
-        def organization_name
-          local_available? ? git['organizationName'] : nil
+        def path
+          Path.new(local_available? && git["path"] || "")
         end
 
-        def project_name
-          local_available? ? git['projectName'] : nil
-        end
-
-        def board_id
-          local_available? ? git['boardId'] : nil
-        end
-
-        def work_item_id
-          local_available? ? git['workItemId'] : nil
-        end
-
-        def organization_name=(value)
-          return if organization_name == value
-
-          clear_local(verbose: false)
-          git['organizationName'] = value unless value.nil?
-        end
-
-        def project_name=(value)
-          return if project_name == value
-
-          git['projectName'] = value unless value.nil?
-          git['boardId'] = nil
-          git['workItemId'] = nil
-        end
-
-        def board_id=(value)
-          return if board_id == value
-
-          git['boardId'] = value unless value.nil?
-          git['workItemId'] = nil
-        end
-
-        def work_item_id=(value)
-          git['workItemId'] = value
+        def path=(new_path)
+          git["path"] = new_path
         end
 
         def clear_local(verbose: true)
@@ -62,40 +27,50 @@ module Abt
         end
 
         def clear_global(verbose: true)
-          git.global.clear(output: verbose ? cli.err_output : nil)
+          git_global.clear(output: verbose ? cli.err_output : nil)
         end
 
         def username_for_organization(organization_name)
           username_key = "organizations.#{organization_name}.username"
 
-          return git.global[username_key] unless git.global[username_key].nil?
+          return git_global[username_key] unless git_global[username_key].nil?
 
-          git.global[username_key] = cli.prompt.text([
+          git_global[username_key] = cli.prompt.text([
             "Please provide your username for the DevOps organization (#{organization_name}).",
-            '',
-            'Enter username'
+            "",
+            "Enter username"
           ].join("\n"))
         end
 
         def access_token_for_organization(organization_name)
           access_token_key = "organizations.#{organization_name}.accessToken"
 
-          return git.global[access_token_key] unless git.global[access_token_key].nil?
+          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
 
-        attr_reader :git
+        def git
+          @git ||= GitConfig.new("local", "abt.devops")
+        end
+
+        def git_global
+          @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
   end