abt-cli 0.0.16 → 0.0.21

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

@@ -14,16 +14,16 @@ module Abt
           end
 
           def perform
-            unless config.local_available?
-              cli.abort 'This is a no-op for tasks outside the current project'
+            unless project_gid == config.path.project_gid
+              abort 'This is a no-op for tasks outside the current project'
             end
             require_task!
             print_task(project_gid, task)
 
             if task_already_in_finalized_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: #{finalized_section['name']}"
+              warn "Moving task to section: #{finalized_section['name']}"
               move_task
             end
           end
@@ -57,11 +57,7 @@ module Abt
 
           def task
             @task ||= begin
-              if task_gid.nil?
-                nil
-              else
-                api.get("tasks/#{task_gid}", opt_fields: 'name,memberships.section.name,permalink_url')
-              end
+              api.get("tasks/#{task_gid}", opt_fields: 'name,memberships.section.name,permalink_url')
             end
           end
         end

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

@@ -26,21 +26,26 @@ module Abt
               }
             }
 
-            cli.puts Oj.dump(body, mode: :json)
+            puts Oj.dump(body, mode: :json)
           end
 
           private
 
           def ensure_current_is_valid!
-            cli.abort "Invalid task gid: #{task_gid}" if task.nil?
+            abort "Invalid task gid: #{task_gid}" if task.nil?
 
             return if task['memberships'].any? { |m| m.dig('project', 'gid') == project_gid }
 
-            cli.abort "Invalid project gid: #{project_gid}"
+            abort "Invalid or unmatching project gid: #{project_gid}"
           end
 
           def task
-            @task ||= api.get("tasks/#{task_gid}", opt_fields: 'name,permalink_url,memberships.project')
+            @task ||= begin
+              warn 'Fetching task...'
+              api.get("tasks/#{task_gid}", opt_fields: 'name,permalink_url,memberships.project')
+                      rescue Abt::HttpError::NotFoundError
+                        nil
+            end
           end
         end
       end

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

@@ -19,12 +19,12 @@ module Abt
           end
 
           def perform
-            cli.abort 'Must be run inside a git repository' unless config.local_available?
+            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
             project = find_search_result
 
-            config.project_gid = project['gid']
+            config.path = Path.from_ids(project['gid'])
 
             print_project(project)
           end
@@ -32,16 +32,16 @@ module Abt
           private
 
           def find_search_result
-            cli.warn 'Select a project'
+            warn 'Select a project'
 
             loop do
               matches = matches_for_string cli.prompt.text('Enter search')
               if matches.empty?
-                cli.warn 'No matches'
+                warn 'No matches'
                 next
               end
 
-              cli.warn 'Showing the 10 first matches' if matches.size > 10
+              warn 'Showing the 10 first matches' if matches.size > 10
               choice = cli.prompt.choice 'Select a project', matches[0...10], true
               break choice unless choice.nil?
             end
@@ -61,7 +61,7 @@ module Abt
 
           def projects
             @projects ||= begin
-              cli.warn 'Fetching projects...'
+              warn 'Fetching projects...'
               api.get_paged('projects',
                             workspace: config.workspace_gid,
                             archived: false,

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

@@ -20,10 +20,10 @@ module Abt
           end
 
           def perform
-            cli.abort 'Must be run inside a git repository' unless config.local_available?
+            abort 'Must be run inside a git repository' unless config.local_available?
             require_project!
 
-            cli.warn project['name']
+            warn project['name']
 
             task = select_task
 
@@ -31,24 +31,23 @@ module Abt
 
             return if flags[:"dry-run"]
 
-            config.project_gid = project_gid # We might have gotten the project ID as an argument
-            config.task_gid = task['gid']
+            config.path = Path.from_ids(project_gid, task['gid'])
           end
 
           private
 
           def project
-            @project ||= api.get("projects/#{project_gid}")
+            @project ||= api.get("projects/#{project_gid}", opt_fields: 'name')
           end
 
           def select_task
             loop do
               section = cli.prompt.choice 'Which section?', sections
-              cli.warn 'Fetching tasks...'
+              warn 'Fetching tasks...'
               tasks = tasks_in_section(section)
 
               if tasks.length.zero?
-                cli.warn 'Section is empty'
+                warn 'Section is empty'
                 next
               end
 
@@ -58,15 +57,21 @@ module Abt
           end
 
           def tasks_in_section(section)
-            api.get_paged('tasks', section: section['gid'], opt_fields: 'name,permalink_url')
+            tasks = api.get_paged(
+              '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'] }
           end
 
           def sections
             @sections ||= begin
-              cli.warn 'Fetching sections...'
+              warn 'Fetching sections...'
               api.get_paged("projects/#{project_gid}/sections", opt_fields: 'name')
-                          rescue Abt::HttpError::HttpError
-                            []
             end
           end
         end

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

@@ -23,7 +23,7 @@ module Abt
 
           def projects
             @projects ||= begin
-              cli.warn 'Fetching projects...'
+              warn 'Fetching projects...'
               api.get_paged(
                 'projects',
                 workspace: config.workspace_gid,

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

@@ -10,16 +10,14 @@ module Abt
           end
 
           def self.description
-            'Print project/task config string'
+            'Print project/task ARI'
           end
 
           def perform
-            require_project!
-
-            if task_gid.nil?
-              cli.print_scheme_argument('asana', project_gid)
-            else
-              cli.print_scheme_argument('asana', "#{project_gid}/#{task_gid}")
+            if path != ''
+              cli.print_ari('asana', path)
+            elsif cli.output.isatty
+              warn 'No configuration for project. Did you initialize Asana?'
             end
           end
         end

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

@@ -22,10 +22,11 @@ module Abt
           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
@@ -33,36 +34,37 @@ module Abt
           def maybe_override_current_task
             return unless flags[:set]
             return if path.nil?
-            return if same_args_as_config?
+            return if path == config.path
             return unless config.local_available?
 
-            Current.new(path: path, cli: cli).call
+            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'
+              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 "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
@@ -82,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
@@ -102,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

@@ -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,29 +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(verbose: false)
-          git['projectGid'] = value unless value.nil?
-        end
-
-        def task_gid=(value)
-          git['taskGid'] = value
-        end
-
         def clear_local(verbose: true)
           git.clear(output: verbose ? cli.err_output : nil)
         end
 
         def clear_global(verbose: true)
-          git.global.clear(output: verbose ? cli.err_output : nil)
+          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',
             '',
@@ -78,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")')
@@ -94,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