highline 3.0.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77aabe8e1a9f098383f7bdee9fb2fb985fe46ecd9faf59c676753bd59fef9da4
-  data.tar.gz: b7c90d18ba2adbdbab4ce5e20dd166ba812f506d7755429c12a955acc34bdfee
+  metadata.gz: b9d2b093cb533443369ed3d5c31f6c09f1d5fdfd4d5b9f89a1e48d8da20a377a
+  data.tar.gz: 150008ffff933909afcc40ebdee9bba538dc1170331a4a58cd5ebff5fc582738
 SHA512:
-  metadata.gz: d708e26cdac5cd985562e57290cdfd8fecb3f6ca2d81bdff0c1e0c2c4ab006c98668b2c4346e0fdd24acd74f05db14f30d2cb5f870906538b9b1af44b0a3ed31
-  data.tar.gz: b0d5453c17c7ed667bd68b9ea208c4f5b78da1a0d101d01f69ec0299fb8eb8a234a5491053e148422542ed502ac7406711b6e6a30343c46be1c1eb611b159135
+  metadata.gz: 016dc7d742577f9cb8fbca44a07e14a9911b314afb9ad4974456ae29fb379705a4161e48eb19c73fb2a7afe6ae602272360141b09cc17ad33346eb00a03f34e8
+  data.tar.gz: 41d933367b093d1296535eedcf8ffc147c561dd51f07ef81d20d3c044877c93d1c3eb0c96a783e1c0f4cfd444ceb1bbbda26c21509519515571cab87ac3744ba

data/.github/workflows/ci.yml

@@ -10,6 +10,7 @@ jobs:
         os: [ubuntu-latest]
         ruby-version:
           - head
+          - '3.4'
           - '3.3'
           - '3.2'
           - '3.1'
@@ -23,7 +24,7 @@ jobs:
           - os: windows-latest
             ruby-version: head
           - os: windows-latest
-            ruby-version: '3.3'
+            ruby-version: '3.4'
           - os: windows-latest
             ruby-version: mingw
           - os: windows-latest
@@ -33,10 +34,10 @@ jobs:
           - os: macos-latest
             ruby-version: 'head'
           - os: macos-latest
-            ruby-version: '3.3'
+            ruby-version: '3.4'
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby ${{ matrix.ruby-version }}
       uses: ruby/setup-ruby@v1
       with:

data/.rubocop.yml

@@ -4,7 +4,8 @@
 # https://github.com/bbatsov/rubocop/tree/master/config
 
 AllCops:
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 3.4
+  NewCops: enable
 
 # General
 
@@ -58,7 +59,7 @@ Style/OptionalArguments:
     - 'lib/highline/list_renderer.rb'
 
 # TemplateRenderer should never fail on method missing.
-Style/MethodMissing:
+Style/MissingRespondToMissing:
   Exclude:
     - 'lib/highline/template_renderer.rb'
 
@@ -73,7 +74,7 @@ Style/SymbolArray:
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Exclude:
     - 'examples/page_and_wrap.rb'
     - 'highline.gemspec'

data/Changelog.md

@@ -2,6 +2,20 @@
 
 Below is a complete listing of changes for each revision of HighLine.
 
+### 3.1.2 / 2025-01-05
+* PR #279 - Upgrades and adjustments for Ruby 3.4 release (@abinoam)
+* PR #278 - Prevent ArgumentError for #col_count_calculate when items exceed 80 chars (@davidjkling, @justintsteele)
+
+### 3.1.1 / 2024-08-18
+* PR #276 - Update #say to always flush the output after a #puts (@blipper)
+* PR #274 / I #273 (@costa)
+  * Add Highline#add_to_color_scheme
+  * Dockerize the test environment. Just run `bin/test` and voilá!
+
+### 3.1.0 / 2024-07-15
+* PR #272 / I #271 - Readline is now completed deprecated over Reline (@abinoam, issue by @64kramsystem)
+* PR #269 - Provide a 'Changelog' link on rubygems.org/gems/highline (@mark-young-atg)
+
 ### 3.0.1 / 2024-01-20
 * PR #268 - Remove unused abbrev dependency (@zvkemp)
 

data/Gemfile

@@ -13,7 +13,9 @@ group :code_quality do
   gem "flog", require: false
   gem "pronto", require: false, platform: :ruby
   gem "pronto-flay", require: false, platform: :ruby
+  gem "path_expander", "1.1.1", require: false # Remove this lock when path_expander > 1.1.2 and flay > 2.13.3 is released.
   # gem "pronto-poper", require: false, platform: :ruby
   gem "pronto-reek", require: false, platform: :ruby
   gem "pronto-rubocop", require: false, platform: :ruby
+  gem "base64", require: false
 end

data/README.md

@@ -206,6 +206,9 @@ Contributing
   - ```rake acceptance```
   - ```pronto run```
 
+  Alternatively, if you're in a [Docker](https://www.docker.com)ised environment,
+  don't care about installing anything locally -- just run `bin/test` instead.
+
 8. Commit your changes
   - ```git commit -am "Your commit message"```
 

data/bin/test

@@ -0,0 +1,11 @@
+#!/bin/bash -e
+test "$#" -ne 0 && echo "Unsupported args: $@" >&2 && exit 145
+cd "$( dirname "${BASH_SOURCE[0]}" )"/..
+
+export COMPOSE_FILE=test/docker-compose.yml
+export COMPOSE_PROJECT_NAME=highline_dev
+
+docker compose rm -svf
+docker compose build --force-rm
+
+docker compose run --rm tester && docker compose rm -svf || ( docker compose logs && exit 1 )

data/highline.gemspec

@@ -33,5 +33,8 @@ DESCRIPTION
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "dry-types"
-  spec.add_development_dependency "reline"
+
+  spec.add_runtime_dependency "reline"
+
+  spec.metadata["changelog_uri"] = spec.homepage + "/blob/master/Changelog.md"
 end

data/lib/highline/list_renderer.rb

@@ -236,8 +236,8 @@ class HighLine
     end
 
     def col_count_calculate
-      (line_size_limit + row_join_str_size) /
-        (items_max_length + row_join_str_size)
+      result = (line_size_limit + row_join_str_size) / (items_max_length + row_join_str_size)
+      result == 0 ? 1 : result
     end
 
     def col_count

data/lib/highline/menu.rb

@@ -374,12 +374,14 @@ class HighLine
     end
 
     def map_items_by_index
-      if [:letter, :capital_letter].include?(@index)
-        # @ and ` are the previous ASCII characters to A and a respectively
-        prev_char = (@index == :capital_letter ? '@' : '`')
-        all_items.map { prev_char.succ!.dup }
+      size = all_items.size
+      case @index
+      when :letter
+        ("a".."z").first(size)
+      when :capital_letter
+        ("A".."Z").first(size)
       else
-        (1..all_items.size).map(&:to_s)
+        (1..size).map(&:to_s)
       end
     end
 

data/lib/highline/terminal.rb

@@ -112,7 +112,7 @@ class HighLine
     def readline_read(question, highline)
       # prep auto-completion
       unless question.selection.empty?
-        Readline.completion_proc = lambda do |str|
+        Reline.completion_proc = lambda do |str|
           question.selection.grep(/\A#{Regexp.escape(str)}/)
         end
       end
@@ -124,7 +124,7 @@ class HighLine
 
       raw_answer  = run_preserving_stty do
         prompt = highline.render_and_ident_statement(question)
-        Readline.readline(prompt, true)
+        Reline.readline(prompt, true)
       end
 
       $VERBOSE = old_verbose

data/lib/highline/version.rb

@@ -2,5 +2,5 @@
 
 class HighLine
   # The version of the installed library.
-  VERSION = "3.0.1".freeze
+  VERSION = "3.1.2".freeze
 end

data/lib/highline.rb

@@ -61,6 +61,14 @@ class HighLine
       true if @color_scheme
     end
 
+    # Pass a +Hash+ to add +new+ colors to the current scheme.
+    def add_to_color_scheme(hash)
+      old_hash = (color_scheme || {}).to_hash
+      fail "Overlapping color schemes: #{old_hash.keys & hash.keys}"  unless
+        (old_hash.keys & hash.keys).empty?
+      self.color_scheme = ColorScheme.new(old_hash.merge hash)
+    end
+
     # Reset color scheme to default (+nil+)
     def reset_color_scheme
       self.color_scheme = nil
@@ -377,10 +385,10 @@ class HighLine
     # if statement ends with whitespace before a color escape code.
     if /[ \t](\e\[\d+(;\d+)*m)?\Z/ =~ statement
       output.print(statement)
-      output.flush
     else
       output.puts(statement)
     end
+    output.flush # See: https://github.com/JEG2/highline/pull/276
   end
 
   # Renders and indents a statement.
@@ -547,21 +555,26 @@ class HighLine
     terminal.raw_no_echo_mode_exec do
       loop do
         character = terminal.get_character
-        raise Interrupt if character == "\u0003"
-        break unless character
-        break if ["\n", "\r"].include? character
-
-        # honor backspace and delete
-        if character == "\b" || character == "\u007F"
-          chopped = line.chop!
-          output_erase_char if chopped && question.echo
-        elsif character == "\cU"
+
+        case character
+        when "\u0003" # Ctrl+C (Interrupt)
+          raise Interrupt
+        when nil # No character received
+          break
+        when "\n", "\r" # Newline or carriage return
+          break
+        when "\b", "\u007F" # Backspace and delete
+          unless line.empty?
+            line = line.chop
+            output_erase_char if question.echo
+          end
+        when "\cU" # Clear line
           line.size.times { output_erase_char } if question.echo
           line = ""
-        elsif character == "\e"
+        when "\e" # Escape key
           ignore_arrow_key
-        else
-          line << character
+        else # Any other character
+          line += character
           say_last_char_or_echo_char(line, question)
         end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: highline
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.2
 platform: ruby
 authors:
 - James Edward Gray II
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-20 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,7 +72,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -106,6 +105,7 @@ files:
 - README.md
 - Rakefile
 - TODO
+- bin/test
 - doc/.cvsignore
 - examples/ansi_colors.rb
 - examples/asking_for_arrays.rb
@@ -156,8 +156,8 @@ files:
 homepage: https://github.com/JEG2/highline
 licenses:
 - Ruby
-metadata: {}
-post_install_message:
+metadata:
+  changelog_uri: https://github.com/JEG2/highline/blob/master/Changelog.md
 rdoc_options: []
 require_paths:
 - lib
@@ -172,8 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: HighLine is a high-level command-line IO library.
 test_files: []