abt-cli 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fbc512b85932a7c8cfa8e6d9ec10176f3e2ac8711df78ad4ce67100ac79f003
-  data.tar.gz: 7dc1c727ced7d316c84075458b75839bd931050e50c9ffe39f925324c6a8e63d
+  metadata.gz: 7f0389f2300f5dc3f3143f6672d770a7dc50cce27b77774915eba3873cdfc89c
+  data.tar.gz: bc7952525895e85a0b2d0b0e679ebf98a687647e86bf2b4250d9dcb0abc1e4ac
 SHA512:
-  metadata.gz: 74f84e028cf84f156ee18f46177fae4e17f857eb538362daf2baf3b017f1ace428a8b9c16aa912ba0c486fdc13cbf2a41402fa64917fa74ee9578c6e041c6d7b
-  data.tar.gz: fe06b4314f9a119950979b7a8c966758a56b4a3619dcabc9328209beaca94f317851bc9dedbc986a955a120afe29da0707225e78896e1517854c24864bba2efc
+  metadata.gz: 484a395a41009899bb56e42049f0acb33e764ff8b4f54fbabdb5e7a468e663717f537a9b6e29934b02e6d668b7b6f3218fca35f6de3983ff32dd3e51a48ba7b3
+  data.tar.gz: 0d1651b94be6bbc6c93fb68fee3b1ca2dab62aa5160994b29b0009ee68f77090c3303b145cb3aae49305c5742ace9153a7392c637c566422cdec088923de61df

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,19 +65,17 @@ module Abt
         end
 
         def base_url
-          "https://#{organization_name}.visualstudio.com/#{project_name}"
-        end
-
-        def api_endpoint
-          "#{base_url}/_apis"
+          "https://#{organization_name}.visualstudio.com"
         end
 
         def url_for_work_item(work_item)
-          "#{base_url}/_workitems/edit/#{work_item['id']}"
+          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_board(board)
-          "#{base_url}/_boards/board/#{rfc_3986_encode_path_segment(board['name'])}"
+        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 sanitize_work_item(work_item)
@@ -84,7 +89,7 @@ module Abt
         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"
@@ -93,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,7 +24,7 @@ module Abt
         end
 
         def require_board!
-          return if board_id && organization_name && project_name
+          return if board_name && organization_name && project_name && team_name
 
           abort("No current/specified board. Did you forget to `pick`?")
         end
@@ -36,12 +36,8 @@ module Abt
           abort("No current/specified work item. Did you forget to `pick`?")
         end
 
-        def prompt_project!
-          @path = Services::ProjectPicker.call(cli: cli).path
-        end
-
         def prompt_board!
-          result = Services::BoardPicker.call(cli: cli, path: path, config: config)
+          result = Services::BoardPicker.call(cli: cli, config: config)
           @path = result.path
           @board = result.board
         end
@@ -54,7 +50,7 @@ module Abt
 
         def board
           @board ||= begin
-            api.get("work/boards/#{board_id}")
+            api.get("#{project_name}/#{team_name}/_apis/work/boards/#{board_name}")
           rescue HttpError::NotFoundError
             nil
           end
@@ -62,33 +58,34 @@ module Abt
 
         def work_item
           @work_item ||= begin
-            work_item = api.get_paged("wit/workitems", ids: work_item_id)[0]
+            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

@@ -19,11 +19,9 @@ module Abt
             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('/')}
+                devops:#{path}
               TXT
             end
           end

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
 

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

@@ -19,11 +19,9 @@ module Abt
             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('/')}
+                devops:#{path}
               TXT
             end
           end

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

@@ -23,7 +23,7 @@ module Abt
           def perform
             pick!
 
-            print_work_item(organization_name, project_name, board, work_item)
+            print_work_item(organization_name, project_name, team_name, board, work_item)
 
             return if flags[:"dry-run"]
 
@@ -37,8 +37,7 @@ module Abt
           private
 
           def pick!
-            prompt_project! if project_name.nil? || flags[:clean]
-            prompt_board! if board_id.nil? || flags[:clean]
+            prompt_board! if board_name.nil? || flags[:clean]
             prompt_work_item!
           end
         end

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

@@ -14,11 +14,10 @@ module Abt
           end
 
           def perform
-            prompt_project! unless project_name
-            prompt_board! unless board_id
+            prompt_board! unless board_name
 
             work_items.each do |work_item|
-              print_work_item(organization_name, project_name, board, work_item)
+              print_work_item(organization_name, project_name, team_name, board, work_item)
             end
           end
 

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

@@ -20,8 +20,7 @@ module Abt
           end
 
           def perform
-            prompt_project! if project_name.nil? || flags[:clean]
-            prompt_board! if board_id.nil? || flags[:clean]
+            prompt_board! if board_name.nil? || flags[:clean]
 
             update_directory_config!
 
@@ -35,7 +34,8 @@ module Abt
               "path" => Path.from_ids(
                 organization_name: organization_name,
                 project_name: project_name,
-                board_id: board_id
+                team_name: team_name,
+                board_name: board_name
               ).to_s
             }
             cli.directory_config.save!

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

@@ -6,16 +6,28 @@ module Abt
       class Path < String
         ORGANIZATION_NAME_REGEX = %r{(?<organization_name>[^/ ]+)}.freeze
         PROJECT_NAME_REGEX = %r{(?<project_name>[^/ ]+)}.freeze
-        BOARD_ID_REGEX = /(?<board_id>[a-z0-9\-]+)/.freeze
+        TEAM_NAME_REGEX = %r{(?<team_name>[^/ ]+)}.freeze
+        BOARD_NAME_REGEX = %r{(?<board_name>[^/ ]+)}.freeze
         WORK_ITEM_ID_REGEX = /(?<work_item_id>\d+)/.freeze
 
         PATH_REGEX =
-          %r{^(#{ORGANIZATION_NAME_REGEX}/#{PROJECT_NAME_REGEX}(/#{BOARD_ID_REGEX}(/#{WORK_ITEM_ID_REGEX})?)?)?}.freeze
+          %r{^(#{ORGANIZATION_NAME_REGEX}/#{PROJECT_NAME_REGEX}(/#{TEAM_NAME_REGEX}(/#{BOARD_NAME_REGEX}(/#{WORK_ITEM_ID_REGEX})?)?)?)?}.freeze # rubocop:disable Layout/LineLength
 
-        def self.from_ids(organization_name: nil, project_name: nil, board_id: nil, work_item_id: nil)
+        def self.from_ids(organization_name: nil, project_name: nil, team_name: nil, board_name: nil, work_item_id: nil)
           return new unless organization_name && project_name
 
-          new([organization_name, project_name, *board_id, *work_item_id].join("/"))
+          parts = [organization_name, project_name]
+
+          if team_name
+            parts << team_name
+
+            if board_name
+              parts << board_name
+              parts << work_item_id if work_item_id
+            end
+          end
+
+          new(parts.join("/"))
         end
 
         def initialize(path = "")
@@ -32,8 +44,12 @@ module Abt
           match[:project_name]
         end
 
-        def board_id
-          match[:board_id]
+        def team_name
+          match[:team_name]
+        end
+
+        def board_name
+          match[:board_name]
         end
 
         def work_item_id

data/lib/abt/providers/devops/services/board_picker.rb

@@ -20,36 +20,47 @@ module Abt
 
           attr_reader :cli, :config, :path
 
-          def initialize(cli:, path:, config:)
+          def initialize(cli:, config:)
             @cli = cli
             @config = config
-            @path = path
           end
 
           def call
+            @path = ProjectPicker.call(cli: cli).path
             board = cli.prompt.choice("Select a project work board", boards)
 
-            path_with_board = Path.from_ids(
+            Result.new(board: board, path: path_with_board(team, board))
+          end
+
+          private
+
+          def path_with_board(team, board)
+            Path.from_ids(
               organization_name: path.organization_name,
               project_name: path.project_name,
-              board_id: board["id"]
+              team_name: Api.rfc_3986_encode_path_segment(team["name"]),
+              board_name: Api.rfc_3986_encode_path_segment(board["name"])
             )
+          end
 
-            Result.new(board: board, path: path_with_board)
+          def team
+            @team ||= cli.prompt.choice("Select a team", teams)
           end
 
-          private
+          def teams
+            @teams ||= api.get_paged("/_apis/projects/#{path.project_name}/teams")
+          end
 
           def boards
-            @boards ||= api.get_paged("work/boards")
+            team_name = Api.rfc_3986_encode_path_segment(team["name"])
+            @boards ||= api.get_paged("#{path.project_name}/#{team_name}/_apis/work/boards")
           end
 
           def api
-            Abt::Providers::Devops::Api.new(organization_name: path.organization_name,
-                                            project_name: path.project_name,
-                                            username: config.username_for_organization(path.organization_name),
-                                            access_token: config.access_token_for_organization(path.organization_name),
-                                            cli: cli)
+            Api.new(organization_name: path.organization_name,
+                    username: config.username_for_organization(path.organization_name),
+                    access_token: config.access_token_for_organization(path.organization_name),
+                    cli: cli)
           end
         end
       end

data/lib/abt/providers/devops/services/work_item_picker.rb

@@ -33,7 +33,8 @@ module Abt
             path_with_work_item = Path.from_ids(
               organization_name: path.organization_name,
               project_name: path.project_name,
-              board_id: path.board_id,
+              team_name: path.team_name,
+              board_name: path.board_name,
               work_item_id: work_item["id"]
             )
 
@@ -79,14 +80,14 @@ module Abt
           end
 
           def columns
-            board["columns"] || api.get("work/boards/#{path.board_id}")["columns"]
+            board["columns"] ||
+              api.get("#{path.project_name}/#{path.team_name}/_apis/work/boards/#{path.board_name}")["columns"]
           end
 
           private
 
           def api
             Abt::Providers::Devops::Api.new(organization_name: path.organization_name,
-                                            project_name: path.project_name,
                                             username: config.username_for_organization(path.organization_name),
                                             access_token: config.access_token_for_organization(path.organization_name),
                                             cli: cli)

data/lib/abt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Abt
-  VERSION = "0.0.29"
+  VERSION = "0.0.30"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abt-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - Jesper Sørensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-28 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -118,7 +118,6 @@ files:
 - "./lib/abt/providers/devops.rb"
 - "./lib/abt/providers/devops/api.rb"
 - "./lib/abt/providers/devops/base_command.rb"
-- "./lib/abt/providers/devops/commands/boards.rb"
 - "./lib/abt/providers/devops/commands/branch_name.rb"
 - "./lib/abt/providers/devops/commands/clear.rb"
 - "./lib/abt/providers/devops/commands/current.rb"

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

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module Abt
-  module Providers
-    module Devops
-      module Commands
-        class Boards < BaseCommand
-          def self.usage
-            "abt boards devops"
-          end
-
-          def self.description
-            "List all boards - useful for piping into grep etc"
-          end
-
-          def perform
-            prompt_project! unless project_name
-
-            boards.map do |board|
-              print_board(organization_name, project_name, board)
-            end
-          end
-
-          private
-
-          def boards
-            @boards ||= api.get_paged("work/boards")
-          end
-        end
-      end
-    end
-  end
-end