abt-cli 0.0.11 → 0.0.16

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,17 @@ 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|
               print_task(project, task)
             end

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

@@ -5,22 +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 scheme argument to link the time entry, e.g. `abt track harvest asana`'
           end
 
-          def call
-            abort 'No current/provided task' if task_id.nil?
-            cli.abort('No task selected') if task_id.nil?
+          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
 
@@ -31,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,
@@ -39,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.scheme_arguments.to_s)
               output = StringIO.new
               Abt::Cli.new(argv: ['harvest-time-entry-data'], output: output, input: input).perform
 
@@ -60,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.11'
+  VERSION = '0.0.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abt-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.16
 platform: ruby
 authors:
 - Jesper Sørensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-29 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -76,8 +76,9 @@ extra_rdoc_files: []
 files:
 - "./lib/abt.rb"
 - "./lib/abt/cli.rb"
-- "./lib/abt/cli/dialogs.rb"
-- "./lib/abt/cli/io.rb"
+- "./lib/abt/cli/arguments_parser.rb"
+- "./lib/abt/cli/base_command.rb"
+- "./lib/abt/cli/prompt.rb"
 - "./lib/abt/docs.rb"
 - "./lib/abt/docs/cli.rb"
 - "./lib/abt/docs/markdown.rb"
@@ -88,8 +89,9 @@ files:
 - "./lib/abt/providers/asana.rb"
 - "./lib/abt/providers/asana/api.rb"
 - "./lib/abt/providers/asana/base_command.rb"
+- "./lib/abt/providers/asana/commands/add.rb"
+- "./lib/abt/providers/asana/commands/branch_name.rb"
 - "./lib/abt/providers/asana/commands/clear.rb"
-- "./lib/abt/providers/asana/commands/clear_global.rb"
 - "./lib/abt/providers/asana/commands/current.rb"
 - "./lib/abt/providers/asana/commands/finalize.rb"
 - "./lib/abt/providers/asana/commands/harvest_time_entry_data.rb"
@@ -103,19 +105,22 @@ files:
 - "./lib/abt/providers/devops.rb"
 - "./lib/abt/providers/devops/api.rb"
 - "./lib/abt/providers/devops/base_command.rb"
+- "./lib/abt/providers/devops/commands/boards.rb"
+- "./lib/abt/providers/devops/commands/branch_name.rb"
 - "./lib/abt/providers/devops/commands/clear.rb"
-- "./lib/abt/providers/devops/commands/clear_global.rb"
 - "./lib/abt/providers/devops/commands/current.rb"
 - "./lib/abt/providers/devops/commands/harvest_time_entry_data.rb"
 - "./lib/abt/providers/devops/commands/init.rb"
 - "./lib/abt/providers/devops/commands/pick.rb"
 - "./lib/abt/providers/devops/commands/share.rb"
+- "./lib/abt/providers/devops/commands/work-items.rb"
 - "./lib/abt/providers/devops/configuration.rb"
+- "./lib/abt/providers/git.rb"
+- "./lib/abt/providers/git/commands/branch.rb"
 - "./lib/abt/providers/harvest.rb"
 - "./lib/abt/providers/harvest/api.rb"
 - "./lib/abt/providers/harvest/base_command.rb"
 - "./lib/abt/providers/harvest/commands/clear.rb"
-- "./lib/abt/providers/harvest/commands/clear_global.rb"
 - "./lib/abt/providers/harvest/commands/current.rb"
 - "./lib/abt/providers/harvest/commands/init.rb"
 - "./lib/abt/providers/harvest/commands/pick.rb"

data/lib/abt/cli/dialogs.rb

@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-module Abt
-  class Cli
-    module Dialogs
-      def prompt(question)
-        err_output.print "#{question}: "
-        read_user_input.strip
-      end
-
-      def prompt_boolean(text)
-        warn text
-
-        loop do
-          err_output.print '(y / n): '
-
-          case read_user_input.strip
-          when 'y', 'Y' then return true
-          when 'n', 'N' then return false
-          else
-            warn 'Invalid choice'
-            next
-          end
-        end
-      end
-
-      def prompt_choice(text, options, allow_back_option = false)
-        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
-
-      private
-
-      def print_options(options)
-        options.each_with_index do |option, index|
-          warn "(#{index + 1}) #{option['name']}"
-        end
-      end
-
-      def select_options(options, allow_back_option)
-        loop do
-          number = read_option_number(options.length, allow_back_option)
-          if number.nil?
-            return nil if allow_back_option
-
-            next
-          end
-
-          option = options[number - 1]
-
-          warn "Selected: (#{number}) #{option['name']}"
-          return option
-        end
-      end
-
-      def read_option_number(options_length, allow_back_option)
-        err_output.print "(1-#{options_length}#{allow_back_option ? ', q: back' : ''}): "
-
-        input = read_user_input
-
-        return nil if allow_back_option && input == 'q'
-
-        option_number = input.to_i
-        if option_number <= 0 || option_number > options_length
-          warn 'Invalid selection'
-          return nil
-        end
-
-        option_number
-      end
-
-      def read_user_input
-        open('/dev/tty', &:gets).strip
-      end
-    end
-  end
-end

data/lib/abt/cli/io.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Abt
-  class Cli
-    module Io
-      def warn(*args)
-        err_output.puts(*args)
-      end
-
-      def puts(*args)
-        output.puts(*args)
-      end
-
-      def print(*args)
-        output.print(*args)
-      end
-
-      def abort(message)
-        raise AbortError, message
-      end
-    end
-  end
-end

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

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Abt
-  module Providers
-    module Asana
-      module Commands
-        class ClearGlobal < BaseCommand
-          def self.command
-            'clear-global asana'
-          end
-
-          def self.description
-            'Clear all global configuration'
-          end
-
-          def call
-            cli.warn 'Clearing Asana project configuration'
-            config.clear_global
-          end
-        end
-      end
-    end
-  end
-end

data/lib/abt/providers/devops/commands/clear_global.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Abt
-  module Providers
-    module Devops
-      module Commands
-        class ClearGlobal < BaseCommand
-          def self.command
-            'clear-global devops'
-          end
-
-          def self.description
-            'Clear all global configuration'
-          end
-
-          def call
-            cli.warn 'Clearing global DevOps configuration'
-            config.clear_global
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Abt
-  module Providers
-    module Harvest
-      module Commands
-        class ClearGlobal < BaseCommand
-          def self.command
-            'clear-global harvest'
-          end
-
-          def self.description
-            'Clear all global configuration'
-          end
-
-          def call
-            cli.warn 'Clearing Harvest project configuration'
-            config.clear_global
-          end
-        end
-      end
-    end
-  end
-end