abt-cli 0.0.26 → 0.0.27

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

@@ -42,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,15 +16,16 @@ 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
+              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
@@ -49,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,26 +15,33 @@ 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)
 
             return if flags[:"dry-run"]
 
-            update_config(work_item)
+            if config.local_available?
+              update_config(work_item)
+            else
+              warn("No local configuration to update - will function as dry run")
+            end
           end
 
           private
 
+          def pick!
+            prompt_project! if project_name.nil? || flags[:clean]
+            prompt_board! if board_id.nil? || flags[:clean]
+            prompt_work_item!
+          end
+
           def update_config(work_item)
             config.path = Path.from_ids(
               organization_name: organization_name,
@@ -43,52 +50,6 @@ module Abt
               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
-            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| sanitize_work_item(work_item) }
-          end
-
-          def columns
-            board["columns"]
-          end
-
-          def board
-            @board ||= api.get("work/boards/#{board_id}")
-          end
         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/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 = "")

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

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

@@ -0,0 +1,79 @@
+# 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 ||= begin
+              project_url_match && project_url_match[:project]
+            end
+          end
+
+          def organization_name
+            @organization_name ||= begin
+              project_url_match && project_url_match[:organization]
+            end
+          end
+
+          def project_url_match
+            AZURE_DEV_URL_REGEX.match(project_url) || VS_URL_REGEX.match(project_url)
+          end
+
+          def project_url
+            @project_url ||= begin
+              loop do
+                url = prompt_url
+
+                break url if AZURE_DEV_URL_REGEX =~ url || VS_URL_REGEX =~ url
+
+                cli.warn("Invalid URL")
+              end
+            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,93 @@
+# 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.new([path, work_item["id"]].join("/"))
+
+            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