harvest-worklog 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ead4ee3da24a3522c5b5e09e694de573b4e10c2736b7e328377197efd349dcb
-  data.tar.gz: 41cce9ae00a04e151fd68914ddbb3200ae8451c837f93e95a8bd5b601ea1fc27
+  metadata.gz: b50e3af9480bb1ed9d5a98d4e746b3476cf14b10b04ce90dfacaacafa872bd52
+  data.tar.gz: cf030243de7c163c4fb1287af66bf60f50669b55fed524c1e304ff00d1b0ab21
 SHA512:
-  metadata.gz: 2e2592d645f2153fab30539d0ad0fd103b8008c0025950c9222298fc1e06abf4cbd759f3b1a6e4a8eeba5ecf985670d13b994d430b870144afdf825a0ea44018
-  data.tar.gz: 11f9e301054fc944a9abf5a4509777cb9e6e538d3cd5be2fd50fc06b2a88feaf577b7ae22265ffe7d0a45972f5a7d25f58b99fb9ea36fd54b9eaee2edce0cd64
+  metadata.gz: a70c1b74ccc40f2641a5668830783e7b5f3f6773d0bec2fe825dd1591ac0d4ca79f5e057a5b75d6f36dd98a20d106210b153af4f8364929533aca6f420c5a3e8
+  data.tar.gz: 52e27558d3af81deb788fce38892e7cb7410907f4974ef553f6e2c3998385054ebb6415a88531ec3465e39f4d8fda9bf63a72bc93b5e63ed72ca277ca0d24e6a

data/README.md

@@ -21,7 +21,9 @@ Personal Access Tokens are the intended Harvest authentication method for person
 
 ```text
 harvest-worklog time-off FROM TO --project NAME --task NAME [options]
+harvest-worklog time-off FROM TO --project-id ID --task-id ID [options]
 harvest-worklog work-entry DATE --project NAME --task NAME --hours HOURS --notes NOTES [options]
+harvest-worklog work-entry DATE --project-id ID --task-id ID --hours HOURS --notes NOTES [options]
 harvest-worklog aggregate FROM TO [--project NAME] [--task NAME]
 harvest-worklog timesheet DATE --project NAME [--task NAME]
 ```
@@ -42,6 +44,8 @@ The default holiday region is `ca_yt`. Add `--holiday-region REGION` or set `HAR
 
 A time-off block never creates weekend entries. When names are supplied, it resolves them from your active personal Harvest assignments, so a Project Manager role is not required.
 
+The `harvest_record_time_off` OMP tool accepts the same name pair or ID pair. Its optional `holidayRegions` array adds per-call regions to the configured defaults.
+
 ### Reviewed ordinary work
 
 The `work-entry` command checks for existing or locked entries for its project, task, and date before creating a new duration entry. Use `--dry-run` to complete that preflight without a write. OMP Project Time uses the same path.
@@ -66,9 +70,9 @@ The `timesheet` command reads the authenticated user's compact daily Harvest vie
 harvest-worklog timesheet today --project WRAP
 ```
 
-OMP exposes the same CLI-only path through `/harvest-worklog today WRAP` and the read-only `harvest_time_sheet` tool. The wrapper never calls Harvest directly. A later, separate feature may upload reviewed content through the Harvest API; keep that write path separate from this read-only formatter.
+OMP exposes the same CLI-only path through `/harvest-worklog timesheet today --project WRAP` and the read-only `harvest_time_sheet` tool. The wrapper never calls Harvest directly. A later, separate feature may upload reviewed content through the Harvest API; keep that write path separate from this read-only formatter.
 
-Type `/harvest-worklog ` in OMP to discover the compact and explicit timesheet forms, relative date tokens, and context-valid `--project`/`--task` options. Completion keeps filter values as editable text, and the slash command delegates the selected timesheet argument vector to the CLI.
+Type `/harvest-worklog ` in OMP to discover `timesheet`, then select `today`, `yesterday`, or an ISO date before the contextual `--project` and `--task` options. Completion keeps filter values as editable text, and the slash command delegates the selected timesheet argument vector to the CLI.
 
 ## OMP settings
 

data/lib/harvest_worklog/aggregate_cli.rb

@@ -8,7 +8,7 @@ module HarvestWorklog
       options = {}
       parser = option_parser(options)
       dates = parser.parse(arguments)
-      validate!(dates)
+      validate!(dates, options)
 
       from = Date.iso8601(dates[0])
       to = Date.iso8601(dates[1])
@@ -36,8 +36,10 @@ module HarvestWorklog
       end
     end
 
-    def self.validate!(dates)
+    def self.validate!(dates, options = {})
       raise Error, "FROM and TO are required" unless dates.length == 2
+      raise Error, "--project must not be blank" if options[:project]&.strip&.empty?
+      raise Error, "--task must not be blank" if options[:task]&.strip&.empty?
     end
 
     def self.fetch_entries(client, from:, to:, user_id: nil)

data/lib/harvest_worklog/timesheet_cli.rb

@@ -46,7 +46,8 @@ module HarvestWorklog
 
     def self.validate!(dates, options)
       raise Error, "DATE is required" unless dates.length == 1
-      raise Error, "--project is required" unless options[:project] && !options[:project].empty?
+      raise Error, "--project is required" unless options[:project] && !options[:project].strip.empty?
+      raise Error, "--task must not be blank" if options[:task]&.strip&.empty?
     end
 
     def self.print_timesheet(output, entries, spent_date:, requested_project:)

data/lib/harvest_worklog/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HarvestWorklog
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/lib/harvest_worklog/work_entry_cli.rb

@@ -42,7 +42,9 @@ module HarvestWorklog
       end
 
       if options[:dry_run]
-        output.puts "Would create #{spent_date.iso8601}: #{HarvestWorklog.display_hours(options[:hours])}h on #{options[:project]} / #{options[:task]}; #{options[:notes]}"
+        project = options[:project] || "project ##{options[:project_id]}"
+        task = options[:task] || "task ##{options[:task_id]}"
+        output.puts "Would create #{spent_date.iso8601}: #{HarvestWorklog.display_hours(options[:hours])}h on #{project} / #{task}; #{options[:notes]}"
         return 0
       end
 
@@ -63,7 +65,10 @@ module HarvestWorklog
 
     def self.option_parser(options)
       OptionParser.new do |opts|
-        opts.banner = "Usage: harvest-worklog work-entry DATE --project NAME --task NAME --hours HOURS --notes NOTES [--dry-run]"
+        opts.banner = <<~USAGE
+          Usage: harvest-worklog work-entry DATE --project NAME --task NAME --hours HOURS --notes NOTES [options]
+                 harvest-worklog work-entry DATE --project-id ID --task-id ID --hours HOURS --notes NOTES [options]
+        USAGE
         opts.on("--project NAME", "Harvest project name") { |value| options[:project] = value }
         opts.on("--task NAME", "Harvest task name") { |value| options[:task] = value }
         opts.on("--project-id ID", Integer, "Harvest project ID") { |value| options[:project_id] = value }
@@ -82,12 +87,12 @@ module HarvestWorklog
     def self.validate!(dates, options)
       raise Error, "DATE is required" unless dates.length == 1
       raise Error, "--hours must be a positive finite number" unless options[:hours]&.positive? && options[:hours].finite?
-      raise Error, "--notes is required" unless options[:notes] && !options[:notes].empty?
+      raise Error, "--notes is required" unless options[:notes] && !options[:notes].strip.empty?
 
       names_provided = options[:project] || options[:task]
       ids_provided = options[:project_id] || options[:task_id]
-      valid_names = options[:project] && options[:task]
-      valid_ids = options[:project_id] && options[:task_id]
+      valid_names = options[:project] && !options[:project].strip.empty? && options[:task] && !options[:task].strip.empty?
+      valid_ids = options[:project_id]&.positive? && options[:task_id]&.positive?
       raise Error, "supply --project and --task, or --project-id and --task-id" unless valid_names || valid_ids
       raise Error, "do not combine project/task names with IDs" if names_provided && ids_provided
     end

data/lib/harvest_worklog.rb

@@ -52,7 +52,9 @@ module HarvestWorklog
       <<~USAGE
         Usage:
           harvest-worklog time-off FROM TO --project NAME --task NAME [options]
+          harvest-worklog time-off FROM TO --project-id ID --task-id ID [options]
           harvest-worklog work-entry DATE --project NAME --task NAME --hours HOURS --notes NOTES [options]
+          harvest-worklog work-entry DATE --project-id ID --task-id ID --hours HOURS --notes NOTES [options]
           harvest-worklog aggregate FROM TO [--project NAME] [--task NAME]
           harvest-worklog timesheet DATE --project NAME [--task NAME]
 
@@ -70,6 +72,7 @@ module HarvestWorklog
       options = { hours: 7.0, dry_run: false, holiday_regions: holiday_regions_from_environment }
       parser = option_parser(options)
       dates = parser.parse(arguments)
+      normalize_holiday_regions!(options[:holiday_regions])
       validate!(dates, options)
 
       from = Date.iso8601(dates[0])
@@ -133,11 +136,12 @@ module HarvestWorklog
       raise Error, "FROM and TO are required" unless dates.length == 2
       raise Error, "--hours must be a positive finite number" unless options[:hours].positive? && options[:hours].finite?
       raise Error, "--holiday-region or HARVEST_HOLIDAY_REGIONS is required" if options[:holiday_regions].empty?
+      raise Error, "--notes must not be blank" if options[:notes]&.strip&.empty?
 
       names_provided = options[:project] || options[:task]
       ids_provided = options[:project_id] || options[:task_id]
-      valid_names = options[:project] && options[:task]
-      valid_ids = options[:project_id] && options[:task_id]
+      valid_names = options[:project] && !options[:project].strip.empty? && options[:task] && !options[:task].strip.empty?
+      valid_ids = options[:project_id]&.positive? && options[:task_id]&.positive?
       raise Error, "supply --project and --task, or --project-id and --task-id" unless valid_names || valid_ids
       raise Error, "do not combine project/task names with IDs" if names_provided && ids_provided
     end
@@ -146,6 +150,13 @@ module HarvestWorklog
       ENV.fetch("HARVEST_HOLIDAY_REGIONS", "ca_yt").split(",").map { |region| region.strip.downcase }.reject(&:empty?)
     end
 
+    def self.normalize_holiday_regions!(regions)
+      regions.map! { |region| region.strip.downcase }
+      regions.reject!(&:empty?)
+      regions.uniq!
+      regions
+    end
+
     def self.resolve_assignment(client, project_name, task_name)
       # ponytail: one 2,000-item page covers personal assignments; follow cursor pagination if that ceiling is exceeded.
       matches = client.active_personal_task_assignments.select do |assignment|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harvest-worklog
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Marlen Brunner