abt-cli 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48f55dc71fb2babaa1b1b6ce4aa99dfdc3eea8a31f0cdc8bd43eecd94cd220f0
-  data.tar.gz: 94ece036845a7375e434bde005f388bf7e8e9a7f0f1b89c6b19ecfa7bbb8bb7a
+  metadata.gz: cd99c9123cfbd4222176495fd039015ad56ddaf0841350347169fa6809f8d6b2
+  data.tar.gz: 33d0adf3e73be8f5b2a6f52d61cea46285e0e2ab036b2d1b0e1b4fe1f2c0a27a
 SHA512:
-  metadata.gz: 56ab38ab3607b95f420cb8178250d6bb83f338a92695011d753b9218a462292f2a0c95cb06d32a7b316142ace8def6a20be441df0e01f1dbb214384af239cf99
-  data.tar.gz: 96927e87f95be0cb844dbabbceb855ee26f5d77ef0f44e3728166f3e9e84123a71d4a71f5eb38f9c8ebb099be7ba3eda46dd7ed8fd1e5e41ddf5bcc0f71c2061
+  metadata.gz: 2ea6b3ea3f1f2056b9e7911144542f0d2f3b568544fcd68901299fb64c84414290d7cecfc884405bde0125b096bc7033b99d3c2eb87e0598f434de79cfa76ae3
+  data.tar.gz: 3c8ffb1c3ba6553d16611c0f55a1c1bae3cf97d156fc79242f66b2d0b2ac622b08ab4ef049b98299553c708dc36365fc4e6158e31b556d830d863019134f34eb

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

@@ -39,14 +39,14 @@ module Abt
 
               cli.warn 'Showing the 10 first matches' if matches.size > 10
               choice = cli.prompt_choice 'Select a project', matches[0...10], true
-              break choice unless choice.nil?
+              break choice['project'] unless choice.nil?
             end
           end
 
           def matches_for_string(string)
             search_string = sanitize_string(string)
 
-            projects.select do |project|
+            searchable_projects.select do |project|
               sanitize_string(project['name']).include?(search_string)
             end
           end
@@ -55,6 +55,15 @@ module Abt
             string.downcase.gsub(/[^\w]/, '')
           end
 
+          def searchable_projects
+            @searchable_projects ||= projects.map do |project|
+              {
+                'name' => "#{project['client']['name']} > #{project['name']}",
+                'project' => project
+              }
+            end
+          end
+
           def projects
             @projects ||= begin
               cli.warn 'Fetching projects...'

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

@@ -42,13 +42,21 @@ module Abt
           end
 
           def create_time_entry
-            body = Oj.dump({
+            body = {
               project_id: project_id,
               task_id: task_id,
               user_id: config.user_id,
               spent_date: Date.today.iso8601
-            }.merge(external_link_data), mode: :json)
-            api.post('time_entries', body)
+            }
+
+            if external_link_data
+              body.merge! external_link_data
+            else
+              cli.warn 'No external link provided'
+              body[:notes] ||= cli.prompt('Fill in comment (optional)')
+            end
+
+            api.post('time_entries', Oj.dump(body, mode: :json))
           end
 
           def project
@@ -76,7 +84,7 @@ module Abt
               arg_strs = cli.args.join(' ')
               lines = `#{$PROGRAM_NAME} harvest-time-entry-data #{arg_strs}`.split("\n")
 
-              return {} if lines.empty?
+              return if lines.empty?
 
               # TODO: Make user choose which reference to use by printing the urls
               if lines.length > 1

data/lib/abt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Abt
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abt-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jesper Sørensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector