abt-cli 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f0389f2300f5dc3f3143f6672d770a7dc50cce27b77774915eba3873cdfc89c
-  data.tar.gz: bc7952525895e85a0b2d0b0e679ebf98a687647e86bf2b4250d9dcb0abc1e4ac
+  metadata.gz: 9b0f6705f90f844f11a301d2aee417ded8524de882bba8cd114d62ceee77ee92
+  data.tar.gz: d51120f9529853801fefd8b557102e1cac058685da5208f5a42577726e3c871d
 SHA512:
-  metadata.gz: 484a395a41009899bb56e42049f0acb33e764ff8b4f54fbabdb5e7a468e663717f537a9b6e29934b02e6d668b7b6f3218fca35f6de3983ff32dd3e51a48ba7b3
-  data.tar.gz: 0d1651b94be6bbc6c93fb68fee3b1ca2dab62aa5160994b29b0009ee68f77090c3303b145cb3aae49305c5742ace9153a7392c637c566422cdec088923de61df
+  metadata.gz: f2e08dd8e61a8d0271661af7e653b4da5d26f5ba0790cf657e2ec0c8524d784af707e1cd9bb2914192ba6943ae1d39f845aedd80c3dbffc2f529a46b9a0dba5d
+  data.tar.gz: 728e3b2cfbe503ab9188b789510c112e3f2c569e32a3a541f1f30e454bfdd80381f0a35185fc0b10ad9ff9751141dc168bdb84422b09657b46621f04df982df1

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/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/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/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/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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abt-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - Jesper Sørensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
+date: 2021-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -147,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"