abt-cli 0.0.26 → 0.0.31

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

@@ -71,7 +71,7 @@ module Abt
         private
 
         def directory_config
-          Abt.directory_config.fetch("asana", {})
+          cli.directory_config.fetch("asana", {})
         end
 
         def git

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

@@ -4,15 +4,22 @@ module Abt
   module Providers
     module Devops
       class Api
+        # Shamelessly copied from ERB::Util.url_encode
+        # https://apidock.com/ruby/ERB/Util/url_encode
+        def self.rfc_3986_encode_path_segment(string)
+          string.to_s.b.gsub(/[^a-zA-Z0-9_\-.~]/) do |match|
+            format("%%%02X", match.unpack1("C"))
+          end
+        end
+
         VERBS = [:get, :post, :put].freeze
 
         CONDITIONAL_ACCESS_POLICY_ERROR_CODE = "VS403463"
 
         attr_reader :organization_name, :project_name, :username, :access_token, :cli
 
-        def initialize(organization_name:, project_name:, username:, access_token:, cli:)
+        def initialize(organization_name:, username:, access_token:, cli:)
           @organization_name = organization_name
-          @project_name = project_name
           @username = username
           @access_token = access_token
           @cli = cli
@@ -32,12 +39,12 @@ module Abt
         end
 
         def work_item_query(wiql)
-          response = post("wit/wiql", Oj.dump({ query: wiql }, mode: :json))
+          response = post("_apis/wit/wiql", Oj.dump({ query: wiql }, mode: :json))
           ids = response["workItems"].map { |work_item| work_item["id"] }
 
           work_items = []
           ids.each_slice(200) do |page_ids|
-            work_items += get_paged("wit/workitems", ids: page_ids.join(","))
+            work_items += get_paged("_apis/wit/workitems", ids: page_ids.join(","))
           end
 
           work_items
@@ -58,23 +65,31 @@ module Abt
         end
 
         def base_url
-          "https://#{organization_name}.visualstudio.com/#{project_name}"
+          "https://#{organization_name}.visualstudio.com"
         end
 
-        def api_endpoint
-          "#{base_url}/_apis"
+        def url_for_work_item(work_item)
+          project_name = self.class.rfc_3986_encode_path_segment(work_item["fields"]["System.TeamProject"])
+          "#{base_url}/#{project_name}/_workitems/edit/#{work_item['id']}"
         end
 
-        def url_for_work_item(work_item)
-          "#{base_url}/_workitems/edit/#{work_item['id']}"
+        def url_for_board(project_name, team_name, board)
+          board_name = self.class.rfc_3986_encode_path_segment(board["name"])
+          "#{base_url}/#{project_name}/_boards/board/t/#{team_name}/#{board_name}"
         end
 
-        def url_for_board(board)
-          "#{base_url}/_boards/board/#{rfc_3986_encode_path_segment(board['name'])}"
+        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 ||= Faraday.new(base_url) do |connection|
             connection.basic_auth(username, access_token)
             connection.headers["Content-Type"] = "application/json"
             connection.headers["Accept"] = "application/json; api-version=6.0"
@@ -83,14 +98,6 @@ module Abt
 
         private
 
-        # Shamelessly copied from ERB::Util.url_encode
-        # https://apidock.com/ruby/ERB/Util/url_encode
-        def rfc_3986_encode_path_segment(string)
-          string.to_s.b.gsub(/[^a-zA-Z0-9_\-.~]/) do |match|
-            format("%%%02X", match.unpack1("C"))
-          end
-        end
-
         def handle_denied_by_conditional_access_policy!(exception)
           raise exception unless exception.message.include?(CONDITIONAL_ACCESS_POLICY_ERROR_CODE)
 

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

@@ -8,7 +8,7 @@ module Abt
 
         attr_reader :config, :path
 
-        def_delegators(:@path, :organization_name, :project_name, :board_id, :work_item_id)
+        def_delegators(:@path, :organization_name, :project_name, :team_name, :board_name, :work_item_id)
 
         def initialize(ari:, cli:)
           super
@@ -24,51 +24,68 @@ module Abt
         end
 
         def require_board!
-          return if organization_name && project_name && board_id
+          return if board_name && organization_name && project_name && team_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 sanitize_work_item(work_item)
-          return nil if work_item.nil?
+        def prompt_board!
+          result = Services::BoardPicker.call(cli: cli, config: config)
+          @path = result.path
+          @board = result.board
+        end
+
+        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
 
-          work_item.merge(
-            "id" => work_item["id"].to_s,
-            "name" => work_item["fields"]["System.Title"],
-            "url" => api.url_for_work_item(work_item)
-          )
+        def board
+          @board ||= begin
+            api.get("#{project_name}/#{team_name}/_apis/work/boards/#{board_name}")
+          rescue HttpError::NotFoundError
+            nil
+          end
+        end
+
+        def work_item
+          @work_item ||= begin
+            work_item = api.get_paged("_apis/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)
-          path = "#{organization_name}/#{project_name}/#{board['id']}"
+        def print_board(organization_name, project_name, team_name, board)
+          board_name = Api.rfc_3986_encode_path_segment(board["name"])
+          path = "#{organization_name}/#{project_name}/#{team_name}/#{board_name}"
 
           cli.print_ari("devops", path, board["name"])
-          warn(api.url_for_board(board)) if cli.output.isatty
+          warn(api.url_for_board(project_name, team_name, board)) if cli.output.isatty
         end
 
-        def print_work_item(organization, project, board, work_item)
-          path = "#{organization}/#{project}/#{board['id']}/#{work_item['id']}"
+        def print_work_item(organization, project, team_name, board, work_item)
+          board_name = Api.rfc_3986_encode_path_segment(board["name"])
+          path = "#{organization}/#{project}/#{team_name}/#{board_name}/#{work_item['id']}"
 
           cli.print_ari("devops", path, work_item["name"])
           warn(work_item["url"]) if work_item.key?("url") && cli.output.isatty
         end
 
         def api
-          Abt::Providers::Devops::Api.new(organization_name: organization_name,
-                                          project_name: project_name,
-                                          username: config.username_for_organization(organization_name),
-                                          access_token: config.access_token_for_organization(organization_name),
-                                          cli: cli)
+          Api.new(organization_name: organization_name,
+                  username: config.username_for_organization(organization_name),
+                  access_token: config.access_token_for_organization(organization_name),
+                  cli: cli)
         end
       end
     end

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

@@ -16,15 +16,14 @@ 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
+              abort(<<~TXT)
+                Unable to find work item for configuration:
+                devops:#{path}
+              TXT
+            end
           end
 
           private
@@ -35,13 +34,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/clear.rb

@@ -22,7 +22,7 @@ module Abt
           end
 
           def perform
-            abort("Flags --global and --all cannot be used at the same time") if flags[:global] && flags[:all]
+            abort("Flags --global and --all cannot be used together") if flags[:global] && flags[:all]
 
             config.clear_local unless flags[:global]
             config.clear_global if flags[:global] || flags[:all]

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

@@ -30,9 +30,9 @@ module Abt
 
           def print_configuration
             if work_item_id.nil?
-              print_board(organization_name, project_name, board)
+              print_board(organization_name, project_name, team_name, board)
             else
-              print_work_item(organization_name, project_name, board, work_item)
+              print_work_item(organization_name, project_name, team_name, board, work_item)
             end
           end
 
@@ -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