abt-cli 0.0.24 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b21c8f210a7c29d5f43ef7c756cfdcc7d8ef2b13ef4dcaef1cec4f8bf2297a1
-  data.tar.gz: f7586aa063494d796ded7c2e8696d9bf834e24be3004c621408e2fdd58f9b516
+  metadata.gz: 1fbc512b85932a7c8cfa8e6d9ec10176f3e2ac8711df78ad4ce67100ac79f003
+  data.tar.gz: 7dc1c727ced7d316c84075458b75839bd931050e50c9ffe39f925324c6a8e63d
 SHA512:
-  metadata.gz: b9d5278daeec2067937212108eb0ba478c1ec80d45c14a94025f7d6d83c5a30c4cdb716d010a4dfc807166165cd04af8e7962ec2b776f9f2fb7feee7edb65194
-  data.tar.gz: 2faba55f9dcf4ee66f82a77b647fe367fbebeb74c70fde23edd6543ad83ce1f995bdeb01673555219c498a971919e0b2fd0ec1f8362484f56ba6a54a2b65503c
+  metadata.gz: 74f84e028cf84f156ee18f46177fae4e17f857eb538362daf2baf3b017f1ace428a8b9c16aa912ba0c486fdc13cbf2a41402fa64917fa74ee9578c6e041c6d7b
+  data.tar.gz: fe06b4314f9a119950979b7a8c966758a56b4a3619dcabc9328209beaca94f317851bc9dedbc986a955a120afe29da0707225e78896e1517854c24864bba2efc

data/bin/abt

@@ -8,5 +8,5 @@ begin
 rescue Abt::Cli::Abort => e
   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

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,33 @@ module Abt
       raise Exit, message
     end
 
+    def aris
+      @aris ||= ArgumentsParser.new(sanitized_piped_args + remaining_args).parse
+    end
+
+    def directory_config
+      @directory_config ||= Abt::DirectoryConfig.new
+    end
+
     private
 
+    def alias?
+      command[0] == "@"
+    end
+
+    def process_alias
+      matching_alias = 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

@@ -14,17 +14,20 @@ module Abt
         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): ")
+        output.print("#{text} (#{choices}): ")
 
-          case Abt::Helpers.read_user_input
-          when "y", "Y" then return true
-          when "n", "N" then return false
-          else output.puts "Invalid choice" end
-        end
+        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)

data/lib/abt/directory_config.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Abt
+  class DirectoryConfig < Hash
+    FILE_NAME = ".abt.yml"
+
+    def initialize
+      super
+      load! if config_file_path && File.exist?(config_file_path)
+    end
+
+    def available?
+      !config_file_path.nil?
+    end
+
+    def load!
+      merge!(YAML.load_file(config_file_path))
+    end
+
+    def save!
+      raise Abt::Cli::Abort("Configuration files are not available outside of git repositories") unless available?
+
+      config_file = File.open(config_file_path, "w")
+      YAML.dump(to_h, config_file)
+      config_file.close
+    end
+
+    private
+
+    def config_file_path
+      @config_file_path ||= begin
+        path = nil
+        Open3.popen3("git rev-parse --show-toplevel") do |_i, output, _e, thread|
+          if thread.value.success?
+            repo_root = output.read.chomp
+            path = File.join(repo_root, FILE_NAME)
+          end
+        end
+        path
+      end
+    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/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

@@ -25,12 +25,42 @@ module Abt
         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

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

@@ -36,24 +36,6 @@ module Abt
             abort("Invalid project: #{project_gid}") if project.nil?
             abort("Invalid task: #{task_gid}") if task_gid && task.nil?
           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 task
-            @task ||= begin
-              warn("Fetching task...")
-              api.get("tasks/#{task_gid}", opt_fields: "name,permalink_url")
-            rescue Abt::HttpError::NotFoundError
-              nil
-            end
-          end
         end
       end
     end

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

@@ -58,10 +58,8 @@ module Abt
           end
 
           def task
-            @task ||= begin
-              api.get("tasks/#{task_gid}",
-                      opt_fields: "name,memberships.section.name,permalink_url")
-            end
+            @task ||= api.get("tasks/#{task_gid}",
+                              opt_fields: "name,memberships.section.name,permalink_url")
           end
         end
       end

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

@@ -10,65 +10,35 @@ module Abt
           end
 
           def self.description
-            "Pick task for current git repository"
+            "Pick a task and - unless told not to - make it current"
           end
 
           def self.flags
             [
-              ["-d", "--dry-run", "Keep existing configuration"]
+              ["-d", "--dry-run", "Keep existing configuration"],
+              ["-c", "--clean", "Don't reuse project configuration"]
             ]
           end
 
           def perform
-            require_local_config!
-            require_project!
-
-            warn(project["name"])
-            task = select_task
+            pick!
 
             print_task(project, task)
 
             return if flags[:"dry-run"]
 
-            config.path = Path.from_ids(project_gid: project_gid, task_gid: task["gid"])
-          end
-
-          private
-
-          def project
-            @project ||= api.get("projects/#{project_gid}", opt_fields: "name")
-          end
-
-          def select_task
-            section = cli.prompt.choice("Which section?", sections)
-            warn("Fetching tasks...")
-            tasks = tasks_in_section(section)
-
-            if tasks.length.zero?
-              warn("Section is empty")
-              select_task
+            if config.local_available?
+              config.path = path
             else
-              cli.prompt.choice("Select a task", tasks, nil_option: true) || select_task
+              warn("No local configuration to update - will function as dry run")
             end
           end
 
-          def tasks_in_section(section)
-            tasks = api.get_paged(
-              "tasks",
-              section: section["gid"],
-              opt_fields: "name,completed,permalink_url"
-            )
-
-            # The below filtering is the best we can do with Asanas api, see this:
-            # https://forum.asana.com/t/tasks-query-completed-since-is-broken-for-sections/21461
-            tasks.reject { |task| task["completed"] }
-          end
+          private
 
-          def sections
-            @sections ||= begin
-              warn("Fetching sections...")
-              api.get_paged("projects/#{project_gid}/sections", opt_fields: "name")
-            end
+          def pick!
+            prompt_project! if project_gid.nil? || flags[:clean]
+            prompt_task!
           end
         end
       end

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

@@ -14,7 +14,7 @@ module Abt
           end
 
           def perform
-            require_project!
+            prompt_project! unless project_gid
 
             tasks.each do |task|
               print_task(project, task)
@@ -23,14 +23,9 @@ module Abt
 
           private
 
-          def project
-            @project ||= begin
-              api.get("projects/#{project_gid}", opt_fields: "name")
-            end
-          end
-
           def tasks
             @tasks ||= begin
+              project
               warn("Fetching tasks...")
               tasks = api.get_paged("tasks", project: project["gid"], opt_fields: "name,completed")
               tasks.reject { |task| task["completed"] }

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Asana
+      module Commands
+        class WriteConfig < BaseCommand
+          def self.usage
+            "abt write-config asana[:<project-gid>]"
+          end
+
+          def self.description
+            "Write Asana settings to .abt.yml"
+          end
+
+          def self.flags
+            [
+              ["-c", "--clean", "Don't reuse project configuration"]
+            ]
+          end
+
+          def perform
+            cli.directory_config["asana"] = config_data
+            cli.directory_config.save!
+
+            warn("Asana configuration written to #{Abt::DirectoryConfig::FILE_NAME}")
+          end
+
+          private
+
+          def config_data
+            {
+              "path" => project_gid,
+              "wip_section_gid" => wip_section_gid,
+              "finalized_section_gid" => finalized_section_gid
+            }
+          end
+
+          def project_gid
+            @project_gid ||= begin
+              prompt_project! if super.nil? || flags[:clean]
+
+              super
+            end
+          end
+
+          def wip_section_gid
+            return config.wip_section_gid if use_previous_config?
+
+            cli.prompt.choice("Select WIP (Work In Progress) section", sections)["gid"]
+          end
+
+          def finalized_section_gid
+            return config.finalized_section_gid if use_previous_config?
+
+            cli.prompt.choice('Select section for finalized tasks (E.g. "Merged")', sections)["gid"]
+          end
+
+          def use_previous_config?
+            project_gid == config.path.project_gid
+          end
+
+          def sections
+            @sections ||= begin
+              warn("Fetching sections...")
+              api.get_paged("projects/#{project_gid}/sections", opt_fields: "name")
+            end
+          end
+        end
+      end
+    end
+  end
+end