abt-cli 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6355433a65cf9e49738ab971a8886e657cefff8d3a8322e44d140a18fa7a6be
-  data.tar.gz: f71c9909c3c8063f24365d80db1ae91223876be98cda4e6681a5f37e017af2ca
+  metadata.gz: f176b71200cc6fcc13ab56507e4d48234785e2307ab350afca7be13193ef2a5e
+  data.tar.gz: '093172885ed64949153cd73457748f446e012887f78d092f2483164f005fbfd0'
 SHA512:
-  metadata.gz: 809f27b09f6bbf41eefca395f95621b9bd7c48cb3f78cd5e7bf62c48a87895669fa74aebad4ea31fdee6ed484bf8944bb6216059b93066db2cfe118bc65c6e34
-  data.tar.gz: '032284e3f7e465618c2c039dbafa84855548bcee41d56725606fd2b48e58c008ba89010be8c25e78f714f3c1e16cc8a30f3e8021a0a5a531617dc0d54393ce1e'
+  metadata.gz: 6350132f05617d7e7222f0b7e07255091119ad0edac59277795c891668a6de4fb3ea9e376cdc93ab2672e130b5222d6ff310d80da8979dfaf060ff0e2479e447
+  data.tar.gz: 14eea7d7cb849f39d1aef4643df214541178d4f8702cecc962ffcff099b0c9143be68b8562aac0fdbc75b2bb2424872bd34661136104ac233df2097031d49394

data/lib/abt/cli.rb

@@ -8,10 +8,7 @@ module Abt
   class Cli
     class AbortError < StandardError; end
 
-    include Dialogs
-    include Io
-
-    attr_reader :command, :args, :input, :output, :err_output
+    attr_reader :command, :args, :input, :output, :err_output, :prompt
 
     def initialize(argv: ARGV, input: STDIN, output: STDOUT, err_output: STDERR)
       (@command, *@args) = argv
@@ -19,12 +16,13 @@ module Abt
       @input = input
       @output = output
       @err_output = err_output
+      @prompt = Abt::Cli::Prompt.new(output: err_output)
 
       @args += args_from_input unless input.isatty # Add piped arguments
     end
 
     def perform
-      handle_global_commands!
+      return if handle_global_commands!
 
       abort('No provider arguments') if args.empty?
 
@@ -37,6 +35,22 @@ module Abt
       output.puts command
     end
 
+    def warn(*args)
+      err_output.puts(*args)
+    end
+
+    def puts(*args)
+      output.puts(*args)
+    end
+
+    def print(*args)
+      output.print(*args)
+    end
+
+    def abort(message)
+      raise AbortError, message
+    end
+
     private
 
     def handle_global_commands! # rubocop:disable Metrics/MethodLength
@@ -44,21 +58,23 @@ module Abt
       when nil
         warn("No command specified\n\n")
         puts(Abt::Docs::Cli.content)
-        exit
+        true
       when '--help', '-h', 'help', 'commands'
         puts(Abt::Docs::Cli.content)
-        exit
+        true
       when 'help-md'
         puts(Abt::Docs::Markdown.content)
-        exit
+        true
       when '--version', '-v', 'version'
         puts(Abt::VERSION)
-        exit
+        true
+      else
+        false
       end
     end
 
     def args_from_input
-      input_string = input.read
+      input_string = input.read.strip
 
       abort 'No input from pipe' if input_string.nil? || input_string.empty?
 
@@ -85,7 +101,7 @@ module Abt
         used_providers << provider if process_provider_command(provider, command, arg_str)
       end
 
-      warn 'No matching providers found for command' if used_providers.empty? && output.isatty
+      abort 'No matching providers found for command' if used_providers.empty? && output.isatty
     end
 
     def process_provider_command(provider_name, command_name, arg_str)

data/lib/abt/cli/{dialogs.rb → prompt.rb}

@@ -2,35 +2,41 @@
 
 module Abt
   class Cli
-    module Dialogs
-      def prompt(question)
-        err_output.print "#{question}: "
-        read_user_input.strip
+    class Prompt
+      attr_reader :output
+
+      def initialize(output:)
+        @output = output
+      end
+
+      def text(question)
+        output.print "#{question}: "
+        read_user_input
       end
 
-      def prompt_boolean(text)
-        warn text
+      def boolean(text)
+        output.puts text
 
         loop do
-          err_output.print '(y / n): '
+          output.print '(y / n): '
 
-          case read_user_input.strip
+          case read_user_input
           when 'y', 'Y' then return true
           when 'n', 'N' then return false
           else
-            warn 'Invalid choice'
+            output.puts 'Invalid choice'
             next
           end
         end
       end
 
-      def prompt_choice(text, options, nil_option = false)
-        warn "#{text}:"
+      def choice(text, options, nil_option = false)
+        output.puts "#{text}:"
 
         if options.length.zero?
-          abort 'No available options' unless nil_option
+          raise AbortError, 'No available options' unless nil_option
 
-          warn 'No available options'
+          output.puts 'No available options'
           return nil
         end
 
@@ -42,7 +48,7 @@ module Abt
 
       def print_options(options)
         options.each_with_index do |option, index|
-          warn "(#{index + 1}) #{option['name']}"
+          output.puts "(#{index + 1}) #{option['name']}"
         end
       end
 
@@ -57,13 +63,16 @@ module Abt
 
           option = options[number - 1]
 
-          warn "Selected: (#{number}) #{option['name']}"
+          output.puts "Selected: (#{number}) #{option['name']}"
           return option
         end
       end
 
       def read_option_number(options_length, nil_option)
-        err_output.print "(1-#{options_length}#{nil_option_string(nil_option)}): "
+        output.print '('
+        output.print options_length > 1 ? "1-#{options_length}" : '1'
+        output.print nil_option_string(nil_option)
+        output.print '): '
 
         input = read_user_input
 
@@ -71,7 +80,7 @@ module Abt
 
         option_number = input.to_i
         if option_number <= 0 || option_number > options_length
-          warn 'Invalid selection'
+          output.puts 'Invalid selection'
           return nil
         end
 
@@ -98,7 +107,17 @@ module Abt
       end
 
       def read_user_input
-        open('/dev/tty', &:gets).strip
+        open(tty_path, &:gets).strip # rubocop:disable Security/Open
+      end
+
+      def tty_path
+        @tty_path ||= begin
+          candidates = ['/dev/tty', 'CON:'] # Unix: '/dev/tty', Windows: 'CON:'
+          selected = candidates.find { |candidate| File.exist?(candidate) }
+          raise AbortError, 'Unable to prompt for user input' if selected.nil?
+
+          selected
+        end
       end
     end
   end

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

@@ -45,11 +45,11 @@ module Abt
           end
 
           def name
-            @name ||= cli.prompt 'Enter task description'
+            @name ||= cli.prompt.text 'Enter task description'
           end
 
           def notes
-            @notes ||= cli.prompt 'Enter task notes'
+            @notes ||= cli.prompt.text 'Enter task notes'
           end
 
           def project
@@ -57,7 +57,7 @@ module Abt
           end
 
           def section
-            @section ||= cli.prompt_choice 'Add to section?', sections, ['q', 'Don\'t add to section']
+            @section ||= cli.prompt.choice 'Add to section?', sections, ['q', 'Don\'t add to section']
           end
 
           def sections

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

@@ -35,14 +35,14 @@ module Abt
             cli.warn 'Select a project'
 
             loop do
-              matches = matches_for_string cli.prompt('Enter search')
+              matches = matches_for_string cli.prompt.text('Enter search')
               if matches.empty?
                 cli.warn 'No matches'
                 next
               end
 
               cli.warn 'Showing the 10 first matches' if matches.size > 10
-              choice = cli.prompt_choice 'Select a project', matches[0...10], true
+              choice = cli.prompt.choice 'Select a project', matches[0...10], true
               break choice unless choice.nil?
             end
           end

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

@@ -35,7 +35,7 @@ module Abt
 
           def select_task
             loop do
-              section = cli.prompt_choice 'Which section?', sections
+              section = cli.prompt.choice 'Which section?', sections
               cli.warn 'Fetching tasks...'
               tasks = tasks_in_section(section)
 
@@ -44,7 +44,7 @@ module Abt
                 next
               end
 
-              task = cli.prompt_choice 'Select a task', tasks, true
+              task = cli.prompt.choice 'Select a task', tasks, true
               return task if task
             end
           end

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

@@ -29,7 +29,7 @@ module Abt
             return if same_args_as_config?
             return unless config.local_available?
 
-            should_override = cli.prompt_boolean 'Set selected task as current?'
+            should_override = cli.prompt.boolean 'Set selected task as current?'
             Current.new(arg_str: arg_str, cli: cli).call if should_override
           end
 
@@ -41,7 +41,7 @@ module Abt
               update_assignee
             elsif current_assignee['gid'] == current_user['gid']
               cli.warn 'You are already assigned to this task'
-            elsif cli.prompt_boolean "Task is assigned to: #{current_assignee['name']}, take over?"
+            elsif cli.prompt.boolean "Task is assigned to: #{current_assignee['name']}, take over?"
               cli.warn "Reassigning task to user: #{current_user['name']}"
               update_assignee
             end

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

@@ -76,7 +76,7 @@ module Abt
         def access_token
           return git.global['accessToken'] unless git.global['accessToken'].nil?
 
-          git.global['accessToken'] = cli.prompt([
+          git.global['accessToken'] = cli.prompt.text([
             'Please provide your personal access token for Asana.',
             'If you don\'t have one, create one here: https://app.asana.com/0/developer-console',
             '',
@@ -103,7 +103,7 @@ module Abt
         def prompt_section(message)
           cli.warn 'Fetching sections...'
           sections = api.get_paged("projects/#{project_gid}/sections")
-          cli.prompt_choice(message, sections)
+          cli.prompt.choice(message, sections)
         end
 
         def prompt_workspace
@@ -115,7 +115,7 @@ module Abt
             workspace = workspaces.first
             cli.warn "Selected Asana workspace #{workspace['name']}"
           else
-            workspace = cli.prompt_choice('Select Asana workspace', workspaces)
+            workspace = cli.prompt.choice('Select Asana workspace', workspaces)
           end
 
           git.global['workspaceGid'] = workspace['gid']

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

@@ -22,7 +22,7 @@ module Abt
             @organization_name = config.organization_name = organization_name_from_url
             @project_name = config.project_name = project_name_from_url
 
-            board = cli.prompt_choice 'Select a project work board', boards
+            board = cli.prompt.choice 'Select a project work board', boards
 
             config.board_id = board['id']
 
@@ -52,7 +52,7 @@ module Abt
           def project_url
             @project_url ||= begin
               loop do
-                url = cli.prompt([
+                url = cli.prompt.text([
                   'Please provide the URL for the devops project',
                   'For instance https://{organization}.visualstudio.com/{project} or https://dev.azure.com/{organization}/{project}',
                   '',

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

@@ -37,7 +37,7 @@ module Abt
 
           def select_work_item
             loop do
-              column = cli.prompt_choice 'Which column?', columns
+              column = cli.prompt.choice 'Which column?', columns
               cli.warn 'Fetching work items...'
               work_items = work_items_in_column(column)
 
@@ -46,7 +46,7 @@ module Abt
                 next
               end
 
-              work_item = cli.prompt_choice 'Select a work item', work_items, true
+              work_item = cli.prompt.choice 'Select a work item', work_items, true
               return work_item if work_item
             end
           end

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

@@ -78,7 +78,7 @@ module Abt
 
           return git.global[username_key] unless git.global[username_key].nil?
 
-          git.global[username_key] = cli.prompt([
+          git.global[username_key] = cli.prompt.text([
             "Please provide your username for the DevOps organization (#{organization_name}).",
             '',
             'Enter username'
@@ -90,7 +90,7 @@ module Abt
 
           return git.global[access_token_key] unless git.global[access_token_key].nil?
 
-          git.global[access_token_key] = cli.prompt([
+          git.global[access_token_key] = cli.prompt.text([
             "Please provide your personal access token for the DevOps organization (#{organization_name}).",
             'If you don\'t have one, follow the guide here: https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate',
             '',

data/lib/abt/providers/git/commands/branch.rb

@@ -36,7 +36,7 @@ module Abt
 
           def create_and_switch
             cli.warn "No such branch: #{branch_name}"
-            cli.abort('Aborting') unless cli.prompt_boolean 'Create branch?'
+            cli.abort('Aborting') unless cli.prompt.boolean 'Create branch?'
 
             Open3.popen3("git switch -c #{branch_name}") do |_i, _o, _e, thread|
               thread.value

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

@@ -31,14 +31,14 @@ module Abt
             cli.warn 'Select a project'
 
             loop do
-              matches = matches_for_string cli.prompt('Enter search')
+              matches = matches_for_string cli.prompt.text('Enter search')
               if matches.empty?
                 warn 'No matches'
                 next
               end
 
               cli.warn 'Showing the 10 first matches' if matches.size > 10
-              choice = cli.prompt_choice 'Select a project', matches[0...10], true
+              choice = cli.prompt.choice 'Select a project', matches[0...10], true
               break choice['project'] unless choice.nil?
             end
           end

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

@@ -18,7 +18,7 @@ module Abt
             require_project!
 
             cli.warn project['name']
-            task = cli.prompt_choice 'Select a task', tasks
+            task = cli.prompt.choice 'Select a task', tasks
 
             config.project_id = project_id # We might have gotten the project ID as an argument
             config.task_id = task['id']

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

@@ -44,7 +44,7 @@ module Abt
             return if arg_str.nil?
             return if same_args_as_config?
             return unless config.local_available?
-            return unless cli.prompt_boolean 'Set selected task as current?'
+            return unless cli.prompt.boolean 'Set selected task as current?'
 
             input = StringIO.new("harvest:#{project_id}/#{task_id}")
             output = StringIO.new

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

@@ -41,7 +41,7 @@ module Abt
               body.merge! external_link_data
             else
               cli.warn 'No external link provided'
-              body[:notes] ||= cli.prompt('Fill in comment (optional)')
+              body[:notes] ||= cli.prompt.text('Fill in comment (optional)')
             end
 
             api.post('time_entries', Oj.dump(body, mode: :json))

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

@@ -53,7 +53,7 @@ module Abt
         def access_token
           return git.global['accessToken'] unless git.global['accessToken'].nil?
 
-          git.global['accessToken'] = cli.prompt([
+          git.global['accessToken'] = cli.prompt.text([
             'Please provide your personal access token for Harvest.',
             'If you don\'t have one, create one here: https://id.getharvest.com/developers',
             '',
@@ -64,7 +64,7 @@ module Abt
         def account_id
           return git.global['accountId'] unless git.global['accountId'].nil?
 
-          git.global['accountId'] = cli.prompt([
+          git.global['accountId'] = cli.prompt.text([
             'Please provide harvest account id.',
             'This information is shown next to your generated access token',
             '',

data/lib/abt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abt-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Jesper Sørensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -76,8 +76,7 @@ extra_rdoc_files: []
 files:
 - "./lib/abt.rb"
 - "./lib/abt/cli.rb"
-- "./lib/abt/cli/dialogs.rb"
-- "./lib/abt/cli/io.rb"
+- "./lib/abt/cli/prompt.rb"
 - "./lib/abt/docs.rb"
 - "./lib/abt/docs/cli.rb"
 - "./lib/abt/docs/markdown.rb"

data/lib/abt/cli/io.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Abt
-  class Cli
-    module Io
-      def warn(*args)
-        err_output.puts(*args)
-      end
-
-      def puts(*args)
-        output.puts(*args)
-      end
-
-      def print(*args)
-        output.print(*args)
-      end
-
-      def abort(message)
-        raise AbortError, message
-      end
-    end
-  end
-end