abt-cli 0.0.18 → 0.0.23

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

@@ -8,53 +8,18 @@ module Abt
 
         def initialize(cli:)
           @cli = cli
-          @git = GitConfig.new(namespace: 'abt.devops')
         end
 
         def local_available?
-          GitConfig.local_available?
+          git.available?
         end
 
-        def organization_name
-          local_available? ? git['organizationName'] : nil
+        def path
+          Path.new(local_available? && git["path"] || "")
         end
 
-        def project_name
-          local_available? ? git['projectName'] : nil
-        end
-
-        def board_id
-          local_available? ? git['boardId'] : nil
-        end
-
-        def work_item_id
-          local_available? ? git['workItemId'] : nil
-        end
-
-        def organization_name=(value)
-          return if organization_name == value
-
-          clear_local(verbose: false)
-          git['organizationName'] = value unless value.nil?
-        end
-
-        def project_name=(value)
-          return if project_name == value
-
-          git['projectName'] = value unless value.nil?
-          git['boardId'] = nil
-          git['workItemId'] = nil
-        end
-
-        def board_id=(value)
-          return if board_id == value
-
-          git['boardId'] = value unless value.nil?
-          git['workItemId'] = nil
-        end
-
-        def work_item_id=(value)
-          git['workItemId'] = value
+        def path=(new_path)
+          git["path"] = new_path
         end
 
         def clear_local(verbose: true)
@@ -62,40 +27,46 @@ module Abt
         end
 
         def clear_global(verbose: true)
-          git.global.clear(output: verbose ? cli.err_output : nil)
+          git_global.clear(output: verbose ? cli.err_output : nil)
         end
 
         def username_for_organization(organization_name)
           username_key = "organizations.#{organization_name}.username"
 
-          return git.global[username_key] unless git.global[username_key].nil?
+          return git_global[username_key] unless git_global[username_key].nil?
 
-          git.global[username_key] = cli.prompt.text([
+          git_global[username_key] = cli.prompt.text([
             "Please provide your username for the DevOps organization (#{organization_name}).",
-            '',
-            'Enter username'
+            "",
+            "Enter username"
           ].join("\n"))
         end
 
         def access_token_for_organization(organization_name)
           access_token_key = "organizations.#{organization_name}.accessToken"
 
-          return git.global[access_token_key] unless git.global[access_token_key].nil?
+          return git_global[access_token_key] unless git_global[access_token_key].nil?
 
-          git.global[access_token_key] = cli.prompt.text([
-            "Please provide your personal access token for the DevOps organization (#{organization_name}).",
-            'If you don\'t have one, follow the guide here: https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate',
-            '',
-            'The token MUST have "Read" permission for Work Items',
-            'Future features will likely require "Write" or "Manage"',
-            '',
-            'Enter access token'
-          ].join("\n"))
+          git_global[access_token_key] = cli.prompt.text(<<~TXT)
+            Please provide your personal access token for the DevOps organization (#{organization_name}).
+            If you don't have one, follow the guide here: https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate
+
+            The token MUST have "Read" permission for Work Items
+            Future features will likely require "Write" or "Manage
+
+            Enter access token"
+          TXT
         end
 
         private
 
-        attr_reader :git
+        def git
+          @git ||= GitConfig.new("local", "abt.devops")
+        end
+
+        def git_global
+          @git_global ||= GitConfig.new("global", "abt.devops")
+        end
       end
     end
   end

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Devops
+      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
+        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
+
+        def self.from_ids(organization_name: nil, project_name: nil, board_id: nil, work_item_id: nil)
+          return new unless organization_name && project_name && board_id
+
+          new([organization_name, project_name, board_id, *work_item_id].join("/"))
+        end
+
+        def initialize(path = "")
+          raise Abt::Cli::Abort, "Invalid path: #{path}" unless PATH_REGEX.match?(path)
+
+          super
+        end
+
+        def organization_name
+          match[:organization_name]
+        end
+
+        def project_name
+          match[:project_name]
+        end
+
+        def board_id
+          match[:board_id]
+        end
+
+        def work_item_id
+          match[:work_item_id]
+        end
+
+        private
+
+        def match
+          @match ||= PATH_REGEX.match(self)
+        end
+      end
+    end
+  end
+end

data/lib/abt/providers/git/commands/branch.rb

@@ -4,33 +4,33 @@ module Abt
   module Providers
     module Git
       module Commands
-        class Branch < Abt::Cli::BaseCommand
+        class Branch < Abt::BaseCommand
           def self.usage
-            'abt branch git <scheme>[:<path>]'
+            "abt branch git <scheme>[:<path>]"
           end
 
           def self.description
-            'Switch branch. Uses a compatible scheme to generate the branch-name: E.g. `abt branch git asana`'
+            "Switch branch. Uses a compatible scheme to generate the branch-name: E.g. `abt branch git asana`"
           end
 
           def perform
-            create_and_switch unless switch
-            cli.warn "Switched to #{branch_name}"
+            switch || create_and_switch
+            warn("Switched to #{branch_name}")
           end
 
           private
 
           def switch
             success = false
-            Open3.popen3("git switch #{branch_name}") do |_i, _o, _error_output, thread|
+            Open3.popen3("git switch #{branch_name}") do |_i, _o, _e, thread|
               success = thread.value.success?
             end
             success
           end
 
           def create_and_switch
-            cli.warn "No such branch: #{branch_name}"
-            cli.abort('Aborting') unless cli.prompt.boolean 'Create branch?'
+            warn("No such branch: #{branch_name}")
+            abort("Aborting") unless cli.prompt.boolean("Create branch?")
 
             Open3.popen3("git switch -c #{branch_name}") do |_i, _o, _e, thread|
               thread.value
@@ -40,20 +40,20 @@ module Abt
           def branch_name # rubocop:disable Metrics/MethodLength
             @branch_name ||= begin
               if branch_names_from_aris.empty?
-                cli.abort [
-                  'None of the specified ARIs responded to `branch-name`.',
-                  'Did you add compatible scheme? e.g.:',
-                  '   abt branch git asana',
-                  '   abt branch git devops'
-                ].join("\n")
+                abort([
+                  "None of the specified ARIs responded to `branch-name`.",
+                  "Did you add compatible scheme? e.g.:",
+                  "   abt branch git asana",
+                  "   abt branch git devops"
+                ].join("\n"))
               end
 
               if branch_names_from_aris.length > 1
-                cli.abort [
-                  'Got branch names from multiple ARIs, only one is supported',
-                  'Branch names were:',
+                abort([
+                  "Got branch names from multiple ARIs, only one is supported",
+                  "Branch names were:",
                   *branch_names_from_aris.map { |name| "   #{name}" }
-                ].join("\n")
+                ].join("\n"))
               end
 
               branch_names_from_aris.first
@@ -61,12 +61,18 @@ module Abt
           end
 
           def branch_names_from_aris
+            abort("You must provide an additional ARI that responds to: branch-name. E.g., asana") if other_aris.empty?
+
             input = StringIO.new(cli.aris.to_s)
             output = StringIO.new
-            Abt::Cli.new(argv: ['branch-name'], output: output, input: input).perform
+            Abt::Cli.new(argv: ["branch-name"], output: output, input: input).perform
 
             output.string.lines.map(&:strip).compact
           end
+
+          def other_aris
+            @other_aris ||= cli.aris - [ari]
+          end
         end
       end
     end

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

@@ -4,8 +4,8 @@ module Abt
   module Providers
     module Harvest
       class Api
-        API_ENDPOINT = 'https://api.harvestapp.com/v2'
-        VERBS = %i[get post patch].freeze
+        API_ENDPOINT = "https://api.harvestapp.com/v2"
+        VERBS = [:get, :post, :patch].freeze
 
         attr_reader :access_token, :account_id
 
@@ -21,7 +21,7 @@ module Abt
         end
 
         def get_paged(path, query = {})
-          result_key = path.split('?').first.split('/').last
+          result_key = path.split("?").first.split("/").last
 
           page = 1
           records = []
@@ -29,7 +29,7 @@ module Abt
           loop do
             result = get(path, query.merge(page: page))
             records += result[result_key]
-            break if result['total_pages'] == page
+            break if result["total_pages"] == page
 
             page += 1
           end
@@ -44,16 +44,16 @@ module Abt
             Oj.load(response.body)
           else
             error_class = Abt::HttpError.error_class_for_status(response.status)
-            encoded_response_body = response.body.force_encoding('utf-8')
+            encoded_response_body = response.body.force_encoding("utf-8")
             raise error_class, "Code: #{response.status}, body: #{encoded_response_body}"
           end
         end
 
         def connection
           @connection ||= Faraday.new(API_ENDPOINT) do |connection|
-            connection.headers['Authorization'] = "Bearer #{access_token}"
-            connection.headers['Harvest-Account-Id'] = account_id
-            connection.headers['Content-Type'] = 'application/json'
+            connection.headers["Authorization"] = "Bearer #{access_token}"
+            connection.headers["Harvest-Account-Id"] = account_id
+            connection.headers["Content-Type"] = "application/json"
           end
         end
       end

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

@@ -3,70 +3,54 @@
 module Abt
   module Providers
     module Harvest
-      class BaseCommand < Abt::Cli::BaseCommand
-        attr_reader :path, :flags, :project_id, :task_id, :cli, :config
+      class BaseCommand < Abt::BaseCommand
+        extend Forwardable
 
-        def initialize(path:, cli:, **)
+        attr_reader :config, :path
+
+        def_delegators(:@path, :project_id, :task_id)
+
+        def initialize(ari:, cli:)
           super
 
           @config = Configuration.new(cli: cli)
-
-          if path.nil?
-            use_current_path
-          else
-            use_path(path)
-          end
+          @path = ari.path ? Path.new(ari.path) : config.path
         end
 
         private
 
+        def require_local_config!
+          abort("Must be run inside a git repository") unless config.local_available?
+        end
+
         def require_project!
-          cli.abort 'No current/specified project. Did you initialize Harvest?' if project_id.nil?
+          return if project_id
+
+          abort("No current/specified project. Did you initialize Harvest?")
         end
 
         def require_task!
-          if project_id.nil?
-            cli.abort 'No current/specified project. Did you initialize Harvest and pick a task?'
-          end
-          cli.abort 'No current/specified task. Did you pick a Harvest task?' if task_id.nil?
-        end
+          abort("No current/specified project. Did you initialize Harvest and pick a task?") unless project_id
 
-        def same_args_as_config?
-          project_id == config.project_id && task_id == config.task_id
+          abort("No current/specified task. Did you pick a Harvest task?") if task_id.nil?
         end
 
         def print_project(project)
           cli.print_ari(
-            'harvest',
-            project['id'],
+            "harvest",
+            project["id"],
             "#{project['client']['name']} > #{project['name']}"
           )
         end
 
         def print_task(project, task)
           cli.print_ari(
-            'harvest',
+            "harvest",
             "#{project['id']}/#{task['id']}",
             "#{project['name']} > #{task['name']}"
           )
         end
 
-        def use_current_path
-          @project_id = config.project_id
-          @task_id = config.task_id
-        end
-
-        def use_path(path)
-          args = path.to_s.split('/')
-          @project_id = args[0].to_s
-          @project_id = nil if project_id.empty?
-
-          return if project_id.nil?
-
-          @task_id = args[1].to_s
-          @task_id = nil if @task_id.empty?
-        end
-
         def api
           @api ||= Abt::Providers::Harvest::Api.new(access_token: config.access_token,
                                                     account_id: config.account_id)

data/lib/abt/providers/harvest/commands/clear.rb

@@ -6,27 +6,28 @@ module Abt
       module Commands
         class Clear < BaseCommand
           def self.usage
-            'abt clear harvest'
+            "abt clear harvest"
           end
 
           def self.description
-            'Clear harvest configuration'
+            "Clear harvest configuration"
           end
 
           def self.flags
             [
-              ['-g', '--global', 'Clear global instead of local harvest configuration (credentials etc.)'],
-              ['-a', '--all', 'Clear all harvest configuration']
+              ["-g", "--global",
+               "Clear global instead of local harvest configuration (credentials etc.)"],
+              ["-a", "--all", "Clear all harvest configuration"]
             ]
           end
 
           def perform
-            if flags[:global] && flags[:all]
-              abort('Flags --global and --all cannot be used at the same time')
-            end
+            abort("Flags --global and --all cannot be used at the same time") if flags[:global] && flags[:all]
 
             config.clear_local unless flags[:global]
             config.clear_global if flags[:global] || flags[:all]
+
+            warn("Configuration cleared")
           end
         end
       end

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

@@ -6,75 +6,67 @@ module Abt
       module Commands
         class Current < BaseCommand
           def self.usage
-            'abt current harvest[:<project-id>[/<task-id>]]'
+            "abt current harvest[:<project-id>[/<task-id>]]"
           end
 
           def self.description
-            'Get or set project and or task for current git repository'
+            "Get or set project and or task for current git repository"
           end
 
           def perform
+            require_local_config!
             require_project!
+            ensure_valid_configuration!
 
-            if same_args_as_config? || !config.local_available?
-              show_current_configuration
-            else
-              cli.warn 'Updating configuration'
-              update_configuration
+            if path != config.path
+              config.path = path
+              warn("Configuration updated")
             end
-          end
-
-          private
 
-          def show_current_configuration
-            if task_id.nil?
-              print_project(project)
-            else
-              print_task(project, task)
-            end
+            print_configuration
           end
 
-          def update_configuration
-            ensure_project_is_valid!
-            config.project_id = project_id
+          private
 
+          def print_configuration
             if task_id.nil?
               print_project(project)
-              config.task_id = nil
             else
-              ensure_task_is_valid!
-              config.task_id = task_id
-
               print_task(project, task)
             end
           end
 
-          def ensure_project_is_valid!
-            cli.abort "Invalid project: #{project_id}" if project.nil?
-          end
-
-          def ensure_task_is_valid!
-            cli.abort "Invalid task: #{task_id}" if task.nil?
+          def ensure_valid_configuration!
+            abort("Invalid project: #{project_id}") if project.nil?
+            abort("Invalid task: #{task_id}") if task_id && task.nil?
           end
 
           def project
-            @project ||= project_assignment['project'].merge('client' => project_assignment['client'])
+            return @project if instance_variable_defined?(:@project)
+
+            @project = if project_assignment
+                         project_assignment["project"].merge("client" => project_assignment["client"])
+                       end
           end
 
           def task
-            @task ||= project_assignment['task_assignments'].map { |ta| ta['task'] }.find do |task|
-              task['id'].to_s == task_id
-            end
+            return @task if instance_variable_defined?(:@task)
+
+            @task = if project_assignment
+                      project_assignment["task_assignments"].map { |ta| ta["task"] }.find do |task|
+                        task["id"].to_s == task_id
+                      end
+                    end
           end
 
           def project_assignment
             @project_assignment ||= begin
-              project_assignments.find { |pa| pa['project']['id'].to_s == project_id }
+              project_assignments.find { |pa| pa["project"]["id"].to_s == project_id }
             end
           end
 
           def project_assignments
-            @project_assignments ||= api.get_paged('users/me/project_assignments')
+            @project_assignments ||= api.get_paged("users/me/project_assignments")
           end
         end
       end