abt-cli 0.0.21 → 0.0.22

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

@@ -6,30 +6,33 @@ module Abt
       module Commands
         class Track < BaseCommand
           def self.usage
-            'abt track harvest[:<project-id>/<task-id>] [options]'
+            "abt track harvest[:<project-id>/<task-id>] [options]"
           end
 
           def self.description
-            'Start tracker for current or specified task. Add a relevant ARI to link the time entry, e.g. `abt track harvest asana`'
+            <<~TXT
+              Start tracker for current or specified task. Add a relevant ARI to link the time entry, e.g. `abt track harvest asana`
+            TXT
           end
 
           def self.flags
             [
-              ['-s', '--set', 'Set specified task as current'],
-              ['-c', '--comment COMMENT', 'Override comment'],
-              ['-t', '--time HOURS', 'Set hours. Creates a stopped entry unless used with --running'],
-              ['-r', '--running', 'Used with --time, starts the created time entry']
+              ["-s", "--set", "Set specified task as current"],
+              ["-c", "--comment COMMENT", "Override comment"],
+              ["-t", "--time HOURS",
+               "Set hours. Creates a stopped entry unless used with --running"],
+              ["-r", "--running", "Used with --time, starts the created time entry"]
             ]
           end
 
           def perform
             require_task!
 
-            print_task(created_time_entry['project'], created_time_entry['task'])
+            print_task(created_time_entry["project"], created_time_entry["task"])
 
             maybe_override_current_task
           rescue Abt::HttpError::HttpError => _e
-            abort 'Invalid task'
+            abort("Invalid task")
           end
 
           private
@@ -40,13 +43,11 @@ module Abt
 
           def create_time_entry
             body = time_entry_base_data
-            body.merge!(hours: flags[:time]) if flags.key? :time
+            body[:hours] = flags[:time] if flags.key?(:time)
 
-            result = api.post('time_entries', Oj.dump(body, mode: :json))
+            result = api.post("time_entries", Oj.dump(body, mode: :json))
 
-            if flags.key?(:time) && flags[:running]
-              api.patch("time_entries/#{result['id']}/restart")
-            end
+            api.patch("time_entries/#{result['id']}/restart") if flags.key?(:time) && flags[:running]
 
             result
           end
@@ -60,18 +61,18 @@ module Abt
             }
 
             if external_link_data
-              warn <<~TXT
+              warn(<<~TXT)
                 Linking to:
                   #{external_link_data[:notes]}
                   #{external_link_data[:external_reference][:permalink]}
               TXT
-              body.merge! external_link_data
+              body.merge!(external_link_data)
             else
-              warn 'No external link provided'
+              warn("No external link provided")
             end
 
             body[:notes] = flags[:comment] if flags.key?(:comment)
-            body[:notes] ||= cli.prompt.text('Fill in comment (optional)')
+            body[:notes] ||= cli.prompt.text("Fill in comment (optional)")
             body
           end
 
@@ -83,7 +84,7 @@ module Abt
                 nil
               else
                 if lines.length > 1
-                  abort('Got reference data from multiple scheme providers, only one is supported at a time')
+                  abort("Got reference data from multiple scheme providers, only one is supported at a time")
                 end
 
                 Oj.load(lines.first, symbol_keys: true)
@@ -97,7 +98,7 @@ module Abt
 
             input = StringIO.new(other_aris.to_s)
             output = StringIO.new
-            Abt::Cli.new(argv: ['harvest-time-entry-data'], output: output, input: input).perform
+            Abt::Cli.new(argv: ["harvest-time-entry-data"], output: output, input: input).perform
 
             output.string.strip.lines
           end
@@ -108,7 +109,7 @@ module Abt
             return unless config.local_available?
 
             config.path = path
-            warn 'Current task updated'
+            warn("Current task updated")
           end
         end
       end

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

@@ -15,11 +15,11 @@ module Abt
         end
 
         def path
-          Path.new(local_available? && git['path'] || '')
+          Path.new(local_available? && git["path"] || "")
         end
 
         def path=(new_path)
-          git['path'] = new_path
+          git["path"] = new_path
         end
 
         def clear_local(verbose: true)
@@ -31,41 +31,41 @@ module Abt
         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([
-            'Please provide your personal access token for Harvest.',
-            'If you don\'t have one, create one here: https://id.getharvest.com/developers',
-            '',
-            'Enter access token'
+          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",
+            "",
+            "Enter access token"
           ].join("\n"))
         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([
-            'Please provide harvest account id.',
-            'This information is shown next to your generated access token',
-            '',
-            'Enter account id'
+          git_global["accountId"] = cli.prompt.text([
+            "Please provide harvest account id.",
+            "This information is shown next to your generated access token",
+            "",
+            "Enter account id"
           ].join("\n"))
         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
 
         def git
-          @git ||= GitConfig.new('local', 'abt.harvest')
+          @git ||= GitConfig.new("local", "abt.harvest")
         end
 
         def git_global
-          @git_global ||= GitConfig.new('global', 'abt.harvest')
+          @git_global ||= GitConfig.new("global", "abt.harvest")
         end
 
         def api

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

@@ -4,15 +4,15 @@ module Abt
   module Providers
     module Harvest
       class Path < String
-        PATH_REGEX = %r{^(?<project_id>\d+)?(/(?<task_id>\d+))?$}.freeze
+        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
+          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
+        def initialize(path = "")
+          raise Abt::Cli::Abort, "Invalid path: #{path}" unless PATH_REGEX.match?(path)
 
           super
         end

data/lib/abt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abt-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Jesper Sørensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -80,6 +80,7 @@ files:
 - "./lib/abt/base_command.rb"
 - "./lib/abt/cli.rb"
 - "./lib/abt/cli/arguments_parser.rb"
+- "./lib/abt/cli/global_commands.rb"
 - "./lib/abt/cli/global_commands/commands.rb"
 - "./lib/abt/cli/global_commands/examples.rb"
 - "./lib/abt/cli/global_commands/help.rb"
@@ -122,7 +123,7 @@ files:
 - "./lib/abt/providers/devops/commands/init.rb"
 - "./lib/abt/providers/devops/commands/pick.rb"
 - "./lib/abt/providers/devops/commands/share.rb"
-- "./lib/abt/providers/devops/commands/work-items.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"
@@ -158,14 +159,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Versatile scripts