abt-cli 0.0.14 → 0.0.19

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

@@ -5,58 +5,66 @@ 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
+            print_task(project_gid, task)
 
             update_assignee_if_needed
             move_if_needed
+            maybe_override_current_task
           end
 
           private
 
           def maybe_override_current_task
-            return if arg_str.nil?
-            return if same_args_as_config?
+            return unless flags[:set]
+            return if path.nil?
+            return if path == config.path
             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
+            config.path = path
+            warn 'Current task updated'
           end
 
           def update_assignee_if_needed
             current_assignee = task.dig('assignee')
 
             if current_assignee.nil?
-              cli.warn "Assigning task to user: #{current_user['name']}"
+              warn "Assigning task to user: #{current_user['name']}"
               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?"
-              cli.warn "Reassigning task to user: #{current_user['name']}"
+              warn 'You are already assigned to this task'
+            elsif cli.prompt.boolean "Task is assigned to: #{current_assignee['name']}, take over?"
+              warn "Reassigning task to user: #{current_user['name']}"
               update_assignee
             end
           end
 
           def move_if_needed
-            unless project_gid == config.project_gid
-              cli.warn 'Task was not moved, this is not implemented for tasks outside current project'
+            unless project_gid == config.path.project_gid
+              warn 'Task was not moved, this is not implemented for tasks outside current project'
               return
             end
 
             if task_already_in_wip_section?
-              cli.warn "Task already in section: #{current_task_section['name']}"
+              warn "Task already in section: #{current_task_section['name']}"
             else
-              cli.warn "Moving task to section: #{wip_section['name']}"
+              warn "Moving task to section: #{wip_section['name']}"
               move_task
             end
           end
@@ -76,7 +84,7 @@ module Abt
           end
 
           def wip_section
-            @wip_section ||= api.get("sections/#{config.wip_section_gid}")
+            @wip_section ||= api.get("sections/#{config.wip_section_gid}", opt_fields: 'name')
           end
 
           def move_task
@@ -96,7 +104,7 @@ module Abt
           end
 
           def task
-            @task ||= api.get("tasks/#{task_gid}", opt_fields: 'name,memberships.section.name,assignee.name')
+            @task ||= api.get("tasks/#{task_gid}", opt_fields: 'name,memberships.section.name,assignee.name,permalink_url')
           end
         end
       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|
@@ -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.filter { |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([
+          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,8 +88,8 @@ module Abt
 
         def prompt_section(message)
           cli.warn 'Fetching sections...'
-          sections = api.get_paged("projects/#{project_gid}/sections")
-          cli.prompt_choice(message, sections)
+          sections = api.get_paged("projects/#{path.project_gid}/sections")
+          cli.prompt.choice(message, sections)
         end
 
         def prompt_workspace
@@ -115,10 +101,10 @@ 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']
+          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