abt-cli 0.0.15 → 0.0.16

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_scheme_argument('asana', project_gid)
             else
-              cli.print_provider_command('asana', "#{project_gid}/#{task_gid}")
+              cli.print_scheme_argument('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

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,20 +57,12 @@ 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

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_scheme_argument('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_scheme_argument('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|

data/lib/abt/providers/devops/commands/{branch-name.rb → branch_name.rb}

@@ -5,15 +5,15 @@ module Abt
     module Devops
       module Commands
         class BranchName < BaseCommand
-          def self.command
-            'branch-name devops[:<organization-name>/<project-name>/<board-id>/<work-item-id>]'
+          def self.usage
+            'abt branch-name devops[:<organization-name>/<project-name>/<board-id>/<work-item-id>]'
           end
 
           def self.description
             'Suggest a git branch name for the current/specified work-item.'
           end
 
-          def call
+          def perform
             require_work_item!
 
             cli.puts name

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

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

@@ -5,15 +5,15 @@ module Abt
     module Devops
       module Commands
         class Current < BaseCommand
-          def self.command
-            'current devops[:<organization-name>/<project-name>/<board-id>[/<work-item-id>]]'
+          def self.usage
+            'abt current devops[:<organization-name>/<project-name>/<board-id>[/<work-item-id>]]'
           end
 
           def self.description
             'Get or set DevOps configuration for current git repository'
           end
 
-          def call
+          def perform
             require_board!
 
             if same_args_as_config? || !config.local_available?

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

@@ -5,15 +5,15 @@ module Abt
     module Devops
       module Commands
         class HarvestTimeEntryData < BaseCommand
-          def self.command
-            'harvest-time-entry-data devops[:<organization-name>/<project-name>/<board-id>/<work-item-id>]'
+          def self.usage
+            'abt harvest-time-entry-data devops[:<organization-name>/<project-name>/<board-id>/<work-item-id>]'
           end
 
           def self.description
             'Print Harvest time entry data for DevOps work item as json. Used by harvest start script.'
           end
 
-          def call
+          def perform
             require_work_item!
 
             body = {

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

@@ -8,15 +8,15 @@ module Abt
           AZURE_DEV_URL_REGEX = %r{^https://dev\.azure\.com/(?<organization>[^/]+)/(?<project>[^/]+)}.freeze
           VS_URL_REGEX = %r{^https://(?<organization>[^.]+)\.visualstudio\.com/(?<project>[^/]+)}.freeze
 
-          def self.command
-            'init devops'
+          def self.usage
+            'abt init devops'
           end
 
           def self.description
             'Pick DevOps board for current git repository'
           end
 
-          def call
+          def perform
             cli.abort 'Must be run inside a git repository' unless config.local_available?
 
             @organization_name = config.organization_name = organization_name_from_url

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

@@ -5,25 +5,32 @@ module Abt
     module Devops
       module Commands
         class Pick < BaseCommand
-          def self.command
-            'pick devops[:<organization-name>/<project-name>/<board-id>]'
+          def self.usage
+            'abt pick devops[:<organization-name>/<project-name>/<board-id>]'
           end
 
           def self.description
             'Pick work item 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_board!
 
             cli.warn "#{project_name} - #{board['name']}"
 
             work_item = select_work_item
+            print_work_item(organization_name, project_name, board, work_item)
 
-            update_config!(work_item)
+            return if flags[:"dry-run"]
 
-            print_work_item(organization_name, project_name, board, work_item)
+            update_config!(work_item)
           end
 
           private

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

@@ -5,19 +5,19 @@ module Abt
     module Devops
       module Commands
         class Share < BaseCommand
-          def self.command
-            'share devops[:<organization-name>/<project-name>/<board-id>[/<work-item-id>]]'
+          def self.usage
+            'abt share devops[:<organization-name>/<project-name>/<board-id>[/<work-item-id>]]'
           end
 
           def self.description
             'Print DevOps config string'
           end
 
-          def call
+          def perform
             require_work_item!
 
             args = [organization_name, project_name, board_id, work_item_id].compact
-            cli.print_provider_command('devops', args.join('/'))
+            cli.print_scheme_argument('devops', args.join('/'))
           end
         end
       end

data/lib/abt/providers/devops/commands/work-items.rb

@@ -5,15 +5,15 @@ module Abt
     module Devops
       module Commands
         class WorkItems < BaseCommand
-          def self.command
-            'work-items devops'
+          def self.usage
+            'abt work-items devops'
           end
 
           def self.description
             'List all work items on board - useful for piping into grep etc.'
           end
 
-          def call
+          def perform
             require_board!
 
             work_items.each do |work_item|

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

@@ -34,7 +34,7 @@ module Abt
         def organization_name=(value)
           return if organization_name == value
 
-          clear_local
+          clear_local(verbose: false)
           git['organizationName'] = value unless value.nil?
         end
 
@@ -57,20 +57,12 @@ module Abt
           git['workItemId'] = value
         end
 
-        def clear_local
-          cli.abort 'No local configuration was found' unless local_available?
-
-          git['organizationName'] = nil
-          git['projectName'] = nil
-          git['boardId'] = nil
-          git['workItemId'] = 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 username_for_organization(organization_name)

data/lib/abt/providers/git/commands/branch.rb

@@ -4,22 +4,16 @@ module Abt
   module Providers
     module Git
       module Commands
-        class Branch
-          attr_reader :cli
-
-          def self.command
-            'branch git <provider>'
+        class Branch < Abt::Cli::BaseCommand
+          def self.usage
+            'abt branch git <scheme>[:<path>]'
           end
 
           def self.description
-            'Switch branch. Uses a compatible provider to generate the branch-name: E.g. `abt branch git asana`'
-          end
-
-          def initialize(cli:, **)
-            @cli = cli
+            'Switch branch. Uses a compatible scheme to generate the branch-name: E.g. `abt branch git asana`'
           end
 
-          def call
+          def perform
             create_and_switch unless switch
             cli.warn "Switched to #{branch_name}"
           end
@@ -45,29 +39,29 @@ module Abt
 
           def branch_name # rubocop:disable Metrics/MethodLength
             @branch_name ||= begin
-              if branch_names_from_providers.empty?
+              if branch_names_from_scheme_arguments.empty?
                 cli.abort [
-                  'None of the specified providers responded to `branch-name`.',
-                  'Did you add compatible provider? e.g.:',
+                  'None of the specified scheme arguments responded to `branch-name`.',
+                  'Did you add compatible scheme? e.g.:',
                   '   abt branch git asana',
                   '   abt branch git devops'
                 ].join("\n")
               end
 
-              if branch_names_from_providers.length > 1
+              if branch_names_from_scheme_arguments.length > 1
                 cli.abort [
-                  'Got branch names from multiple providers, only one is supported',
-                  'Branch names where:',
-                  *branch_names_from_providers.map { |name| "   #{name}" }
+                  'Got branch names from multiple scheme arguments, only one is supported',
+                  'Branch names were:',
+                  *branch_names_from_scheme_arguments.map { |name| "   #{name}" }
                 ].join("\n")
               end
 
-              branch_names_from_providers.first
+              branch_names_from_scheme_arguments.first
             end
           end
 
-          def branch_names_from_providers
-            input = StringIO.new(cli.args.join(' '))
+          def branch_names_from_scheme_arguments
+            input = StringIO.new(cli.scheme_arguments.to_s)
             output = StringIO.new
             Abt::Cli.new(argv: ['branch-name'], output: output, input: input).perform