abt-cli 0.0.17 → 0.0.22

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

@@ -6,24 +6,22 @@ module Abt
       module Commands
         class Finalize < BaseCommand
           def self.usage
-            'abt finalize asana[:<project-gid>/<task-gid>]'
+            "abt finalize asana[:<project-gid>/<task-gid>]"
           end
 
           def self.description
-            'Move current/specified task to section (column) for finalized tasks'
+            "Move current/specified task to section (column) for finalized tasks"
           end
 
           def perform
-            unless config.local_available?
-              cli.abort 'This is a no-op for tasks outside the current project'
-            end
+            abort("This is a no-op for tasks outside the current project") unless project_gid == config.path.project_gid
             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
@@ -35,18 +33,18 @@ 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.finalized_section_gid
+            task["memberships"].find do |membership|
+              membership.dig("section", "gid") == config.finalized_section_gid
             end
           end
 
           def finalized_section
             @finalized_section ||= api.get("sections/#{config.finalized_section_gid}",
-                                           opt_fields: 'name')
+                                           opt_fields: "name")
           end
 
           def move_task
@@ -57,11 +55,8 @@ 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

@@ -6,11 +6,11 @@ module Abt
       module Commands
         class HarvestTimeEntryData < BaseCommand
           def self.usage
-            'abt harvest-time-entry-data asana[:<project-gid>/<task-gid>]'
+            "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.'
+            "Print Harvest time entry data for Asana task as json. Used by harvest start script."
           end
 
           def perform
@@ -18,29 +18,34 @@ module Abt
             ensure_current_is_valid!
 
             body = {
-              notes: task['name'],
+              notes: task["name"],
               external_reference: {
                 id: task_gid.to_i,
                 group_id: project_gid.to_i,
-                permalink: task['permalink_url']
+                permalink: task["permalink_url"]
               }
             }
 
-            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 }
+            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

@@ -6,66 +6,33 @@ module Abt
       module Commands
         class Init < BaseCommand
           def self.usage
-            'abt init asana'
+            "abt init asana"
           end
 
           def self.description
-            'Pick Asana project for current git repository'
-          end
-
-          def initialize(cli:, **)
-            @config = Configuration.new(cli: cli)
-            @cli = cli
+            "Pick Asana project for current git repository"
           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
+            project = cli.prompt.search("Select a project", projects)
 
-            config.project_gid = project['gid']
+            config.path = Path.from_ids(project["gid"])
 
             print_project(project)
           end
 
           private
 
-          def find_search_result
-            cli.warn 'Select a project'
-
-            loop do
-              matches = matches_for_string cli.prompt.text('Enter search')
-              if matches.empty?
-                cli.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
-              break choice unless choice.nil?
-            end
-          end
-
-          def matches_for_string(string)
-            search_string = sanitize_string(string)
-
-            projects.select do |project|
-              sanitize_string(project['name']).include?(search_string)
-            end
-          end
-
-          def sanitize_string(string)
-            string.downcase.gsub(/[^\w]/, '')
-          end
-
           def projects
             @projects ||= begin
-              cli.warn 'Fetching projects...'
-              api.get_paged('projects',
+              warn("Fetching projects...")
+              api.get_paged("projects",
                             workspace: config.workspace_gid,
                             archived: false,
-                            opt_fields: 'name,permalink_url')
+                            opt_fields: "name,permalink_url")
             end
           end
         end

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

@@ -6,24 +6,24 @@ 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
-            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,42 +31,47 @@ 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...'
+              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, nil_option: 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.reject { |task| task["completed"] }
           end
 
           def sections
             @sections ||= begin
-              cli.warn 'Fetching sections...'
-              api.get_paged("projects/#{project_gid}/sections", opt_fields: 'name')
-                          rescue Abt::HttpError::HttpError
-                            []
+              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
-              cli.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,20 +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 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

@@ -6,26 +6,27 @@ 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
 
           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')
+            current_assignee = task["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']}"
+            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']}")
               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
@@ -72,17 +74,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}")
+            @wip_section ||= api.get("sections/#{config.wip_section_gid}", opt_fields: "name")
           end
 
           def move_task
@@ -92,17 +94,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')
+            @task ||= api.get("tasks/#{task_gid}",
+                              opt_fields: "name,memberships.section.name,assignee.name,permalink_url")
           end
         end
       end