abt-cli 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b21c8f210a7c29d5f43ef7c756cfdcc7d8ef2b13ef4dcaef1cec4f8bf2297a1
-  data.tar.gz: f7586aa063494d796ded7c2e8696d9bf834e24be3004c621408e2fdd58f9b516
+  metadata.gz: 3af480b982ad0feef367f157d2658f5dd7a3059de13f7098ff267fd06b53fd47
+  data.tar.gz: 15b6177165d60fa0bc76c0ac201755d9fb987c62b98e97784ebd2eb5748f12bf
 SHA512:
-  metadata.gz: b9d5278daeec2067937212108eb0ba478c1ec80d45c14a94025f7d6d83c5a30c4cdb716d010a4dfc807166165cd04af8e7962ec2b776f9f2fb7feee7edb65194
-  data.tar.gz: 2faba55f9dcf4ee66f82a77b647fe367fbebeb74c70fde23edd6543ad83ce1f995bdeb01673555219c498a971919e0b2fd0ec1f8362484f56ba6a54a2b65503c
+  metadata.gz: 9eb5c49b996574004c1abffffad6aef76e3bc8ad7ea3fcbf0e05e2b0b33788d01cd041e031f5e98c85b86b7aee442ce8b2ac11995944a1e8d8674053736a6f9b
+  data.tar.gz: 16278e95b9d5e25a7b2fb7dc931e140b732638ce767e99b20a9b7b442a560b6e56abf982f42a65b7dd97973d58332854915421d26cac686a8af8965a0dcaa148

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/providers/devops/commands/pick.rb

@@ -53,10 +53,22 @@ module Abt
               warn("Section is empty")
               select_work_item
             else
-              cli.prompt.choice("Select a work item", work_items, nil_option: true) || select_work_item
+              prompt_work_item(work_items) || select_work_item
             end
           end
 
+          def prompt_work_item(work_items)
+            options = work_items.map do |work_item|
+              {
+                "id" => work_item["id"],
+                "name" => "##{work_item['id']} #{work_item['name']}"
+              }
+            end
+
+            choice = cli.prompt.choice("Select a work item", options, nil_option: true)
+            choice && work_items.find { |work_item| work_item["id"] == choice["id"] }
+          end
+
           def work_items_in_column(column)
             work_items = api.work_item_query(
               <<~WIQL

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

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

data/lib/abt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abt-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Jesper Sørensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector