abt-cli 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cc34f7579a887a49ae83db56c8b3808a0e00b09c55631f9b4224228477a0762
-  data.tar.gz: 9c26a06c3af53ebe55ca5e53f93b5d6d73854962daebef31d131000657be1c63
+  metadata.gz: 4f1631b9069ca5094ba301eb3ccc5cf42da8e48a85b2678e8499cea1e9e4551c
+  data.tar.gz: cd9dc57e8a6276de5a2bca61e59fb537bc8887901615d7ec86f2c4a59145f76c
 SHA512:
-  metadata.gz: 4fe10297a130b747d93dc1398bdf404996d5c07987680deac59a5365d6893ab3d0466ebd764ef087f5eb2409b99a7733dc55a869432d81286f3460ec510d247d
-  data.tar.gz: 3684a1d3113f9df06637a6c7294f334b48e2c8cd5e54d4334c1ec1884571519f6e5aedeec327d8292f5364d1251453d6a7a8131074f91b2f94935b7a3586ddb9
+  metadata.gz: bdca57213f85db7a3604ac1a5ed50a16a2918fded5b3b3e090e52aeb184414345d7609f08ef5145f205cf3fb9f1576f9e0aaa6b25a2e41684cfd506bed19e851
+  data.tar.gz: d7eb95a22516aa0f894262e0a1b52ee659736b88775936040a87db03260711e12dbc6764674799b5d2f8bdb86cb14495f01440a0703d300759c3482db17a810a

data/lib/abt/cli/dialogs.rb

@@ -24,18 +24,18 @@ module Abt
         end
       end
 
-      def prompt_choice(text, options, allow_back_option = false)
+      def prompt_choice(text, options, nil_option = false)
         warn "#{text}:"
 
         if options.length.zero?
-          abort 'No available options' unless allow_back_option
+          abort 'No available options' unless nil_option
 
           warn 'No available options'
           return nil
         end
 
         print_options(options)
-        select_options(options, allow_back_option)
+        select_options(options, nil_option)
       end
 
       private
@@ -46,11 +46,11 @@ module Abt
         end
       end
 
-      def select_options(options, allow_back_option)
+      def select_options(options, nil_option)
         loop do
-          number = read_option_number(options.length, allow_back_option)
+          number = read_option_number(options.length, nil_option)
           if number.nil?
-            return nil if allow_back_option
+            return nil if nil_option
 
             next
           end
@@ -62,12 +62,12 @@ module Abt
         end
       end
 
-      def read_option_number(options_length, allow_back_option)
-        err_output.print "(1-#{options_length}#{allow_back_option ? ', q: back' : ''}): "
+      def read_option_number(options_length, nil_option)
+        err_output.print "(1-#{options_length}#{nil_option_string(nil_option)}): "
 
         input = read_user_input
 
-        return nil if allow_back_option && input == 'q'
+        return nil if nil_option && input == nil_option_character(nil_option)
 
         option_number = input.to_i
         if option_number <= 0 || option_number > options_length
@@ -78,6 +78,25 @@ module Abt
         option_number
       end
 
+      def nil_option_string(nil_option)
+        return '' unless nil_option
+
+        ", #{nil_option_character(nil_option)}: #{nil_option_description(nil_option)}"
+      end
+
+      def nil_option_character(nil_option)
+        return 'q' if nil_option == true
+
+        nil_option[0]
+      end
+
+      def nil_option_description(nil_option)
+        return 'back' if nil_option == true
+        return nil_option if nil_option.is_a?(String)
+
+        nil_option[1]
+      end
+
       def read_user_input
         open('/dev/tty', &:gets).strip
       end

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

@@ -20,6 +20,17 @@ module Abt
 
         private
 
+        def require_project!
+          cli.abort 'No current/specified project. Did you initialize Asana?' if project_gid.nil?
+        end
+
+        def require_task!
+          if project_gid.nil?
+            cli.abort 'No current/specified project. Did you initialize Asana and pick a task?'
+          end
+          cli.abort 'No current/specified task. Did you pick an Asana task?' if task_gid.nil?
+        end
+
         def same_args_as_config?
           project_gid == config.project_gid && task_gid == config.task_gid
         end

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

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Asana
+      module Commands
+        class Add < BaseCommand
+          def self.command
+            'add asana[:<project-gid>]'
+          end
+
+          def self.description
+            'Create a new task for the current/specified Asana project'
+          end
+
+          def call
+            require_project!
+
+            task
+            print_task(project, task)
+
+            move_task if section
+          end
+
+          private
+
+          def task
+            @task ||= begin
+              body = {
+                data: {
+                  name: name,
+                  notes: notes,
+                  projects: [project_gid]
+                }
+              }
+              cli.warn 'Creating task'
+              api.post('tasks', Oj.dump(body, mode: :json))
+            end
+          end
+
+          def move_task
+            body = { data: { task: task['gid'] } }
+            body_json = Oj.dump(body, mode: :json)
+            api.post("sections/#{section['gid']}/addTask", body_json)
+          end
+
+          def name
+            @name ||= cli.prompt 'Enter task description'
+          end
+
+          def notes
+            @notes ||= cli.prompt 'Enter task notes'
+          end
+
+          def project
+            @project ||= api.get("projects/#{project_gid}")
+          end
+
+          def section
+            @section ||= cli.prompt_choice 'Add to section?', sections, ['q', 'Don\'t add to section']
+          end
+
+          def sections
+            @sections ||= begin
+              cli.warn 'Fetching sections...'
+              api.get_paged("projects/#{project_gid}/sections", opt_fields: 'name')
+                          rescue Abt::HttpError::HttpError
+                            []
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -14,6 +14,8 @@ module Abt
           end
 
           def call
+            require_project!
+
             if same_args_as_config? || !config.local_available?
               show_current_configuration
             else
@@ -25,9 +27,7 @@ module Abt
           private
 
           def show_current_configuration
-            if project_gid.nil?
-              cli.warn 'No project selected'
-            elsif task_gid.nil?
+            if task_gid.nil?
               print_project(project)
             else
               print_task(project, task)

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

@@ -17,7 +17,7 @@ module Abt
             unless config.local_available?
               cli.abort 'This is a no-op for tasks outside the current project'
             end
-            cli.abort 'No current or specified task' if task.nil?
+            require_task!
             print_task(project_gid, task)
 
             if task_already_in_finalized_section?

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

@@ -14,6 +14,7 @@ module Abt
           end
 
           def call
+            require_task!
             ensure_current_is_valid!
 
             body = {

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

@@ -15,6 +15,7 @@ module Abt
 
           def call
             cli.abort 'Must be run inside a git repository' unless config.local_available?
+            require_project!
 
             cli.warn project['name']
 

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

@@ -14,9 +14,9 @@ module Abt
           end
 
           def call
-            if project_gid.nil?
-              cli.warn 'No project selected'
-            elsif task_gid.nil?
+            require_project!
+
+            if task_gid.nil?
               cli.print_provider_command('asana', project_gid)
             else
               cli.print_provider_command('asana', "#{project_gid}/#{task_gid}")

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

@@ -14,7 +14,7 @@ module Abt
           end
 
           def call
-            abort 'No current/provided task' if task_gid.nil?
+            require_task!
 
             maybe_override_current_task
 

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

@@ -14,6 +14,8 @@ module Abt
           end
 
           def call
+            require_project!
+
             tasks.each do |task|
               print_task(project, task)
             end

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

@@ -28,6 +28,18 @@ module Abt
           # TODO: Loop if necessary
         end
 
+        def work_item_query(wiql)
+          response = post('wit/wiql', Oj.dump({ query: wiql }, mode: :json))
+          ids = response['workItems'].map { |work_item| work_item['id'] }
+
+          work_items = []
+          ids.each_slice(200) do |page_ids|
+            work_items += get_paged('wit/workitems', ids: page_ids.join(','))
+          end
+
+          work_items
+        end
+
         def request(*args)
           response = connection.public_send(*args)
 

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

@@ -21,6 +21,22 @@ module Abt
 
         private
 
+        def require_board!
+          return if organization_name && project_name && board_id
+
+          cli.abort 'No current/specified board. Did you initialize DevOps?'
+        end
+
+        def require_work_item!
+          unless organization_name && project_name && board_id
+            cli.abort 'No current/specified board. Did you initialize DevOps and pick a work item?'
+          end
+
+          return if work_item_id
+
+          cli.abort 'No current/specified work item. Did you pick a DevOps work item?'
+        end
+
         def sanitize_work_item(work_item)
           return nil if work_item.nil?
 

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Devops
+      module Commands
+        class Boards < BaseCommand
+          def self.command
+            'boards devops'
+          end
+
+          def self.description
+            'List all boards - useful for piping into grep etc'
+          end
+
+          def call
+            cli.abort 'No organization selected. Did you initialize DevOps?' if organization_name.nil?
+            cli.abort 'No project selected. Did you initialize DevOps?' if project_name.nil?
+
+            boards.map do |board|
+              print_board(organization_name, project_name, board)
+            end
+          end
+
+          private
+
+          def boards
+            @boards ||= api.get_paged('work/boards')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -14,6 +14,8 @@ module Abt
           end
 
           def call
+            require_board!
+
             if same_args_as_config? || !config.local_available?
               show_current_configuration
             else
@@ -25,13 +27,7 @@ module Abt
           private
 
           def show_current_configuration
-            if organization_name.nil?
-              cli.warn 'No organization selected'
-            elsif project_name.nil?
-              cli.warn 'No project selected'
-            elsif board_id.nil?
-              cli.warn 'No board selected'
-            elsif work_item_id.nil?
+            if work_item_id.nil?
               print_board(organization_name, project_name, board)
             else
               print_work_item(organization_name, project_name, board, work_item)

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

@@ -14,6 +14,8 @@ module Abt
           end
 
           def call
+            require_work_item!
+
             body = {
               notes: notes,
               external_reference: {

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

@@ -15,22 +15,26 @@ module Abt
 
           def call
             cli.abort 'Must be run inside a git repository' unless config.local_available?
+            require_board!
 
             cli.warn "#{project_name} - #{board['name']}"
 
             work_item = select_work_item
 
-            # We might have gotten org, project, board as arg str
-            config.organization_name = organization_name
-            config.project_name = project_name
-            config.board_id = board_id
-            config.work_item_id = work_item['id']
+            update_config!(work_item)
 
             print_work_item(organization_name, project_name, board, work_item)
           end
 
           private
 
+          def update_config!(work_item)
+            config.organization_name = organization_name
+            config.project_name = project_name
+            config.board_id = board_id
+            config.work_item_id = work_item['id']
+          end
+
           def select_work_item
             loop do
               column = cli.prompt_choice 'Which column?', columns
@@ -48,16 +52,14 @@ module Abt
           end
 
           def work_items_in_column(column)
-            wiql = <<~WIQL
-              SELECT [System.Id]
-              FROM WorkItems
-              WHERE [System.BoardColumn] = '#{column['name']}'
-              ORDER BY [Microsoft.VSTS.Common.BacklogPriority] ASC
-            WIQL
-
-            response = api.post('wit/wiql', Oj.dump({ query: wiql }, mode: :json))
-            ids = response['workItems'].map { |work_item| work_item['id'] }
-            work_items = api.get_paged('wit/workitems', ids: ids.join(','))
+            work_items = api.work_item_query(
+              <<~WIQL
+                SELECT [System.Id]
+                FROM WorkItems
+                WHERE [System.BoardColumn] = '#{column['name']}'
+                ORDER BY [Microsoft.VSTS.Common.BacklogPriority] ASC
+              WIQL
+            )
 
             work_items.map { |work_item| sanitize_work_item(work_item) }
           end

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

@@ -14,16 +14,10 @@ module Abt
           end
 
           def call
-            if organization_name.nil?
-              cli.warn 'No organization selected'
-            elsif project_name.nil?
-              cli.warn 'No project selected'
-            elsif board_id.nil?
-              cli.warn 'No board selected'
-            else
-              args = [organization_name, project_name, board_id, work_item_id].compact
-              cli.print_provider_command('devops', args.join('/'))
-            end
+            require_work_item!
+
+            args = [organization_name, project_name, board_id, work_item_id].compact
+            cli.print_provider_command('devops', args.join('/'))
           end
         end
       end

data/lib/abt/providers/devops/commands/work-items.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Devops
+      module Commands
+        class WorkItems < BaseCommand
+          def self.command
+            'work-items devops'
+          end
+
+          def self.description
+            'List all work items on board - useful for piping into grep etc.'
+          end
+
+          def call
+            require_board!
+
+            work_items.each do |work_item|
+              print_work_item(organization_name, project_name, board, work_item)
+            end
+          end
+
+          private
+
+          def work_items
+            @work_items ||= begin
+              cli.warn 'Fetching work items...'
+              api.work_item_query(
+                <<~WIQL
+                  SELECT [System.Id]
+                  FROM WorkItems
+                  ORDER BY [System.Title] ASC
+                WIQL
+              ).map { |work_item| sanitize_work_item(work_item) }
+            end
+          end
+
+          def board
+            @board ||= api.get("work/boards/#{board_id}")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -20,6 +20,17 @@ module Abt
 
         private
 
+        def require_project!
+          cli.abort 'No current/specified project. Did you initialize Harvest?' if project_id.nil?
+        end
+
+        def require_task!
+          if project_id.nil?
+            cli.abort 'No current/specified project. Did you initialize Harvest and pick a task?'
+          end
+          cli.abort 'No current/specified task. Did you pick a Harvest task?' if task_id.nil?
+        end
+
         def same_args_as_config?
           project_id == config.project_id && task_id == config.task_id
         end

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

@@ -14,6 +14,8 @@ module Abt
           end
 
           def call
+            require_project!
+
             if same_args_as_config? || !config.local_available?
               show_current_configuration
             else
@@ -25,9 +27,7 @@ module Abt
           private
 
           def show_current_configuration
-            if project_id.nil?
-              cli.warn 'No project selected'
-            elsif task_id.nil?
+            if task_id.nil?
               print_project(project)
             else
               print_task(project, task)

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

@@ -15,6 +15,7 @@ module Abt
 
           def call
             cli.abort 'Must be run inside a git repository' unless config.local_available?
+            require_project!
 
             cli.warn project['name']
             task = cli.prompt_choice 'Select a task', tasks

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

@@ -37,9 +37,7 @@ module Abt
             output = StringIO.new
             Abt::Cli.new(argv: ['track'], output: output, input: input).perform
 
-            output_str = output.string.strip
-            cli.abort 'No task provided' if output_str.empty?
-            output_str
+            output.string.strip
           end
 
           def maybe_override_current_task

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

@@ -14,6 +14,8 @@ module Abt
           end
 
           def call
+            require_project!
+
             tasks.each do |task|
               print_task(project, task)
             end

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

@@ -14,8 +14,7 @@ module Abt
           end
 
           def call
-            abort 'No current/provided task' if task_id.nil?
-            cli.abort('No task selected') if task_id.nil?
+            require_task!
 
             print_task(created_time_entry['project'], created_time_entry['task'])
 

data/lib/abt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Abt
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abt-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Jesper Sørensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-29 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -88,6 +88,7 @@ files:
 - "./lib/abt/providers/asana.rb"
 - "./lib/abt/providers/asana/api.rb"
 - "./lib/abt/providers/asana/base_command.rb"
+- "./lib/abt/providers/asana/commands/add.rb"
 - "./lib/abt/providers/asana/commands/clear.rb"
 - "./lib/abt/providers/asana/commands/clear_global.rb"
 - "./lib/abt/providers/asana/commands/current.rb"
@@ -103,6 +104,7 @@ files:
 - "./lib/abt/providers/devops.rb"
 - "./lib/abt/providers/devops/api.rb"
 - "./lib/abt/providers/devops/base_command.rb"
+- "./lib/abt/providers/devops/commands/boards.rb"
 - "./lib/abt/providers/devops/commands/clear.rb"
 - "./lib/abt/providers/devops/commands/clear_global.rb"
 - "./lib/abt/providers/devops/commands/current.rb"
@@ -110,6 +112,7 @@ files:
 - "./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/harvest.rb"
 - "./lib/abt/providers/harvest/api.rb"