abt-cli 0.0.22 → 0.0.27

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

@@ -14,8 +14,7 @@ module Abt
           end
 
           def perform
-            abort("Must be run inside a git repository") unless config.local_available?
-
+            require_local_config!
             require_project!
             ensure_valid_configuration!
 
@@ -37,24 +36,6 @@ module Abt
             abort("Invalid project: #{project_gid}") if project.nil?
             abort("Invalid task: #{task_gid}") if task_gid && task.nil?
           end
-
-          def project
-            @project ||= begin
-              warn("Fetching project...")
-              api.get("projects/#{project_gid}", opt_fields: "name,permalink_url")
-            rescue Abt::HttpError::NotFoundError
-              nil
-            end
-          end
-
-          def task
-            @task ||= begin
-              warn("Fetching task...")
-              api.get("tasks/#{task_gid}", opt_fields: "name,permalink_url")
-            rescue Abt::HttpError::NotFoundError
-              nil
-            end
-          end
         end
       end
     end

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

@@ -18,6 +18,12 @@ module Abt
             require_task!
             print_task(project_gid, task)
 
+            maybe_move_task
+          end
+
+          private
+
+          def maybe_move_task
             if task_already_in_finalized_section?
               warn("Task already in section: #{current_task_section['name']}")
             else
@@ -26,8 +32,6 @@ module Abt
             end
           end
 
-          private
-
           def task_already_in_finalized_section?
             !task_section_membership.nil?
           end

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

@@ -17,7 +17,13 @@ module Abt
             require_task!
             ensure_current_is_valid!
 
-            body = {
+            puts Oj.dump(body, mode: :json)
+          end
+
+          private
+
+          def body
+            {
               notes: task["name"],
               external_reference: {
                 id: task_gid.to_i,
@@ -25,12 +31,8 @@ module Abt
                 permalink: task["permalink_url"]
               }
             }
-
-            puts Oj.dump(body, mode: :json)
           end
 
-          private
-
           def ensure_current_is_valid!
             abort("Invalid task gid: #{task_gid}") if task.nil?
 

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

@@ -10,69 +10,35 @@ module Abt
           end
 
           def self.description
-            "Pick task for current git repository"
+            "Pick a task and - unless told not to - make it current"
           end
 
           def self.flags
             [
-              ["-d", "--dry-run", "Keep existing configuration"]
+              ["-d", "--dry-run", "Keep existing configuration"],
+              ["-c", "--clean", "Don't reuse project configuration"]
             ]
           end
 
           def perform
-            abort("Must be run inside a git repository") unless config.local_available?
-            require_project!
-
-            warn(project["name"])
-
-            task = select_task
+            pick!
 
             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}", 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, nil_option: true)
-              return task if task
+            if config.local_available?
+              config.path = Path.from_gids(project_gid: project["gid"], task_gid: task["gid"])
+            else
+              warn("No local configuration to update - will function as dry run")
             end
           end
 
-          def tasks_in_section(section)
-            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
+          private
 
-          def sections
-            @sections ||= begin
-              warn("Fetching sections...")
-              api.get_paged("projects/#{project_gid}/sections", opt_fields: "name")
-            end
+          def pick!
+            prompt_project! if project_gid.nil? || flags[:clean]
+            prompt_task!
           end
         end
       end

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

@@ -42,19 +42,25 @@ module Abt
           end
 
           def update_assignee_if_needed
-            current_assignee = task["assignee"]
-
             if current_assignee.nil?
               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?")
+            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")

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

@@ -14,7 +14,7 @@ module Abt
           end
 
           def perform
-            require_project!
+            prompt_project! unless project_gid
 
             tasks.each do |task|
               print_task(project, task)
@@ -23,14 +23,9 @@ module Abt
 
           private
 
-          def project
-            @project ||= begin
-              api.get("projects/#{project_gid}", opt_fields: "name")
-            end
-          end
-
           def tasks
             @tasks ||= begin
+              project
               warn("Fetching tasks...")
               tasks = api.get_paged("tasks", project: project["gid"], opt_fields: "name,completed")
               tasks.reject { |task| task["completed"] }

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

@@ -15,7 +15,7 @@ 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)
@@ -26,7 +26,7 @@ module Abt
           @workspace_gid ||= begin
             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)
@@ -66,6 +70,10 @@ module Abt
 
         private
 
+        def directory_config
+          Abt.directory_config.fetch("asana", {})
+        end
+
         def git
           @git ||= GitConfig.new("local", "abt.asana")
         end
@@ -92,20 +100,28 @@ module Abt
           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']}")
           else
-            workspace = cli.prompt.choice("Select Asana workspace", workspaces)
+            workspace = pick_workspace
           end
 
           git_global["workspaceGid"] = workspace["gid"]
-          workspace
+        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

@@ -6,7 +6,7 @@ module Abt
       class Path < String
         PATH_REGEX = %r{^(?<project_gid>\d+)?/?(?<task_gid>\d+)?$}.freeze
 
-        def self.from_ids(project_gid = nil, task_gid = nil)
+        def self.from_gids(project_gid: nil, task_gid: nil)
           path = project_gid ? [project_gid, *task_gid].join("/") : ""
           new(path)
         end

data/lib/abt/providers/asana/services/project_picker.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Asana
+      module Services
+        class ProjectPicker
+          class Result
+            attr_reader :project, :path
+
+            def initialize(project:, path:)
+              @project = project
+              @path = path
+            end
+          end
+
+          def self.call(**args)
+            new(**args).call
+          end
+
+          attr_reader :cli, :config
+
+          def initialize(cli:, config:)
+            @cli = cli
+            @config = config
+          end
+
+          def call
+            project = cli.prompt.search("Select a project", projects)
+            path = Path.from_gids(project_gid: project["gid"])
+
+            Result.new(project: project, path: path)
+          end
+
+          private
+
+          def projects
+            @projects ||= begin
+              cli.warn("Fetching projects...")
+              api.get_paged("projects",
+                            workspace: config.workspace_gid,
+                            archived: false,
+                            opt_fields: "name,permalink_url")
+            end
+          end
+
+          def api
+            Abt::Providers::Asana::Api.new(access_token: config.access_token)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/abt/providers/asana/services/task_picker.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Asana
+      module Services
+        class TaskPicker
+          class Result
+            attr_reader :task, :path
+
+            def initialize(task:, path:)
+              @task = task
+              @path = path
+            end
+          end
+
+          def self.call(**args)
+            new(**args).call
+          end
+
+          attr_reader :cli, :path, :config, :project
+
+          def initialize(cli:, path:, config:, project:)
+            @cli = cli
+            @path = path
+            @config = config
+            @project = project
+          end
+
+          def call
+            task = select_task
+
+            path_with_task = Path.new([path, task["gid"]].join("/"))
+
+            Result.new(task: task, path: path_with_task)
+          end
+
+          private
+
+          def select_task
+            section = prompt_section
+            tasks = tasks_in_section(section)
+
+            if tasks.length.zero?
+              cli.warn("Section is empty")
+              select_task
+            else
+              cli.prompt.choice("Select a task", tasks, nil_option: true) || select_task
+            end
+          end
+
+          def prompt_section
+            cli.prompt.choice("Which section in #{project['name']}?", sections)
+          end
+
+          def tasks_in_section(section)
+            cli.warn("Fetching tasks...")
+            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")
+            end
+          end
+
+          def api
+            Abt::Providers::Asana::Api.new(access_token: config.access_token)
+          end
+        end
+      end
+    end
+  end
+end