abt-cli 0.0.26 → 0.0.31

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/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/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

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

@@ -15,46 +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
-            require_local_config!
-            require_project!
-
-            warn(project["name"])
-            task = pick_task
+            pick!
 
             print_task(project, task)
 
             return if flags[:"dry-run"]
 
-            config.path = Path.from_ids(project_id: project_id, task_id: task["id"])
-          end
-
-          private
-
-          def project
-            project_assignment["project"]
-          end
-
-          def pick_task
-            cli.prompt.choice("Select a task", tasks)
-          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
           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

@@ -22,17 +22,10 @@ module Abt
           private
 
           def projects
-            @projects ||= begin
-              warn("Fetching projects...")
-              project_assignments.map do |project_assignment|
-                project_assignment["project"].merge("client" => project_assignment["client"])
-              end
+            @projects ||= project_assignments.map do |project_assignment|
+              project_assignment["project"].merge("client" => project_assignment["client"])
             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,25 +23,8 @@ 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")
+            @tasks ||= project_assignment["task_assignments"].map { |ta| ta["task"] }
           end
         end
       end

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/commands/write_config.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Harvest
+      module Commands
+        class WriteConfig < BaseCommand
+          def self.usage
+            "abt write-config harvest[:<project-id>[/<task-id>]]"
+          end
+
+          def self.description
+            "Write Harvest settings to .abt.yml"
+          end
+
+          def self.flags
+            [
+              ["-c", "--clean", "Don't reuse configuration"]
+            ]
+          end
+
+          def perform
+            prompt_project! if project_id.nil? || flags[:clean]
+            prompt_task! if task_id.nil? || flags[:clean]
+
+            update_directory_config!
+
+            warn("Harvest configuration written to #{Abt::DirectoryConfig::FILE_NAME}")
+          end
+
+          private
+
+          def update_directory_config!
+            cli.directory_config["harvest"] = { "path" => path.to_s }
+            cli.directory_config.save!
+          end
+        end
+      end
+    end
+  end
+end