abt-cli 0.0.14 → 0.0.19

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

@@ -5,15 +5,15 @@ module Abt
     module Harvest
       module Commands
         class Projects < BaseCommand
-          def self.command
-            'projects harvest'
+          def self.usage
+            'abt projects harvest'
           end
 
           def self.description
             'List all available projects - useful for piping into grep etc.'
           end
 
-          def call
+          def perform
             projects.map do |project|
               print_project(project)
             end
@@ -23,7 +23,7 @@ module Abt
 
           def projects
             @projects ||= begin
-              cli.warn 'Fetching projects...'
+              warn 'Fetching projects...'
               project_assignments.map do |project_assignment|
                 project_assignment['project'].merge('client' => project_assignment['client'])
               end

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

@@ -5,22 +5,18 @@ module Abt
     module Harvest
       module Commands
         class Share < BaseCommand
-          def self.command
-            'share harvest[:<project-id>[/<task-id>]]'
+          def self.usage
+            'abt share harvest[:<project-id>[/<task-id>]]'
           end
 
           def self.description
-            'Print project/task config string'
+            'Print project/task ARI'
           end
 
-          def call
-            if project_id.nil?
-              cli.warn 'No project selected'
-            elsif task_id.nil?
-              cli.print_provider_command('harvest', project_id)
-            else
-              cli.print_provider_command('harvest', "#{project_id}/#{task_id}")
-            end
+          def perform
+            require_project!
+
+            cli.print_ari('harvest', path)
           end
         end
       end

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

@@ -1,54 +1,18 @@
 # frozen_string_literal: true
 
+require_relative 'track'
+
 module Abt
   module Providers
     module Harvest
       module Commands
-        class Start < BaseCommand
-          def self.command
-            'start harvest[:<project-id>/<task-id>]'
+        class Start < Track
+          def self.usage
+            'abt start harvest[:<project-id>/<task-id>] [options]'
           end
 
           def self.description
-            '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
-            track_output = call_track
-            puts track_output
-
-            use_arg_str(arg_str_from_track_output(track_output))
-
-            maybe_override_current_task
-          rescue Abt::HttpError::HttpError => e
-            cli.warn e
-            cli.abort 'Unable to start tracker'
-          end
-
-          private
-
-          def arg_str_from_track_output(output)
-            output = output.split(' # ').first
-            output.split(':')[1]
-          end
-
-          def call_track
-            input = StringIO.new(cli.args.join(' '))
-            output = StringIO.new
-            Abt::Cli.new(argv: ['track'], output: output, input: input).perform
-
-            output.string.strip
-          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?'
-
-            input = StringIO.new("harvest:#{project_id}/#{task_id}")
-            output = StringIO.new
-            Abt::Cli.new(argv: ['current'], output: output, input: input).perform
+            'Alias for: `abt track harvest`. Meant to used in combination with other ARIs, e.g. `abt start harvest asana`'
           end
         end
       end

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

@@ -5,30 +5,30 @@ module Abt
     module Harvest
       module Commands
         class Stop < BaseCommand
-          def self.command
-            'stop harvest'
+          def self.usage
+            'abt stop harvest'
           end
 
           def self.description
             'Stop running harvest tracker'
           end
 
-          def call
-            cli.abort 'No running time entry' if time_entry.nil?
+          def perform
+            abort 'No running time entry' if time_entry.nil?
 
             stop_time_entry
 
-            cli.warn 'Harvest time entry stopped'
+            warn 'Harvest time entry stopped'
             print_task(project, task)
-          rescue Abt::HttpError::HttpError => e
-            cli.warn e
-            cli.abort 'Unable to stop time entry'
           end
 
           private
 
           def stop_time_entry
             api.patch("time_entries/#{time_entry['id']}/stop")
+          rescue Abt::HttpError::HttpError => e
+            warn e
+            abort 'Unable to stop time entry'
           end
 
           def project
@@ -47,8 +47,8 @@ module Abt
                 user_id: config.user_id
               ).first
             rescue Abt::HttpError::HttpError => e # rubocop:disable Layout/RescueEnsureAlignment
-              cli.warn e
-              cli.abort 'Unable to fetch running time entry'
+              warn e
+              abort 'Unable to fetch running time entry'
             end
           end
         end

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

@@ -5,15 +5,15 @@ module Abt
     module Harvest
       module Commands
         class Tasks < BaseCommand
-          def self.command
-            'tasks harvest'
+          def self.usage
+            'abt tasks harvest'
           end
 
           def self.description
             'List available tasks on project - useful for piping into grep etc.'
           end
 
-          def call
+          def perform
             require_project!
 
             tasks.each do |task|
@@ -28,7 +28,10 @@ module Abt
           end
 
           def tasks
-            @tasks ||= project_assignment['task_assignments'].map { |ta| ta['task'] }
+            @tasks ||= begin
+              warn 'Fetching tasks...'
+              project_assignment['task_assignments'].map { |ta| ta['task'] }
+            end
           end
 
           def project_assignment

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

@@ -5,22 +5,31 @@ module Abt
     module Harvest
       module Commands
         class Track < BaseCommand
-          def self.command
-            'track harvest[:<project-id>/<task-id>]'
+          def self.usage
+            'abt track harvest[:<project-id>/<task-id>] [options]'
           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
+            'Start tracker for current or specified task. Add a relevant ARI to link the time entry, e.g. `abt track harvest asana`'
           end
 
-          def call
+          def self.flags
+            [
+              ['-s', '--set', 'Set specified task as current'],
+              ['-c', '--comment COMMENT', 'Override comment'],
+              ['-t', '--time HOURS', 'Set hours. Creates a stopped entry unless used with --running'],
+              ['-r', '--running', 'Used with --time, starts the created time entry']
+            ]
+          end
+
+          def perform
             require_task!
 
             print_task(created_time_entry['project'], created_time_entry['task'])
 
-            cli.warn 'Tracker successfully started'
-          rescue Abt::HttpError::HttpError => e
-            cli.abort 'Invalid task'
+            maybe_override_current_task
+          rescue Abt::HttpError::HttpError => _e
+            abort 'Invalid task'
           end
 
           private
@@ -30,6 +39,19 @@ module Abt
           end
 
           def create_time_entry
+            body = time_entry_base_data
+            body.merge!(hours: flags[:time]) if flags.key? :time
+
+            result = api.post('time_entries', Oj.dump(body, mode: :json))
+
+            if flags.key?(:time) && flags[:running]
+              api.patch("time_entries/#{result['id']}/restart")
+            end
+
+            result
+          end
+
+          def time_entry_base_data
             body = {
               project_id: project_id,
               task_id: task_id,
@@ -38,33 +60,56 @@ module Abt
             }
 
             if external_link_data
+              warn <<~TXT
+                Linking to:
+                  #{external_link_data[:notes]}
+                  #{external_link_data[:external_reference][:permalink]}
+              TXT
               body.merge! external_link_data
             else
-              cli.warn 'No external link provided'
-              body[:notes] ||= cli.prompt('Fill in comment (optional)')
+              warn 'No external link provided'
             end
 
-            api.post('time_entries', Oj.dump(body, mode: :json))
+            body[:notes] = flags[:comment] if flags.key?(:comment)
+            body[:notes] ||= cli.prompt.text('Fill in comment (optional)')
+            body
           end
 
           def external_link_data
             @external_link_data ||= begin
-              input = StringIO.new(cli.args.join(' '))
-              output = StringIO.new
-              Abt::Cli.new(argv: ['harvest-time-entry-data'], output: output, input: input).perform
-
-              lines = output.string.strip.lines
+              lines = call_harvest_time_entry_data_for_other_aris
 
-              return if lines.empty?
+              if lines.empty?
+                nil
+              else
+                if lines.length > 1
+                  abort('Got reference data from multiple scheme providers, only one is supported at a time')
+                end
 
-              # 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
+                Oj.load(lines.first, symbol_keys: true)
               end
-
-              Oj.load(lines.first)
             end
           end
+
+          def call_harvest_time_entry_data_for_other_aris
+            other_aris = cli.aris - [ari]
+            return [] if other_aris.empty?
+
+            input = StringIO.new(other_aris.to_s)
+            output = StringIO.new
+            Abt::Cli.new(argv: ['harvest-time-entry-data'], output: output, input: input).perform
+
+            output.string.strip.lines
+          end
+
+          def maybe_override_current_task
+            return unless flags[:set]
+            return if path == config.path
+            return unless config.local_available?
+
+            config.path = path
+            warn 'Current task updated'
+          end
         end
       end
     end

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

@@ -8,52 +8,32 @@ module Abt
 
         def initialize(cli:)
           @cli = cli
-          @git = GitConfig.new(namespace: 'abt.harvest')
         end
 
         def local_available?
-          GitConfig.local_available?
+          git.available?
         end
 
-        def project_id
-          local_available? ? git['projectId'] : nil
+        def path
+          Path.new(local_available? && git['path'] || '')
         end
 
-        def task_id
-          local_available? ? git['taskId'] : nil
+        def path=(new_path)
+          git['path'] = new_path
         end
 
-        def project_id=(value)
-          value = value.to_s unless value.nil?
-          return if project_id == value
-
-          clear_local
-          git['projectId'] = value
+        def clear_local(verbose: true)
+          git.clear(output: verbose ? cli.err_output : nil)
         end
 
-        def task_id=(value)
-          value = value.to_s unless value.nil?
-          git['taskId'] = value
-        end
-
-        def clear_local
-          cli.abort 'No local configuration was found' unless local_available?
-
-          git['projectId'] = nil
-          git['taskId'] = nil
-        end
-
-        def clear_global
-          git.global.keys.each do |key|
-            cli.puts 'Deleting configuration: ' + key
-            git.global[key] = nil
-          end
+        def clear_global(verbose: true)
+          git_global.clear(output: verbose ? cli.err_output : nil)
         end
 
         def access_token
-          return git.global['accessToken'] unless git.global['accessToken'].nil?
+          return git_global['accessToken'] unless git_global['accessToken'].nil?
 
-          git.global['accessToken'] = cli.prompt([
+          git_global['accessToken'] = cli.prompt.text([
             'Please provide your personal access token for Harvest.',
             'If you don\'t have one, create one here: https://id.getharvest.com/developers',
             '',
@@ -62,9 +42,9 @@ module Abt
         end
 
         def account_id
-          return git.global['accountId'] unless git.global['accountId'].nil?
+          return git_global['accountId'] unless git_global['accountId'].nil?
 
-          git.global['accountId'] = cli.prompt([
+          git_global['accountId'] = cli.prompt.text([
             'Please provide harvest account id.',
             'This information is shown next to your generated access token',
             '',
@@ -73,18 +53,23 @@ module Abt
         end
 
         def user_id
-          return git.global['userId'] unless git.global['userId'].nil?
+          return git_global['userId'] unless git_global['userId'].nil?
 
-          git.global['userId'] = api.get('users/me')['id'].to_s
+          git_global['userId'] = api.get('users/me')['id'].to_s
         end
 
         private
 
-        attr_reader :git
+        def git
+          @git ||= GitConfig.new('local', 'abt.harvest')
+        end
+
+        def git_global
+          @git_global ||= GitConfig.new('global', 'abt.harvest')
+        end
 
         def api
-          @api ||=
-            Abt::Providers::Harvest::Api.new(access_token: access_token, account_id: account_id)
+          @api ||= Api.new(access_token: access_token, account_id: account_id)
         end
       end
     end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Harvest
+      class Path < String
+        PATH_REGEX = %r{^(?<project_id>\d+)?(/(?<task_id>\d+))?$}.freeze
+
+        def self.from_ids(project_id = nil, task_id = nil)
+          path = project_id ? [project_id, *task_id].join('/') : ''
+          new path
+        end
+
+        def initialize(path = '')
+          raise Abt::Cli::Abort, "Invalid path: #{path}" unless path =~ PATH_REGEX
+
+          super
+        end
+
+        def project_id
+          match[:project_id]
+        end
+
+        def task_id
+          match[:task_id]
+        end
+
+        private
+
+        def match
+          @match ||= PATH_REGEX.match(self)
+        end
+      end
+    end
+  end
+end