abt-cli 0.0.24 → 0.0.29

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)
@@ -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
+          cli.directory_config.fetch("asana", {})
+        end
+
         def git
           @git ||= GitConfig.new("local", "abt.asana")
         end

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
@@ -28,7 +28,7 @@ module Abt
         private
 
         def match
-          @match ||= PATH_REGEX.match(self)
+          @match ||= PATH_REGEX.match(to_s)
         end
       end
     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.from_gids(project_gid: path.project_gid, task_gid: task["gid"])
+
+            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

data/lib/abt/providers/devops.rb

@@ -2,6 +2,7 @@
 
 Dir.glob("#{File.expand_path(__dir__)}/devops/*.rb").sort.each { |file| require file }
 Dir.glob("#{File.expand_path(__dir__)}/devops/commands/*.rb").sort.each { |file| require file }
+Dir.glob("#{File.expand_path(__dir__)}/devops/services/*.rb").sort.each { |file| require file }
 
 module Abt
   module Providers

data/lib/abt/providers/devops/api.rb

@@ -73,6 +73,16 @@ module Abt
           "#{base_url}/_boards/board/#{rfc_3986_encode_path_segment(board['name'])}"
         end
 
+        def sanitize_work_item(work_item)
+          return nil if work_item.nil?
+
+          work_item.merge(
+            "id" => work_item["id"].to_s,
+            "name" => work_item["fields"]["System.Title"],
+            "url" => url_for_work_item(work_item)
+          )
+        end
+
         def connection
           @connection ||= Faraday.new(api_endpoint) do |connection|
             connection.basic_auth(username, access_token)

data/lib/abt/providers/devops/base_command.rb

@@ -24,29 +24,49 @@ module Abt
         end
 
         def require_board!
-          return if organization_name && project_name && board_id
+          return if board_id && organization_name && project_name
 
-          abort("No current/specified board. Did you initialize DevOps?")
+          abort("No current/specified board. Did you forget to `pick`?")
         end
 
         def require_work_item!
-          unless organization_name && project_name && board_id
-            abort("No current/specified board. Did you initialize DevOps and pick a work item?")
-          end
-
+          require_board!
           return if work_item_id
 
-          abort("No current/specified work item. Did you pick a DevOps work item?")
+          abort("No current/specified work item. Did you forget to `pick`?")
+        end
+
+        def prompt_project!
+          @path = Services::ProjectPicker.call(cli: cli).path
         end
 
-        def sanitize_work_item(work_item)
-          return nil if work_item.nil?
+        def prompt_board!
+          result = Services::BoardPicker.call(cli: cli, path: path, config: config)
+          @path = result.path
+          @board = result.board
+        end
 
-          work_item.merge(
-            "id" => work_item["id"].to_s,
-            "name" => work_item["fields"]["System.Title"],
-            "url" => api.url_for_work_item(work_item)
-          )
+        def prompt_work_item!
+          result = Services::WorkItemPicker.call(cli: cli, path: path, config: config, board: board)
+          @path = result.path
+          @work_item = result.work_item
+        end
+
+        def board
+          @board ||= begin
+            api.get("work/boards/#{board_id}")
+          rescue HttpError::NotFoundError
+            nil
+          end
+        end
+
+        def work_item
+          @work_item ||= begin
+            work_item = api.get_paged("wit/workitems", ids: work_item_id)[0]
+            api.sanitize_work_item(work_item)
+          rescue HttpError::NotFoundError
+            nil
+          end
         end
 
         def print_board(organization_name, project_name, board)

data/lib/abt/providers/devops/commands/boards.rb

@@ -14,8 +14,7 @@ module Abt
           end
 
           def perform
-            abort("No organization selected. Did you initialize DevOps?") if organization_name.nil?
-            abort("No project selected. Did you initialize DevOps?") if project_name.nil?
+            prompt_project! unless project_name
 
             boards.map do |board|
               print_board(organization_name, project_name, board)

data/lib/abt/providers/devops/commands/branch_name.rb

@@ -16,15 +16,16 @@ module Abt
           def perform
             require_work_item!
 
-            puts name
-          rescue HttpError::NotFoundError
-            args = [organization_name, project_name, board_id, work_item_id].compact
-
-            error_message = [
-              "Unable to find work item for configuration:",
-              "devops:#{args.join('/')}"
-            ].join("\n")
-            abort(error_message)
+            if work_item
+              puts name
+            else
+              args = [organization_name, project_name, board_id, work_item_id].compact
+
+              abort(<<~TXT)
+                Unable to find work item for configuration:
+                devops:#{args.join('/')}
+              TXT
+            end
           end
 
           private
@@ -35,13 +36,6 @@ module Abt
             str += work_item["name"].downcase.gsub(/[^\w]/, "-")
             str.squeeze("-").gsub(/(^-|-$)/, "")
           end
-
-          def work_item
-            @work_item ||= begin
-              work_item = api.get_paged("wit/workitems", ids: work_item_id)[0]
-              sanitize_work_item(work_item)
-            end
-          end
         end
       end
     end

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

@@ -42,25 +42,6 @@ module Abt
             end
             abort("No such work item: ##{work_item_id}") if work_item_id && work_item.nil?
           end
-
-          def board
-            @board ||= begin
-              warn("Fetching board...")
-              api.get("work/boards/#{board_id}")
-            rescue HttpError::NotFoundError
-              nil
-            end
-          end
-
-          def work_item
-            @work_item ||= begin
-              warn("Fetching work item...")
-              work_item = api.get_paged("wit/workitems", ids: work_item_id)[0]
-              sanitize_work_item(work_item)
-            rescue HttpError::NotFoundError
-              nil
-            end
-          end
         end
       end
     end

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

@@ -16,15 +16,16 @@ module Abt
           def perform
             require_work_item!
 
-            puts Oj.dump(body, mode: :json)
-          rescue HttpError::NotFoundError
-            args = [organization_name, project_name, board_id, work_item_id].compact
-
-            error_message = [
-              "Unable to find work item for configuration:",
-              "devops:#{args.join('/')}"
-            ].join("\n")
-            abort(error_message)
+            if work_item
+              puts Oj.dump(body, mode: :json)
+            else
+              args = [organization_name, project_name, board_id, work_item_id].compact
+
+              abort(<<~TXT)
+                Unable to find work item for configuration:
+                devops:#{args.join('/')}
+              TXT
+            end
           end
 
           private
@@ -49,13 +50,6 @@ module Abt
               work_item["name"]
             ].join(" ")
           end
-
-          def work_item
-            @work_item ||= begin
-              work_item = api.get_paged("wit/workitems", ids: work_item_id)[0]
-              sanitize_work_item(work_item)
-            end
-          end
         end
       end
     end

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

@@ -15,67 +15,31 @@ module Abt
 
           def self.flags
             [
-              ["-d", "--dry-run", "Keep existing configuration"]
+              ["-d", "--dry-run", "Keep existing configuration"],
+              ["-c", "--clean", "Don't reuse project/board configuration"]
             ]
           end
 
           def perform
-            require_local_config!
-            require_board!
+            pick!
 
-            warn("#{project_name} - #{board['name']}")
-
-            work_item = select_work_item
             print_work_item(organization_name, project_name, board, work_item)
 
             return if flags[:"dry-run"]
 
-            update_config(work_item)
-          end
-
-          private
-
-          def update_config(work_item)
-            config.path = Path.from_ids(
-              organization_name: organization_name,
-              project_name: project_name,
-              board_id: board_id,
-              work_item_id: work_item["id"]
-            )
-          end
-
-          def select_work_item
-            column = cli.prompt.choice("Which column?", columns)
-            warn("Fetching work items...")
-            work_items = work_items_in_column(column)
-
-            if work_items.length.zero?
-              warn("Section is empty")
-              select_work_item
+            if config.local_available?
+              config.path = path
             else
-              cli.prompt.choice("Select a work item", work_items, nil_option: true) || select_work_item
+              warn("No local configuration to update - will function as dry run")
             end
           end
 
-          def work_items_in_column(column)
-            work_items = api.work_item_query(
-              <<~WIQL
-                SELECT [System.Id]
-                FROM WorkItems
-                WHERE [System.BoardColumn] = '#{column['name']}'
-                ORDER BY [Microsoft.VSTS.Common.BacklogPriority] ASC
-              WIQL
-            )
-
-            work_items.map { |work_item| sanitize_work_item(work_item) }
-          end
-
-          def columns
-            board["columns"]
-          end
+          private
 
-          def board
-            @board ||= api.get("work/boards/#{board_id}")
+          def pick!
+            prompt_project! if project_name.nil? || flags[:clean]
+            prompt_board! if board_id.nil? || flags[:clean]
+            prompt_work_item!
           end
         end
       end