abt-cli 0.0.4 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c8beb7e6080443354e8ddb0d8f00106694731d931283494e1337daee0547c9a
-  data.tar.gz: df7840006160bbdb850bdd475496202848080ec118753be8df00f99bc5aa7c3f
+  metadata.gz: 5044c8e5cb4330dd9db124834ee6f9bffca78a0ffaa08c268ba35eb3b0a21fe9
+  data.tar.gz: d9eb98460e021a032f9efdc0d9b2b98a20b57aba6267ef9024ee6f840bcf6858
 SHA512:
-  metadata.gz: e6f1c8df5509096dc414acff24952b57d656b064c95777f2741ada1164576c9ef6fe20bd7a13a50c8a0d30784c92d1d56ff000bf853972c5f8ee8334e69c538d
-  data.tar.gz: 8d3c36f885f175927efb5418547e782fcd864e81646602d8473b435222f3405f89973337b9368b718ff8413b8a8a0e714d90d2ce0e784fe62cbf02bc98bf734c
+  metadata.gz: e2536f6b91bebf10d0fe637864045f61d04f90aa1b1ede6bd0a0db62ad54ef54cb541eda71fca2554cd741fe0011cb5586a0bb904ec412a6a07d90fc6c477208
+  data.tar.gz: 10c5fcf70d15dcfff152cf62a3d39109db499768c5fbb96d0eadecc107c85150e9277f647da482ea72d6d2cab68974b950500c2e433a0a3f8c1547c6c6fe74a0

data/bin/abt

@@ -5,6 +5,7 @@ require 'dry-inflector'
 require 'faraday'
 require 'oj'
 require 'open3'
+require 'stringio'
 
 require_relative '../lib/abt.rb'
 

data/lib/abt/cli.rb

@@ -60,7 +60,7 @@ module Abt
     def args_from_stdin
       input = STDIN.read
 
-      return [] if input.nil?
+      abort 'No input from pipe' if input.nil? || input.empty?
 
       # Exclude comment part of piped input lines
       lines_without_comments = input.lines.map do |line|

data/lib/abt/cli/dialogs.rb

@@ -25,13 +25,15 @@ module Abt
       end
 
       def prompt_choice(text, options, allow_back_option = false)
-        if options.one?
-          warn "Selected: #{options.first['name']}"
-          return options.first
-        end
-
         warn "#{text}:"
 
+        if options.length.zero?
+          abort 'No available options' unless allow_back_option
+
+          warn 'No available options'
+          return nil
+        end
+
         print_options(options)
         select_options(options, allow_back_option)
       end
@@ -45,11 +47,12 @@ module Abt
       end
 
       def select_options(options, allow_back_option)
-        while (number = read_option_number(options.length, allow_back_option))
+        loop do
+          number = read_option_number(options.length, allow_back_option)
           if number.nil?
             return nil if allow_back_option
 
-            abort
+            next
           end
 
           option = options[number - 1]

data/lib/abt/docs.rb

@@ -17,6 +17,10 @@ module Abt
             'abt start asana harvest' => 'Continue working, e.g. after a break',
             'abt finalize asana' => 'Finalize the selected asana task'
           },
+          'Tracking meetings (without changing the config):' => {
+            'abt tasks asana | grep -i standup | abt track harvest' => 'Track on asana meeting task without changing any configuration',
+            'abt tasks harvest | grep -i comment | abt track harvest' => 'Track on harvest "Comment"-task (will prompt for a comment)'
+          },
           'Command output can be piped, e.g.:' => {
             'abt tasks asana | grep -i <name of task>' => nil,
             'abt tasks asana | grep -i <name of task> | abt start' => nil

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

@@ -27,6 +27,8 @@ module Abt
           private
 
           def find_search_result
+            cli.warn 'Select a project'
+
             loop do
               matches = matches_for_string cli.prompt('Enter search')
               if matches.empty?

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

@@ -18,7 +18,7 @@ module Abt
 
             cli.warn project['name']
 
-            task = cli.prompt_choice 'Select a task', tasks
+            task = select_task
 
             config.project_gid = project_gid # We might have gotten the project ID as an argument
             config.task_gid = task['gid']
@@ -32,14 +32,26 @@ module Abt
             @project ||= api.get("projects/#{project_gid}")
           end
 
-          def tasks
-            @tasks ||= begin
+          def select_task
+            loop do
               section = cli.prompt_choice 'Which section?', sections
               cli.warn 'Fetching tasks...'
-              api.get_paged('tasks', section: section['gid'], opt_fields: 'name,permalink_url')
+              tasks = tasks_in_section(section)
+
+              if tasks.length.zero?
+                cli.warn 'Section is empty'
+                next
+              end
+
+              task = cli.prompt_choice 'Select a task', tasks, true
+              return task if task
             end
           end
 
+          def tasks_in_section(section)
+            api.get_paged('tasks', section: section['gid'], opt_fields: 'name,permalink_url')
+          end
+
           def sections
             @sections ||= begin
               cli.warn 'Fetching sections...'

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

@@ -109,9 +109,13 @@ module Abt
           workspaces = api.get_paged('workspaces')
           if workspaces.empty?
             cli.abort 'Your asana access token does not have access to any workspaces'
+          elsif workspaces.one?
+            workspace = workspaces.first
+            cli.warn "Selected Asana workspace #{workspace['name']}"
+          else
+            workspace = cli.prompt_choice('Select Asana workspace', workspaces)
           end
 
-          workspace = cli.prompt_choice('Select Asana workspace', workspaces)
           git.global['workspaceGid'] = workspace['gid']
           workspace
         end

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

@@ -13,11 +13,9 @@ module Abt
             'Clear project/task for current git repository'
           end
 
-          def initialize(**); end
-
           def call
             cli.warn 'Clearing Harvest project configuration'
-            config.clear
+            config.clear_local
           end
         end
       end

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

@@ -28,6 +28,8 @@ module Abt
           private
 
           def find_search_result
+            cli.warn 'Select a project'
+
             loop do
               matches = matches_for_string cli.prompt('Enter search')
               if matches.empty?
@@ -37,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
@@ -53,12 +55,27 @@ 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...'
-              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

@@ -10,21 +10,16 @@ module Abt
           end
 
           def self.description
-            'Start tracker for current or specified task. Add a relevant provider to link the time entry: E.g. `abt start harvest asana`' # rubocop:disable Layout/LineLength
+            'As track, but also lets the user override the current task and triggers `start` commands for other providers ' # rubocop:disable Layout/LineLength
           end
 
           def call
-            abort 'No current/provided task' if task_id.nil?
+            start_output = call_start
+            puts start_output
 
-            maybe_override_current_task
-
-            print_task(project, task)
-
-            cli.abort('No task selected') if task_id.nil?
+            use_arg_str(arg_str_from_start_output(start_output))
 
-            create_time_entry
-
-            cli.warn 'Tracker successfully started'
+            maybe_override_current_task
           rescue Abt::HttpError::HttpError => e
             cli.warn e
             cli.abort 'Unable to start tracker'
@@ -32,47 +27,29 @@ module Abt
 
           private
 
-          def maybe_override_current_task
-            return if arg_str.nil?
-            return if same_args_as_config?
-            return unless config.local_available?
-
-            should_override = cli.prompt_boolean 'Set selected task as current?'
-            Current.new(arg_str: arg_str, cli: cli).call if should_override
+          def arg_str_from_start_output(output)
+            output = output.split(' # ').first
+            output.split(':')[1]
           end
 
-          def create_time_entry
-            body = Oj.dump({
-              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)
-          end
-
-          def project
-            @project ||= api.get("projects/#{project_id}")
-          end
+          def call_start
+            output = StringIO.new
+            Abt::Cli.new(argv: ['track', *cli.args], output: output).perform
 
-          def task
-            @task ||= api.get("tasks/#{task_id}")
+            output_str = output.string.strip
+            cli.abort 'No task provided' if output_str.empty?
+            output_str
           end
 
-          def external_link_data
-            @external_link_data ||= begin
-              arg_strs = cli.args.join(' ')
-              lines = `#{$PROGRAM_NAME} harvest-time-entry-data #{arg_strs}`.split("\n")
-
-              return {} if lines.empty?
-
-              # TODO: Make user choose which reference to use by printing the urls
-              if lines.length > 1
-                cli.abort('Multiple providers had harvest reference data, only one is supported at a time') # rubocop:disable Layout/LineLength
-              end
+          def maybe_override_current_task
+            return if arg_str.nil?
+            return if same_args_as_config?
+            return unless config.local_available?
+            return unless cli.prompt_boolean 'Set selected task as current?'
 
-              Oj.load(lines.first)
-            end
+            output = StringIO.new
+            Abt::Cli.new(argv: ['current', "harvest:#{project_id}/#{task_id}"],
+                         output: output).perform
           end
         end
       end

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

@@ -44,7 +44,7 @@ module Abt
               api.get_paged(
                 'time_entries',
                 is_running: true,
-                user_id: Harvest.user_id
+                user_id: config.user_id
               ).first
             rescue Abt::HttpError::HttpError => e # rubocop:disable Layout/RescueEnsureAlignment
               cli.warn e

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/commands/track.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Harvest
+      module Commands
+        class Track < BaseCommand
+          def self.command
+            'track harvest[:<project-id>/<task-id>]'
+          end
+
+          def self.description
+            'Start tracker for current or specified task. Add a relevant provider to link the time entry: E.g. `abt start harvest asana`' # rubocop:disable Layout/LineLength
+          end
+
+          def call
+            abort 'No current/provided task' if task_id.nil?
+            cli.abort('No task selected') if task_id.nil?
+
+            print_task(created_time_entry['project'], created_time_entry['task'])
+
+            cli.warn 'Tracker successfully started'
+          rescue Abt::HttpError::HttpError => e
+            cli.abort 'Invalid task'
+          end
+
+          private
+
+          def created_time_entry
+            @created_time_entry ||= create_time_entry
+          end
+
+          def create_time_entry
+            body = {
+              project_id: project_id,
+              task_id: task_id,
+              user_id: config.user_id,
+              spent_date: Date.today.iso8601
+            }
+
+            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 external_link_data
+            @external_link_data ||= begin
+              arg_strs = cli.args.join(' ')
+              lines = `#{$PROGRAM_NAME} harvest-time-entry-data #{arg_strs}`.split("\n")
+
+              return if lines.empty?
+
+              # TODO: Make user choose which reference to use by printing the urls
+              if lines.length > 1
+                cli.abort('Multiple providers had harvest reference data, only one is supported at a time') # rubocop:disable Layout/LineLength
+              end
+
+              Oj.load(lines.first)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -24,13 +24,15 @@ module Abt
         end
 
         def project_id=(value)
+          value = value.to_s unless value.nil?
           return if project_id == value
 
           clear_local
-          git['projectId'] = value unless value.nil?
+          git['projectId'] = value
         end
 
         def task_id=(value)
+          value = value.to_s unless value.nil?
           git['taskId'] = value
         end
 
@@ -72,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.4'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abt-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.9
 platform: ruby
 authors:
 - Jesper Sørensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-17 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -113,6 +113,7 @@ files:
 - "./lib/abt/providers/harvest/commands/start.rb"
 - "./lib/abt/providers/harvest/commands/stop.rb"
 - "./lib/abt/providers/harvest/commands/tasks.rb"
+- "./lib/abt/providers/harvest/commands/track.rb"
 - "./lib/abt/providers/harvest/configuration.rb"
 - "./lib/abt/version.rb"
 - bin/abt