abt-cli 0.0.13 → 0.0.18

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

@@ -5,17 +5,28 @@ module Abt
     module Harvest
       module Commands
         class Clear < BaseCommand
-          def self.command
-            'clear harvest'
+          def self.usage
+            'abt clear harvest'
           end
 
           def self.description
-            'Clear project/task for current git repository'
+            'Clear harvest configuration'
           end
 
-          def call
-            cli.warn 'Clearing Harvest project configuration'
-            config.clear_local
+          def self.flags
+            [
+              ['-g', '--global', 'Clear global instead of local harvest configuration (credentials etc.)'],
+              ['-a', '--all', 'Clear all harvest configuration']
+            ]
+          end
+
+          def perform
+            if flags[:global] && flags[:all]
+              abort('Flags --global and --all cannot be used at the same time')
+            end
+
+            config.clear_local unless flags[:global]
+            config.clear_global if flags[:global] || flags[:all]
           end
         end
       end

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

@@ -5,15 +5,15 @@ module Abt
     module Harvest
       module Commands
         class Current < BaseCommand
-          def self.command
-            'current harvest[:<project-id>[/<task-id>]]'
+          def self.usage
+            'abt current harvest[:<project-id>[/<task-id>]]'
           end
 
           def self.description
             'Get or set project and or task for current git repository'
           end
 
-          def call
+          def perform
             require_project!
 
             if same_args_as_config? || !config.local_available?

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

@@ -5,15 +5,15 @@ module Abt
     module Harvest
       module Commands
         class Init < BaseCommand
-          def self.command
-            'init harvest'
+          def self.usage
+            'abt init harvest'
           end
 
           def self.description
             'Pick Harvest project for current git repository'
           end
 
-          def call
+          def perform
             cli.abort 'Must be run inside a git repository' unless config.local_available?
 
             projects # Load projects up front to make it obvious that searches are instant
@@ -31,14 +31,14 @@ module Abt
             cli.warn 'Select a project'
 
             loop do
-              matches = matches_for_string cli.prompt('Enter search')
+              matches = matches_for_string cli.prompt.text('Enter search')
               if matches.empty?
                 warn 'No matches'
                 next
               end
 
               cli.warn 'Showing the 10 first matches' if matches.size > 10
-              choice = cli.prompt_choice 'Select a project', matches[0...10], true
+              choice = cli.prompt.choice 'Select a project', matches[0...10], true
               break choice['project'] unless choice.nil?
             end
           end

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

@@ -5,25 +5,33 @@ module Abt
     module Harvest
       module Commands
         class Pick < BaseCommand
-          def self.command
-            'pick harvest[:<project-id>]'
+          def self.usage
+            'abt pick harvest[:<project-id>]'
           end
 
           def self.description
             'Pick task for current git repository'
           end
 
-          def call
+          def self.flags
+            [
+              ['-d', '--dry-run', 'Keep existing configuration']
+            ]
+          end
+
+          def perform
             cli.abort 'Must be run inside a git repository' unless config.local_available?
             require_project!
 
             cli.warn project['name']
-            task = cli.prompt_choice 'Select a task', tasks
-
-            config.project_id = project_id # We might have gotten the project ID as an argument
-            config.task_id = task['id']
+            task = cli.prompt.choice 'Select a task', tasks
 
             print_task(project, task)
+
+            return if flags[:"dry-run"]
+
+            config.project_id = project_id # We might have gotten the project ID as a path
+            config.task_id = task['id']
           end
 
           private

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

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

@@ -5,21 +5,21 @@ 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'
           end
 
-          def call
+          def perform
             if project_id.nil?
               cli.warn 'No project selected'
             elsif task_id.nil?
-              cli.print_provider_command('harvest', project_id)
+              cli.print_ari('harvest', project_id)
             else
-              cli.print_provider_command('harvest', "#{project_id}/#{task_id}")
+              cli.print_ari('harvest', "#{project_id}/#{task_id}")
             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,15 +5,15 @@ 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
+          def perform
             cli.abort 'No running time entry' if time_entry.nil?
 
             stop_time_entry

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|

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

@@ -5,21 +5,30 @@ 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
+            maybe_override_current_task
+          rescue Abt::HttpError::HttpError => _e
             cli.abort 'Invalid task'
           end
 
@@ -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,18 +60,24 @@ module Abt
             }
 
             if external_link_data
+              cli.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)')
             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(' '))
+              input = StringIO.new(cli.aris.to_s)
               output = StringIO.new
               Abt::Cli.new(argv: ['harvest-time-entry-data'], output: output, input: input).perform
 
@@ -59,12 +87,22 @@ module Abt
 
               # 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
+                cli.abort('Got reference data from multiple scheme providers, only one is supported at a time')
               end
 
-              Oj.load(lines.first)
+              Oj.load(lines.first, symbol_keys: true)
             end
           end
+
+          def maybe_override_current_task
+            return unless flags[:set]
+            return if same_args_as_config?
+            return unless config.local_available?
+
+            input = StringIO.new("harvest:#{project_id}/#{task_id}")
+            output = StringIO.new
+            Abt::Cli.new(argv: ['current'], output: output, input: input).perform
+          end
         end
       end
     end

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

@@ -27,7 +27,7 @@ module Abt
           value = value.to_s unless value.nil?
           return if project_id == value
 
-          clear_local
+          clear_local(verbose: false)
           git['projectId'] = value
         end
 
@@ -36,24 +36,18 @@ module Abt
           git['taskId'] = value
         end
 
-        def clear_local
-          cli.abort 'No local configuration was found' unless local_available?
-
-          git['projectId'] = nil
-          git['taskId'] = nil
+        def clear_local(verbose: true)
+          git.clear(output: verbose ? cli.err_output : 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?
 
-          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',
             '',
@@ -64,7 +58,7 @@ module Abt
         def account_id
           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',
             '',

data/lib/abt/version.rb

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