prompts 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40fa96bdb16258c1e9612971eeea11a1757e82cdbc68e6084000c26c96f2d86c
-  data.tar.gz: b7a7daee831ca3473aa043bfe0b1f94aff8f12a9aa8e2fa4acdb6a4a75fb0634
+  metadata.gz: 3105477fb552d35423f55db2fd9dc67d0187e0ef02fc1ef6e7f1394405787c00
+  data.tar.gz: cb9a0a8a247e329fd75f3af7e01c38cbe57b0fdc9f3c584eb310527b6dd51e2b
 SHA512:
-  metadata.gz: fb8c9184e577f2e7b9f6c003407e028ee1613db35ee288c0ac914d5a8464f3c2135e22d4e280aab7233aa52418f60fed3ca6cf05c37d4c6907ef5937099f1445
-  data.tar.gz: cd5e4cb5512224d68c825b28f67398f5366d0d8a5a1026523c3cc431b44efea1ddef5fdb969832af49b2158dc1bb3e94b6a98cb8781c9422c324f02ebbce16c3
+  metadata.gz: d6d7e0a75213bbb99c10103b7069ff5be9e4e9113214d800ddc61567a90f4b6f5590c1c9e1cfbe003457d65827650b46ca149187c4fbad312bc5980a7c12c235
+  data.tar.gz: 3bbc31709a1eb187dd00b73f70bae8edf829360db4b6cc0a0b275ae01b9c188645b4559afb45fc05ff7232475cb55ebbd223b1f8fa9416175e2ff732029a2e97

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [Unreleased]
 
+## [0.3.1] - 2024-10-08
+
+- Keep past frames in the terminal window ([@fractaledmind](https://github.com/fractaledmind/prompts/pull/10))
+- Allow users to specify a new for form fields ([@fractaledmind](https://github.com/fractaledmind/prompts/pull/11))
+
+## [0.3.0] - 2024-10-08
+
+- Update `fmt` gem and use new syntax ([@KonnorRogers](https://github.com/fractaledmind/prompts/pull/9))
+
 ## [0.2.1] - 2024-08-22
 
 - Add `Form.submit` method

data/lib/prompts/box.rb

@@ -55,16 +55,16 @@ module Prompts
 
     def top_border
       border = @border_parts[:top_left] + @border_parts[:horizontal] * (@width - 2) + @border_parts[:top_right]
-      Fmt("#{@line_padding}%{border}#{@border_color}", border: border)
+      Fmt("#{@line_padding}%{border}|>#{@border_color}", border: border)
     end
 
     def bottom_border
       border = @border_parts[:bottom_left] + @border_parts[:horizontal] * (@width - 2) + @border_parts[:bottom_right]
-      Fmt("#{@line_padding}%{border}#{@border_color}", border: border)
+      Fmt("#{@line_padding}%{border}|>#{@border_color}", border: border)
     end
 
     def align(text, alignment, between: @border_parts[:vertical])
-      formatted_boundary = Fmt("%{boundary}#{@border_color}", boundary: between)
+      formatted_boundary = Fmt("%{boundary}|>#{@border_color}", boundary: between)
       wrap_text(text, width: @width, line_prefix: formatted_boundary + SPACE, line_suffix: SPACE + formatted_boundary, alignment: alignment)
     end
   end

data/lib/prompts/content.rb

@@ -64,7 +64,7 @@ module Prompts
     end
 
     def erase_down
-      OUTPUT.print "\e[J"
+      OUTPUT.print "\e[2J\e[H"
     end
   end
 end

data/lib/prompts/form.rb

@@ -3,15 +3,16 @@
 module Prompts
   class Form
     def self.submit(&block)
-      instance = new()
-      yield instance if block_given?
+      instance = new
+      yield instance if block
       instance.submit
     end
 
     def initialize
       @content = Prompts::Content.new
-      @prompts = []
-      @results = []
+      @index = 0
+      @prompts = {}
+      @results = {}
     end
 
     def content(&block)
@@ -19,37 +20,41 @@ module Prompts
       @content
     end
 
-    def text(label: nil, prompt: "> ", hint: nil, default: nil, required: false, validate: nil, &block)
+    def text(label: nil, prompt: "> ", hint: nil, default: nil, required: false, validate: nil, name: nil, &block)
       prompt = TextPrompt.new(label: label, prompt: prompt, hint: hint, default: default, required: required, validate: validate)
-      yield(prompt) if block_given?
+      yield(prompt) if block
       prepend_form_content_to_prompt(prompt)
-      @prompts << prompt
+      key = name || (@index += 1)
+      @prompts[key] = prompt
     end
 
-    def select(label: nil, options: nil, prompt: "> ", hint: nil, default: nil, validate: nil, &block)
+    def select(label: nil, options: nil, prompt: "> ", hint: nil, default: nil, validate: nil, name: nil, &block)
       prompt = SelectPrompt.new(label: label, options: options, prompt: prompt, hint: hint, default: default, validate: validate)
-      yield(prompt) if block_given?
+      yield(prompt) if block
       prepend_form_content_to_prompt(prompt)
-      @prompts << prompt
+      key = name || (@index += 1)
+      @prompts[key] = prompt
     end
 
-    def pause(label: nil, prompt: "> ", hint: nil, default: nil, required: false, validate: nil, &block)
+    def pause(label: nil, prompt: "> ", hint: nil, default: nil, required: false, validate: nil, name: nil, &block)
       prompt = PausePrompt.new(label: label, prompt: prompt, hint: hint, default: default, required: required, validate: validate)
-      yield(prompt) if block_given?
+      yield(prompt) if block
       prepend_form_content_to_prompt(prompt)
-      @prompts << prompt
+      key = name || (@index += 1)
+      @prompts[key] = prompt
     end
 
-    def confirm(label: nil, prompt: "> ", hint: nil, default: nil, required: false, validate: nil, &block)
+    def confirm(label: nil, prompt: "> ", hint: nil, default: nil, required: false, validate: nil, name: nil, &block)
       prompt = ConfirmPrompt.new(label: label, prompt: prompt, hint: hint, default: default, required: required, validate: validate)
-      yield(prompt) if block_given?
+      yield(prompt) if block
       prepend_form_content_to_prompt(prompt)
-      @prompts << prompt
+      key = name || (@index += 1)
+      @prompts[key] = prompt
     end
 
     def submit
-      @prompts.each do |prompt|
-        @results << prompt.ask
+      @prompts.each do |key, prompt|
+        @results[key] = prompt.ask
       end
       @results
     end
@@ -58,7 +63,7 @@ module Prompts
 
     def prepend_form_content_to_prompt(prompt)
       prompt.prepare_content
-      @content.gap
+      prompt.prepend_content([SPACE])
       prompt.prepend_content(*@content.slots)
     end
   end

data/lib/prompts/prompt.rb

@@ -61,7 +61,7 @@ module Prompts
 
         if (@error = ensure_validity(response))
           @content.reset!
-          @content.paragraph Fmt("%{error}red|bold", error: @error + " Try again (×#{@attempts})...")
+          @content.paragraph Fmt("%{error}|>red|>bold", error: @error + " Try again (×#{@attempts})...")
           @attempts += 1
           next
         else
@@ -114,20 +114,20 @@ module Prompts
 
     def formatted_prompt
       prompt_with_space = @prompt.end_with?(SPACE) ? @prompt : @prompt + SPACE
-      ansi_prompt = Fmt("%{prompt}faint|bold", prompt: prompt_with_space)
+      ansi_prompt = Fmt("%{prompt}|>faint|>bold", prompt: prompt_with_space)
       @formatted_prompt ||= Paragraph.new(ansi_prompt, width: MAX_WIDTH).lines
     end
 
     def formatted_label
-      Fmt("%{label}cyan|bold %{instructions}faint|italic", label: @label, instructions: @instructions ? "(#{@instructions})" : "")
+      Fmt("%{label}|>cyan|>bold %{instructions}|>faint|>italic", label: @label, instructions: @instructions ? "(#{@instructions})" : "")
     end
 
     def formatted_hint
-      Fmt("%{hint}faint|bold", hint: @hint)
+      Fmt("%{hint}|>faint|>bold", hint: @hint)
     end
 
     def formatted_error
-      Fmt("%{error}red|bold", error: @error + " Try again (×#{@attempts})...")
+      Fmt("%{error}|>red|>bold", error: @error + " Try again (×#{@attempts})...")
     end
 
     def ensure_validity(response)

data/lib/prompts/select_prompt.rb

@@ -29,7 +29,7 @@ module Prompts
     def prepare_content
       super
       @options.each_with_index do |(key, value), index|
-        @content.paragraph Fmt("%{prefix}faint|bold %{option}", prefix: "#{index + 1}.", option: value)
+        @content.paragraph Fmt("%{prefix}|>faint|>bold %{option}", prefix: "#{index + 1}.", option: value)
       end
       @content
     end

data/lib/prompts/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Prompts
-  VERSION = "0.2.1"
+  VERSION = "0.3.1"
 end

data/lib/prompts.rb

@@ -2,10 +2,8 @@
 
 require "io/console"
 require "reline"
+require "rainbow" # this needs to come before require "fmt"
 require "fmt"
-require "rainbow"
-
-Fmt.add_rainbow_filters
 
 require_relative "prompts/version"
 require_relative "prompts/prompt"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prompts
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Stephen Margheim
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicode-display_width
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Beautiful and user-friendly forms for your command-line Ruby applications.