abt-cli 0.0.22 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b8172eca54c77feb083acbc9895bf9f221b69efc1c0b8170d87f250b486286a
-  data.tar.gz: e07e6122c3b3c3bc1307769f5d52d01cb6db9126df0fe10bfb217b940a1eaf12
+  metadata.gz: 0bffe51f05670b4fcbf1bf2a023c354e26a387b0a74fd34751ef180b1f619c62
+  data.tar.gz: 7e5c476b8e1b803adfbb92590676c883e66a6ac74b5111e83aed9f4d6b9feb8a
 SHA512:
-  metadata.gz: 5eee8193b985110d79170134593fa1ac03b50f6be36b43fa99bb99c8bdcf51d531f9e2b10fe5bca919524f388f503a3a46b9d74bf4764226e6f8d94b905d12ca
-  data.tar.gz: 3a3d7f288dbf3faaab041934bcf703afbaa87b989a1e869bae02a084c83834fd02a1a93df78ed06b2bb6a0b29f4167cdae8a972940c6684e9660dd58d06a78ba
+  metadata.gz: 9dba1d7966f28966e5fe8d33fd3b380e823f707536b86e1f21a82bfdb74e20ba4d76b2c08e1fb9da9b7f1dc1d74ea6a787979b6ae86ca59b3ce9305964f7a063
+  data.tar.gz: 33b61911f3018b0e51ece32264c98f8327af60fcfb94bb59e4d210171bf8562fb885c120be565f79a827dd7f35c72d4d91acf48aa8497079107e120d8e4535bf

data/bin/abt

@@ -6,7 +6,7 @@ require_relative "../lib/abt"
 begin
   Abt::Cli.new.perform
 rescue Abt::Cli::Abort => e
-  abort(e.message)
+  abort(e.message.strip)
 rescue Interrupt
-  abort("Aborted")
+  exit 130
 end

data/lib/abt.rb

@@ -6,6 +6,7 @@ require "oj"
 require "open3"
 require "stringio"
 require "optparse"
+require "yaml"
 
 Dir.glob("#{File.dirname(File.absolute_path(__FILE__))}/abt/*.rb").sort.each do |file|
   require file
@@ -22,4 +23,8 @@ module Abt
     const_name = Helpers.command_to_const(scheme)
     Providers.const_get(const_name) if Providers.const_defined?(const_name)
   end
+
+  def self.directory_config
+    @directory_config ||= Abt::DirectoryConfig.new
+  end
 end

data/lib/abt/cli.rb

@@ -5,20 +5,19 @@ Dir.glob("#{File.expand_path(__dir__)}/cli/*.rb").sort.each do |file|
 end
 
 module Abt
-  class Cli
+  class Cli # rubocop:disable Metrics/ClassLength
     class Abort < StandardError; end
 
     class Exit < StandardError; end
 
-    attr_reader :command, :aris, :input, :output, :err_output, :prompt
+    attr_reader :command, :remaining_args, :input, :output, :err_output, :prompt
 
     def initialize(argv: ARGV, input: $stdin, output: $stdout, err_output: $stderr)
-      (@command, *remaining_args) = argv
+      (@command, *@remaining_args) = argv
       @input = input
       @output = output
       @err_output = err_output
       @prompt = Abt::Cli::Prompt.new(output: err_output)
-      @aris = ArgumentsParser.new(sanitized_piped_args + remaining_args).parse
     end
 
     def perform
@@ -27,11 +26,10 @@ module Abt
         @command = "help"
       end
 
-      if global_command?
-        process_global_command
-      else
-        process_aris
-      end
+      return process_alias if alias?
+      return process_global_command if global_command?
+
+      process_aris
     end
 
     def print_ari(scheme, path, description = nil)
@@ -60,8 +58,29 @@ module Abt
       raise Exit, message
     end
 
+    def aris
+      @aris ||= ArgumentsParser.new(sanitized_piped_args + remaining_args).parse
+    end
+
     private
 
+    def alias?
+      command[0] == "@"
+    end
+
+    def process_alias
+      matching_alias = Abt.directory_config.dig("aliases", command[1..-1])
+
+      abort("No such alias #{command}") if matching_alias.nil?
+
+      with_args = matching_alias.sub("$@", remaining_args.join(" "))
+      with_program_name = with_args.gsub("$0", $PROGRAM_NAME).strip
+      humanized = with_args.gsub("$0", "abt").strip
+
+      warn(humanized)
+      system(with_program_name)
+    end
+
     def global_command?
       return true if aris.empty?
       return true if aris.first.scheme.nil?

data/lib/abt/cli/prompt.rb

@@ -11,22 +11,23 @@ module Abt
 
       def text(question)
         output.print("#{question.strip}: ")
-        read_user_input
+        Abt::Helpers.read_user_input
       end
 
-      def boolean(text)
-        output.puts text
+      def boolean(text, default: nil)
+        choices = [default == true ? "Y" : "y",
+                   default == false ? "N" : "n"].join("/")
 
-        loop do
-          output.print("(y / n): ")
-
-          case read_user_input
-          when "y", "Y" then return true
-          when "n", "N" then return false
-          else
-            output.puts "Invalid choice"
-          end
-        end
+        output.print("#{text} (#{choices}): ")
+
+        input = Abt::Helpers.read_user_input.downcase
+
+        return true if input == "y"
+        return false if input == "n"
+        return default if input.empty? && !default.nil?
+
+        output.puts "Invalid choice"
+        boolean(text, default: default)
       end
 
       def choice(text, options, nil_option: false)
@@ -40,7 +41,7 @@ module Abt
         end
 
         print_options(options)
-        select_options(options, nil_option)
+        select_option(options, nil_option)
       end
 
       def search(text, options)
@@ -60,40 +61,37 @@ module Abt
         end
       end
 
-      def select_options(options, nil_option)
-        loop do
-          number = read_option_number(options.length, nil_option)
-          if number.nil?
-            return nil if nil_option
-
-            next
-          end
+      def select_option(options, nil_option)
+        number = prompt_valid_option_number(options, nil_option)
 
-          option = options[number - 1]
+        return nil if number.nil?
 
-          output.puts "Selected: (#{number}) #{option['name']}"
-          return option
-        end
+        option = options[number - 1]
+        output.puts "Selected: (#{number}) #{option['name']}"
+        option
       end
 
-      def read_option_number(options_length, nil_option)
-        str = "("
-        str += options_length > 1 ? "1-#{options_length}" : "1"
-        str += nil_option_string(nil_option)
-        str += "): "
-        output.print(str)
-
-        input = read_user_input
+      def prompt_valid_option_number(options, nil_option)
+        output.print(options_info(options, nil_option))
+        input = Abt::Helpers.read_user_input
 
         return nil if nil_option && input == nil_option_character(nil_option)
 
         option_number = input.to_i
-        if option_number <= 0 || option_number > options_length
-          output.puts "Invalid selection"
-          return nil
-        end
+        return option_number if (1..options.length).cover?(option_number)
+
+        output.puts "Invalid selection"
+
+        # Prompt again if the selection was invalid
+        prompt_valid_option_number(options, nil_option)
+      end
 
-        option_number
+      def options_info(options, nil_option)
+        str = "("
+        str += options.length > 1 ? "1-#{options.length}" : "1"
+        str += nil_option_string(nil_option)
+        str += "): "
+        str
       end
 
       def nil_option_string(nil_option)
@@ -115,10 +113,6 @@ module Abt
         nil_option[1]
       end
 
-      def read_user_input
-        open(tty_path, &:gets).strip # rubocop:disable Security/Open
-      end
-
       def get_search_result(options)
         matches = matches_for_string(text("Enter search"), options)
         if matches.empty?
@@ -141,16 +135,6 @@ module Abt
       def sanitize_string(string)
         string.downcase.gsub(/[^\w]/, "")
       end
-
-      def tty_path
-        @tty_path ||= begin
-          candidates = ["/dev/tty", "CON:"] # Unix: '/dev/tty', Windows: 'CON:'
-          selected = candidates.find { |candidate| File.exist?(candidate) }
-          raise Abort, "Unable to prompt for user input" if selected.nil?
-
-          selected
-        end
-      end
     end
   end
 end

data/lib/abt/directory_config.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Abt
+  class DirectoryConfig < Hash
+    def initialize
+      super
+      merge!(YAML.load_file(config_file_path)) if config_file_path
+    end
+
+    private
+
+    def config_file_path
+      dir = Dir.pwd
+
+      until File.exist?(File.join(dir, ".abt.yml"))
+        next_dir = File.expand_path("..", dir)
+        return if next_dir == dir
+
+        dir = next_dir
+      end
+
+      File.join(dir, ".abt.yml")
+    end
+  end
+end

data/lib/abt/docs.rb

@@ -10,11 +10,10 @@ module Abt
       def basic_examples
         {
           "Getting started:" => {
-            "abt init asana harvest" => "Setup asana and harvest project for local git repo",
             "abt pick harvest" => "Pick harvest task. This will likely stay the same throughout the project",
             "abt pick asana | abt start harvest" => "Pick asana task and start tracking time",
             "abt stop harvest" => "Stop time tracker",
-            "abt start asana harvest" => "Continue working, e.g., after a break",
+            "abt track asana harvest" => "Continue tracking time, e.g., after a break",
             "abt finalize asana" => "Finalize the selected asana task"
           }
         }
@@ -31,10 +30,15 @@ module Abt
             "abt tasks asana | grep -i <name of task> | abt start" => nil
           },
           "Sharing ARIs:" => {
-            'abt share asana harvest | tr "\n" " "' => "Print current asana and harvest ARIs on a single line",
-            'abt share asana harvest | tr "\n" " " | pbcopy' => "Copy ARIs to clipboard (mac only)",
-            "abt start <ARIs from coworker>" => "Work on a task your coworker shared with you",
-            "abt current <ARIs from coworker> | abt start" => "Set task as current, then start it"
+            "abt share" => "Print current asana and harvest ARIs on a single line",
+            "abt share | pbcopy" => "Copy ARIs to clipboard (mac only)",
+            "abt track <ARIs from coworker>" => "Start tracking on the task your coworker shared with you",
+            "abt current <ARIs from coworker> | abt track" => "Set task as current, then start tracking"
+          },
+          "One-off tracking on any project": {
+            "abt pick asana -dc -- harvest -dc | abt track" =>
+              "Find a track any task on any project, without reusing/affecting previous settings",
+            "abt pick asana harvest | abt track" => "Can be used instead of the above when outside a git repo"
           },
           "Flags:" => {
             'abt start harvest -c "comment"' => "Add command flags after ARIs",

data/lib/abt/docs/markdown.rb

@@ -50,8 +50,7 @@ module Abt
         def example_commands
           lines = []
 
-          examples = Docs.basic_examples.merge(Docs.extended_examples)
-          examples.each_with_index do |(title, commands), index|
+          complete_examples.each_with_index do |(title, commands), index|
             lines << "" unless index.zero?
             lines << title
 
@@ -84,6 +83,10 @@ module Abt
           lines.join("\n")
         end
 
+        def complete_examples
+          Docs.basic_examples.merge(Docs.extended_examples)
+        end
+
         def inflector
           Dry::Inflector.new
         end

data/lib/abt/helpers.rb

@@ -2,15 +2,33 @@
 
 module Abt
   module Helpers
-    def self.const_to_command(string)
-      string = string.to_s.dup
-      string[0] = string[0].downcase
-      string.gsub(/([A-Z])/, '-\1').downcase
-    end
+    class << self
+      def const_to_command(string)
+        string = string.to_s.dup
+        string[0] = string[0].downcase
+        string.gsub(/([A-Z])/, '-\1').downcase
+      end
+
+      def command_to_const(string)
+        inflector = Dry::Inflector.new
+        inflector.camelize(inflector.underscore(string))
+      end
+
+      def read_user_input
+        open(tty_path, &:gets).strip # rubocop:disable Security/Open
+      end
+
+      private
+
+      def tty_path
+        @tty_path ||= begin
+          candidates = ["/dev/tty", "CON:"] # Unix: '/dev/tty', Windows: 'CON:'
+          selected = candidates.find { |candidate| File.exist?(candidate) }
+          raise Abort, "Unable to prompt for user input" if selected.nil?
 
-    def self.command_to_const(string)
-      inflector = Dry::Inflector.new
-      inflector.camelize(inflector.underscore(string))
+          selected
+        end
+      end
     end
   end
 end

data/lib/abt/providers/asana.rb

@@ -2,6 +2,7 @@
 
 Dir.glob("#{File.expand_path(__dir__)}/asana/*.rb").sort.each { |file| require file }
 Dir.glob("#{File.expand_path(__dir__)}/asana/commands/*.rb").sort.each { |file| require file }
+Dir.glob("#{File.expand_path(__dir__)}/asana/services/*.rb").sort.each { |file| require file }
 
 module Abt
   module Providers

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

@@ -20,13 +20,47 @@ module Abt
 
         private
 
+        def require_local_config!
+          abort("Must be run inside a git repository") unless config.local_available?
+        end
+
         def require_project!
-          abort("No current/specified project. Did you initialize Asana?") if project_gid.nil?
+          abort("No current/specified project. Did you forget to run `pick`?") if project_gid.nil?
         end
 
         def require_task!
-          abort("No current/specified project. Did you initialize Asana and pick a task?") if project_gid.nil?
-          abort("No current/specified task. Did you pick an Asana task?") if task_gid.nil?
+          require_project!
+          abort("No current/specified task. Did you forget to run `pick`?") if task_gid.nil?
+        end
+
+        def prompt_project!
+          result = Services::ProjectPicker.call(cli: cli, config: config)
+          @path = result.path
+          @project = result.project
+        end
+
+        def prompt_task!
+          result = Services::TaskPicker.call(cli: cli, path: path, config: config, project: project)
+          @path = result.path
+          @task = result.task
+        end
+
+        def task
+          @task ||= begin
+            warn("Fetching task...")
+            api.get("tasks/#{task_gid}", opt_fields: "name,permalink_url")
+          rescue Abt::HttpError::NotFoundError
+            nil
+          end
+        end
+
+        def project
+          @project ||= begin
+            warn("Fetching project...")
+            api.get("projects/#{project_gid}", opt_fields: "name,permalink_url")
+          rescue Abt::HttpError::NotFoundError
+            nil
+          end
         end
 
         def print_project(project)

data/lib/abt/providers/asana/commands/add.rb

@@ -56,10 +56,6 @@ module Abt
             @notes ||= cli.prompt.text("Enter task notes")
           end
 
-          def project
-            @project ||= api.get("projects/#{project_gid}", opt_fields: "name")
-          end
-
           def section
             @section ||= cli.prompt.choice("Add to section?", sections,
                                            nil_option: ["q", "Don't add to section"])

data/lib/abt/providers/asana/commands/branch_name.rb

@@ -28,19 +28,6 @@ module Abt
 
           def ensure_current_is_valid!
             abort("Invalid task gid: #{task_gid}") if task.nil?
-
-            return if task["memberships"].any? { |m| m.dig("project", "gid") == project_gid }
-
-            abort("Invalid or unmatching project gid: #{project_gid}")
-          end
-
-          def task
-            @task ||= begin
-              warn("Fetching task...")
-              api.get("tasks/#{task_gid}", opt_fields: "name,memberships.project")
-            rescue Abt::HttpError::NotFoundError
-              nil
-            end
           end
         end
       end