harvest-time-off 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d14f2defb88e655452e5c21a45c28586127977e4e38976628cc9caf2b4fa88d2
-  data.tar.gz: eb1f5d5c3f25a4a65e24d74aeef9a6d186248134d96c542496ac476cbe82748c
+  metadata.gz: 281fe13df87f06f4e9ffc0cd8cbd3df85e23f29400460dfbc0cca59182f8b641
+  data.tar.gz: 2512474000205216fb1ecabe4da817766a85ce4b5a6a088f7ec0c41be5dc51c7
 SHA512:
-  metadata.gz: e29d62624542e6cbc648138d9ec29e998bf16469e965bc00d03b8e5b82760b21ee73848b4d0fd7c216b79239790cd3033980f85225d50a65cc8a67ccd3b63b19
-  data.tar.gz: c0c27dc68af09a0e8f6a5d1e983054ce83205b6ab0035e03d086b505d1bd7258ed600b558c60b7c7428d1bffca065855420467eba17c91cb0dc8430d6192a4ca
+  metadata.gz: 7c0a91b9787d899a64ceb1186935c5e196d3c75a14b0a71a027209b225174088fea6fc1aa8f60a4ad2a4ec975a96994969e4495232d523d5b5aee899aff5456f
+  data.tar.gz: d7b776f47216657ec923475ab54cb0d4f34fa1c2ba35f06bf1b207b11f495490a713601a6912e02bd6c8ac4ab218cd84acea59c32e4a998a47f914714e3f71cd

data/README.md

@@ -38,10 +38,21 @@ A time-off block never creates weekend entries. The underlying [`marlens-harvest
 - `defaultHours`: hours per business day when a tool call omits `hours`; defaults to `7`.
 - `holidayRegions`: comma-separated Holidays regions; defaults to `ca_yt`.
 - `command`: direct path to the `harvest-time-off` executable.
+- `workEntryCommand`: direct path to the `harvest-work-entry` executable.
+- `projectTimeMappings`: JSON mapping from OMP Project Time project names to Harvest project/task names.
+- `projectTimeLogPath`: optional override for `~/.omp/project-time/time-log.json`.
 
 ## V2: OMP Project Time integration
 
-[Issue #3](https://github.com/klondikemarlen/harvest-time-off/issues/3) tracks the next scope: turn reviewed `omp-project-time` output into Harvest work entries with configured project/task mappings, generated descriptions, duplicate/lock checks, preview, and approval. V1 remains deliberately focused on time off.
+Configure `projectTimeMappings` with the recorded OMP Project Time project name as the key:
+
+```json
+{
+  "Harvest API": { "project": "Internal", "task": "Development" }
+}
+```
+
+`harvest_preview_project_time_entries` reads the configured time log, splits sessions across local dates, generates descriptions from the project and repository, and checks Harvest for existing or locked entries without writing. `harvest_record_project_time_entries` performs the same preflight then creates only new entries; OMP treats it as a write requiring approval. Unmapped sessions are reported and never written.
 
 ## Release
 
@@ -60,4 +71,5 @@ gem push harvest-time-off-<version>.gem
 omp plugin install --force github:klondikemarlen/harvest-time-off
 omp plugin list
 harvest-time-off --help
+harvest-work-entry --help
 ```

data/bin/harvest-work-entry

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "harvest_time_off"
+
+exit HarvestTimeOff::WorkEntryCLI.run(ARGV)

data/lib/harvest_time_off/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HarvestTimeOff
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/harvest_time_off/work_entry_cli.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+module HarvestTimeOff
+  class WorkEntryCLI
+    EXISTING_ENTRY = 2
+    LOCKED_ENTRY = 3
+
+    def self.run(arguments, output: $stdout, error: $stderr, client: nil)
+      options = { dry_run: false }
+      parser = option_parser(options)
+      dates = parser.parse(arguments)
+      validate!(dates, options)
+
+      spent_date = Date.iso8601(dates.first)
+      client ||= Marlens::HarvestApiV2::Client.from_environment
+      project_id, task_id = if options[:project_id]
+                              [options[:project_id], options[:task_id]]
+                            else
+                              CLI.resolve_assignment(client, options[:project], options[:task])
+                            end
+      existing_entries = client.request(
+        :get,
+        "/v2/time_entries",
+        params: { project_id:, task_id:, from: spent_date.iso8601, to: spent_date.iso8601 }
+      ).fetch("time_entries")
+
+      if existing_entries.any? { |entry| entry["is_locked"] }
+        output.puts "Locked existing Harvest entry on #{spent_date.iso8601}; skipped"
+        return LOCKED_ENTRY
+      end
+
+      if existing_entries.any?
+        output.puts "Existing Harvest entry on #{spent_date.iso8601}; skipped"
+        return EXISTING_ENTRY
+      end
+
+      if options[:dry_run]
+        output.puts "Would create #{spent_date.iso8601}: #{HarvestTimeOff.display_hours(options[:hours])}h on #{options[:project]} / #{options[:task]}; #{options[:notes]}"
+        return 0
+      end
+
+      entry = client.create_time_entry(
+        project_id:,
+        task_id:,
+        spent_date:,
+        hours: options[:hours],
+        notes: options[:notes]
+      )
+      output.puts "Created #{spent_date.iso8601}: #{HarvestTimeOff.display_hours(options[:hours])}h (entry ##{entry.fetch("id")})"
+      0
+    rescue Error, Marlens::HarvestApiV2::Error, OptionParser::ParseError, Date::Error => e
+      error.puts "Error: #{e.message}"
+      error.puts parser if parser
+      1
+    end
+
+    def self.option_parser(options)
+      OptionParser.new do |opts|
+        opts.banner = "Usage: harvest-work-entry DATE --project NAME --task NAME --hours HOURS --notes NOTES [--dry-run]"
+        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 }
+        opts.on("--task-id ID", Integer, "Harvest task ID") { |value| options[:task_id] = value }
+        opts.on("--hours HOURS", Float, "Hours for this entry") { |value| options[:hours] = value }
+        opts.on("--notes NOTES", "Entry description") { |value| options[:notes] = value }
+        opts.on("--dry-run", "Check for existing entries without writing") { options[:dry_run] = true }
+        opts.on("-h", "--help", "Show this help") do
+          puts opts
+          exit 0
+        end
+      end
+    end
+
+    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?
+
+      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]
+      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
+  end
+end

data/lib/harvest_time_off.rb

@@ -132,3 +132,5 @@ module HarvestTimeOff
     end
   end
 end
+
+require "harvest_time_off/work_entry_cli"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harvest-time-off
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Marlen Brunner
@@ -55,14 +55,17 @@ email:
 - klondikemarlen@gmail.com
 executables:
 - harvest-time-off
+- harvest-work-entry
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
 - bin/harvest-time-off
+- bin/harvest-work-entry
 - harvest-time-off.rb
 - lib/harvest_time_off.rb
 - lib/harvest_time_off/version.rb
+- lib/harvest_time_off/work_entry_cli.rb
 homepage: https://github.com/klondikemarlen/harvest-time-off
 licenses:
 - MIT
@@ -84,5 +87,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 4.0.3
 specification_version: 4
-summary: Create Harvest time-off entries over a date range.
+summary: Create Harvest time-off and reviewed OMP Project Time entries.
 test_files: []