abt-cli 0.0.18 → 0.0.23

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

@@ -6,75 +6,45 @@ module Abt
       module Commands
         class Init < BaseCommand
           def self.usage
-            'abt init harvest'
+            "abt init harvest"
           end
 
           def self.description
-            'Pick Harvest project for current git repository'
+            "Pick Harvest project for current git repository"
           end
 
           def perform
-            cli.abort 'Must be run inside a git repository' unless config.local_available?
-
+            require_local_config!
             projects # Load projects up front to make it obvious that searches are instant
-            project = find_search_result
+            project = cli.prompt.search("Select a project", searchable_projects)["project"]
 
-            config.project_id = project['id']
-            config.task_id = nil
+            config.path = Path.from_ids(project_id: project["id"])
 
             print_project(project)
           end
 
           private
 
-          def find_search_result
-            cli.warn 'Select a project'
-
-            loop do
-              matches = matches_for_string cli.prompt.text('Enter search')
-              if matches.empty?
-                warn 'No matches'
-                next
-              end
-
-              cli.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
-          end
-
-          def matches_for_string(string)
-            search_string = sanitize_string(string)
-
-            searchable_projects.select do |project|
-              sanitize_string(project['name']).include?(search_string)
-            end
-          end
-
-          def sanitize_string(string)
-            string.downcase.gsub(/[^\w]/, '')
-          end
-
           def searchable_projects
             @searchable_projects ||= projects.map do |project|
               {
-                'name' => "#{project['client']['name']} > #{project['name']}",
-                'project' => project
+                "name" => "#{project['client']['name']} > #{project['name']}",
+                "project" => project
               }
             end
           end
 
           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'])
+                project_assignment["project"].merge("client" => project_assignment["client"])
               end
             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

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

@@ -6,52 +6,55 @@ module Abt
       module Commands
         class Pick < BaseCommand
           def self.usage
-            'abt pick harvest[:<project-id>]'
+            "abt pick harvest[:<project-id>]"
           end
 
           def self.description
-            'Pick task for current git repository'
+            "Pick task for current git repository"
           end
 
           def self.flags
             [
-              ['-d', '--dry-run', 'Keep existing configuration']
+              ["-d", "--dry-run", "Keep existing configuration"]
             ]
           end
 
           def perform
-            cli.abort 'Must be run inside a git repository' unless config.local_available?
+            require_local_config!
             require_project!
 
-            cli.warn project['name']
-            task = cli.prompt.choice 'Select a task', tasks
+            warn(project["name"])
+            task = pick_task
 
             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: project_id, task_id: task["id"])
           end
 
           private
 
           def project
-            project_assignment['project']
+            project_assignment["project"]
+          end
+
+          def pick_task
+            cli.prompt.choice("Select a task", tasks)
           end
 
           def tasks
-            @tasks ||= project_assignment['task_assignments'].map { |ta| ta['task'] }
+            @tasks ||= project_assignment["task_assignments"].map { |ta| ta["task"] }
           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

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

@@ -6,11 +6,11 @@ module Abt
       module Commands
         class Projects < BaseCommand
           def self.usage
-            'abt projects harvest'
+            "abt projects harvest"
           end
 
           def self.description
-            'List all available projects - useful for piping into grep etc.'
+            "List all available projects - useful for piping into grep etc."
           end
 
           def perform
@@ -23,15 +23,15 @@ 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'])
+                project_assignment["project"].merge("client" => project_assignment["client"])
               end
             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

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

@@ -6,20 +6,18 @@ module Abt
       module Commands
         class Share < BaseCommand
           def self.usage
-            'abt share harvest[:<project-id>[/<task-id>]]'
+            "abt share harvest[:<project-id>[/<task-id>]]"
           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}")
+            if path != ""
+              cli.print_ari("harvest", path)
+            elsif cli.output.isatty
+              warn("No configuration for project. Did you initialize Harvest?")
             end
           end
         end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'track'
+require_relative "track"
 
 module Abt
   module Providers
@@ -8,11 +8,13 @@ module Abt
       module Commands
         class Start < Track
           def self.usage
-            'abt start harvest[:<project-id>/<task-id>] [options]'
+            "abt start harvest[:<project-id>/<task-id>] [options]"
           end
 
           def self.description
-            'Alias for: `abt track harvest`. Meant to used in combination with other ARIs, e.g. `abt start harvest asana`'
+            <<~TXT
+              Alias for: `abt track harvest`. Meant to used in combination with other ARIs, e.g. `abt start harvest asana`
+            TXT
           end
         end
       end

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

@@ -6,49 +6,49 @@ module Abt
       module Commands
         class Stop < BaseCommand
           def self.usage
-            'abt stop harvest'
+            "abt stop harvest"
           end
 
           def self.description
-            'Stop running harvest tracker'
+            "Stop running harvest tracker"
           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
-            time_entry['project']
+            time_entry["project"]
           end
 
           def task
-            time_entry['task']
+            time_entry["task"]
           end
 
           def time_entry
             @time_entry ||= begin
               api.get_paged(
-                'time_entries',
+                "time_entries",
                 is_running: true,
                 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'
+            rescue Abt::HttpError::HttpError => e
+              warn(e)
+              abort("Unable to fetch running time entry")
             end
           end
         end

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

@@ -6,11 +6,11 @@ module Abt
       module Commands
         class Tasks < BaseCommand
           def self.usage
-            'abt tasks harvest'
+            "abt tasks harvest"
           end
 
           def self.description
-            'List available tasks on project - useful for piping into grep etc.'
+            "List available tasks on project - useful for piping into grep etc."
           end
 
           def perform
@@ -24,21 +24,24 @@ module Abt
           private
 
           def project
-            project_assignment['project']
+            project_assignment["project"]
           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
             @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

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
-            cli.abort 'Invalid task'
+            abort("Invalid task")
           end
 
           private
@@ -39,69 +42,88 @@ module Abt
           end
 
           def create_time_entry
-            body = time_entry_base_data
-            body.merge!(hours: flags[:time]) if flags.key? :time
+            body = time_entry_data
 
-            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
 
+          def time_entry_data
+            body = time_entry_base_data
+
+            maybe_add_external_link(body)
+            maybe_add_comment(body)
+            maybe_add_time(body)
+
+            body
+          end
+
           def time_entry_base_data
-            body = {
+            {
               project_id: project_id,
               task_id: task_id,
               user_id: config.user_id,
               spent_date: Date.today.iso8601
             }
+          end
 
+          def maybe_add_external_link(body)
             if external_link_data
-              cli.warn <<~TXT
+              warn(<<~TXT)
                 Linking to:
-                  #{external_link_data[:notes]}
-                  #{external_link_data[:external_reference][:permalink]}
+                #{external_link_data[:notes]}
+                #{external_link_data[:external_reference][:permalink]}
               TXT
-              body.merge! external_link_data
+              body.merge!(external_link_data)
             else
-              cli.warn 'No external link provided'
+              warn("No external link provided")
             end
+          end
 
+          def maybe_add_comment(body)
             body[:notes] = flags[:comment] if flags.key?(:comment)
-            body[:notes] ||= cli.prompt.text('Fill in comment (optional)')
-            body
+            body[:notes] ||= cli.prompt.text("Fill in comment (optional)")
           end
 
-          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
+          def maybe_add_time(body)
+            body[:hours] = flags[:time] if flags.key?(:time)
+          end
 
-              lines = output.string.strip.lines
+          def external_link_data
+            return @external_link_data if instance_variable_defined?(:@external_link_data)
 
-              return if lines.empty?
+            lines = fetch_link_data_lines
 
-              # 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')
-              end
+            return @external_link_data = nil if lines.empty?
 
-              Oj.load(lines.first, symbol_keys: true)
+            if lines.length > 1
+              abort("Got reference data from multiple scheme providers, only one is supported at a time")
             end
+
+            @external_link_data = Oj.load(lines.first, symbol_keys: true)
+          end
+
+          def fetch_link_data_lines
+            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