abt-cli 0.0.24 → 0.0.29

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/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_project! if project_name.nil? || flags[:clean]
+            prompt_board! if board_id.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,
+                board_id: board_id
+              ).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"] || "")
+          Path.new(local_available? && git["path"] || cli.directory_config.dig("devops", "path") || "")
         end
 
         def path=(new_path)

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

@@ -13,9 +13,9 @@ module Abt
           %r{^(#{ORGANIZATION_NAME_REGEX}/#{PROJECT_NAME_REGEX}(/#{BOARD_ID_REGEX}(/#{WORK_ITEM_ID_REGEX})?)?)?}.freeze
 
         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
+          return new unless organization_name && project_name
 
-          new([organization_name, project_name, board_id, *work_item_id].join("/"))
+          new([organization_name, project_name, *board_id, *work_item_id].join("/"))
         end
 
         def initialize(path = "")
@@ -43,7 +43,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,58 @@
+# 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.from_ids(
+              organization_name: path.organization_name,
+              project_name: path.project_name,
+              board_id: board["id"]
+            )
+
+            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

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,98 @@
+# 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,
+              board_id: path.board_id,
+              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("work/boards/#{path.board_id}")["columns"]
+          end
+
+          private
+
+          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

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

@@ -30,7 +30,7 @@ module Abt
 
           def create_and_switch
             warn("No such branch: #{branch_name}")
-            abort("Aborting") unless cli.prompt.boolean("Create branch?")
+            abort("Aborting") unless cli.prompt.boolean("Create branch?", default: true)
 
             Open3.popen3("git switch -c #{branch_name}") do |_i, _o, _e, thread|
               thread.value

data/lib/abt/providers/harvest.rb

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

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

@@ -26,13 +26,55 @@ module Abt
         def require_project!
           return if project_id
 
-          abort("No current/specified project. Did you initialize Harvest?")
+          abort("No current/specified project. Did you forget to run `pick`?")
         end
 
         def require_task!
-          abort("No current/specified project. Did you initialize Harvest and pick a task?") unless project_id
+          require_project!
+          return if task_id
 
-          abort("No current/specified task. Did you pick a Harvest task?") if task_id.nil?
+          abort("No current/specified task. Did you forget to run `pick`?")
+        end
+
+        def prompt_project!
+          result = Services::ProjectPicker.call(cli: cli, project_assignments: project_assignments)
+          @path = result.path
+          @project = result.project
+        end
+
+        def prompt_task!
+          result = Services::TaskPicker.call(cli: cli, path: path, project_assignment: project_assignment)
+          @path = result.path
+          @task = result.task
+        end
+
+        def task
+          return @task if instance_variable_defined?(:@task)
+
+          @task = if project_assignment
+                    project_assignment["task_assignments"].map { |ta| ta["task"] }.find do |task|
+                      task["id"].to_s == task_id
+                    end
+                  end
+        end
+
+        def project
+          return @project if instance_variable_defined?(:@project)
+
+          @project = if project_assignment
+                       project_assignment["project"].merge("client" => project_assignment["client"])
+                     end
+        end
+
+        def project_assignment
+          @project_assignment ||= project_assignments.find { |pa| pa["project"]["id"].to_s == path.project_id }
+        end
+
+        def project_assignments
+          @project_assignments ||= begin
+            warn("Fetching Harvest data...")
+            api.get_paged("users/me/project_assignments")
+          end
         end
 
         def print_project(project)

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

@@ -40,34 +40,6 @@ module Abt
             abort("Invalid project: #{project_id}") if project.nil?
             abort("Invalid task: #{task_id}") if task_id && task.nil?
           end
-
-          def project
-            return @project if instance_variable_defined?(:@project)
-
-            @project = if project_assignment
-                         project_assignment["project"].merge("client" => project_assignment["client"])
-                       end
-          end
-
-          def task
-            return @task if instance_variable_defined?(:@task)
-
-            @task = if project_assignment
-                      project_assignment["task_assignments"].map { |ta| ta["task"] }.find do |task|
-                        task["id"].to_s == task_id
-                      end
-                    end
-          end
-
-          def project_assignment
-            @project_assignment ||= begin
-              project_assignments.find { |pa| pa["project"]["id"].to_s == project_id }
-            end
-          end
-
-          def project_assignments
-            @project_assignments ||= api.get_paged("users/me/project_assignments")
-          end
         end
       end
     end