abt-cli 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46ae22fa656f0ef8cbabad171a43087a3642df0336eb2fe9cf3adf031ea0ad4e
-  data.tar.gz: dea107e2ce9f7a4ed405d6b1c323bad31b643ba836162534e6b601d735a03d7d
+  metadata.gz: 48f55dc71fb2babaa1b1b6ce4aa99dfdc3eea8a31f0cdc8bd43eecd94cd220f0
+  data.tar.gz: 94ece036845a7375e434bde005f388bf7e8e9a7f0f1b89c6b19ecfa7bbb8bb7a
 SHA512:
-  metadata.gz: 18bc1dd8b3aca70fb1f38bb2ca7b62650c9ba5dc8a62f5acae6bef9bf08f4edcca6259805d546adcc42d463c26ca882aa9ec735e3ea30f94295853eb927071bd
-  data.tar.gz: 4cf57895173624b581eb09a74597ce0f3f4081d7525fd9926d73cb1f14b493f8ec8da7d9fef729cc0b306002cba16c3cbe4fb85ad50b1f316c693adbf6a8e710
+  metadata.gz: 56ab38ab3607b95f420cb8178250d6bb83f338a92695011d753b9218a462292f2a0c95cb06d32a7b316142ace8def6a20be441df0e01f1dbb214384af239cf99
+  data.tar.gz: 96927e87f95be0cb844dbabbceb855ee26f5d77ef0f44e3728166f3e9e84123a71d4a71f5eb38f9c8ebb099be7ba3eda46dd7ed8fd1e5e41ddf5bcc0f71c2061

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

@@ -58,22 +58,24 @@ module Abt
           end
 
           def project
-            @project ||= api.get("projects/#{project_id}")
+            @project ||= project_assignment['project'].merge('client' => project_assignment['client'])
           end
 
           def task
-            project_task_assignments
-              .map { |assignment| assignment['task'] }
-              .find { |task| task['id'].to_s == task_id }
+            @task ||= project_assignment['task_assignments'].map { |ta| ta['task'] }.find do |task|
+              task['id'].to_s == task_id
+            end
           end
 
-          def project_task_assignments
-            @project_task_assignments ||= begin
-              api.get_paged("projects/#{project_id}/task_assignments", is_active: true)
-            rescue Abt::HttpError::HttpError # rubocop:disable Layout/RescueEnsureAlignment
-              []
+          def project_assignment
+            @project_assignment ||= begin
+              project_assignments.find { |pa| pa['project']['id'].to_s == project_id }
             end
           end
+
+          def project_assignments
+            @project_assignments ||= api.get_paged('users/me/project_assignments')
+          end
         end
       end
     end

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

@@ -58,9 +58,15 @@ module Abt
           def projects
             @projects ||= begin
               cli.warn 'Fetching projects...'
-              api.get_paged('projects')
+              project_assignments.map do |project_assignment|
+                project_assignment['project'].merge('client' => project_assignment['client'])
+              end
             end
           end
+
+          def project_assignments
+            @project_assignments ||= api.get_paged('users/me/project_assignments')
+          end
         end
       end
     end

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

@@ -28,20 +28,22 @@ module Abt
           private
 
           def project
-            @project ||= api.get("projects/#{project_id}")
+            project_assignment['project']
           end
 
           def tasks
-            project_task_assignments.map { |assignment| assignment['task'] }
+            @tasks ||= project_assignment['task_assignments'].map { |ta| ta['task'] }
           end
 
-          def project_task_assignments
-            @project_task_assignments ||= begin
-              api.get_paged("projects/#{project_id}/task_assignments", is_active: true)
-            rescue Abt::HttpError::HttpError # rubocop:disable Layout/RescueEnsureAlignment
-              []
+          def project_assignment
+            @project_assignment ||= begin
+              project_assignments.find { |pa| pa['project']['id'].to_s == project_id }
             end
           end
+
+          def project_assignments
+            @project_assignments ||= api.get_paged('users/me/project_assignments')
+          end
         end
       end
     end

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

@@ -24,9 +24,15 @@ module Abt
           def projects
             @projects ||= begin
               cli.warn 'Fetching projects...'
-              api.get_paged('projects', is_active: true)
+              project_assignments.map do |project_assignment|
+                project_assignment['project'].merge('client' => project_assignment['client'])
+              end
             end
           end
+
+          def project_assignments
+            @project_assignments ||= api.get_paged('users/me/project_assignments')
+          end
         end
       end
     end

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

@@ -52,11 +52,23 @@ module Abt
           end
 
           def project
-            @project ||= api.get("projects/#{project_id}")
+            project_assignment['project']
           end
 
           def task
-            @task ||= api.get("tasks/#{task_id}")
+            @task ||= project_assignment['task_assignments'].map { |ta| ta['task'] }.find do |task|
+              task['id'].to_s == task_id
+            end
+          end
+
+          def project_assignment
+            @project_assignment ||= begin
+              project_assignments.find { |pa| pa['project']['id'].to_s == project_id }
+            end
+          end
+
+          def project_assignments
+            @project_assignments ||= api.get_paged('users/me/project_assignments')
           end
 
           def external_link_data

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

@@ -14,23 +14,30 @@ module Abt
           end
 
           def call
-            project_task_assignments.each do |a|
-              project = a['project']
-              task = a['task']
-
+            tasks.each do |task|
               print_task(project, task)
             end
           end
 
           private
 
-          def project_task_assignments
-            @project_task_assignments ||= begin
-              api.get_paged("projects/#{project_id}/task_assignments", is_active: true)
-            rescue Abt::HttpError::HttpError # rubocop:disable Layout/RescueEnsureAlignment
-              []
+          def project
+            project_assignment['project']
+          end
+
+          def tasks
+            @tasks ||= project_assignment['task_assignments'].map { |ta| ta['task'] }
+          end
+
+          def project_assignment
+            @project_assignment ||= begin
+              project_assignments.find { |pa| pa['project']['id'].to_s == project_id }
             end
           end
+
+          def project_assignments
+            @project_assignments ||= api.get_paged('users/me/project_assignments')
+          end
         end
       end
     end

data/lib/abt/providers/harvest/configuration.rb

@@ -74,18 +74,17 @@ module Abt
         def user_id
           return git.global['userId'] unless git.global['userId'].nil?
 
-          git.global['userId'] = cli.prompt([
-            'Please provide your harvest User ID.',
-            'To find it open "My profile" inside the harvest web UI.',
-            'The ID is the number part of the URL for that page.',
-            '',
-            'Enter user id'
-          ].join("\n"))
+          git.global['userId'] = api.get('users/me')['id'].to_s
         end
 
         private
 
         attr_reader :git
+
+        def api
+          @api ||=
+            Abt::Providers::Harvest::Api.new(access_token: access_token, account_id: account_id)
+        end
       end
     end
   end

data/lib/abt/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abt-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Jesper Sørensen