abt-cli 0.0.28 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dd7a6d58fed695f167581c8c7b16578b1e0f29664319c1b3594235e07bfc179
-  data.tar.gz: 48e88420bd4e7b7dd2c99ac82cfcc7ada1120637f9f7b08c39fa9abf128ebefe
+  metadata.gz: 38d3fa16692941ffa0e720a7a0331d91215e33e37092946df35053f040ee2af8
+  data.tar.gz: b2471d250f4580b9334f7005496e45ae1487eb8e979bcf3aedd975e3f418c79b
 SHA512:
-  metadata.gz: d8e7534007c20d2f16099e453d8d7fdaae042f4f658ef111c4a7d2ec25dee13d9e6c7ed511de57ba14e249c1043129cb540742a5746ee32c6ed51c419470e756
-  data.tar.gz: 28173fc0ea536fdfd3c787e18abf4ed27818f9a47d4e69bfa2c25c6f5a00ef12e586378dec0be4e21b61cb198e24ab8ba36c1289ccc0b90f0f009d88000ba5e3
+  metadata.gz: c5232fcb04eb5c3c35cae6b29a82586ef289316a3540eec50f63aa55b42a79226e4000d3c6cff37a318cf8b93d17f47df3cccd8a61f68d02e2fccbe0f9aacd18
+  data.tar.gz: 59cc3c70175c71420cbb2c0bc0b6e96d40b34c21a225cf4f2e3e310fa33f228a1792a31d6eeb9b4485ef140f75f88358679e08d301ef7adde736b5f45fe86ddf

data/lib/abt/providers/asana/commands/clear.rb

@@ -22,7 +22,7 @@ module Abt
           end
 
           def perform
-            abort("Flags --global and --all cannot be used at the same time") if flags[:global] && flags[:all]
+            abort("Flags --global and --all cannot be used together") if flags[:global] && flags[:all]
 
             config.clear_local unless flags[:global]
             config.clear_global if flags[:global] || flags[:all]

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

@@ -28,7 +28,7 @@ module Abt
             return if flags[:"dry-run"]
 
             if config.local_available?
-              config.path = Path.from_gids(project_gid: project["gid"], task_gid: task["gid"])
+              config.path = path
             else
               warn("No local configuration to update - will function as dry run")
             end

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

@@ -15,7 +15,7 @@ module Abt
         end
 
         def path
-          Path.new(local_available? && git["path"] || directory_config["path"] || "")
+          Path.new((local_available? && git["path"]) || directory_config["path"] || "")
         end
 
         def path=(new_path)

data/lib/abt/providers/asana/services/task_picker.rb

@@ -30,7 +30,7 @@ module Abt
           def call
             task = select_task
 
-            path_with_task = Path.new([path, task["gid"]].join("/"))
+            path_with_task = Path.from_gids(project_gid: path.project_gid, task_gid: task["gid"])
 
             Result.new(task: task, path: path_with_task)
           end
@@ -45,7 +45,7 @@ module Abt
               cli.warn("Section is empty")
               select_task
             else
-              cli.prompt.choice("Select a task", tasks, nil_option: true) || select_task
+              cli.prompt.choice("Select a task", options_for_tasks(tasks), nil_option: true) || select_task
             end
           end
 
@@ -53,12 +53,32 @@ module Abt
             cli.prompt.choice("Which section in #{project['name']}?", sections)
           end
 
+          def options_for_tasks(tasks)
+            tasks.map do |task|
+              formatted_name = [
+                task["name"],
+                formatted_assignee(task)
+              ].compact.join(" ")
+
+              task.merge("name" => formatted_name)
+            end
+          end
+
+          def formatted_assignee(task)
+            name = task.dig("assignee", "name")
+
+            return unless name
+
+            initials = name.split.map(&:chr).join.upcase
+            "(#{initials}👤)"
+          end
+
           def tasks_in_section(section)
             cli.warn("Fetching tasks...")
             tasks = api.get_paged(
               "tasks",
               section: section["gid"],
-              opt_fields: "name,completed,permalink_url"
+              opt_fields: "name,completed,permalink_url,assignee.name"
             )
 
             # The below filtering is the best we can do with Asanas api, see this:

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

@@ -4,15 +4,22 @@ module Abt
   module Providers
     module Devops
       class Api
+        # Shamelessly copied from ERB::Util.url_encode
+        # https://apidock.com/ruby/ERB/Util/url_encode
+        def self.rfc_3986_encode_path_segment(string)
+          string.to_s.b.gsub(/[^a-zA-Z0-9_\-.~]/) do |match|
+            format("%%%02X", match.unpack1("C"))
+          end
+        end
+
         VERBS = [:get, :post, :put].freeze
 
         CONDITIONAL_ACCESS_POLICY_ERROR_CODE = "VS403463"
 
         attr_reader :organization_name, :project_name, :username, :access_token, :cli
 
-        def initialize(organization_name:, project_name:, username:, access_token:, cli:)
+        def initialize(organization_name:, username:, access_token:, cli:)
           @organization_name = organization_name
-          @project_name = project_name
           @username = username
           @access_token = access_token
           @cli = cli
@@ -32,12 +39,12 @@ module Abt
         end
 
         def work_item_query(wiql)
-          response = post("wit/wiql", Oj.dump({ query: wiql }, mode: :json))
+          response = post("_apis/wit/wiql", Oj.dump({ query: wiql }, mode: :json))
           ids = response["workItems"].map { |work_item| work_item["id"] }
 
           work_items = []
           ids.each_slice(200) do |page_ids|
-            work_items += get_paged("wit/workitems", ids: page_ids.join(","))
+            work_items += get_paged("_apis/wit/workitems", ids: page_ids.join(","))
           end
 
           work_items
@@ -58,19 +65,17 @@ module Abt
         end
 
         def base_url
-          "https://#{organization_name}.visualstudio.com/#{project_name}"
-        end
-
-        def api_endpoint
-          "#{base_url}/_apis"
+          "https://#{organization_name}.visualstudio.com"
         end
 
         def url_for_work_item(work_item)
-          "#{base_url}/_workitems/edit/#{work_item['id']}"
+          project_name = self.class.rfc_3986_encode_path_segment(work_item["fields"]["System.TeamProject"])
+          "#{base_url}/#{project_name}/_workitems/edit/#{work_item['id']}"
         end
 
-        def url_for_board(board)
-          "#{base_url}/_boards/board/#{rfc_3986_encode_path_segment(board['name'])}"
+        def url_for_board(project_name, team_name, board)
+          board_name = self.class.rfc_3986_encode_path_segment(board["name"])
+          "#{base_url}/#{project_name}/_boards/board/t/#{team_name}/#{board_name}"
         end
 
         def sanitize_work_item(work_item)
@@ -84,7 +89,7 @@ module Abt
         end
 
         def connection
-          @connection ||= Faraday.new(api_endpoint) do |connection|
+          @connection ||= Faraday.new(base_url) do |connection|
             connection.basic_auth(username, access_token)
             connection.headers["Content-Type"] = "application/json"
             connection.headers["Accept"] = "application/json; api-version=6.0"
@@ -93,14 +98,6 @@ module Abt
 
         private
 
-        # Shamelessly copied from ERB::Util.url_encode
-        # https://apidock.com/ruby/ERB/Util/url_encode
-        def rfc_3986_encode_path_segment(string)
-          string.to_s.b.gsub(/[^a-zA-Z0-9_\-.~]/) do |match|
-            format("%%%02X", match.unpack1("C"))
-          end
-        end
-
         def handle_denied_by_conditional_access_policy!(exception)
           raise exception unless exception.message.include?(CONDITIONAL_ACCESS_POLICY_ERROR_CODE)
 

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

@@ -8,7 +8,7 @@ module Abt
 
         attr_reader :config, :path
 
-        def_delegators(:@path, :organization_name, :project_name, :board_id, :work_item_id)
+        def_delegators(:@path, :organization_name, :project_name, :team_name, :board_name, :work_item_id)
 
         def initialize(ari:, cli:)
           super
@@ -24,7 +24,7 @@ module Abt
         end
 
         def require_board!
-          return if board_id && organization_name && project_name
+          return if board_name && organization_name && project_name && team_name
 
           abort("No current/specified board. Did you forget to `pick`?")
         end
@@ -36,12 +36,8 @@ module Abt
           abort("No current/specified work item. Did you forget to `pick`?")
         end
 
-        def prompt_project!
-          @path = Services::ProjectPicker.call(cli: cli).path
-        end
-
         def prompt_board!
-          result = Services::BoardPicker.call(cli: cli, path: path, config: config)
+          result = Services::BoardPicker.call(cli: cli, config: config)
           @path = result.path
           @board = result.board
         end
@@ -54,7 +50,7 @@ module Abt
 
         def board
           @board ||= begin
-            api.get("work/boards/#{board_id}")
+            api.get("#{project_name}/#{team_name}/_apis/work/boards/#{board_name}")
           rescue HttpError::NotFoundError
             nil
           end
@@ -62,33 +58,34 @@ module Abt
 
         def work_item
           @work_item ||= begin
-            work_item = api.get_paged("wit/workitems", ids: work_item_id)[0]
+            work_item = api.get_paged("_apis/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)
-          path = "#{organization_name}/#{project_name}/#{board['id']}"
+        def print_board(organization_name, project_name, team_name, board)
+          board_name = Api.rfc_3986_encode_path_segment(board["name"])
+          path = "#{organization_name}/#{project_name}/#{team_name}/#{board_name}"
 
           cli.print_ari("devops", path, board["name"])
-          warn(api.url_for_board(board)) if cli.output.isatty
+          warn(api.url_for_board(project_name, team_name, board)) if cli.output.isatty
         end
 
-        def print_work_item(organization, project, board, work_item)
-          path = "#{organization}/#{project}/#{board['id']}/#{work_item['id']}"
+        def print_work_item(organization, project, team_name, board, work_item)
+          board_name = Api.rfc_3986_encode_path_segment(board["name"])
+          path = "#{organization}/#{project}/#{team_name}/#{board_name}/#{work_item['id']}"
 
           cli.print_ari("devops", path, work_item["name"])
           warn(work_item["url"]) if work_item.key?("url") && cli.output.isatty
         end
 
         def api
-          Abt::Providers::Devops::Api.new(organization_name: organization_name,
-                                          project_name: project_name,
-                                          username: config.username_for_organization(organization_name),
-                                          access_token: config.access_token_for_organization(organization_name),
-                                          cli: cli)
+          Api.new(organization_name: organization_name,
+                  username: config.username_for_organization(organization_name),
+                  access_token: config.access_token_for_organization(organization_name),
+                  cli: cli)
         end
       end
     end

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

@@ -19,11 +19,9 @@ module Abt
             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('/')}
+                devops:#{path}
               TXT
             end
           end

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

@@ -22,7 +22,7 @@ module Abt
           end
 
           def perform
-            abort("Flags --global and --all cannot be used at the same time") if flags[:global] && flags[:all]
+            abort("Flags --global and --all cannot be used together") if flags[:global] && flags[:all]
 
             config.clear_local unless flags[:global]
             config.clear_global if flags[:global] || flags[:all]

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

@@ -30,9 +30,9 @@ module Abt
 
           def print_configuration
             if work_item_id.nil?
-              print_board(organization_name, project_name, board)
+              print_board(organization_name, project_name, team_name, board)
             else
-              print_work_item(organization_name, project_name, board, work_item)
+              print_work_item(organization_name, project_name, team_name, board, work_item)
             end
           end
 

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

@@ -19,11 +19,9 @@ module Abt
             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('/')}
+                devops:#{path}
               TXT
             end
           end

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

@@ -23,12 +23,12 @@ module Abt
           def perform
             pick!
 
-            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"]
 
             if config.local_available?
-              update_config(work_item)
+              config.path = path
             else
               warn("No local configuration to update - will function as dry run")
             end
@@ -37,19 +37,9 @@ module Abt
           private
 
           def pick!
-            prompt_project! if project_name.nil? || flags[:clean]
-            prompt_board! if board_id.nil? || flags[:clean]
+            prompt_board! if board_name.nil? || flags[:clean]
             prompt_work_item!
           end
-
-          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
         end
       end
     end

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

@@ -14,11 +14,10 @@ module Abt
           end
 
           def perform
-            prompt_project! unless project_name
-            prompt_board! unless board_id
+            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
 

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

@@ -20,8 +20,7 @@ module Abt
           end
 
           def perform
-            prompt_project! if project_name.nil? || flags[:clean]
-            prompt_board! if board_id.nil? || flags[:clean]
+            prompt_board! if board_name.nil? || flags[:clean]
 
             update_directory_config!
 
@@ -35,7 +34,8 @@ module Abt
               "path" => Path.from_ids(
                 organization_name: organization_name,
                 project_name: project_name,
-                board_id: board_id
+                team_name: team_name,
+                board_name: board_name
               ).to_s
             }
             cli.directory_config.save!

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

@@ -15,7 +15,7 @@ module Abt
         end
 
         def path
-          Path.new(local_available? && git["path"] || cli.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)
+        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

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

@@ -20,32 +20,47 @@ module Abt
 
           attr_reader :cli, :config, :path
 
-          def initialize(cli:, path:, config:)
+          def initialize(cli:, config:)
             @cli = cli
             @config = config
-            @path = path
           end
 
           def call
+            @path = ProjectPicker.call(cli: cli).path
             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)
+            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
-            @boards ||= api.get_paged("work/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
-            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)
+            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

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

@@ -30,7 +30,13 @@ module Abt
           def call
             work_item = select_work_item
 
-            path_with_work_item = Path.new([path, work_item["id"]].join("/"))
+            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
@@ -74,14 +80,14 @@ module Abt
           end
 
           def columns
-            board["columns"] || api.get("work/boards/#{path.board_id}")["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,
-                                            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)

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

@@ -22,7 +22,7 @@ module Abt
           end
 
           def perform
-            abort("Flags --global and --all cannot be used at the same time") if flags[:global] && flags[:all]
+            abort("Flags --global and --all cannot be used together") if flags[:global] && flags[:all]
 
             config.clear_local unless flags[:global]
             config.clear_global if flags[:global] || flags[:all]

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

@@ -32,7 +32,7 @@ module Abt
               return
             end
 
-            config.path = Path.from_ids(project_id: project["id"], task_id: task["id"])
+            config.path = path
           end
 
           private

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

@@ -4,7 +4,7 @@ module Abt
   module Providers
     module Harvest
       module Commands
-        class Track < BaseCommand
+        class Track < BaseCommand # rubocop:disable Metrics/ClassLength
           def self.usage
             "abt track harvest[:<project-id>/<task-id>] [options]"
           end
@@ -20,15 +20,21 @@ module Abt
               ["-s", "--set", "Set specified task as current"],
               ["-c", "--comment COMMENT", "Override comment"],
               ["-t", "--time HOURS",
-               "Set hours. Creates a stopped entry unless used with --running"],
-              ["-r", "--running", "Used with --time, starts the created time entry"]
+               "Track amount of hours, this will create a stopped entry."],
+              ["-i", "--since HH:MM",
+               "Start entry today at specified time. The computed duration will be deducted from the running entry if one exists."] # rubocop:disable Layout/LineLength
             ]
           end
 
           def perform
+            abort("Flags --time and --since cannot be used together") if flags[:time] && flags[:since]
+
             require_task!
 
-            print_task(created_time_entry["project"], created_time_entry["task"])
+            maybe_adjust_previous_entry
+            entry = create_entry!
+
+            print_task(entry["project"], entry["task"])
 
             maybe_override_current_task
           rescue Abt::HttpError::HttpError => _e
@@ -37,31 +43,41 @@ module Abt
 
           private
 
-          def created_time_entry
-            @created_time_entry ||= create_time_entry
+          def create_entry!
+            result = api.post("time_entries", Oj.dump(entry_data, mode: :json))
+            api.patch("time_entries/#{result['id']}/restart") if flags.key?(:since)
+            result
           end
 
-          def create_time_entry
-            body = time_entry_data
+          def maybe_adjust_previous_entry
+            return unless flags.key?(:since)
+            return unless since_flag_duration # Ensure --since flag is valid before fetching data
+            return unless previous_entry
+
+            adjust_previous_entry
+          end
 
-            result = api.post("time_entries", Oj.dump(body, mode: :json))
+          def adjust_previous_entry
+            updated_hours = previous_entry["hours"] - since_flag_duration
+            abort("Cannot adjust previous entry to a negative duration") if updated_hours <= 0
 
-            api.patch("time_entries/#{result['id']}/restart") if flags.key?(:time) && flags[:running]
+            api.patch("time_entries/#{previous_entry['id']}", Oj.dump({ hours: updated_hours }, mode: :json))
 
-            result
+            subtracted_minutes = (since_flag_duration * 60).round
+            warn("~#{subtracted_minutes} minute(s) subtracted from previous entry")
           end
 
-          def time_entry_data
-            body = time_entry_base_data
+          def entry_data
+            body = entry_base_data
 
             maybe_add_external_link(body)
             maybe_add_comment(body)
-            maybe_add_time(body)
+            maybe_add_hours(body)
 
             body
           end
 
-          def time_entry_base_data
+          def entry_base_data
             {
               project_id: project_id,
               task_id: task_id,
@@ -74,8 +90,8 @@ module Abt
             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
@@ -83,38 +99,40 @@ module Abt
             end
           end
 
-          def maybe_add_comment(body)
-            body[:notes] = flags[:comment] if flags.key?(:comment)
-            body[:notes] ||= cli.prompt.text("Fill in comment (optional)")
-          end
-
-          def maybe_add_time(body)
-            body[:hours] = flags[:time] if flags.key?(:time)
-          end
-
           def external_link_data
             return @external_link_data if instance_variable_defined?(:@external_link_data)
+            return @external_link_data = nil if link_data_lines.empty?
 
-            lines = fetch_link_data_lines
-
-            return @external_link_data = nil if lines.empty?
-
-            if lines.length > 1
+            if link_data_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)
+            @external_link_data = Oj.load(link_data_lines.first, symbol_keys: true)
           end
 
-          def fetch_link_data_lines
-            other_aris = cli.aris - [ari]
-            return [] if other_aris.empty?
+          def link_data_lines
+            @link_data_lines ||= begin
+              other_aris = cli.aris - [ari]
+              other_aris.map do |other_ari|
+                input = StringIO.new(other_ari.to_s)
+                output = StringIO.new
+                Abt::Cli.new(argv: ["harvest-time-entry-data"], output: output, input: input).perform
+                output.string.chomp
+              end.reject(&:empty?)
+            end
+          end
 
-            input = StringIO.new(other_aris.to_s)
-            output = StringIO.new
-            Abt::Cli.new(argv: ["harvest-time-entry-data"], output: output, input: input).perform
+          def maybe_add_comment(body)
+            body[:notes] = flags[:comment] if flags.key?(:comment)
+            body[:notes] ||= cli.prompt.text("Fill in comment (optional)")
+          end
 
-            output.string.strip.lines
+          def maybe_add_hours(body)
+            if flags[:time]
+              body[:hours] = flags[:time]
+            elsif flags[:since]
+              body[:hours] = since_flag_duration
+            end
           end
 
           def maybe_override_current_task
@@ -125,6 +143,21 @@ module Abt
             config.path = path
             warn("Current task updated")
           end
+
+          def since_flag_duration
+            @since_flag_duration ||= begin
+              since_hours = HarvestHelpers.decimal_hours_from_string(flags[:since])
+              now_hours = HarvestHelpers.decimal_hours_from_string(Time.now.strftime("%T"))
+
+              abort("Specified \"since\" time (#{flags[:since]}) is in the future") if now_hours <= since_hours
+
+              now_hours - since_hours
+            end
+          end
+
+          def previous_entry
+            @previous_entry ||= api.get_paged("time_entries", is_running: true, user_id: config.user_id).first
+          end
         end
       end
     end

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

@@ -15,7 +15,7 @@ module Abt
         end
 
         def path
-          Path.new(local_available? && git["path"] || cli.directory_config.dig("harvest", "path") || "")
+          Path.new((local_available? && git["path"]) || cli.directory_config.dig("harvest", "path") || "")
         end
 
         def path=(new_path)

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Harvest
+      class HarvestHelpers
+        class << self
+          HOURS_REGEX = /(?<hours>\d+)/.freeze
+          MINUTES_REGEX = /(?<minutes>[0-5][0-9])/.freeze
+          SECONDS_REGEX = /(?<seconds>[0-5][0-9])/.freeze
+          TIME_REGEX = /^#{HOURS_REGEX}:#{MINUTES_REGEX}(?::#{SECONDS_REGEX})?$/.freeze
+
+          def decimal_hours_from_string(hh_mm_ss)
+            match = TIME_REGEX.match(hh_mm_ss)
+            raise Abt::Cli::Abort, "Invalid time: #{hh_mm_ss}, supported formats are: HH:MM, HH:MM:SS" if match.nil?
+
+            match[:hours].to_i +
+              (match[:minutes].to_i / 60.0) +
+              (match[:seconds].to_i / 60.0 / 60.0)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/abt/providers/harvest/services/task_picker.rb

@@ -29,7 +29,7 @@ module Abt
           def call
             task = cli.prompt.choice("Select a task from #{project['name']}", tasks)
 
-            path_with_task = Path.new([path, task["id"]].join("/"))
+            path_with_task = Path.from_ids(project_id: path.project_id, task_id: task["id"])
 
             Result.new(task: task, path: path_with_task)
           end

data/lib/abt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Abt
-  VERSION = "0.0.28"
+  VERSION = "0.0.32"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abt-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.32
 platform: ruby
 authors:
 - Jesper Sørensen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-28 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -66,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: 
+description:
 email:
 - js@abtion.com
 executables:
@@ -118,7 +118,6 @@ files:
 - "./lib/abt/providers/devops.rb"
 - "./lib/abt/providers/devops/api.rb"
 - "./lib/abt/providers/devops/base_command.rb"
-- "./lib/abt/providers/devops/commands/boards.rb"
 - "./lib/abt/providers/devops/commands/branch_name.rb"
 - "./lib/abt/providers/devops/commands/clear.rb"
 - "./lib/abt/providers/devops/commands/current.rb"
@@ -148,6 +147,7 @@ files:
 - "./lib/abt/providers/harvest/commands/track.rb"
 - "./lib/abt/providers/harvest/commands/write_config.rb"
 - "./lib/abt/providers/harvest/configuration.rb"
+- "./lib/abt/providers/harvest/harvest_helpers.rb"
 - "./lib/abt/providers/harvest/path.rb"
 - "./lib/abt/providers/harvest/services/project_picker.rb"
 - "./lib/abt/providers/harvest/services/task_picker.rb"
@@ -159,7 +159,8 @@ licenses:
 metadata:
   homepage_uri: https://github.com/abtion/abt
   source_code_uri: https://github.com/abtion/abt
-post_install_message: 
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -174,8 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Versatile scripts
 test_files: []

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

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module Abt
-  module Providers
-    module Devops
-      module Commands
-        class Boards < BaseCommand
-          def self.usage
-            "abt boards devops"
-          end
-
-          def self.description
-            "List all boards - useful for piping into grep etc"
-          end
-
-          def perform
-            prompt_project! unless project_name
-
-            boards.map do |board|
-              print_board(organization_name, project_name, board)
-            end
-          end
-
-          private
-
-          def boards
-            @boards ||= api.get_paged("work/boards")
-          end
-        end
-      end
-    end
-  end
-end