abt-cli 0.0.22 → 0.0.27

data/lib/abt/providers/devops.rb

@@ -2,6 +2,7 @@
 
 Dir.glob("#{File.expand_path(__dir__)}/devops/*.rb").sort.each { |file| require file }
 Dir.glob("#{File.expand_path(__dir__)}/devops/commands/*.rb").sort.each { |file| require file }
+Dir.glob("#{File.expand_path(__dir__)}/devops/services/*.rb").sort.each { |file| require file }
 
 module Abt
   module Providers

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

@@ -73,6 +73,16 @@ module Abt
           "#{base_url}/_boards/board/#{rfc_3986_encode_path_segment(board['name'])}"
         end
 
+        def sanitize_work_item(work_item)
+          return nil if work_item.nil?
+
+          work_item.merge(
+            "id" => work_item["id"].to_s,
+            "name" => work_item["fields"]["System.Title"],
+            "url" => url_for_work_item(work_item)
+          )
+        end
+
         def connection
           @connection ||= Faraday.new(api_endpoint) do |connection|
             connection.basic_auth(username, access_token)

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

@@ -19,30 +19,54 @@ module Abt
 
         private
 
+        def require_local_config!
+          abort("Must be run inside a git repository") unless config.local_available?
+        end
+
         def require_board!
-          return if organization_name && project_name && board_id
+          return if board_id && organization_name && project_name
 
-          abort("No current/specified board. Did you initialize DevOps?")
+          abort("No current/specified board. Did you forget to `pick`?")
         end
 
         def require_work_item!
-          unless organization_name && project_name && board_id
-            abort("No current/specified board. Did you initialize DevOps and pick a work item?")
-          end
-
+          require_board!
           return if work_item_id
 
-          abort("No current/specified work item. Did you pick a DevOps work item?")
+          abort("No current/specified work item. Did you forget to `pick`?")
         end
 
-        def sanitize_work_item(work_item)
-          return nil if work_item.nil?
+        def prompt_project!
+          @path = Services::ProjectPicker.call(cli: cli).path
+        end
+
+        def prompt_board!
+          result = Services::BoardPicker.call(cli: cli, path: path, config: config)
+          @path = result.path
+          @board = result.board
+        end
 
-          work_item.merge(
-            "id" => work_item["id"].to_s,
-            "name" => work_item["fields"]["System.Title"],
-            "url" => api.url_for_work_item(work_item)
-          )
+        def prompt_work_item!
+          result = Services::WorkItemPicker.call(cli: cli, path: path, config: config, board: board)
+          @path = result.path
+          @work_item = result.work_item
+        end
+
+        def board
+          @board ||= begin
+            api.get("work/boards/#{board_id}")
+          rescue HttpError::NotFoundError
+            nil
+          end
+        end
+
+        def work_item
+          @work_item ||= begin
+            work_item = api.get_paged("wit/workitems", ids: work_item_id)[0]
+            api.sanitize_work_item(work_item)
+          rescue HttpError::NotFoundError
+            nil
+          end
         end
 
         def print_board(organization_name, project_name, board)

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

@@ -14,8 +14,7 @@ module Abt
           end
 
           def perform
-            abort("No organization selected. Did you initialize DevOps?") if organization_name.nil?
-            abort("No project selected. Did you initialize DevOps?") if project_name.nil?
+            prompt_project! unless project_name
 
             boards.map do |board|
               print_board(organization_name, project_name, board)

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

@@ -16,15 +16,16 @@ module Abt
           def perform
             require_work_item!
 
-            puts name
-          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)
+            if work_item
+              puts name
+            else
+              args = [organization_name, project_name, board_id, work_item_id].compact
+
+              abort(<<~TXT)
+                Unable to find work item for configuration:
+                devops:#{args.join('/')}
+              TXT
+            end
           end
 
           private
@@ -35,13 +36,6 @@ module Abt
             str += work_item["name"].downcase.gsub(/[^\w]/, "-")
             str.squeeze("-").gsub(/(^-|-$)/, "")
           end
-
-          def work_item
-            @work_item ||= begin
-              work_item = api.get_paged("wit/workitems", ids: work_item_id)[0]
-              sanitize_work_item(work_item)
-            end
-          end
         end
       end
     end

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

@@ -14,8 +14,7 @@ module Abt
           end
 
           def perform
-            abort("Must be run inside a git repository") unless config.local_available?
-
+            require_local_config!
             require_board!
             ensure_valid_configuration!
 
@@ -43,25 +42,6 @@ module Abt
             end
             abort("No such work item: ##{work_item_id}") if work_item_id && work_item.nil?
           end
-
-          def board
-            @board ||= begin
-              warn("Fetching board...")
-              api.get("work/boards/#{board_id}")
-            rescue HttpError::NotFoundError
-              nil
-            end
-          end
-
-          def work_item
-            @work_item ||= begin
-              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
     end

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

@@ -16,7 +16,22 @@ module Abt
           def perform
             require_work_item!
 
-            body = {
+            if work_item
+              puts Oj.dump(body, mode: :json)
+            else
+              args = [organization_name, project_name, board_id, work_item_id].compact
+
+              abort(<<~TXT)
+                Unable to find work item for configuration:
+                devops:#{args.join('/')}
+              TXT
+            end
+          end
+
+          private
+
+          def body
+            {
               notes: notes,
               external_reference: {
                 id: work_item["id"],
@@ -24,20 +39,8 @@ module Abt
                 permalink: work_item["url"]
               }
             }
-
-            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",
@@ -47,13 +50,6 @@ module Abt
               work_item["name"]
             ].join(" ")
           end
-
-          def work_item
-            @work_item ||= begin
-              work_item = api.get_paged("wit/workitems", ids: work_item_id)[0]
-              sanitize_work_item(work_item)
-            end
-          end
         end
       end
     end

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

@@ -15,61 +15,40 @@ module Abt
 
           def self.flags
             [
-              ["-d", "--dry-run", "Keep existing configuration"]
+              ["-d", "--dry-run", "Keep existing configuration"],
+              ["-c", "--clean", "Don't reuse project/board configuration"]
             ]
           end
 
           def perform
-            abort("Must be run inside a git repository") unless config.local_available?
-            require_board!
+            pick!
 
-            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"])
+            if config.local_available?
+              update_config(work_item)
+            else
+              warn("No local configuration to update - will function as dry run")
+            end
           end
 
           private
 
-          def select_work_item
-            loop do
-              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")
-                next
-              end
-
-              work_item = cli.prompt.choice("Select a work item", work_items, nil_option: true)
-              return work_item if work_item
-            end
+          def pick!
+            prompt_project! if project_name.nil? || flags[:clean]
+            prompt_board! if board_id.nil? || flags[:clean]
+            prompt_work_item!
           end
 
-          def work_items_in_column(column)
-            work_items = api.work_item_query(
-              <<~WIQL
-                SELECT [System.Id]
-                FROM WorkItems
-                WHERE [System.BoardColumn] = '#{column['name']}'
-                ORDER BY [Microsoft.VSTS.Common.BacklogPriority] ASC
-              WIQL
+          def update_config(work_item)
+            config.path = Path.from_ids(
+              organization_name: organization_name,
+              project_name: project_name,
+              board_id: board_id,
+              work_item_id: work_item["id"]
             )
-
-            work_items.map { |work_item| sanitize_work_item(work_item) }
-          end
-
-          def columns
-            board["columns"]
-          end
-
-          def board
-            @board ||= api.get("work/boards/#{board_id}")
           end
         end
       end

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

@@ -14,7 +14,8 @@ module Abt
           end
 
           def perform
-            require_board!
+            prompt_project! unless project_name
+            prompt_board! unless board_id
 
             work_items.each do |work_item|
               print_work_item(organization_name, project_name, board, work_item)
@@ -32,13 +33,9 @@ module Abt
                   FROM WorkItems
                   ORDER BY [System.Title] ASC
                 WIQL
-              ).map { |work_item| sanitize_work_item(work_item) }
+              ).map { |work_item| api.sanitize_work_item(work_item) }
             end
           end
-
-          def board
-            @board ||= api.get("work/boards/#{board_id}")
-          end
         end
       end
     end

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

@@ -15,7 +15,7 @@ module Abt
         end
 
         def path
-          Path.new(local_available? && git["path"] || "")
+          Path.new(local_available? && git["path"] || Abt.directory_config.dig("devops", "path") || "")
         end
 
         def path=(new_path)
@@ -47,7 +47,15 @@ module Abt
 
           return git_global[access_token_key] unless git_global[access_token_key].nil?
 
-          git_global[access_token_key] = cli.prompt.text(access_token_prompt_text)
+          git_global[access_token_key] = cli.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
 
         private
@@ -59,18 +67,6 @@ module Abt
         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

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

@@ -10,12 +10,12 @@ module Abt
         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
+          %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
+        def self.from_ids(organization_name: nil, project_name: nil, board_id: nil, work_item_id: nil)
+          return new unless organization_name && project_name
 
-          new([organization_id, project_name, board_id, *work_item_id].join("/"))
+          new([organization_name, project_name, *board_id, *work_item_id].join("/"))
         end
 
         def initialize(path = "")

data/lib/abt/providers/devops/services/board_picker.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Devops
+      module Services
+        class BoardPicker
+          class Result
+            attr_reader :board, :path
+
+            def initialize(board:, path:)
+              @board = board
+              @path = path
+            end
+          end
+
+          def self.call(**args)
+            new(**args).call
+          end
+
+          attr_reader :cli, :config, :path
+
+          def initialize(cli:, path:, config:)
+            @cli = cli
+            @config = config
+            @path = path
+          end
+
+          def call
+            board = cli.prompt.choice("Select a project work board", boards)
+
+            path_with_board = Path.new([path, board["id"]].join("/"))
+
+            Result.new(board: board, path: path_with_board)
+          end
+
+          private
+
+          def boards
+            @boards ||= api.get_paged("work/boards")
+          end
+
+          def api
+            Abt::Providers::Devops::Api.new(organization_name: path.organization_name,
+                                            project_name: path.project_name,
+                                            username: config.username_for_organization(path.organization_name),
+                                            access_token: config.access_token_for_organization(path.organization_name),
+                                            cli: cli)
+          end
+        end
+      end
+    end
+  end
+end