ttytest2 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7bf4ac747757d3aeaf01d103d15708cf487834ed43b9e3dad90e0d94e5203bc
-  data.tar.gz: 901c844e8719e6652943aae004e5f3deada174c4ab312e2e1c5956f496aa64c0
+  metadata.gz: efba349f76f4726f156f95a655ead1afadfbcb9cce9ce06f15f87d9861186535
+  data.tar.gz: '0853b6b8a00b864d1b53b0d8517b25ecb3337051d0e4e73cac7f9aa0d676b2cd'
 SHA512:
-  metadata.gz: '02128e6d6ada7be932b624b5dd48c4d7eef0ace8a3d727629f7c756f4e5b0027b00aa6fe96040a38ff84178e0b74256e644584376e8d6784c48728662e50af3d'
-  data.tar.gz: a2909a072f201511eed7e77b72a67143b0fb9caa2dac07aa583696aa040e88c34a2188644b1a0872d4309cfe8b2ef7e30d271a68b97f298b4334948dd879a3a6
+  metadata.gz: aa99a3bab7f20c1c9568dde993bc466506087b19e136f8cb45b6617482cb5fc3c9af8344fddf21d591e5026c9a5b16ca4dd57f97c2717d2311a6993c8511ed54
+  data.tar.gz: 9d754810ae1f74c45db37ae4ac1de7495dbc5b83e786c29fd8c5f9be9f91e57e895638555bee13920ce6705b27a35ae33e5b22c3e6e5f99f4b7f5041325ba21f

data/README.md

@@ -134,6 +134,8 @@ If you are reading this on github, the ruby docs accessible from [RubyDoc.Info](
 
 * `assert_rows_each_match_regexp(row_start, row_end, regexp_str)`
 
+* `assert_rows_match_regexp(row_start, row_end, regexp_str, remove_newlines: false)`
+
 #### Column Assertions
 
 * `assert_column(col_number, expected_text)`
@@ -150,6 +152,8 @@ If you are reading this on github, the ruby docs accessible from [RubyDoc.Info](
 
 * `assert_columns_each_match_regexp(col_start, col_end, regexp_str)`
 
+* `assert_columns_match_regexp(col_start, col_end, regexp_str, remove_newlines: false)`
+
 #### Cursor Assertions
 
 * `assert_cursor_position(x: x, y: y)`

data/lib/ttytest/assertions/column_assertions.rb

@@ -151,6 +151,32 @@ module TTYtest
       end
     end
 
+    # Asserts the contents of multiple columns match the passed in regular expression.
+    # @param [Integer] col_start the column (starting from 0) to test against
+    # @param [Integer] col_end the last column to test against
+    # @param [String] regexp_str the regular expression as a string that will be used to match with.
+    # @param [bool] remove_newlines an optional paramter to specify if line separators should be removed, defaults to false
+    # @raise [MatchError] if the columns don't match against the regular expression
+    def assert_columns_match_regexp(col_start, col_end, regexp_str, remove_newlines: false)
+      validate(col_end)
+      regexp = Regexp.new(regexp_str)
+      col_cur = col_start
+      col_end += 1 if col_end.zero?
+      actual = ''
+
+      while col_cur < col_end
+        col = get_column(col_cur).join
+        col = col.rstrip if remove_newlines
+        actual += col
+        col_cur += 1
+      end
+
+      return if !actual.nil? && actual.match?(regexp)
+
+      raise MatchError,
+            "expected columns #{col_start}-#{col_end} to match regexp #{regexp_str} but they did not. Columns value #{get_inspection(actual)}\nEntire screen:\n#{self}"
+    end
+
     private
 
     def get_column(col_number)

data/lib/ttytest/assertions/row_assertions.rb

@@ -125,7 +125,7 @@ module TTYtest
     # @param [Integer] row_start the row (starting from 0) to test against
     # @param [Integer] row_end the last row to test against
     # @param [String] regexp_str the regular expression as a string that will be used to match with.
-    # @raise [MatchError] if the row doesn't match against the regular expression
+    # @raise [MatchError] if a row doesn't match against the regular expression
     def assert_rows_each_match_regexp(row_start, row_end, regexp_str)
       validate(row_end)
       regexp = Regexp.new(regexp_str)
@@ -139,5 +139,31 @@ module TTYtest
       end
     end
     alias assert_lines_each_match_regexp assert_rows_each_match_regexp
+
+    # Asserts the contents of multiple rows match the passed in regular expression.
+    # @param [Integer] row_start the row (starting from 0) to test against
+    # @param [Integer] row_end the last row to test against
+    # @param [String] regexp_str the regular expression as a string that will be used to match with.
+    # @param [bool] remove_newlines an optional paramter to specify if line separators should be removed, defaults to false
+    # @raise [MatchError] if the rows don't match against the regular expression
+    def assert_rows_match_regexp(row_start, row_end, regexp_str, remove_newlines: false)
+      validate(row_end)
+      regexp = Regexp.new(regexp_str)
+      row_end += 1 if row_end.zero?
+
+      slices = rows.slice(row_start, row_end)
+      if remove_newlines
+        slices.each_with_index do |slice, i|
+          slices[i] = slice.rstrip
+        end
+      end
+      actual = slices.join
+
+      return if !actual.nil? && actual.match?(regexp)
+
+      raise MatchError,
+            "expected rows #{row_start}-#{row_end} to match regexp #{regexp_str} but they did not. Rows value #{get_inspection(actual)}\nEntire screen:\n#{self}"
+    end
+    alias assert_lines_match_regexp assert_rows_match_regexp
   end
 end

data/lib/ttytest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TTYtest
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end

data/notes.txt

@@ -1,7 +1,7 @@
 to push new version to github
-git tag v1.5.0
+git tag v1.6.0
 git push origin --tags
 
 to push new version to rubygems.org
 gem build ttytest2.gemspec
-gem push ttytest2-1.5.0.gem
+gem push ttytest2-1.6.0.gem

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ttytest2
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Alex Eski
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-06 00:00:00.000000000 Z
+date: 2025-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler