abt-cli 0.0.16 → 0.0.21

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

@@ -10,7 +10,7 @@ module Abt
           end
 
           def self.description
-            'Start tracker for current or specified task. Add a relevant scheme argument to link the time entry, e.g. `abt track harvest asana`'
+            'Start tracker for current or specified task. Add a relevant ARI to link the time entry, e.g. `abt track harvest asana`'
           end
 
           def self.flags
@@ -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.scheme_arguments.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

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

@@ -8,32 +8,18 @@ module Abt
 
         def initialize(cli:)
           @cli = cli
-          @git = GitConfig.new(namespace: 'abt.harvest')
         end
 
         def local_available?
-          GitConfig.local_available?
+          git.available?
         end
 
-        def project_id
-          local_available? ? git['projectId'] : nil
+        def path
+          Path.new(local_available? && git['path'] || '')
         end
 
-        def task_id
-          local_available? ? git['taskId'] : nil
-        end
-
-        def project_id=(value)
-          value = value.to_s unless value.nil?
-          return if project_id == value
-
-          clear_local(verbose: false)
-          git['projectId'] = value
-        end
-
-        def task_id=(value)
-          value = value.to_s unless value.nil?
-          git['taskId'] = value
+        def path=(new_path)
+          git['path'] = new_path
         end
 
         def clear_local(verbose: true)
@@ -41,13 +27,13 @@ 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 access_token
-          return git.global['accessToken'] unless git.global['accessToken'].nil?
+          return git_global['accessToken'] unless git_global['accessToken'].nil?
 
-          git.global['accessToken'] = cli.prompt.text([
+          git_global['accessToken'] = cli.prompt.text([
             'Please provide your personal access token for Harvest.',
             'If you don\'t have one, create one here: https://id.getharvest.com/developers',
             '',
@@ -56,9 +42,9 @@ module Abt
         end
 
         def account_id
-          return git.global['accountId'] unless git.global['accountId'].nil?
+          return git_global['accountId'] unless git_global['accountId'].nil?
 
-          git.global['accountId'] = cli.prompt.text([
+          git_global['accountId'] = cli.prompt.text([
             'Please provide harvest account id.',
             'This information is shown next to your generated access token',
             '',
@@ -67,18 +53,23 @@ module Abt
         end
 
         def user_id
-          return git.global['userId'] unless git.global['userId'].nil?
+          return git_global['userId'] unless git_global['userId'].nil?
 
-          git.global['userId'] = api.get('users/me')['id'].to_s
+          git_global['userId'] = api.get('users/me')['id'].to_s
         end
 
         private
 
-        attr_reader :git
+        def git
+          @git ||= GitConfig.new('local', 'abt.harvest')
+        end
+
+        def git_global
+          @git_global ||= GitConfig.new('global', 'abt.harvest')
+        end
 
         def api
-          @api ||=
-            Abt::Providers::Harvest::Api.new(access_token: access_token, account_id: account_id)
+          @api ||= Api.new(access_token: access_token, account_id: account_id)
         end
       end
     end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Harvest
+      class Path < String
+        PATH_REGEX = %r{^(?<project_id>\d+)?(/(?<task_id>\d+))?$}.freeze
+
+        def self.from_ids(project_id = nil, task_id = nil)
+          path = project_id ? [project_id, *task_id].join('/') : ''
+          new path
+        end
+
+        def initialize(path = '')
+          raise Abt::Cli::Abort, "Invalid path: #{path}" unless path =~ PATH_REGEX
+
+          super
+        end
+
+        def project_id
+          match[:project_id]
+        end
+
+        def task_id
+          match[:task_id]
+        end
+
+        private
+
+        def match
+          @match ||= PATH_REGEX.match(self)
+        end
+      end
+    end
+  end
+end

data/lib/abt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Abt
-  VERSION = '0.0.16'
+  VERSION = '0.0.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abt-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.21
 platform: ruby
 authors:
 - Jesper Sørensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -75,9 +75,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - "./lib/abt.rb"
+- "./lib/abt/ari.rb"
+- "./lib/abt/ari_list.rb"
+- "./lib/abt/base_command.rb"
 - "./lib/abt/cli.rb"
 - "./lib/abt/cli/arguments_parser.rb"
-- "./lib/abt/cli/base_command.rb"
+- "./lib/abt/cli/global_commands/commands.rb"
+- "./lib/abt/cli/global_commands/examples.rb"
+- "./lib/abt/cli/global_commands/help.rb"
+- "./lib/abt/cli/global_commands/readme.rb"
+- "./lib/abt/cli/global_commands/share.rb"
+- "./lib/abt/cli/global_commands/version.rb"
 - "./lib/abt/cli/prompt.rb"
 - "./lib/abt/docs.rb"
 - "./lib/abt/docs/cli.rb"
@@ -102,6 +110,7 @@ files:
 - "./lib/abt/providers/asana/commands/start.rb"
 - "./lib/abt/providers/asana/commands/tasks.rb"
 - "./lib/abt/providers/asana/configuration.rb"
+- "./lib/abt/providers/asana/path.rb"
 - "./lib/abt/providers/devops.rb"
 - "./lib/abt/providers/devops/api.rb"
 - "./lib/abt/providers/devops/base_command.rb"
@@ -115,6 +124,7 @@ files:
 - "./lib/abt/providers/devops/commands/share.rb"
 - "./lib/abt/providers/devops/commands/work-items.rb"
 - "./lib/abt/providers/devops/configuration.rb"
+- "./lib/abt/providers/devops/path.rb"
 - "./lib/abt/providers/git.rb"
 - "./lib/abt/providers/git/commands/branch.rb"
 - "./lib/abt/providers/harvest.rb"
@@ -131,6 +141,7 @@ files:
 - "./lib/abt/providers/harvest/commands/tasks.rb"
 - "./lib/abt/providers/harvest/commands/track.rb"
 - "./lib/abt/providers/harvest/configuration.rb"
+- "./lib/abt/providers/harvest/path.rb"
 - "./lib/abt/version.rb"
 - bin/abt
 homepage: https://github.com/abtion/abt

data/lib/abt/cli/base_command.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-module Abt
-  class Cli
-    class BaseCommand
-      def self.usage
-        raise NotImplementedError, 'Command classes must implement .command'
-      end
-
-      def self.description
-        raise NotImplementedError, 'Command classes must implement .description'
-      end
-
-      def self.flags
-        []
-      end
-
-      attr_reader :path, :flags, :cli
-
-      def initialize(path:, flags:, cli:)
-        @cli = cli
-        @path = path
-        @flags = parse_flags(flags)
-      end
-
-      def perform
-        raise NotImplementedError, 'Command classes must implement #perform'
-      end
-
-      private
-
-      def parse_flags(flags)
-        result = {}
-
-        flag_parser.parse!(flags.dup, into: result)
-
-        cli.exit_with_message(flag_parser.help) if result[:help]
-
-        result
-      rescue OptionParser::InvalidOption => e
-        cli.abort e.message
-      end
-
-      def flag_parser
-        @flag_parser ||= OptionParser.new do |opts|
-          opts.banner = <<~TXT
-            #{self.class.description}
-
-            Usage: #{self.class.usage}
-          TXT
-
-          opts.on('-h', '--help')
-
-          self.class.flags.each do |(*flag)|
-            opts.on(*flag)
-          end
-        end
-      end
-    end
-  end
-end