abt-cli 0.0.18 → 0.0.19

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Asana
+      class Path < String
+        PATH_REGEX = %r{^(?<project_gid>\d+)?(/(?<task_gid>\d+))?$}.freeze
+
+        def self.from_ids(project_gid = nil, task_gid = nil)
+          path = project_gid ? [project_gid, *task_gid].join('/') : ''
+          new path
+        end
+
+        def initialize(path = '')
+          raise Abt::Cli::Abort, "Invalid path: #{path}" unless path =~ PATH_REGEX
+
+          super
+        end
+
+        def project_gid
+          match[:project_gid]
+        end
+
+        def task_gid
+          match[:task_gid]
+        end
+
+        private
+
+        def match
+          @match ||= PATH_REGEX.match(self)
+        end
+      end
+    end
+  end
+end

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

@@ -69,6 +69,10 @@ module Abt
           "#{base_url}/_workitems/edit/#{work_item['id']}"
         end
 
+        def url_for_board(board)
+          "#{base_url}/_boards/board/#{rfc_3986_encode_path_segment(board['name'])}"
+        end
+
         def connection
           @connection ||= Faraday.new(api_endpoint) do |connection|
             connection.basic_auth username, access_token
@@ -79,6 +83,14 @@ module Abt
 
         private
 
+        # Shamelessly copied from ERB::Util.url_encode
+        # https://apidock.com/ruby/ERB/Util/url_encode
+        def rfc_3986_encode_path_segment(string)
+          string.to_s.b.gsub(/[^a-zA-Z0-9_\-.~]/) do |match|
+            format('%%%02X', match.unpack1('C')) # rubocop:disable Style/FormatStringToken
+          end
+        end
+
         def handle_denied_by_conditional_access_policy!(exception)
           raise exception unless exception.message.include?(CONDITIONAL_ACCESS_POLICY_ERROR_CODE)
 

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

@@ -3,19 +3,18 @@
 module Abt
   module Providers
     module Devops
-      class BaseCommand < Abt::Cli::BaseCommand
-        attr_reader :organization_name, :project_name, :board_id, :work_item_id, :config
+      class BaseCommand < Abt::BaseCommand
+        extend Forwardable
 
-        def initialize(path:, cli:, **)
+        attr_reader :config, :path
+
+        def_delegators(:@path, :organization_name, :project_name, :board_id, :work_item_id)
+
+        def initialize(ari:, cli:)
           super
 
           @config = Configuration.new(cli: cli)
-
-          if path.nil?
-            use_current_path
-          else
-            use_path(path)
-          end
+          @path = ari.path ? Path.new(ari.path) : config.path
         end
 
         private
@@ -23,17 +22,17 @@ module Abt
         def require_board!
           return if organization_name && project_name && board_id
 
-          cli.abort 'No current/specified board. Did you initialize DevOps?'
+          abort 'No current/specified board. Did you initialize DevOps?'
         end
 
         def require_work_item!
           unless organization_name && project_name && board_id
-            cli.abort 'No current/specified board. Did you initialize DevOps and pick a work item?'
+            abort 'No current/specified board. Did you initialize DevOps and pick a work item?'
           end
 
           return if work_item_id
 
-          cli.abort 'No current/specified work item. Did you pick a DevOps work item?'
+          abort 'No current/specified work item. Did you pick a DevOps work item?'
         end
 
         def sanitize_work_item(work_item)
@@ -46,42 +45,18 @@ module Abt
           )
         end
 
-        def same_args_as_config?
-          organization_name == config.organization_name &&
-            project_name == config.project_name &&
-            board_id == config.board_id &&
-            work_item_id == config.work_item_id
-        end
-
         def print_board(organization_name, project_name, board)
           path = "#{organization_name}/#{project_name}/#{board['id']}"
 
           cli.print_ari('devops', path, board['name'])
-          # cli.warn board['url'] if board.key?('url') && cli.output.isatty # TODO: Web URL
+          warn api.url_for_board(board) if cli.output.isatty
         end
 
         def print_work_item(organization, project, board, work_item)
           path = "#{organization}/#{project}/#{board['id']}/#{work_item['id']}"
 
           cli.print_ari('devops', path, work_item['name'])
-          cli.warn work_item['url'] if work_item.key?('url') && cli.output.isatty
-        end
-
-        def use_current_path
-          @organization_name = config.organization_name
-          @project_name = config.project_name
-          @board_id = config.board_id
-          @work_item_id = config.work_item_id
-        end
-
-        def use_path(path)
-          args = path.to_s.split('/')
-
-          if args.length < 3
-            cli.abort 'Argument format is <organization>/<project>/<board-id>[/<work-item-id>]'
-          end
-
-          (@organization_name, @project_name, @board_id, @work_item_id) = args
+          warn work_item['url'] if work_item.key?('url') && cli.output.isatty
         end
 
         def api

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

@@ -15,9 +15,9 @@ module Abt
 
           def perform
             if organization_name.nil?
-              cli.abort 'No organization selected. Did you initialize DevOps?'
+              abort 'No organization selected. Did you initialize DevOps?'
             end
-            cli.abort 'No project selected. Did you initialize DevOps?' if project_name.nil?
+            abort 'No project selected. Did you initialize DevOps?' if project_name.nil?
 
             boards.map do |board|
               print_board(organization_name, project_name, board)

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

@@ -16,11 +16,15 @@ module Abt
           def perform
             require_work_item!
 
-            cli.puts name
+            puts name
           rescue HttpError::NotFoundError
             args = [organization_name, project_name, board_id, work_item_id].compact
-            cli.warn 'Unable to find work item for configuration:'
-            cli.abort "devops:#{args.join('/')}"
+
+            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/clear.rb

@@ -27,6 +27,8 @@ module Abt
 
             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

@@ -14,63 +14,39 @@ module Abt
           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...'
+                         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

@@ -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

@@ -17,15 +17,11 @@ module Abt
           end
 
           def perform
-            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
+            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

@@ -20,36 +20,29 @@ module Abt
           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...'
+              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

@@ -10,14 +10,13 @@ module Abt
           end
 
           def self.description
-            'Print DevOps config string'
+            'Print DevOps ARI'
           end
 
           def perform
-            require_work_item!
+            require_board!
 
-            args = [organization_name, project_name, board_id, work_item_id].compact
-            cli.print_ari('devops', args.join('/'))
+            cli.print_ari('devops', path)
           end
         end
       end

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

@@ -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,15 +27,15 @@ 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'
@@ -80,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',
             '',
@@ -95,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