abt-cli 0.0.13 → 0.0.18

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

@@ -5,17 +5,28 @@ module Abt
     module Asana
       module Commands
         class Clear < BaseCommand
-          def self.command
-            'clear asana'
+          def self.usage
+            'abt clear asana'
           end
 
           def self.description
-            'Clear project/task for current git repository'
+            'Clear asana configuration'
           end
 
-          def call
-            cli.warn 'Clearing Asana project configuration'
-            config.clear_local
+          def self.flags
+            [
+              ['-g', '--global', 'Clear global instead of local asana configuration (credentials etc.)'],
+              ['-a', '--all', 'Clear all asana 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/asana/commands/current.rb

@@ -5,15 +5,15 @@ module Abt
     module Asana
       module Commands
         class Current < BaseCommand
-          def self.command
-            'current asana[:<project-gid>[/<task-gid>]]'
+          def self.usage
+            'abt current asana[:<project-gid>[/<task-gid>]]'
           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/asana/commands/finalize.rb

@@ -5,15 +5,15 @@ module Abt
     module Asana
       module Commands
         class Finalize < BaseCommand
-          def self.command
-            'finalize asana[:<project-gid>/<task-gid>]'
+          def self.usage
+            'abt finalize asana[:<project-gid>/<task-gid>]'
           end
 
           def self.description
             'Move current/specified task to section (column) for finalized tasks'
           end
 
-          def call
+          def perform
             unless config.local_available?
               cli.abort 'This is a no-op for tasks outside the current project'
             end

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

@@ -5,15 +5,15 @@ module Abt
     module Asana
       module Commands
         class HarvestTimeEntryData < BaseCommand
-          def self.command
-            'harvest-time-entry-data asana[:<project-gid>/<task-gid>]'
+          def self.usage
+            'abt harvest-time-entry-data asana[:<project-gid>/<task-gid>]'
           end
 
           def self.description
             'Print Harvest time entry data for Asana task as json. Used by harvest start script.'
           end
 
-          def call
+          def perform
             require_task!
             ensure_current_is_valid!
 

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

@@ -5,8 +5,8 @@ module Abt
     module Asana
       module Commands
         class Init < BaseCommand
-          def self.command
-            'init asana'
+          def self.usage
+            'abt init asana'
           end
 
           def self.description
@@ -18,7 +18,7 @@ module Abt
             @cli = cli
           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
@@ -35,14 +35,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?
                 cli.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 unless choice.nil?
             end
           end

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

@@ -5,15 +5,21 @@ module Abt
     module Asana
       module Commands
         class Pick < BaseCommand
-          def self.command
-            'pick asana[:<project-gid>]'
+          def self.usage
+            'abt pick asana[:<project-gid>]'
           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!
 
@@ -21,10 +27,12 @@ module Abt
 
             task = select_task
 
-            config.project_gid = project_gid # We might have gotten the project ID as an argument
-            config.task_gid = task['gid']
-
             print_task(project, task)
+
+            return if flags[:"dry-run"]
+
+            config.project_gid = project_gid # We might have gotten the project ID from a path
+            config.task_gid = task['gid']
           end
 
           private
@@ -35,7 +43,7 @@ module Abt
 
           def select_task
             loop do
-              section = cli.prompt_choice 'Which section?', sections
+              section = cli.prompt.choice 'Which section?', sections
               cli.warn 'Fetching tasks...'
               tasks = tasks_in_section(section)
 
@@ -44,7 +52,7 @@ module Abt
                 next
               end
 
-              task = cli.prompt_choice 'Select a task', tasks, true
+              task = cli.prompt.choice 'Select a task', tasks, true
               return task if task
             end
           end

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

@@ -5,15 +5,15 @@ module Abt
     module Asana
       module Commands
         class Projects < BaseCommand
-          def self.command
-            'projects asana'
+          def self.usage
+            'abt projects asana'
           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/asana/commands/share.rb

@@ -5,21 +5,21 @@ module Abt
     module Asana
       module Commands
         class Share < BaseCommand
-          def self.command
-            'share asana[:<project-gid>[/<task-gid>]]'
+          def self.usage
+            'abt share asana[:<project-gid>[/<task-gid>]]'
           end
 
           def self.description
             'Print project/task config string'
           end
 
-          def call
+          def perform
             require_project!
 
             if task_gid.nil?
-              cli.print_provider_command('asana', project_gid)
+              cli.print_ari('asana', project_gid)
             else
-              cli.print_provider_command('asana', "#{project_gid}/#{task_gid}")
+              cli.print_ari('asana', "#{project_gid}/#{task_gid}")
             end
           end
         end

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

@@ -5,15 +5,21 @@ module Abt
     module Asana
       module Commands
         class Start < BaseCommand
-          def self.command
-            'start asana[:<project-gid>/<task-gid>]'
+          def self.usage
+            'abt start asana[:<project-gid>/<task-gid>]'
           end
 
           def self.description
-            'Set current task and move it to a section (column) of your choice'
+            'Move current or specified task to WIP section (column) and assign it to you'
           end
 
-          def call
+          def self.flags
+            [
+              ['-s', '--set', 'Set specified task as current']
+            ]
+          end
+
+          def perform
             require_task!
 
             maybe_override_current_task
@@ -25,12 +31,12 @@ module Abt
           private
 
           def maybe_override_current_task
-            return if arg_str.nil?
+            return unless flags[:set]
+            return if path.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
+            Current.new(path: path, cli: cli).call
           end
 
           def update_assignee_if_needed
@@ -41,7 +47,7 @@ module Abt
               update_assignee
             elsif current_assignee['gid'] == current_user['gid']
               cli.warn 'You are already assigned to this task'
-            elsif cli.prompt_boolean "Task is assigned to: #{current_assignee['name']}, take over?"
+            elsif cli.prompt.boolean "Task is assigned to: #{current_assignee['name']}, take over?"
               cli.warn "Reassigning task to user: #{current_user['name']}"
               update_assignee
             end

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

@@ -5,15 +5,15 @@ module Abt
     module Asana
       module Commands
         class Tasks < BaseCommand
-          def self.command
-            'tasks asana'
+          def self.usage
+            'abt tasks asana'
           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/asana/configuration.rb

@@ -49,7 +49,7 @@ module Abt
         def project_gid=(value)
           return if project_gid == value
 
-          clear_local
+          clear_local(verbose: false)
           git['projectGid'] = value unless value.nil?
         end
 
@@ -57,26 +57,18 @@ module Abt
           git['taskGid'] = value
         end
 
-        def clear_local
-          cli.abort 'No local configuration was found' unless local_available?
-
-          git['projectGid'] = nil
-          git['taskGid'] = nil
-          git['wipSectionGid'] = nil
-          git['finalizedSectionGid'] = 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 Asana.',
             'If you don\'t have one, create one here: https://app.asana.com/0/developer-console',
             '',
@@ -103,7 +95,7 @@ module Abt
         def prompt_section(message)
           cli.warn 'Fetching sections...'
           sections = api.get_paged("projects/#{project_gid}/sections")
-          cli.prompt_choice(message, sections)
+          cli.prompt.choice(message, sections)
         end
 
         def prompt_workspace
@@ -115,7 +107,7 @@ module Abt
             workspace = workspaces.first
             cli.warn "Selected Asana workspace #{workspace['name']}"
           else
-            workspace = cli.prompt_choice('Select Asana workspace', workspaces)
+            workspace = cli.prompt.choice('Select Asana workspace', workspaces)
           end
 
           git.global['workspaceGid'] = workspace['gid']

data/lib/abt/providers/devops/base_command.rb

@@ -3,19 +3,18 @@
 module Abt
   module Providers
     module Devops
-      class BaseCommand
-        attr_reader :arg_str, :organization_name, :project_name, :board_id, :work_item_id, :cli, :config
+      class BaseCommand < Abt::Cli::BaseCommand
+        attr_reader :organization_name, :project_name, :board_id, :work_item_id, :config
 
-        def initialize(arg_str:, cli:)
-          @arg_str = arg_str
+        def initialize(path:, cli:, **)
+          super
 
           @config = Configuration.new(cli: cli)
-          @cli = cli
 
-          if arg_str.nil?
-            use_current_args
+          if path.nil?
+            use_current_path
           else
-            use_arg_str(arg_str)
+            use_path(path)
           end
         end
 
@@ -55,28 +54,28 @@ module Abt
         end
 
         def print_board(organization_name, project_name, board)
-          arg_str = "#{organization_name}/#{project_name}/#{board['id']}"
+          path = "#{organization_name}/#{project_name}/#{board['id']}"
 
-          cli.print_provider_command('devops', arg_str, board['name'])
+          cli.print_ari('devops', path, board['name'])
           # cli.warn board['url'] if board.key?('url') && cli.output.isatty # TODO: Web URL
         end
 
         def print_work_item(organization, project, board, work_item)
-          arg_str = "#{organization}/#{project}/#{board['id']}/#{work_item['id']}"
+          path = "#{organization}/#{project}/#{board['id']}/#{work_item['id']}"
 
-          cli.print_provider_command('devops', arg_str, work_item['name'])
+          cli.print_ari('devops', path, work_item['name'])
           cli.warn work_item['url'] if work_item.key?('url') && cli.output.isatty
         end
 
-        def use_current_args
+        def use_current_path
           @organization_name = config.organization_name
           @project_name = config.project_name
           @board_id = config.board_id
           @work_item_id = config.work_item_id
         end
 
-        def use_arg_str(arg_str)
-          args = arg_str.to_s.split('/')
+        def use_path(path)
+          args = path.to_s.split('/')
 
           if args.length < 3
             cli.abort 'Argument format is <organization>/<project>/<board-id>[/<work-item-id>]'

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

@@ -5,16 +5,18 @@ module Abt
     module Devops
       module Commands
         class Boards < BaseCommand
-          def self.command
-            'boards devops'
+          def self.usage
+            'abt boards devops'
           end
 
           def self.description
             'List all boards - useful for piping into grep etc'
           end
 
-          def call
-            cli.abort 'No organization selected. Did you initialize DevOps?' if organization_name.nil?
+          def perform
+            if organization_name.nil?
+              cli.abort 'No organization selected. Did you initialize DevOps?'
+            end
             cli.abort 'No project selected. Did you initialize DevOps?' if project_name.nil?
 
             boards.map do |board|