abt-cli 0.0.26 → 0.0.31

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

@@ -16,15 +16,14 @@ module Abt
           def perform
             require_work_item!
 
-            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)
+            if work_item
+              puts Oj.dump(body, mode: :json)
+            else
+              abort(<<~TXT)
+                Unable to find work item for configuration:
+                devops:#{path}
+              TXT
+            end
           end
 
           private
@@ -49,13 +48,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,79 +15,30 @@ 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
-            require_local_config!
-            require_board!
+            pick!
 
-            warn("#{project_name} - #{board['name']}")
-
-            work_item = select_work_item
-            print_work_item(organization_name, project_name, board, work_item)
+            print_work_item(organization_name, project_name, team_name, board, work_item)
 
             return if flags[:"dry-run"]
 
-            update_config(work_item)
-          end
-
-          private
-
-          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"]
-            )
-          end
-
-          def select_work_item
-            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")
-              select_work_item
+            if config.local_available?
+              config.path = path
             else
-              prompt_work_item(work_items) || select_work_item
+              warn("No local configuration to update - will function as dry run")
             end
           end
 
-          def prompt_work_item(work_items)
-            options = work_items.map do |work_item|
-              {
-                "id" => work_item["id"],
-                "name" => "##{work_item['id']} #{work_item['name']}"
-              }
-            end
-
-            choice = cli.prompt.choice("Select a work item", options, nil_option: true)
-            choice && work_items.find { |work_item| work_item["id"] == choice["id"] }
-          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
-            )
-
-            work_items.map { |work_item| sanitize_work_item(work_item) }
-          end
-
-          def columns
-            board["columns"]
-          end
+          private
 
-          def board
-            @board ||= api.get("work/boards/#{board_id}")
+          def pick!
+            prompt_board! if board_name.nil? || flags[:clean]
+            prompt_work_item!
           end
         end
       end

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

@@ -14,10 +14,10 @@ module Abt
           end
 
           def perform
-            require_board!
+            prompt_board! unless board_name
 
             work_items.each do |work_item|
-              print_work_item(organization_name, project_name, board, work_item)
+              print_work_item(organization_name, project_name, team_name, board, work_item)
             end
           end
 
@@ -32,13 +32,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/commands/write_config.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Devops
+      module Commands
+        class WriteConfig < BaseCommand
+          def self.usage
+            "abt write-config devops[:<organization-name>/<project-name>/<board-id>]"
+          end
+
+          def self.description
+            "Write DevOps settings to .abt.yml"
+          end
+
+          def self.flags
+            [
+              ["-c", "--clean", "Don't reuse configuration"]
+            ]
+          end
+
+          def perform
+            prompt_board! if board_name.nil? || flags[:clean]
+
+            update_directory_config!
+
+            warn("DevOps configuration written to #{Abt::DirectoryConfig::FILE_NAME}")
+          end
+
+          private
+
+          def update_directory_config!
+            cli.directory_config["devops"] = {
+              "path" => Path.from_ids(
+                organization_name: organization_name,
+                project_name: project_name,
+                team_name: team_name,
+                board_name: board_name
+              ).to_s
+            }
+            cli.directory_config.save!
+          end
+        end
+      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"] || Abt.directory_config.dig("devops", "path") || "")
+          Path.new(local_available? && git["path"] || cli.directory_config.dig("devops", "path") || "")
         end
 
         def path=(new_path)

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

@@ -6,16 +6,28 @@ module Abt
       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
+        TEAM_NAME_REGEX = %r{(?<team_name>[^/ ]+)}.freeze
+        BOARD_NAME_REGEX = %r{(?<board_name>[^/ ]+)}.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
+          %r{^(#{ORGANIZATION_NAME_REGEX}/#{PROJECT_NAME_REGEX}(/#{TEAM_NAME_REGEX}(/#{BOARD_NAME_REGEX}(/#{WORK_ITEM_ID_REGEX})?)?)?)?}.freeze # rubocop:disable Layout/LineLength
 
-        def self.from_ids(organization_name: nil, project_name: nil, board_id: nil, work_item_id: nil)
-          return new unless organization_name && project_name && board_id
+        def self.from_ids(organization_name: nil, project_name: nil, team_name: nil, board_name: nil, work_item_id: nil)
+          return new unless organization_name && project_name
 
-          new([organization_name, project_name, board_id, *work_item_id].join("/"))
+          parts = [organization_name, project_name]
+
+          if team_name
+            parts << team_name
+
+            if board_name
+              parts << board_name
+              parts << work_item_id if work_item_id
+            end
+          end
+
+          new(parts.join("/"))
         end
 
         def initialize(path = "")
@@ -32,8 +44,12 @@ module Abt
           match[:project_name]
         end
 
-        def board_id
-          match[:board_id]
+        def team_name
+          match[:team_name]
+        end
+
+        def board_name
+          match[:board_name]
         end
 
         def work_item_id
@@ -43,7 +59,7 @@ module Abt
         private
 
         def match
-          @match ||= PATH_REGEX.match(self)
+          @match ||= PATH_REGEX.match(to_s)
         end
       end
     end

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

@@ -0,0 +1,69 @@
+# 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:, config:)
+            @cli = cli
+            @config = config
+          end
+
+          def call
+            @path = ProjectPicker.call(cli: cli).path
+            board = cli.prompt.choice("Select a project work board", boards)
+
+            Result.new(board: board, path: path_with_board(team, board))
+          end
+
+          private
+
+          def path_with_board(team, board)
+            Path.from_ids(
+              organization_name: path.organization_name,
+              project_name: path.project_name,
+              team_name: Api.rfc_3986_encode_path_segment(team["name"]),
+              board_name: Api.rfc_3986_encode_path_segment(board["name"])
+            )
+          end
+
+          def team
+            @team ||= cli.prompt.choice("Select a team", teams)
+          end
+
+          def teams
+            @teams ||= api.get_paged("/_apis/projects/#{path.project_name}/teams")
+          end
+
+          def boards
+            team_name = Api.rfc_3986_encode_path_segment(team["name"])
+            @boards ||= api.get_paged("#{path.project_name}/#{team_name}/_apis/work/boards")
+          end
+
+          def api
+            Api.new(organization_name: path.organization_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

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Devops
+      module Services
+        class ProjectPicker
+          class Result
+            attr_reader :board, :path
+
+            def initialize(path:)
+              @path = path
+            end
+          end
+
+          AZURE_DEV_URL_REGEX = %r{^https://dev\.azure\.com/(?<organization>[^/]+)/(?<project>[^/]+)}.freeze
+          VS_URL_REGEX = %r{^https://(?<organization>[^.]+)\.visualstudio\.com/(?<project>[^/]+)}.freeze
+
+          extend Forwardable
+
+          def self.call(**args)
+            new(**args).call
+          end
+
+          attr_reader :cli
+
+          def initialize(cli:)
+            @cli = cli
+          end
+
+          def call
+            Result.new(
+              path: Path.from_ids(organization_name: organization_name, project_name: project_name)
+            )
+          end
+
+          private
+
+          def project_name
+            @project_name ||= project_url_match && project_url_match[:project]
+          end
+
+          def organization_name
+            @organization_name ||= project_url_match && project_url_match[:organization]
+          end
+
+          def project_url_match
+            AZURE_DEV_URL_REGEX.match(project_url) || VS_URL_REGEX.match(project_url)
+          end
+
+          def project_url
+            @project_url ||= loop do
+              url = prompt_url
+
+              break url if AZURE_DEV_URL_REGEX =~ url || VS_URL_REGEX =~ url
+
+              cli.warn("Invalid URL")
+            end
+          end
+
+          def prompt_url
+            cli.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
+  end
+end

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

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Devops
+      module Services
+        class WorkItemPicker
+          class Result
+            attr_reader :work_item, :path
+
+            def initialize(work_item:, path:)
+              @work_item = work_item
+              @path = path
+            end
+          end
+
+          def self.call(**args)
+            new(**args).call
+          end
+
+          attr_reader :cli, :config, :path, :board
+
+          def initialize(cli:, path:, config:, board:)
+            @cli = cli
+            @config = config
+            @path = path
+            @board = board
+          end
+
+          def call
+            work_item = select_work_item
+
+            path_with_work_item = Path.from_ids(
+              organization_name: path.organization_name,
+              project_name: path.project_name,
+              team_name: path.team_name,
+              board_name: path.board_name,
+              work_item_id: work_item["id"]
+            )
+
+            Result.new(work_item: work_item, path: path_with_work_item)
+          end
+
+          def select_work_item
+            column = cli.prompt.choice("Which column in #{board['name']}?", columns)
+            cli.warn("Fetching work items...")
+            work_items = work_items_in_column(column)
+
+            if work_items.length.zero?
+              cli.warn("Section is empty")
+              select_work_item
+            else
+              prompt_work_item(work_items) || select_work_item
+            end
+          end
+
+          def prompt_work_item(work_items)
+            options = work_items.map do |work_item|
+              {
+                "id" => work_item["id"],
+                "name" => "##{work_item['id']} #{work_item['name']}"
+              }
+            end
+
+            choice = cli.prompt.choice("Select a work item", options, nil_option: true)
+            choice && work_items.find { |work_item| work_item["id"] == choice["id"] }
+          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
+            )
+
+            work_items.map { |work_item| api.sanitize_work_item(work_item) }
+          end
+
+          def columns
+            board["columns"] ||
+              api.get("#{path.project_name}/#{path.team_name}/_apis/work/boards/#{path.board_name}")["columns"]
+          end
+
+          private
+
+          def api
+            Abt::Providers::Devops::Api.new(organization_name: path.organization_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