abt-cli 0.0.22 → 0.0.27

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

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
@@ -61,7 +61,7 @@ module Abt
           end
 
           def branch_names_from_aris
-            other_aris = cli.aris - [ari]
+            return @branch_names_from_aris if instance_variable_defined?(:@branch_names_from_aris)
 
             abort("You must provide an additional ARI that responds to: branch-name. E.g., asana") if other_aris.empty?
 
@@ -69,7 +69,11 @@ module Abt
             output = StringIO.new
             Abt::Cli.new(argv: ["branch-name"], output: output, input: input).perform
 
-            output.string.lines.map(&:strip).compact
+            @branch_names_from_aris = output.string.lines.map(&:strip).compact
+          end
+
+          def other_aris
+            @other_aris ||= cli.aris - [ari]
           end
         end
       end

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

@@ -19,16 +19,62 @@ module Abt
 
         private
 
+        def require_local_config!
+          abort("Must be run inside a git repository") unless config.local_available?
+        end
+
         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 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
 
-          abort("No current/specified task. Did you pick a Harvest task?") if task_id.nil?
+        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

@@ -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_project!
             ensure_valid_configuration!
 
@@ -41,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

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

@@ -15,42 +15,31 @@ module Abt
 
           def self.flags
             [
-              ["-d", "--dry-run", "Keep existing configuration"]
+              ["-d", "--dry-run", "Keep existing configuration"],
+              ["-c", "--clean", "Don't reuse project configuration"]
             ]
           end
 
           def perform
-            abort("Must be run inside a git repository") unless config.local_available?
-            require_project!
-
-            warn(project["name"])
-            task = cli.prompt.choice("Select a task", tasks)
+            pick!
 
             print_task(project, task)
 
             return if flags[:"dry-run"]
 
-            config.path = Path.from_ids(project_id, task["id"])
-          end
-
-          private
-
-          def project
-            project_assignment["project"]
-          end
+            unless config.local_available?
+              warn("No local configuration to update - will function as dry run")
+              return
+            end
 
-          def tasks
-            @tasks ||= project_assignment["task_assignments"].map { |ta| ta["task"] }
+            config.path = Path.from_ids(project_id: project["id"], task_id: task["id"])
           end
 
-          def project_assignment
-            @project_assignment ||= begin
-              project_assignments.find { |pa| pa["project"]["id"].to_s == project_id }
-            end
-          end
+          private
 
-          def project_assignments
-            @project_assignments ||= api.get_paged("users/me/project_assignments")
+          def pick!
+            prompt_project! if project_id.nil? || flags[:clean]
+            prompt_task!
           end
         end
       end

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

@@ -23,16 +23,11 @@ module Abt
 
           def projects
             @projects ||= begin
-              warn("Fetching projects...")
               project_assignments.map do |project_assignment|
                 project_assignment["project"].merge("client" => project_assignment["client"])
               end
             end
           end
-
-          def project_assignments
-            @project_assignments ||= api.get_paged("users/me/project_assignments")
-          end
         end
       end
     end

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

@@ -14,7 +14,7 @@ module Abt
           end
 
           def perform
-            require_project!
+            prompt_project! unless project_id
 
             tasks.each do |task|
               print_task(project, task)
@@ -23,26 +23,11 @@ module Abt
 
           private
 
-          def project
-            project_assignment["project"]
-          end
-
           def tasks
             @tasks ||= begin
-              warn("Fetching tasks...")
               project_assignment["task_assignments"].map { |ta| ta["task"] }
             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

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

@@ -42,8 +42,7 @@ module Abt
           end
 
           def create_time_entry
-            body = time_entry_base_data
-            body[:hours] = flags[:time] if flags.key?(:time)
+            body = time_entry_data
 
             result = api.post("time_entries", Oj.dump(body, mode: :json))
 
@@ -52,47 +51,62 @@ module Abt
             result
           end
 
+          def time_entry_data
+            body = time_entry_base_data
+
+            maybe_add_external_link(body)
+            maybe_add_comment(body)
+            maybe_add_time(body)
+
+            body
+          end
+
           def time_entry_base_data
-            body = {
+            {
               project_id: project_id,
               task_id: task_id,
               user_id: config.user_id,
               spent_date: Date.today.iso8601
             }
+          end
 
+          def maybe_add_external_link(body)
             if external_link_data
               warn(<<~TXT)
                 Linking to:
-                  #{external_link_data[:notes]}
-                  #{external_link_data[:external_reference][:permalink]}
+                #{external_link_data[:notes]}
+                #{external_link_data[:external_reference][:permalink]}
               TXT
               body.merge!(external_link_data)
             else
               warn("No external link provided")
             end
+          end
 
+          def maybe_add_comment(body)
             body[:notes] = flags[:comment] if flags.key?(:comment)
             body[:notes] ||= cli.prompt.text("Fill in comment (optional)")
-            body
+          end
+
+          def maybe_add_time(body)
+            body[:hours] = flags[:time] if flags.key?(:time)
           end
 
           def external_link_data
-            @external_link_data ||= begin
-              lines = call_harvest_time_entry_data_for_other_aris
-
-              if lines.empty?
-                nil
-              else
-                if lines.length > 1
-                  abort("Got reference data from multiple scheme providers, only one is supported at a time")
-                end
-
-                Oj.load(lines.first, symbol_keys: true)
-              end
+            return @external_link_data if instance_variable_defined?(:@external_link_data)
+
+            lines = fetch_link_data_lines
+
+            return @external_link_data = nil if lines.empty?
+
+            if lines.length > 1
+              abort("Got reference data from multiple scheme providers, only one is supported at a time")
             end
+
+            @external_link_data = Oj.load(lines.first, symbol_keys: true)
           end
 
-          def call_harvest_time_entry_data_for_other_aris
+          def fetch_link_data_lines
             other_aris = cli.aris - [ari]
             return [] if other_aris.empty?