abt-cli 0.0.26 → 0.0.27

data/lib/abt/providers/harvest.rb

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

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

@@ -26,13 +26,55 @@ module Abt
         def require_project!
           return if project_id
 
-          abort("No current/specified project. Did you initialize Harvest?")
+          abort("No current/specified project. Did you forget to run `pick`?")
         end
 
         def require_task!
-          abort("No current/specified project. Did you initialize Harvest and pick a task?") unless project_id
+          require_project!
+          return if task_id
 
-          abort("No current/specified task. Did you pick a Harvest task?") if task_id.nil?
+          abort("No current/specified task. Did you forget to run `pick`?")
+        end
+
+        def prompt_project!
+          result = Services::ProjectPicker.call(cli: cli, project_assignments: project_assignments)
+          @path = result.path
+          @project = result.project
+        end
+
+        def prompt_task!
+          result = Services::TaskPicker.call(cli: cli, path: path, project_assignment: project_assignment)
+          @path = result.path
+          @task = result.task
+        end
+
+        def task
+          return @task if instance_variable_defined?(:@task)
+
+          @task = if project_assignment
+                    project_assignment["task_assignments"].map { |ta| ta["task"] }.find do |task|
+                      task["id"].to_s == task_id
+                    end
+                  end
+        end
+
+        def project
+          return @project if instance_variable_defined?(:@project)
+
+          @project = if project_assignment
+                       project_assignment["project"].merge("client" => project_assignment["client"])
+                     end
+        end
+
+        def project_assignment
+          @project_assignment ||= project_assignments.find { |pa| pa["project"]["id"].to_s == path.project_id }
+        end
+
+        def project_assignments
+          @project_assignments ||= begin
+            warn("Fetching Harvest data...")
+            api.get_paged("users/me/project_assignments")
+          end
         end
 
         def print_project(project)

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

@@ -40,34 +40,6 @@ module Abt
             abort("Invalid project: #{project_id}") if project.nil?
             abort("Invalid task: #{task_id}") if task_id && task.nil?
           end
-
-          def project
-            return @project if instance_variable_defined?(:@project)
-
-            @project = if project_assignment
-                         project_assignment["project"].merge("client" => project_assignment["client"])
-                       end
-          end
-
-          def task
-            return @task if instance_variable_defined?(:@task)
-
-            @task = if project_assignment
-                      project_assignment["task_assignments"].map { |ta| ta["task"] }.find do |task|
-                        task["id"].to_s == task_id
-                      end
-                    end
-          end
-
-          def project_assignment
-            @project_assignment ||= begin
-              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")
-          end
         end
       end
     end

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

@@ -15,46 +15,31 @@ module Abt
 
           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 = pick_task
+            pick!
 
             print_task(project, task)
 
             return if flags[:"dry-run"]
 
-            config.path = Path.from_ids(project_id: project_id, task_id: task["id"])
-          end
-
-          private
-
-          def project
-            project_assignment["project"]
-          end
-
-          def pick_task
-            cli.prompt.choice("Select a task", tasks)
-          end
+            unless config.local_available?
+              warn("No local configuration to update - will function as dry run")
+              return
+            end
 
-          def tasks
-            @tasks ||= project_assignment["task_assignments"].map { |ta| ta["task"] }
+            config.path = Path.from_ids(project_id: project["id"], task_id: task["id"])
           end
 
-          def project_assignment
-            @project_assignment ||= begin
-              project_assignments.find { |pa| pa["project"]["id"].to_s == project_id }
-            end
-          end
+          private
 
-          def project_assignments
-            @project_assignments ||= api.get_paged("users/me/project_assignments")
+          def pick!
+            prompt_project! if project_id.nil? || flags[:clean]
+            prompt_task!
           end
         end
       end

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

@@ -23,16 +23,11 @@ module Abt
 
           def projects
             @projects ||= begin
-              warn("Fetching projects...")
               project_assignments.map do |project_assignment|
                 project_assignment["project"].merge("client" => project_assignment["client"])
               end
             end
           end
-
-          def project_assignments
-            @project_assignments ||= api.get_paged("users/me/project_assignments")
-          end
         end
       end
     end

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

@@ -14,7 +14,7 @@ module Abt
           end
 
           def perform
-            require_project!
+            prompt_project! unless project_id
 
             tasks.each do |task|
               print_task(project, task)
@@ -23,26 +23,11 @@ module Abt
 
           private
 
-          def project
-            project_assignment["project"]
-          end
-
           def tasks
             @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 }
-            end
-          end
-
-          def project_assignments
-            @project_assignments ||= api.get_paged("users/me/project_assignments")
-          end
         end
       end
     end

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Harvest
+      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, :project_assignments
+
+          def initialize(cli:, project_assignments:)
+            @cli = cli
+            @project_assignments = project_assignments
+          end
+
+          def call
+            project = cli.prompt.search("Select a project", searchable_projects)["project"]
+
+            path = Path.from_ids(project_id: project["id"])
+
+            Result.new(project: project, path: path)
+          end
+
+          private
+
+          def searchable_projects
+            @searchable_projects ||= project_assignments.map do |project_assignment|
+              client = project_assignment["client"]
+              project = project_assignment["project"]
+
+              project_assignment.merge(
+                "name" => "#{client['name']} > #{project['name']}",
+                "project" => project
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Harvest
+      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, :project_assignment
+
+          def initialize(cli:, path:, project_assignment:)
+            @cli = cli
+            @path = path
+            @project_assignment = project_assignment
+          end
+
+          def call
+            task = cli.prompt.choice("Select a task from #{project['name']}", tasks)
+
+            path_with_task = Path.new([path, task["id"]].join("/"))
+
+            Result.new(task: task, path: path_with_task)
+          end
+
+          private
+
+          def project
+            project_assignment["project"]
+          end
+
+          def tasks
+            @tasks ||= project_assignment["task_assignments"].map { |ta| ta["task"] }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/abt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Abt
-  VERSION = "0.0.26"
+  VERSION = "0.0.27"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abt-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Jesper Sørensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -105,7 +105,6 @@ files:
 - "./lib/abt/providers/asana/commands/current.rb"
 - "./lib/abt/providers/asana/commands/finalize.rb"
 - "./lib/abt/providers/asana/commands/harvest_time_entry_data.rb"
-- "./lib/abt/providers/asana/commands/init.rb"
 - "./lib/abt/providers/asana/commands/pick.rb"
 - "./lib/abt/providers/asana/commands/projects.rb"
 - "./lib/abt/providers/asana/commands/share.rb"
@@ -113,6 +112,8 @@ files:
 - "./lib/abt/providers/asana/commands/tasks.rb"
 - "./lib/abt/providers/asana/configuration.rb"
 - "./lib/abt/providers/asana/path.rb"
+- "./lib/abt/providers/asana/services/project_picker.rb"
+- "./lib/abt/providers/asana/services/task_picker.rb"
 - "./lib/abt/providers/devops.rb"
 - "./lib/abt/providers/devops/api.rb"
 - "./lib/abt/providers/devops/base_command.rb"
@@ -121,12 +122,14 @@ files:
 - "./lib/abt/providers/devops/commands/clear.rb"
 - "./lib/abt/providers/devops/commands/current.rb"
 - "./lib/abt/providers/devops/commands/harvest_time_entry_data.rb"
-- "./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/configuration.rb"
 - "./lib/abt/providers/devops/path.rb"
+- "./lib/abt/providers/devops/services/board_picker.rb"
+- "./lib/abt/providers/devops/services/project_picker.rb"
+- "./lib/abt/providers/devops/services/work_item_picker.rb"
 - "./lib/abt/providers/git.rb"
 - "./lib/abt/providers/git/commands/branch.rb"
 - "./lib/abt/providers/harvest.rb"
@@ -134,7 +137,6 @@ files:
 - "./lib/abt/providers/harvest/base_command.rb"
 - "./lib/abt/providers/harvest/commands/clear.rb"
 - "./lib/abt/providers/harvest/commands/current.rb"
-- "./lib/abt/providers/harvest/commands/init.rb"
 - "./lib/abt/providers/harvest/commands/pick.rb"
 - "./lib/abt/providers/harvest/commands/projects.rb"
 - "./lib/abt/providers/harvest/commands/share.rb"
@@ -144,6 +146,8 @@ files:
 - "./lib/abt/providers/harvest/commands/track.rb"
 - "./lib/abt/providers/harvest/configuration.rb"
 - "./lib/abt/providers/harvest/path.rb"
+- "./lib/abt/providers/harvest/services/project_picker.rb"
+- "./lib/abt/providers/harvest/services/task_picker.rb"
 - "./lib/abt/version.rb"
 - bin/abt
 homepage: https://github.com/abtion/abt

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

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module Abt
-  module Providers
-    module Asana
-      module Commands
-        class Init < BaseCommand
-          def self.usage
-            "abt init asana"
-          end
-
-          def self.description
-            "Pick Asana project for current git repository"
-          end
-
-          def perform
-            require_local_config!
-
-            projects # Load projects up front to make it obvious that searches are instant
-            project = cli.prompt.search("Select a project", projects)
-
-            config.path = Path.from_ids(project_gid: project["gid"])
-
-            print_project(project)
-          end
-
-          private
-
-          def projects
-            @projects ||= begin
-              warn("Fetching projects...")
-              api.get_paged("projects",
-                            workspace: config.workspace_gid,
-                            archived: false,
-                            opt_fields: "name,permalink_url")
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-
-module Abt
-  module Providers
-    module Devops
-      module Commands
-        class Init < BaseCommand
-          AZURE_DEV_URL_REGEX = %r{^https://dev\.azure\.com/(?<organization>[^/]+)/(?<project>[^/]+)}.freeze
-          VS_URL_REGEX = %r{^https://(?<organization>[^.]+)\.visualstudio\.com/(?<project>[^/]+)}.freeze
-
-          def self.usage
-            "abt init devops"
-          end
-
-          def self.description
-            "Pick DevOps board for current git repository"
-          end
-
-          def perform
-            require_local_config!
-            board = cli.prompt.choice("Select a project work board", boards)
-
-            config.path = Path.from_ids(
-              organization_name: organization_name,
-              project_name: project_name,
-              board_id: board["id"]
-            )
-            print_board(organization_name, project_name, board)
-          end
-
-          private
-
-          def boards
-            @boards ||= api.get_paged("work/boards")
-          end
-
-          def project_name
-            @project_name ||= begin
-              if (match = AZURE_DEV_URL_REGEX.match(project_url)) ||
-                 (match = VS_URL_REGEX.match(project_url))
-                match[:project]
-              end
-            end
-          end
-
-          def organization_name
-            @organization_name ||= begin
-              if (match = AZURE_DEV_URL_REGEX.match(project_url)) ||
-                 (match = VS_URL_REGEX.match(project_url))
-                match[:organization]
-              end
-            end
-          end
-
-          def project_url
-            @project_url ||= begin
-              loop do
-                url = cli.prompt.text(project_url_prompt_text)
-
-                break url if AZURE_DEV_URL_REGEX =~ url || VS_URL_REGEX =~ url
-
-                warn("Invalid URL")
-              end
-            end
-          end
-
-          def project_url_prompt_text
-            <<~TXT
-              Please provide the URL for the devops project
-              For instance https://{organization}.visualstudio.com/{project} or https://dev.azure.com/{organization}/{project}
-
-              Enter URL
-            TXT
-          end
-        end
-      end
-    end
-  end
-end