abt-cli 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed527a89749355f223b94daa60d63b91c78ae98ab6976c3470ec6ca42cbcff27
-  data.tar.gz: aed24bd58e30bfbbdc574532eb97044cd8e108851c2586ac407c0eb42a2deb28
+  metadata.gz: 0bffe51f05670b4fcbf1bf2a023c354e26a387b0a74fd34751ef180b1f619c62
+  data.tar.gz: 7e5c476b8e1b803adfbb92590676c883e66a6ac74b5111e83aed9f4d6b9feb8a
 SHA512:
-  metadata.gz: 6d615f241ac406df5f89cc79ad36f19b0554602f6eb3e20e2f01ba0143595ea6e748c727ccedfeecd1a826c46e031acc7160a3b0ee7462027157a357d730de35
-  data.tar.gz: 2b9e500f77e181f4198ac17939fc1753f9a7105682783b005d780ec4da61c8af43aa3e986bba34e1df4f5173bde47bd0e97e042f293edb713a364d2a9c1c71b6
+  metadata.gz: 9dba1d7966f28966e5fe8d33fd3b380e823f707536b86e1f21a82bfdb74e20ba4d76b2c08e1fb9da9b7f1dc1d74ea6a787979b6ae86ca59b3ce9305964f7a063
+  data.tar.gz: 33b61911f3018b0e51ece32264c98f8327af60fcfb94bb59e4d210171bf8562fb885c120be565f79a827dd7f35c72d4d91acf48aa8497079107e120d8e4535bf

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/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.from_gids(project_gid: project["gid"], task_gid: task["gid"])
             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/path.rb

@@ -6,7 +6,7 @@ module Abt
       class Path < String
         PATH_REGEX = %r{^(?<project_gid>\d+)?/?(?<task_gid>\d+)?$}.freeze
 
-        def self.from_ids(project_gid: nil, task_gid: nil)
+        def self.from_gids(project_gid: nil, task_gid: nil)
           path = project_gid ? [project_gid, *task_gid].join("/") : ""
           new(path)
         end

data/lib/abt/providers/asana/services/project_picker.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Asana
+      module Services
+        class ProjectPicker
+          class Result
+            attr_reader :project, :path
+
+            def initialize(project:, path:)
+              @project = project
+              @path = path
+            end
+          end
+
+          def self.call(**args)
+            new(**args).call
+          end
+
+          attr_reader :cli, :config
+
+          def initialize(cli:, config:)
+            @cli = cli
+            @config = config
+          end
+
+          def call
+            project = cli.prompt.search("Select a project", projects)
+            path = Path.from_gids(project_gid: project["gid"])
+
+            Result.new(project: project, path: path)
+          end
+
+          private
+
+          def projects
+            @projects ||= begin
+              cli.warn("Fetching projects...")
+              api.get_paged("projects",
+                            workspace: config.workspace_gid,
+                            archived: false,
+                            opt_fields: "name,permalink_url")
+            end
+          end
+
+          def api
+            Abt::Providers::Asana::Api.new(access_token: config.access_token)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/abt/providers/asana/services/task_picker.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Asana
+      module Services
+        class TaskPicker
+          class Result
+            attr_reader :task, :path
+
+            def initialize(task:, path:)
+              @task = task
+              @path = path
+            end
+          end
+
+          def self.call(**args)
+            new(**args).call
+          end
+
+          attr_reader :cli, :path, :config, :project
+
+          def initialize(cli:, path:, config:, project:)
+            @cli = cli
+            @path = path
+            @config = config
+            @project = project
+          end
+
+          def call
+            task = select_task
+
+            path_with_task = Path.new([path, task["gid"]].join("/"))
+
+            Result.new(task: task, path: path_with_task)
+          end
+
+          private
+
+          def select_task
+            section = prompt_section
+            tasks = tasks_in_section(section)
+
+            if tasks.length.zero?
+              cli.warn("Section is empty")
+              select_task
+            else
+              cli.prompt.choice("Select a task", tasks, nil_option: true) || select_task
+            end
+          end
+
+          def prompt_section
+            cli.prompt.choice("Which section in #{project['name']}?", sections)
+          end
+
+          def tasks_in_section(section)
+            cli.warn("Fetching tasks...")
+            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
+
+          def sections
+            @sections ||= begin
+              cli.warn("Fetching sections...")
+              api.get_paged("projects/#{project['gid']}/sections", opt_fields: "name")
+            end
+          end
+
+          def api
+            Abt::Providers::Asana::Api.new(access_token: config.access_token)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/abt/providers/devops.rb

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

data/lib/abt/providers/devops/api.rb

@@ -73,6 +73,16 @@ module Abt
           "#{base_url}/_boards/board/#{rfc_3986_encode_path_segment(board['name'])}"
         end
 
+        def sanitize_work_item(work_item)
+          return nil if work_item.nil?
+
+          work_item.merge(
+            "id" => work_item["id"].to_s,
+            "name" => work_item["fields"]["System.Title"],
+            "url" => url_for_work_item(work_item)
+          )
+        end
+
         def connection
           @connection ||= Faraday.new(api_endpoint) do |connection|
             connection.basic_auth(username, access_token)

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

@@ -24,29 +24,49 @@ module Abt
         end
 
         def require_board!
-          return if organization_name && project_name && board_id
+          return if board_id && organization_name && project_name
 
-          abort("No current/specified board. Did you initialize DevOps?")
+          abort("No current/specified board. Did you forget to `pick`?")
         end
 
         def require_work_item!
-          unless organization_name && project_name && board_id
-            abort("No current/specified board. Did you initialize DevOps and pick a work item?")
-          end
-
+          require_board!
           return if work_item_id
 
-          abort("No current/specified work item. Did you pick a DevOps work item?")
+          abort("No current/specified work item. Did you forget to `pick`?")
+        end
+
+        def prompt_project!
+          @path = Services::ProjectPicker.call(cli: cli).path
         end
 
-        def sanitize_work_item(work_item)
-          return nil if work_item.nil?
+        def prompt_board!
+          result = Services::BoardPicker.call(cli: cli, path: path, config: config)
+          @path = result.path
+          @board = result.board
+        end
 
-          work_item.merge(
-            "id" => work_item["id"].to_s,
-            "name" => work_item["fields"]["System.Title"],
-            "url" => api.url_for_work_item(work_item)
-          )
+        def prompt_work_item!
+          result = Services::WorkItemPicker.call(cli: cli, path: path, config: config, board: board)
+          @path = result.path
+          @work_item = result.work_item
+        end
+
+        def board
+          @board ||= begin
+            api.get("work/boards/#{board_id}")
+          rescue HttpError::NotFoundError
+            nil
+          end
+        end
+
+        def work_item
+          @work_item ||= begin
+            work_item = api.get_paged("wit/workitems", ids: work_item_id)[0]
+            api.sanitize_work_item(work_item)
+          rescue HttpError::NotFoundError
+            nil
+          end
         end
 
         def print_board(organization_name, project_name, board)