abt-cli 0.0.21 → 0.0.26

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

@@ -6,72 +6,68 @@ module Abt
       module Commands
         class Pick < BaseCommand
           def self.usage
-            'abt pick asana[:<project-gid>]'
+            "abt pick asana[:<project-gid>]"
           end
 
           def self.description
-            'Pick task for current git repository'
+            "Pick task for current git repository"
           end
 
           def self.flags
             [
-              ['-d', '--dry-run', 'Keep existing configuration']
+              ["-d", "--dry-run", "Keep existing configuration"]
             ]
           end
 
           def perform
-            abort 'Must be run inside a git repository' unless config.local_available?
+            require_local_config!
             require_project!
 
-            warn project['name']
-
+            warn(project["name"])
             task = select_task
 
             print_task(project, task)
 
             return if flags[:"dry-run"]
 
-            config.path = Path.from_ids(project_gid, task['gid'])
+            config.path = Path.from_ids(project_gid: project_gid, task_gid: task["gid"])
           end
 
           private
 
           def project
-            @project ||= api.get("projects/#{project_gid}", opt_fields: 'name')
+            @project ||= api.get("projects/#{project_gid}", opt_fields: "name")
           end
 
           def select_task
-            loop do
-              section = cli.prompt.choice 'Which section?', sections
-              warn 'Fetching tasks...'
-              tasks = tasks_in_section(section)
-
-              if tasks.length.zero?
-                warn 'Section is empty'
-                next
-              end
-
-              task = cli.prompt.choice 'Select a task', tasks, true
-              return task if task
+            section = cli.prompt.choice("Which section?", sections)
+            warn("Fetching tasks...")
+            tasks = tasks_in_section(section)
+
+            if tasks.length.zero?
+              warn("Section is empty")
+              select_task
+            else
+              cli.prompt.choice("Select a task", tasks, nil_option: true) || select_task
             end
           end
 
           def tasks_in_section(section)
             tasks = api.get_paged(
-              'tasks',
-              section: section['gid'],
-              opt_fields: 'name,completed,permalink_url'
+              "tasks",
+              section: section["gid"],
+              opt_fields: "name,completed,permalink_url"
             )
 
             # The below filtering is the best we can do with Asanas api, see this:
             # https://forum.asana.com/t/tasks-query-completed-since-is-broken-for-sections/21461
-            tasks.select { |task| !task['completed'] }
+            tasks.reject { |task| task["completed"] }
           end
 
           def sections
             @sections ||= begin
-              warn 'Fetching sections...'
-              api.get_paged("projects/#{project_gid}/sections", opt_fields: 'name')
+              warn("Fetching sections...")
+              api.get_paged("projects/#{project_gid}/sections", opt_fields: "name")
             end
           end
         end

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

@@ -6,11 +6,11 @@ module Abt
       module Commands
         class Projects < BaseCommand
           def self.usage
-            'abt projects asana'
+            "abt projects asana"
           end
 
           def self.description
-            'List all available projects - useful for piping into grep etc.'
+            "List all available projects - useful for piping into grep etc."
           end
 
           def perform
@@ -23,12 +23,12 @@ module Abt
 
           def projects
             @projects ||= begin
-              warn 'Fetching projects...'
+              warn("Fetching projects...")
               api.get_paged(
-                'projects',
+                "projects",
                 workspace: config.workspace_gid,
                 archived: false,
-                opt_fields: 'name'
+                opt_fields: "name"
               )
             end
           end

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

@@ -6,18 +6,18 @@ module Abt
       module Commands
         class Share < BaseCommand
           def self.usage
-            'abt share asana[:<project-gid>[/<task-gid>]]'
+            "abt share asana[:<project-gid>[/<task-gid>]]"
           end
 
           def self.description
-            'Print project/task ARI'
+            "Print project/task ARI"
           end
 
           def perform
-            if path != ''
-              cli.print_ari('asana', path)
+            if path != ""
+              cli.print_ari("asana", path)
             elsif cli.output.isatty
-              warn 'No configuration for project. Did you initialize Asana?'
+              warn("No configuration for project. Did you initialize Asana?")
             end
           end
         end

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

@@ -6,16 +6,16 @@ module Abt
       module Commands
         class Start < BaseCommand
           def self.usage
-            'abt start asana[:<project-gid>/<task-gid>]'
+            "abt start asana[:<project-gid>/<task-gid>]"
           end
 
           def self.description
-            'Move current or specified task to WIP section (column) and assign it to you'
+            "Move current or specified task to WIP section (column) and assign it to you"
           end
 
           def self.flags
             [
-              ['-s', '--set', 'Set specified task as current']
+              ["-s", "--set", "Set specified task as current"]
             ]
           end
 
@@ -38,33 +38,39 @@ module Abt
             return unless config.local_available?
 
             config.path = path
-            warn 'Current task updated'
+            warn("Current task updated")
           end
 
           def update_assignee_if_needed
-            current_assignee = task.dig('assignee')
-
             if current_assignee.nil?
-              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']
-              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']}"
+            elsif current_assignee["gid"] == current_user["gid"]
+              warn("You are already assigned to this task")
+            elsif should_reassign?
+              warn("Reassigning task to user: #{current_user['name']}")
               update_assignee
             end
           end
 
+          def current_assignee
+            task["assignee"]
+          end
+
+          def should_reassign?
+            cli.prompt.boolean("Task is assigned to: #{current_assignee['name']}, take over?")
+          end
+
           def move_if_needed
             unless project_gid == config.path.project_gid
-              warn 'Task was not moved, this is not implemented for tasks outside current project'
+              warn("Task was not moved, this is not implemented for tasks outside current project")
               return
             end
 
             if task_already_in_wip_section?
-              warn "Task already in section: #{current_task_section['name']}"
+              warn("Task already in section: #{current_task_section['name']}")
             else
-              warn "Moving task to section: #{wip_section['name']}"
+              warn("Moving task to section: #{wip_section['name']}")
               move_task
             end
           end
@@ -74,17 +80,17 @@ module Abt
           end
 
           def current_task_section
-            task_section_membership&.dig('section')
+            task_section_membership&.dig("section")
           end
 
           def task_section_membership
-            task['memberships'].find do |membership|
-              membership.dig('section', 'gid') == config.wip_section_gid
+            task["memberships"].find do |membership|
+              membership.dig("section", "gid") == config.wip_section_gid
             end
           end
 
           def wip_section
-            @wip_section ||= api.get("sections/#{config.wip_section_gid}", opt_fields: 'name')
+            @wip_section ||= api.get("sections/#{config.wip_section_gid}", opt_fields: "name")
           end
 
           def move_task
@@ -94,17 +100,18 @@ module Abt
           end
 
           def update_assignee
-            body = { data: { assignee: current_user['gid'] } }
+            body = { data: { assignee: current_user["gid"] } }
             body_json = Oj.dump(body, mode: :json)
             api.put("tasks/#{task_gid}", body_json)
           end
 
           def current_user
-            @current_user ||= api.get('users/me', opt_fields: 'name')
+            @current_user ||= api.get("users/me", opt_fields: "name")
           end
 
           def task
-            @task ||= api.get("tasks/#{task_gid}", opt_fields: 'name,memberships.section.name,assignee.name,permalink_url')
+            @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

@@ -6,11 +6,11 @@ module Abt
       module Commands
         class Tasks < BaseCommand
           def self.usage
-            'abt tasks asana'
+            "abt tasks asana"
           end
 
           def self.description
-            'List available tasks on project - useful for piping into grep etc.'
+            "List available tasks on project - useful for piping into grep etc."
           end
 
           def perform
@@ -25,15 +25,15 @@ module Abt
 
           def project
             @project ||= begin
-              api.get("projects/#{project_gid}", opt_fields: 'name')
+              api.get("projects/#{project_gid}", opt_fields: "name")
             end
           end
 
           def tasks
             @tasks ||= begin
-              warn 'Fetching tasks...'
-              tasks = api.get_paged('tasks', project: project['gid'], opt_fields: 'name,completed')
-              tasks.select { |task| !task['completed'] }
+              warn("Fetching tasks...")
+              tasks = api.get_paged("tasks", project: project["gid"], opt_fields: "name,completed")
+              tasks.reject { |task| task["completed"] }
             end
           end
         end

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

@@ -15,18 +15,18 @@ module Abt
         end
 
         def path
-          Path.new(local_available? && git['path'] || '')
+          Path.new(local_available? && git["path"] || directory_config["path"] || "")
         end
 
         def path=(new_path)
-          git['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']
+              prompt_workspace_gid
             else
               current
             end
@@ -36,13 +36,17 @@ module Abt
         def wip_section_gid
           return nil unless local_available?
 
-          @wip_section_gid ||= git['wipSectionGid'] || prompt_wip_section['gid']
+          @wip_section_gid ||= git["wipSectionGid"] ||
+                               directory_config["wip_section_gid"] ||
+                               prompt_wip_section["gid"]
         end
 
         def finalized_section_gid
           return nil unless local_available?
 
-          @finalized_section_gid ||= git['finalizedSectionGid'] || prompt_finalized_section['gid']
+          @finalized_section_gid ||= git["finalizedSectionGid"] ||
+                                     directory_config["finalized_section_gid"] ||
+                                     prompt_finalized_section["gid"]
         end
 
         def clear_local(verbose: true)
@@ -54,58 +58,70 @@ module Abt
         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([
-            'Please provide your personal access token for Asana.',
-            'If you don\'t have one, create one here: https://app.asana.com/0/developer-console',
-            '',
-            'Enter access token'
+          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",
+            "",
+            "Enter access token"
           ].join("\n"))
         end
 
         private
 
+        def directory_config
+          Abt.directory_config.fetch("asana", {})
+        end
+
         def git
-          @git ||= GitConfig.new('local', 'abt.asana')
+          @git ||= GitConfig.new("local", "abt.asana")
         end
 
         def git_global
-          @git_global ||= GitConfig.new('global', 'abt.asana')
+          @git_global ||= GitConfig.new("global", "abt.asana")
         end
 
         def prompt_finalized_section
           section = prompt_section('Select section for finalized tasks (E.g. "Merged")')
-          git['finalizedSectionGid'] = section['gid']
+          git["finalizedSectionGid"] = section["gid"]
           section
         end
 
         def prompt_wip_section
-          section = prompt_section('Select WIP (Work In Progress) section')
-          git['wipSectionGid'] = section['gid']
+          section = prompt_section("Select WIP (Work In Progress) section")
+          git["wipSectionGid"] = section["gid"]
           section
         end
 
         def prompt_section(message)
-          cli.warn 'Fetching sections...'
-          sections = api.get_paged("projects/#{path.project_gid}/sections", opt_fields: 'name')
+          cli.warn("Fetching 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', opt_fields: 'name')
-          if workspaces.empty?
-            cli.abort 'Your asana access token does not have access to any workspaces'
-          elsif workspaces.one?
+        def prompt_workspace_gid
+          cli.abort("Your asana access token does not have access to any workspaces") if workspaces.empty?
+
+          if 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)
+            workspace = pick_workspace
           end
 
-          git_global['workspaceGid'] = workspace['gid']
-          workspace
+          git_global["workspaceGid"] = workspace["gid"]
+        end
+
+        def pick_workspace
+          cli.prompt.choice("Select Asana workspace", workspaces)
+        end
+
+        def workspaces
+          @workspaces ||= begin
+            cli.warn("Fetching workspaces...")
+            api.get_paged("workspaces", opt_fields: "name")
+          end
         end
 
         def api

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

@@ -4,15 +4,15 @@ module Abt
   module Providers
     module Asana
       class Path < String
-        PATH_REGEX = %r{^(?<project_gid>\d+)?(/(?<task_gid>\d+))?$}.freeze
+        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
+        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
+        def initialize(path = "")
+          raise Abt::Cli::Abort, "Invalid path: #{path}" unless PATH_REGEX.match?(path)
 
           super
         end