freeagent-cli 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6aa92b15fccb2ce8b889419652ee23e76455f9dea0f84afef73dbb2d33af023
-  data.tar.gz: 3329b71e37fcea5d277b3e05ba61972dd85f204c49bbe264568d555b15184d44
+  metadata.gz: 7abedc65bda2e935eac6777922e6b06f227745e2de0b1e60b8e1de95c72a0d83
+  data.tar.gz: b2c6ae0c9595a8087cf87360a8dc62ba9c5c4eb02da2e6b0a7cba346fb7f0a4b
 SHA512:
-  metadata.gz: cdfb521afa51bb920e46965da8e965b9bb5d32b1a659a91746fda0801b790f9cac07e563dd8f5caefca026e3df35bc2345974d47d4a85ff694a33fe5518c8818
-  data.tar.gz: 3c3a1be9095e29c94289320b3c471444166047fb5a766bb1daf88fa5ae83e35d22aed735363c5e07b17a81bb11ec28bd92f394cc47ab362fa2c3b3846346cfb6
+  metadata.gz: 29fd16c93ea509618580da1d8b6e45738cc25917a945d77e213ef53cd8e345c57e118a2cfe493d28b497ba7de9b5b658b57af6fb26edb58a2e4307ea859e1d0e
+  data.tar.gz: c648be179c9d9ab46a9831b4a2d3ca412fd47bb2c4db729f86737b588bf46819d1ac0dbc747841a9d0ac7db6f025e5be63c4f39773e2c6444c727ce5d9f198ff

data/LICENSE

@@ -1,4 +1,4 @@
- The MIT License (MIT)
+The MIT License (MIT)
 
 Copyright © 2025 Register Dynamics Limited.
 

data/exe/fa

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require 'dotenv/load'
 require 'thor'
 require_relative '../lib/freeagent'
 
@@ -33,17 +34,18 @@ module Freeagent
       project = match :project, api.projects, project, :name
       task = match :task, api.tasks(project), task, :name
 
-      api.timeslips(user, project, task, from, to).each do |timeslip|
-        puts [Date::parse(timeslip.dated_on).strftime('%a %d %b %Y'), user.email, project.name, task.name, timeslip.hours].join("\t")
+      api.timeslips(user: user, project: project, task: task, from: from, to: to).each do |timeslip|
+        puts [Date::parse(timeslip.dated_on).strftime('%a %d %b %Y'), user.email, project.name, task.name, timeslip.hours, timeslip.comment].join("\t")
       end
     end
 
-    desc 'create USER PROJECT TASK FROM TO', "Create timeslips"
+    desc 'create USER PROJECT TASK [FROM [TO]]', "Create timeslips"
     method_option :hours, aliases: '-h', type: :numeric, default: 8, desc: "Number of hours per day"
     method_option :weekends, aliases: '-w', type: :boolean, default: false, desc: "Create timeslips on Saturdays and Sundays"
-    def create user, project, task, from, to
-      from = Date::parse from
-      to = Date::parse to
+    method_option :comment, aliases: '-c', type: :string, default: nil, desc: "Comment to add to any created timeslips"
+    def create user, project, task, from = nil, to = nil
+      from = from.nil? ? Date::today : Date::parse(from)
+      to = to.nil? ? from : Date::parse(to)
       user = match :user, api.users, user, :first_name, :last_name, :email
       project = match :project, api.projects, project, :name
       task = match :task, api.tasks(project), task, :name
@@ -51,21 +53,49 @@ module Freeagent
       puts "Creating timeslips for #{user.first_name} #{user.last_name} for task '#{task.name}' in project '#{project.name}' between #{from} and #{to} inclusive"
       timeslips = from.step(to).map do |date|
         next if (date.saturday? || date.sunday?) && !options[:weekends]
-        {'task' => task.url, 'project' => project.url, 'user' => user.url, 'dated_on' => date.to_s, 'hours' => options[:hours]}
+        {'task' => task.url, 'project' => project.url, 'user' => user.url, 'dated_on' => date.to_s, 'hours' => options[:hours], 'comment' => options[:comment]}
       end.reject(&:nil?)
       api.batch_create_timeslips timeslips
     end
 
-    desc 'delete USER PROJECT TASK FROM TO', 'Delete timeslips'
-    def delete user, project, task, from, to
-      from = Date::parse from
-      to = Date::parse to
+    desc 'fill USER PROJECT TASK [FROM [TO]]', 'Fill remaining hours with new timeslips'
+    method_option :hours, aliases: '-h', type: :numeric, default: 8, desc: "Number of hours per day"
+    method_option :weekends, aliases: '-w', type: :boolean, default: false, desc: "Create timeslips on Saturdays and Sundays"
+    method_option :comment, aliases: '-c', type: :string, default: nil, desc: "Comment to add to any created timeslips"
+    def fill user, project, task, from = nil, to = nil
+      from = from.nil? ? Date::today : Date::parse(from)
+      to = to.nil? ? from : Date::parse(to)
+      user = match :user, api.users, user, :first_name, :last_name, :email
+      project = match :project, api.projects, project, :name
+      task = match :task, api.tasks(project), task, :name
+
+      existing = api.timeslips(user: user, from: from, to: to).reduce(Hash.new) do |hash, timeslip|
+        date = Date::parse timeslip.dated_on
+        hash.update({date => (hash[date] || 0) + timeslip.hours.to_f})
+      end
+
+      puts "Filling timeslips for #{user.first_name} #{user.last_name} up to #{options[:hours]}hrs using task '#{task.name}' in project '#{project.name}' between #{from} and #{to} inclusive"
+      timeslips = from.step(to).map do |date|
+        next if (date.saturday? || date.sunday?) && !options[:weekends]
+        existing_hours = existing[date] || 0
+        adding_hours = options[:hours] - existing_hours
+        next if adding_hours <= 0
+
+        {'task' => task.url, 'project' => project.url, 'user' => user.url, 'dated_on' => date.to_s, 'hours' => adding_hours.to_s, 'comment' => options[:comment]}
+      end.reject(&:nil?)
+      api.batch_create_timeslips timeslips
+    end
+
+    desc 'delete USER PROJECT TASK [FROM [TO]]', 'Delete timeslips'
+    def delete user, project, task, from = nil, to = nil
+      from = from.nil? ? Date::today : Date::parse(from)
+      to = to.nil? ? from : Date::parse(to)
       user = match :user, api.users, user, :first_name, :last_name, :email
       project = match :project, api.projects, project, :name
       task = match :task, api.tasks(project), task, :name
 
       puts "Deleting timeslips for #{user.first_name} #{user.last_name} for task '#{task.name}' in project '#{project.name}' between #{from} and #{to} inclusive"
-      api.timeslips(user, project, task, from, to).each do |timeslip|
+      api.timeslips(user: user, project: project, task: task, from: from, to: to).each do |timeslip|
         api.delete_timeslip(timeslip)
       end
     end

data/lib/freeagent.rb

@@ -134,8 +134,15 @@ module Freeagent
       get_pages('tasks', project: project.url).flat_map(&:tasks)
     end
 
-    def timeslips user, project, task, from, to
-      get_pages('timeslips', user: user.url, project: project.url, task: task.url, from_date: from.to_s, to_date: to.to_s).flat_map(&:timeslips)
+    def timeslips user: nil, project: nil, task: nil, from: nil, to: nil
+      params = [
+        [:user, user && user.url],
+        [:project, project && project.url],
+        [:task, task && task.url],
+        [:from_date, from && from.to_s],
+        [:to_date, to && to.to_s],
+      ].reject {|(k, v)| v.nil?}.to_h
+      get_pages('timeslips', **params).flat_map(&:timeslips)
     end
 
     def create_timeslip user, project, task, dated, hours

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freeagent-cli
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Simon Worthington
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -87,12 +101,12 @@ files:
 - Rakefile
 - exe/fa
 - lib/freeagent.rb
-homepage: https://www.github.com/register-dynamics/freeagent-cli
+homepage: https://github.com/register-dynamics/freeagent-cli.git
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://www.github.com/register-dynamics/freeagent-cli
-  source_code_uri: https://www.github.com/register-dynamics/freeagent-cli
+  homepage_uri: https://github.com/register-dynamics/freeagent-cli.git
+  source_code_uri: https://github.com/register-dynamics/freeagent-cli.git
 post_install_message:
 rdoc_options: []
 require_paths: