abt-cli 0.0.15 → 0.0.20

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?
-
-            @organization_name = config.organization_name = organization_name_from_url
-            @project_name = config.project_name = project_name_from_url
+          def perform
+            abort 'Must be run inside a git repository' unless config.local_available?
 
             board = cli.prompt.choice 'Select a project work board', boards
 
-            config.board_id = board['id']
-
+            config.path = Path.from_ids(organization_name, project_name, board['id'])
             print_board(organization_name, project_name, board)
           end
 
@@ -35,17 +31,21 @@ 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
 
@@ -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,44 +5,44 @@ 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...'
+              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
 

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.text([
+          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.text([
+          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

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Devops
+      class Path < String
+        ORGANIZATION_NAME_REGEX = %r{(?<organization_name>[^/ ]+)}.freeze
+        PROJECT_NAME_REGEX = %r{(?<project_name>[^/ ]+)}.freeze
+        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
+
+        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('/')
+        end
+
+        def initialize(path = '')
+          raise Abt::Cli::Abort, "Invalid path: #{path}" unless path =~ PATH_REGEX
+
+          super
+        end
+
+        def organization_name
+          match[:organization_name]
+        end
+
+        def project_name
+          match[:project_name]
+        end
+
+        def board_id
+          match[:board_id]
+        end
+
+        def work_item_id
+          match[:work_item_id]
+        end
+
+        private
+
+        def match
+          @match ||= PATH_REGEX.match(self)
+        end
+      end
+    end
+  end
+end

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

@@ -4,39 +4,33 @@ module Abt
   module Providers
     module Git
       module Commands
-        class Branch
-          attr_reader :cli
-
-          def self.command
-            'branch git <provider>'
+        class Branch < Abt::BaseCommand
+          def self.usage
+            'abt branch git <scheme>[:<path>]'
           end
 
           def self.description
-            'Switch branch. Uses a compatible provider to generate the branch-name: E.g. `abt branch git asana`'
-          end
-
-          def initialize(cli:, **)
-            @cli = cli
+            'Switch branch. Uses a compatible scheme to generate the branch-name: E.g. `abt branch git asana`'
           end
 
-          def call
-            create_and_switch unless switch
-            cli.warn "Switched to #{branch_name}"
+          def perform
+            switch || create_and_switch
+            warn "Switched to #{branch_name}"
           end
 
           private
 
           def switch
             success = false
-            Open3.popen3("git switch #{branch_name}") do |_i, _o, _error_output, thread|
+            Open3.popen3("git switch #{branch_name}") do |_i, _o, _e, thread|
               success = thread.value.success?
             end
             success
           end
 
           def create_and_switch
-            cli.warn "No such branch: #{branch_name}"
-            cli.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
@@ -45,29 +39,35 @@ module Abt
 
           def branch_name # rubocop:disable Metrics/MethodLength
             @branch_name ||= begin
-              if branch_names_from_providers.empty?
-                cli.abort [
-                  'None of the specified providers responded to `branch-name`.',
-                  'Did you add compatible provider? e.g.:',
+              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")
               end
 
-              if branch_names_from_providers.length > 1
-                cli.abort [
-                  'Got branch names from multiple providers, only one is supported',
-                  'Branch names where:',
-                  *branch_names_from_providers.map { |name| "   #{name}" }
+              if branch_names_from_aris.length > 1
+                abort [
+                  'Got branch names from multiple ARIs, only one is supported',
+                  'Branch names were:',
+                  *branch_names_from_aris.map { |name| "   #{name}" }
                 ].join("\n")
               end
 
-              branch_names_from_providers.first
+              branch_names_from_aris.first
             end
           end
 
-          def branch_names_from_providers
-            input = StringIO.new(cli.args.join(' '))
+          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
+
+            input = StringIO.new(cli.aris.to_s)
             output = StringIO.new
             Abt::Cli.new(argv: ['branch-name'], output: output, input: input).perform