abt-cli 0.0.15 → 0.0.20

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|
@@ -25,14 +25,15 @@ module Abt
 
           def project
             @project ||= begin
-              api.get("projects/#{project_gid}")
+              api.get("projects/#{project_gid}", opt_fields: 'name')
             end
           end
 
           def tasks
             @tasks ||= begin
-              cli.warn 'Fetching tasks...'
-              api.get_paged('tasks', project: project['gid'], opt_fields: 'name')
+              warn 'Fetching tasks...'
+              tasks = api.get_paged('tasks', project: project['gid'], opt_fields: 'name,completed')
+              tasks.select { |task| !task['completed'] }
             end
           end
         end

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

@@ -8,24 +8,23 @@ module Abt
 
         def initialize(cli:)
           @cli = cli
-          @git = GitConfig.new(namespace: 'abt.asana')
         end
 
         def local_available?
-          GitConfig.local_available?
+          git.available?
         end
 
-        def project_gid
-          local_available? ? git['projectGid'] : nil
+        def path
+          Path.new(local_available? && git['path'] || '')
         end
 
-        def task_gid
-          local_available? ? git['taskGid'] : nil
+        def path=(new_path)
+          git['path'] = new_path
         end
 
         def workspace_gid
           @workspace_gid ||= begin
-            current = git.global['workspaceGid']
+            current = git_global['workspaceGid']
             if current.nil?
               prompt_workspace['gid']
             else
@@ -46,37 +45,18 @@ module Abt
           @finalized_section_gid ||= git['finalizedSectionGid'] || prompt_finalized_section['gid']
         end
 
-        def project_gid=(value)
-          return if project_gid == value
-
-          clear_local
-          git['projectGid'] = value unless value.nil?
-        end
-
-        def task_gid=(value)
-          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?
+          return git_global['accessToken'] unless git_global['accessToken'].nil?
 
-          git.global['accessToken'] = cli.prompt.text([
+          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',
             '',
@@ -86,7 +66,13 @@ module Abt
 
         private
 
-        attr_reader :git
+        def git
+          @git ||= GitConfig.new('local', 'abt.asana')
+        end
+
+        def git_global
+          @git_global ||= GitConfig.new('global', 'abt.asana')
+        end
 
         def prompt_finalized_section
           section = prompt_section('Select section for finalized tasks (E.g. "Merged")')
@@ -102,23 +88,23 @@ module Abt
 
         def prompt_section(message)
           cli.warn 'Fetching sections...'
-          sections = api.get_paged("projects/#{project_gid}/sections")
+          sections = api.get_paged("projects/#{path.project_gid}/sections", opt_fields: 'name')
           cli.prompt.choice(message, sections)
         end
 
         def prompt_workspace
           cli.warn 'Fetching workspaces...'
-          workspaces = api.get_paged('workspaces')
+          workspaces = api.get_paged('workspaces', opt_fields: 'name')
           if workspaces.empty?
             cli.abort 'Your asana access token does not have access to any workspaces'
           elsif workspaces.one?
             workspace = workspaces.first
-            cli.warn "Selected Asana workspace #{workspace['name']}"
+            cli.warn "Selected Asana workspace: #{workspace['name']}"
           else
             workspace = cli.prompt.choice('Select Asana workspace', workspaces)
           end
 
-          git.global['workspaceGid'] = workspace['gid']
+          git_global['workspaceGid'] = workspace['gid']
           workspace
         end
 

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

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

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

@@ -69,6 +69,10 @@ module Abt
           "#{base_url}/_workitems/edit/#{work_item['id']}"
         end
 
+        def url_for_board(board)
+          "#{base_url}/_boards/board/#{rfc_3986_encode_path_segment(board['name'])}"
+        end
+
         def connection
           @connection ||= Faraday.new(api_endpoint) do |connection|
             connection.basic_auth username, access_token
@@ -79,6 +83,14 @@ module Abt
 
         private
 
+        # Shamelessly copied from ERB::Util.url_encode
+        # https://apidock.com/ruby/ERB/Util/url_encode
+        def rfc_3986_encode_path_segment(string)
+          string.to_s.b.gsub(/[^a-zA-Z0-9_\-.~]/) do |match|
+            format('%%%02X', match.unpack1('C')) # rubocop:disable Style/FormatStringToken
+          end
+        end
+
         def handle_denied_by_conditional_access_policy!(exception)
           raise exception unless exception.message.include?(CONDITIONAL_ACCESS_POLICY_ERROR_CODE)
 

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

@@ -3,20 +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::BaseCommand
+        extend Forwardable
 
-        def initialize(arg_str:, cli:)
-          @arg_str = arg_str
+        attr_reader :config, :path
 
-          @config = Configuration.new(cli: cli)
-          @cli = cli
+        def_delegators(:@path, :organization_name, :project_name, :board_id, :work_item_id)
 
-          if arg_str.nil?
-            use_current_args
-          else
-            use_arg_str(arg_str)
-          end
+        def initialize(ari:, cli:)
+          super
+
+          @config = Configuration.new(cli: cli)
+          @path = ari.path ? Path.new(ari.path) : config.path
         end
 
         private
@@ -24,17 +22,17 @@ module Abt
         def require_board!
           return if organization_name && project_name && board_id
 
-          cli.abort 'No current/specified board. Did you initialize DevOps?'
+          abort 'No current/specified board. Did you initialize DevOps?'
         end
 
         def require_work_item!
           unless organization_name && project_name && board_id
-            cli.abort 'No current/specified board. Did you initialize DevOps and pick a work item?'
+            abort 'No current/specified board. Did you initialize DevOps and pick a work item?'
           end
 
           return if work_item_id
 
-          cli.abort 'No current/specified work item. Did you pick a DevOps work item?'
+          abort 'No current/specified work item. Did you pick a DevOps work item?'
         end
 
         def sanitize_work_item(work_item)
@@ -47,42 +45,18 @@ module Abt
           )
         end
 
-        def same_args_as_config?
-          organization_name == config.organization_name &&
-            project_name == config.project_name &&
-            board_id == config.board_id &&
-            work_item_id == config.work_item_id
-        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.warn board['url'] if board.key?('url') && cli.output.isatty # TODO: Web URL
+          cli.print_ari('devops', path, board['name'])
+          warn api.url_for_board(board) if cli.output.isatty
         end
 
         def print_work_item(organization, project, board, work_item)
-          arg_str = "#{organization}/#{project}/#{board['id']}/#{work_item['id']}"
-
-          cli.print_provider_command('devops', arg_str, work_item['name'])
-          cli.warn work_item['url'] if work_item.key?('url') && cli.output.isatty
-        end
-
-        def use_current_args
-          @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('/')
-
-          if args.length < 3
-            cli.abort 'Argument format is <organization>/<project>/<board-id>[/<work-item-id>]'
-          end
+          path = "#{organization}/#{project}/#{board['id']}/#{work_item['id']}"
 
-          (@organization_name, @project_name, @board_id, @work_item_id) = args
+          cli.print_ari('devops', path, work_item['name'])
+          warn work_item['url'] if work_item.key?('url') && cli.output.isatty
         end
 
         def api

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

@@ -5,17 +5,19 @@ 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?
-            cli.abort 'No project selected. Did you initialize DevOps?' if project_name.nil?
+          def perform
+            if organization_name.nil?
+              abort 'No organization selected. Did you initialize DevOps?'
+            end
+            abort 'No project selected. Did you initialize DevOps?' if project_name.nil?
 
             boards.map do |board|
               print_board(organization_name, project_name, board)

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

@@ -5,22 +5,26 @@ 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
+            puts name
           rescue HttpError::NotFoundError
             args = [organization_name, project_name, board_id, work_item_id].compact
-            cli.warn 'Unable to find work item for configuration:'
-            cli.abort "devops:#{args.join('/')}"
+
+            error_message = [
+              'Unable to find work item for configuration:',
+              "devops:#{args.join('/')}"
+            ].join("\n")
+            abort error_message
           end
 
           private

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

@@ -5,17 +5,30 @@ 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]
+
+            warn 'Configuration cleared'
           end
         end
       end

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

@@ -5,72 +5,48 @@ 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
+            abort 'Must be run inside a git repository' unless config.local_available?
+
             require_board!
+            ensure_valid_configuration!
 
-            if same_args_as_config? || !config.local_available?
-              show_current_configuration
-            else
-              cli.warn 'Updating configuration'
-              update_configuration
+            if path != config.path && config.local_available?
+              config.path = path
+              warn 'Configuration updated'
             end
-          end
-
-          private
 
-          def show_current_configuration
-            if work_item_id.nil?
-              print_board(organization_name, project_name, board)
-            else
-              print_work_item(organization_name, project_name, board, work_item)
-            end
+            print_configuration
           end
 
-          def update_configuration
-            ensure_board_is_valid!
+          private
 
+          def print_configuration
             if work_item_id.nil?
-              update_board_config
-              config.work_item_id = nil
-
               print_board(organization_name, project_name, board)
             else
-              ensure_work_item_is_valid!
-
-              update_board_config
-              config.work_item_id = work_item_id
-
               print_work_item(organization_name, project_name, board, work_item)
             end
           end
 
-          def update_board_config
-            config.organization_name = organization_name
-            config.project_name = project_name
-            config.board_id = board_id
-          end
-
-          def ensure_board_is_valid!
+          def ensure_valid_configuration!
             if board.nil?
-              cli.abort 'Board could not be found, ensure that settings for organization, project, and board are correct'
+              abort 'Board could not be found, ensure that settings for organization, project, and board are correct'
             end
-          end
-
-          def ensure_work_item_is_valid!
-            cli.abort "No such work item: ##{work_item_id}" if work_item.nil?
+            abort "No such work item: ##{work_item_id}" if work_item_id && work_item.nil?
           end
 
           def board
             @board ||= begin
-                         cli.warn 'Fetching board...'
+                         warn 'Fetching board...'
                          api.get("work/boards/#{board_id}")
                        rescue HttpError::NotFoundError
                          nil
@@ -79,7 +55,7 @@ module Abt
 
           def work_item
             @work_item ||= begin
-                             cli.warn 'Fetching work item...'
+                             warn 'Fetching work item...'
                              work_item = api.get_paged('wit/workitems', ids: work_item_id)[0]
                              sanitize_work_item(work_item)
                            rescue HttpError::NotFoundError