abt-cli 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd99c9123cfbd4222176495fd039015ad56ddaf0841350347169fa6809f8d6b2
-  data.tar.gz: 33d0adf3e73be8f5b2a6f52d61cea46285e0e2ab036b2d1b0e1b4fe1f2c0a27a
+  metadata.gz: 3568d2d1acd067392e3832ee00bb1eb6f1fdcb6d9526fe1f747674c452173543
+  data.tar.gz: f189b4c27d9cac1703211dc4c9fefdd33d359149d336d74f67f47aa9e9d96137
 SHA512:
-  metadata.gz: 2ea6b3ea3f1f2056b9e7911144542f0d2f3b568544fcd68901299fb64c84414290d7cecfc884405bde0125b096bc7033b99d3c2eb87e0598f434de79cfa76ae3
-  data.tar.gz: 3c8ffb1c3ba6553d16611c0f55a1c1bae3cf97d156fc79242f66b2d0b2ac622b08ab4ef049b98299553c708dc36365fc4e6158e31b556d830d863019134f34eb
+  metadata.gz: c38b239739f77fd58ce6df48e7f4057fb66a1a50f96bb2d7469ef7b0809b085d643face8fdbc82f9bb654ea75e565f60e9629952f9cc894abe9745101fd670bb
+  data.tar.gz: f5fdf894aba1ca64f7a815f7aa1e17d2c23e3c690220f54b4cd0351586c293fd7a5716dbac544c9a63be6fb6ea8154e9e53c2e76658406e67f95656c597ab4f6

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/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/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?
-
-            create_time_entry
+            use_arg_str(arg_str_from_start_output(start_output))
 
-            cli.warn 'Tracker successfully started'
+            maybe_override_current_task
           rescue Abt::HttpError::HttpError => e
             cli.warn e
             cli.abort 'Unable to start tracker'
@@ -32,67 +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 = {
-              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 call_start
+            output = StringIO.new
+            Abt::Cli.new(argv: ['track', *cli.args], output: output).perform
 
-          def project
-            project_assignment['project']
+            output_str = output.string.strip
+            cli.abort 'No task provided' if output_str.empty?
+            output_str
           end
 
-          def task
-            @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
-            @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/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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abt-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Jesper Sørensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-01-20 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