abt-cli 0.0.14 → 0.0.19

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

@@ -5,17 +5,30 @@ module Abt
     module Devops
       module Commands
         class Clear < BaseCommand
-          def self.command
-            'clear devops'
+          def self.usage
+            'abt clear devops'
           end
 
           def self.description
-            'Clear DevOps config for current git repository'
+            'Clear DevOps configuration'
           end
 
-          def call
-            cli.warn 'Clearing configuration'
-            config.clear_local
+          def self.flags
+            [
+              ['-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
+
+            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

@@ -5,72 +5,48 @@ module Abt
     module Devops
       module Commands
         class Current < BaseCommand
-          def self.command
-            'current devops[:<organization-name>/<project-name>/<board-id>[/<work-item-id>]]'
+          def self.usage
+            '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'
           end
 
-          def call
+          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...'
+                         warn 'Fetching board...'
                          api.get("work/boards/#{board_id}")
                        rescue HttpError::NotFoundError
                          nil
@@ -79,7 +55,7 @@ module Abt
 
           def work_item
             @work_item ||= begin
-                             cli.warn 'Fetching work item...'
+                             warn 'Fetching work item...'
                              work_item = api.get_paged('wit/workitems', ids: work_item_id)[0]
                              sanitize_work_item(work_item)
                            rescue HttpError::NotFoundError

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

@@ -5,15 +5,15 @@ module Abt
     module Devops
       module Commands
         class HarvestTimeEntryData < BaseCommand
-          def self.command
-            'harvest-time-entry-data devops[:<organization-name>/<project-name>/<board-id>/<work-item-id>]'
+          def self.usage
+            '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.'
           end
 
-          def call
+          def perform
             require_work_item!
 
             body = {
@@ -25,7 +25,15 @@ module Abt
               }
             }
 
-            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

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

@@ -8,24 +8,20 @@ module Abt
           AZURE_DEV_URL_REGEX = %r{^https://dev\.azure\.com/(?<organization>[^/]+)/(?<project>[^/]+)}.freeze
           VS_URL_REGEX = %r{^https://(?<organization>[^.]+)\.visualstudio\.com/(?<project>[^/]+)}.freeze
 
-          def self.command
-            'init devops'
+          def self.usage
+            'abt init devops'
           end
 
           def self.description
             'Pick DevOps board for current git repository'
           end
 
-          def call
-            cli.abort 'Must be run inside a git repository' unless config.local_available?
+          def perform
+            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
 
@@ -35,24 +31,28 @@ module Abt
             @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([
+                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}',
                   '',
@@ -61,7 +61,7 @@ module Abt
 
                 break url if AZURE_DEV_URL_REGEX =~ url || VS_URL_REGEX =~ url
 
-                cli.warn 'Invalid URL'
+                warn 'Invalid URL'
               end
             end
           end

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

@@ -5,48 +5,48 @@ module Abt
     module Devops
       module Commands
         class Pick < BaseCommand
-          def self.command
-            'pick devops[:<organization-name>/<project-name>/<board-id>]'
+          def self.usage
+            'abt pick devops[:<organization-name>/<project-name>/<board-id>]'
           end
 
           def self.description
             'Pick work item for current git repository'
           end
 
-          def call
-            cli.abort 'Must be run inside a git repository' unless config.local_available?
+          def self.flags
+            [
+              ['-d', '--dry-run', 'Keep existing configuration']
+            ]
+          end
+
+          def perform
+            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)
 
-            update_config!(work_item)
+            return if flags[:"dry-run"]
 
-            print_work_item(organization_name, project_name, board, 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, true
               return work_item if work_item
             end
           end

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

@@ -5,19 +5,18 @@ module Abt
     module Devops
       module Commands
         class Share < BaseCommand
-          def self.command
-            'share devops[:<organization-name>/<project-name>/<board-id>[/<work-item-id>]]'
+          def self.usage
+            '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 call
-            require_work_item!
+          def perform
+            require_board!
 
-            args = [organization_name, project_name, board_id, work_item_id].compact
-            cli.print_provider_command('devops', args.join('/'))
+            cli.print_ari('devops', path)
           end
         end
       end

data/lib/abt/providers/devops/commands/work-items.rb

@@ -5,15 +5,15 @@ module Abt
     module Devops
       module Commands
         class WorkItems < BaseCommand
-          def self.command
-            'work-items devops'
+          def self.usage
+            'abt work-items devops'
           end
 
           def self.description
             'List all work items on board - useful for piping into grep etc.'
           end
 
-          def call
+          def perform
             require_board!
 
             work_items.each do |work_item|
@@ -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,77 +8,34 @@ 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
+        def path=(new_path)
+          git['path'] = new_path
         end
 
-        def board_id
-          local_available? ? git['boardId'] : nil
+        def clear_local(verbose: true)
+          git.clear(output: verbose ? cli.err_output : nil)
         end
 
-        def work_item_id
-          local_available? ? git['workItemId'] : nil
-        end
-
-        def organization_name=(value)
-          return if organization_name == value
-
-          clear_local
-          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
-        end
-
-        def clear_local
-          cli.abort 'No local configuration was found' unless local_available?
-
-          git['organizationName'] = nil
-          git['projectName'] = nil
-          git['boardId'] = nil
-          git['workItemId'] = nil
-        end
-
-        def clear_global
-          git.global.keys.each do |key|
-            cli.puts 'Deleting configuration: ' + key
-            git.global[key] = nil
-          end
+        def clear_global(verbose: true)
+          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([
+          git_global[username_key] = cli.prompt.text([
             "Please provide your username for the DevOps organization (#{organization_name}).",
             '',
             'Enter username'
@@ -88,9 +45,9 @@ module Abt
         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([
+          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',
             '',
@@ -103,7 +60,13 @@ module Abt
 
         private
 
-        attr_reader :git
+        def git
+          @git ||= GitConfig.new('local', 'abt.devops')
+        end
+
+        def git_global
+          @git_global ||= GitConfig.new('global', 'abt.devops')
+        end
       end
     end
   end