abt-cli 0.0.14 → 0.0.19

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

@@ -5,19 +5,19 @@ module Abt
     module Asana
       module Commands
         class BranchName < BaseCommand
-          def self.command
-            'branch-name asana[:<project-gid>/<task-gid>]'
+          def self.usage
+            'abt branch-name asana[:<project-gid>/<task-gid>]'
           end
 
           def self.description
             'Suggest a git branch name for the current/specified task.'
           end
 
-          def call
+          def perform
             require_task!
             ensure_current_is_valid!
 
-            cli.puts name
+            puts name
           end
 
           private
@@ -27,15 +27,20 @@ module Abt
           end
 
           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,memberships.project')
+            @task ||= begin
+              warn 'Fetching task...'
+              api.get("tasks/#{task_gid}", opt_fields: 'name,memberships.project')
+            rescue Abt::HttpError::NotFoundError
+              nil
+            end
           end
         end
       end

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

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

@@ -5,69 +5,54 @@ module Abt
     module Asana
       module Commands
         class Current < BaseCommand
-          def self.command
-            'current asana[:<project-gid>[/<task-gid>]]'
+          def self.usage
+            'abt current asana[:<project-gid>[/<task-gid>]]'
           end
 
           def self.description
             'Get or set project and or task for current git repository'
           end
 
-          def call
+          def perform
+            abort 'Must be run inside a git repository' unless config.local_available?
+
             require_project!
+            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.path = path
+              warn 'Configuration updated'
             end
-          end
 
-          private
-
-          def show_current_configuration
-            if task_gid.nil?
-              print_project(project)
-            else
-              print_task(project, task)
-            end
+            print_configuration
           end
 
-          def update_configuration
-            ensure_project_is_valid!
-            config.project_gid = project_gid
-
-            if task_gid.nil?
-              print_project(project)
-              config.task_gid = nil
-            else
-              ensure_task_is_valid!
-              config.task_gid = task_gid
-
-              print_task(project, task)
-            end
-          end
+          private
 
-          def ensure_project_is_valid!
-            cli.abort "Invalid project: #{project_gid}" if project.nil?
+          def print_configuration
+            task_gid.nil? ? print_project(project) : print_task(project, task)
           end
 
-          def ensure_task_is_valid!
-            cli.abort "Invalid task: #{task_gid}" if task.nil?
+          def ensure_valid_configuration!
+            abort "Invalid project: #{project_gid}" if project.nil?
+            abort "Invalid task: #{task_gid}" if task_gid && task.nil?
           end
 
           def project
             @project ||= begin
-              cli.warn 'Fetching project...'
+              warn 'Fetching project...'
               api.get("projects/#{project_gid}", opt_fields: 'name,permalink_url')
+                         rescue Abt::HttpError::NotFoundError
+                           nil
             end
           end
 
           def task
             @task ||= begin
-              cli.warn 'Fetching task...'
+              warn 'Fetching task...'
               api.get("tasks/#{task_gid}", opt_fields: 'name,permalink_url')
+                      rescue Abt::HttpError::NotFoundError
+                        nil
             end
           end
         end

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

@@ -5,25 +5,25 @@ module Abt
     module Asana
       module Commands
         class Finalize < BaseCommand
-          def self.command
-            'finalize asana[:<project-gid>/<task-gid>]'
+          def self.usage
+            'abt finalize asana[:<project-gid>/<task-gid>]'
           end
 
           def self.description
             'Move current/specified task to section (column) for finalized tasks'
           end
 
-          def call
+          def perform
             unless config.local_available?
-              cli.abort 'This is a no-op for tasks outside the current project'
+              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

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

@@ -5,15 +5,15 @@ module Abt
     module Asana
       module Commands
         class HarvestTimeEntryData < BaseCommand
-          def self.command
-            'harvest-time-entry-data asana[:<project-gid>/<task-gid>]'
+          def self.usage
+            'abt harvest-time-entry-data asana[:<project-gid>/<task-gid>]'
           end
 
           def self.description
             'Print Harvest time entry data for Asana task as json. Used by harvest start script.'
           end
 
-          def call
+          def perform
             require_task!
             ensure_current_is_valid!
 
@@ -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

@@ -5,8 +5,8 @@ module Abt
     module Asana
       module Commands
         class Init < BaseCommand
-          def self.command
-            'init asana'
+          def self.usage
+            'abt init asana'
           end
 
           def self.description
@@ -18,13 +18,13 @@ module Abt
             @cli = cli
           end
 
-          def call
-            cli.abort 'Must be run inside a git repository' unless config.local_available?
+          def perform
+            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,17 +32,17 @@ module Abt
           private
 
           def find_search_result
-            cli.warn 'Select a project'
+            warn 'Select a project'
 
             loop do
-              matches = matches_for_string cli.prompt('Enter search')
+              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
-              choice = cli.prompt_choice 'Select a project', matches[0...10], true
+              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
           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

@@ -5,60 +5,73 @@ module Abt
     module Asana
       module Commands
         class Pick < BaseCommand
-          def self.command
-            'pick asana[:<project-gid>]'
+          def self.usage
+            'abt pick asana[:<project-gid>]'
           end
 
           def self.description
             'Pick task for current git repository'
           end
 
-          def call
-            cli.abort 'Must be run inside a git repository' unless config.local_available?
+          def self.flags
+            [
+              ['-d', '--dry-run', 'Keep existing configuration']
+            ]
+          end
+
+          def perform
+            abort 'Must be run inside a git repository' unless config.local_available?
             require_project!
 
-            cli.warn project['name']
+            warn project['name']
 
             task = select_task
 
-            config.project_gid = project_gid # We might have gotten the project ID as an argument
-            config.task_gid = task['gid']
-
             print_task(project, task)
+
+            return if flags[:"dry-run"]
+
+            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...'
+              section = cli.prompt.choice 'Which section?', sections
+              warn 'Fetching tasks...'
               tasks = tasks_in_section(section)
 
               if tasks.length.zero?
-                cli.warn 'Section is empty'
+                warn 'Section is empty'
                 next
               end
 
-              task = cli.prompt_choice 'Select a task', tasks, true
+              task = cli.prompt.choice 'Select a task', tasks, true
               return task if task
             end
           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.filter { |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

@@ -5,15 +5,15 @@ module Abt
     module Asana
       module Commands
         class Projects < BaseCommand
-          def self.command
-            'projects asana'
+          def self.usage
+            'abt projects asana'
           end
 
           def self.description
             'List all available projects - useful for piping into grep etc.'
           end
 
-          def call
+          def perform
             projects.map do |project|
               print_project(project)
             end
@@ -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

@@ -5,22 +5,18 @@ 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'
+            'Print project/task ARI'
           end
 
-          def call
+          def perform
             require_project!
 
-            if task_gid.nil?
-              cli.print_provider_command('asana', project_gid)
-            else
-              cli.print_provider_command('asana', "#{project_gid}/#{task_gid}")
-            end
+            cli.print_ari('asana', path)
           end
         end
       end