abt-cli 0.0.18 → 0.0.19

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

@@ -0,0 +1,50 @@
+# 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_id = nil, project_name = nil, board_id = nil, work_item_id = nil)
+          return new unless organization_id && project_name && board_id
+
+          new [organization_id, project_name, board_id, *work_item_id].join('/')
+        end
+
+        def initialize(path = '')
+          raise Abt::Cli::Abort, "Invalid path: #{path}" unless path =~ PATH_REGEX
+
+          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,7 +4,7 @@ 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>]'
           end
@@ -14,23 +14,23 @@ module Abt
           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,7 +40,7 @@ module Abt
           def branch_name # rubocop:disable Metrics/MethodLength
             @branch_name ||= begin
               if branch_names_from_aris.empty?
-                cli.abort [
+                abort [
                   'None of the specified ARIs responded to `branch-name`.',
                   'Did you add compatible scheme? e.g.:',
                   '   abt branch git asana',
@@ -49,7 +49,7 @@ module Abt
               end
 
               if branch_names_from_aris.length > 1
-                cli.abort [
+                abort [
                   'Got branch names from multiple ARIs, only one is supported',
                   'Branch names were:',
                   *branch_names_from_aris.map { |name| "   #{name}" }
@@ -61,6 +61,12 @@ module Abt
           end
 
           def branch_names_from_aris
+            other_aris = cli.aris - [ari]
+
+            if other_aris.empty?
+              abort 'You must provide an additional ARI that responds to: branch-name. E.g., asana'
+            end
+
             input = StringIO.new(cli.aris.to_s)
             output = StringIO.new
             Abt::Cli.new(argv: ['branch-name'], output: output, input: input).perform

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

@@ -3,36 +3,34 @@
 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_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?'
+          unless project_id
+            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
 
-        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)
@@ -51,22 +49,6 @@ module Abt
           )
         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

@@ -27,6 +27,8 @@ module Abt
 
             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

@@ -14,57 +14,50 @@ module Abt
           end
 
           def perform
+            abort 'Must be run inside a git repository' unless config.local_available?
+
             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

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

@@ -14,13 +14,12 @@ module Abt
           end
 
           def perform
-            cli.abort 'Must be run inside a git repository' unless config.local_available?
+            abort 'Must be run inside a git repository' unless config.local_available?
 
             projects # Load projects up front to make it obvious that searches are instant
             project = find_search_result
 
-            config.project_id = project['id']
-            config.task_id = nil
+            config.path = Path.from_ids(project['id'])
 
             print_project(project)
           end
@@ -28,7 +27,7 @@ module Abt
           private
 
           def find_search_result
-            cli.warn 'Select a project'
+            warn 'Select a project'
 
             loop do
               matches = matches_for_string cli.prompt.text('Enter search')
@@ -37,7 +36,7 @@ module Abt
                 next
               end
 
-              cli.warn 'Showing the 10 first matches' if matches.size > 10
+              warn 'Showing the 10 first matches' if matches.size > 10
               choice = cli.prompt.choice 'Select a project', matches[0...10], true
               break choice['project'] unless choice.nil?
             end
@@ -66,7 +65,7 @@ module Abt
 
           def projects
             @projects ||= begin
-              cli.warn 'Fetching projects...'
+              warn 'Fetching projects...'
               project_assignments.map do |project_assignment|
                 project_assignment['project'].merge('client' => project_assignment['client'])
               end

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

@@ -20,18 +20,17 @@ module Abt
           end
 
           def perform
-            cli.abort 'Must be run inside a git repository' unless config.local_available?
+            abort 'Must be run inside a git repository' unless config.local_available?
             require_project!
 
-            cli.warn project['name']
+            warn project['name']
             task = cli.prompt.choice 'Select a task', tasks
 
             print_task(project, task)
 
             return if flags[:"dry-run"]
 
-            config.project_id = project_id # We might have gotten the project ID as a path
-            config.task_id = task['id']
+            config.path = Path.from_ids(project_id, task['id'])
           end
 
           private

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

@@ -23,7 +23,7 @@ module Abt
 
           def projects
             @projects ||= begin
-              cli.warn 'Fetching projects...'
+              warn 'Fetching projects...'
               project_assignments.map do |project_assignment|
                 project_assignment['project'].merge('client' => project_assignment['client'])
               end

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

@@ -10,17 +10,13 @@ module Abt
           end
 
           def self.description
-            'Print project/task config string'
+            'Print project/task ARI'
           end
 
           def perform
-            if project_id.nil?
-              cli.warn 'No project selected'
-            elsif task_id.nil?
-              cli.print_ari('harvest', project_id)
-            else
-              cli.print_ari('harvest', "#{project_id}/#{task_id}")
-            end
+            require_project!
+
+            cli.print_ari('harvest', path)
           end
         end
       end

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

@@ -14,21 +14,21 @@ module Abt
           end
 
           def perform
-            cli.abort 'No running time entry' if time_entry.nil?
+            abort 'No running time entry' if time_entry.nil?
 
             stop_time_entry
 
-            cli.warn 'Harvest time entry stopped'
+            warn 'Harvest time entry stopped'
             print_task(project, task)
-          rescue Abt::HttpError::HttpError => e
-            cli.warn e
-            cli.abort 'Unable to stop time entry'
           end
 
           private
 
           def stop_time_entry
             api.patch("time_entries/#{time_entry['id']}/stop")
+          rescue Abt::HttpError::HttpError => e
+            warn e
+            abort 'Unable to stop time entry'
           end
 
           def project
@@ -47,8 +47,8 @@ module Abt
                 user_id: config.user_id
               ).first
             rescue Abt::HttpError::HttpError => e # rubocop:disable Layout/RescueEnsureAlignment
-              cli.warn e
-              cli.abort 'Unable to fetch running time entry'
+              warn e
+              abort 'Unable to fetch running time entry'
             end
           end
         end

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

@@ -28,7 +28,10 @@ module Abt
           end
 
           def tasks
-            @tasks ||= project_assignment['task_assignments'].map { |ta| ta['task'] }
+            @tasks ||= begin
+              warn 'Fetching tasks...'
+              project_assignment['task_assignments'].map { |ta| ta['task'] }
+            end
           end
 
           def project_assignment

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

@@ -29,7 +29,7 @@ module Abt
 
             maybe_override_current_task
           rescue Abt::HttpError::HttpError => _e
-            cli.abort 'Invalid task'
+            abort 'Invalid task'
           end
 
           private
@@ -60,14 +60,14 @@ module Abt
             }
 
             if external_link_data
-              cli.warn <<~TXT
+              warn <<~TXT
                 Linking to:
                   #{external_link_data[:notes]}
                   #{external_link_data[:external_reference][:permalink]}
               TXT
               body.merge! external_link_data
             else
-              cli.warn 'No external link provided'
+              warn 'No external link provided'
             end
 
             body[:notes] = flags[:comment] if flags.key?(:comment)
@@ -77,31 +77,38 @@ module Abt
 
           def external_link_data
             @external_link_data ||= begin
-              input = StringIO.new(cli.aris.to_s)
-              output = StringIO.new
-              Abt::Cli.new(argv: ['harvest-time-entry-data'], output: output, input: input).perform
+              lines = call_harvest_time_entry_data_for_other_aris
 
-              lines = output.string.strip.lines
+              if lines.empty?
+                nil
+              else
+                if lines.length > 1
+                  abort('Got reference data from multiple scheme providers, only one is supported at a time')
+                end
 
-              return if lines.empty?
-
-              # TODO: Make user choose which reference to use by printing the urls
-              if lines.length > 1
-                cli.abort('Got reference data from multiple scheme providers, only one is supported at a time')
+                Oj.load(lines.first, symbol_keys: true)
               end
-
-              Oj.load(lines.first, symbol_keys: true)
             end
           end
 
+          def call_harvest_time_entry_data_for_other_aris
+            other_aris = cli.aris - [ari]
+            return [] if other_aris.empty?
+
+            input = StringIO.new(other_aris.to_s)
+            output = StringIO.new
+            Abt::Cli.new(argv: ['harvest-time-entry-data'], output: output, input: input).perform
+
+            output.string.strip.lines
+          end
+
           def maybe_override_current_task
             return unless flags[:set]
-            return if same_args_as_config?
+            return if path == config.path
             return unless config.local_available?
 
-            input = StringIO.new("harvest:#{project_id}/#{task_id}")
-            output = StringIO.new
-            Abt::Cli.new(argv: ['current'], output: output, input: input).perform
+            config.path = path
+            warn 'Current task updated'
           end
         end
       end