ttytest2 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1878cb00bec4cb2ad2213c6659212cbef7dfc0c1dab31e445e07b1fcbf088e7
-  data.tar.gz: 2298de4d8674e11cf0c23e520176ca3aa9a33ce1ec75e24e712be7a269b79840
+  metadata.gz: 986b298bb959d217e338bd7ce6c6ad5640ee656b99c44a85358bd02d408524b2
+  data.tar.gz: '08f35657997cbad512a7251c895853249fa80342a7a338a7fd83c6dca7fc73f1'
 SHA512:
-  metadata.gz: 73d59c8dbfab01db1c6305b4f3ad6c8f6a44698c83cf969516a3accf33422005b18377d1a809d883834b8e0b11fdd729096460c90de7742417c65f9bd5c79303
-  data.tar.gz: '09c46d90a2776c1fb36d0b896b46c4b1d6b537382b41eb33784326cf99134bf68eac9f89e3dd910a16c3938d188ea1c3a66674e36b8387729f09d4a4b0216e24'
+  metadata.gz: 1df9f3105198994fddb7105892bb0a1a659832bd5de3ac0dca99c87f584ccd11eaa9a9f008be97071f318445b77cde6007c161260616f1f9cd6f55a7193fa239
+  data.tar.gz: 75ddbafbb51117a557e943bd63f7c6b3d908d0e5b3f58ac10f60dff5b9d11a17c29490974cd8a6f5d75c17b89a0320c004c4a2034120170346b089a661d19ee3

data/lib/ttytest/matchers.rb

@@ -3,31 +3,6 @@
 module TTYtest
   # Assertions for ttytest2.
   module Matchers
-    def get_inspection(actual)
-      if actual.nil?
-        'nil'
-      else
-        actual.inspect
-      end
-    end
-
-    def get_inspection_bounded(actual, column_start, column_end)
-      if actual.nil?
-        'nil'
-      else
-        actual[column_start, column_end]
-      end
-    end
-
-    def validate(row)
-      return if @height.nil?
-      return unless row >= @height
-
-      raise MatchError,
-            "row is at #{row}, which is greater than set height #{height}, so assertions will fail. If intentional, set height larger or break apart tests.\n
-            Entire screen:\n#{self}"
-    end
-
     # Asserts the contents of a single row match the value expected
     # @param [Integer] row_number the row (starting from 0) to test against
     # @param [String] expected the expected value of the row. Any trailing whitespace is ignored
@@ -239,6 +214,84 @@ module TTYtest
     alias assert_matches_at assert_contents_at
     alias assert_rows assert_contents_at
 
+    def assert_file_exists(file_path)
+      raise file_not_found_error(file_path) unless File.exist?(file_path)
+      raise file_is_dir_error(file_path) unless File.file?(file_path)
+    end
+
+    def assert_file_doesnt_exist(file_path)
+      return unless File.exist?(file_path) || File.file?(file_path)
+
+      raise MatchError,
+            "File with path #{file_path} was found or is a directory when it was asserted it did not exist.\nEntire screen:\n#{self}"
+    end
+
+    def assert_file_contains(file_path, needle)
+      raise file_not_found_error(file_path) unless File.exist?(file_path)
+      raise file_is_dir_error(file_path) unless File.file?(file_path)
+
+      file_contains = false
+      File.foreach(file_path) do |line|
+        if line.include?(needle)
+          file_contains = true
+          break
+        end
+      end
+      return if file_contains
+
+      raise MatchError,
+            "File with path #{file_path} did not contain #{needle}.\nEntire screen:\n#{self}"
+    end
+
+    def assert_file_has_permissions(file_path, permissions)
+      raise file_not_found_error(file_path) unless File.exist?(file_path)
+      raise file_is_dir_error(file_path) unless File.file?(file_path)
+
+      file_mode = File.stat(file_path).mode
+      perms_octal = format('%o', file_mode)[-3...]
+      return if perms_octal == permissions
+
+      raise MatchError,
+            "File had permissions #{perms_octal}, not #{permissions} as expected.\n Entire screen:\n#{self}"
+    end
+
     METHODS = public_instance_methods
+
+    private
+
+    def get_inspection(actual)
+      if actual.nil?
+        'nil'
+      else
+        actual.inspect
+      end
+    end
+
+    def get_inspection_bounded(actual, column_start, column_end)
+      if actual.nil?
+        'nil'
+      else
+        actual[column_start, column_end]
+      end
+    end
+
+    def validate(row)
+      return if @height.nil?
+      return unless row >= @height
+
+      raise MatchError,
+            "row is at #{row}, which is greater than set height #{height}, so assertions will fail. If intentional, set height larger or break apart tests.\n
+            Entire screen:\n#{self}"
+    end
+
+    def file_not_found_error(file_path)
+      raise MatchError,
+            "File with path #{file_path} was not found when asserted it did exist.\nEntire screen:\n#{self}"
+    end
+
+    def file_is_dir_error(file_path)
+      raise MatchError,
+            "File with path #{file_path} is a directory.\nEntire screen:\n#{self}"
+    end
   end
 end

data/lib/ttytest/terminal.rb

@@ -194,9 +194,9 @@ module TTYtest
                    :cursor_visible?, :cursor_hidden?
 
     Matchers::METHODS.each do |matcher_name|
-      define_method matcher_name do |*args|
+      define_method matcher_name do |*args, **kwargs|
         synchronize do
-          capture.public_send(matcher_name, *args)
+          capture.public_send(matcher_name, *args, **kwargs)
         end
       end
     end

data/lib/ttytest/tmux/driver.rb

@@ -2,6 +2,7 @@
 
 require 'open3'
 require 'securerandom'
+require 'English'
 
 require 'ttytest/terminal'
 require 'ttytest/tmux/session'
@@ -52,10 +53,18 @@ module TTYtest
         ensure_available
         puts "tmux(#{args.inspect[1...-1]})" if debug?
 
-        stdout, stderr, status = Open3.capture3(@tmux_cmd, '-L', SOCKET_NAME, *args)
-        raise TmuxError, "tmux(#{args.inspect[1...-1]}) failed\n#{stderr}" unless !status.nil? && status.success?
+        cmd = [@tmux_cmd, '-L', SOCKET_NAME, *args]
+        output = nil
+        status = nil
+        IO.popen(cmd, err: %i[child out]) do |io|
+          output = io.read
+          io.close
+          status = $CHILD_STATUS
+        end
 
-        stdout
+        raise TmuxError, "tmux(#{args.inspect[1...-1]}) failed\n#{output}" unless status&.success?
+
+        output
       end
 
       def available?

data/lib/ttytest/version.rb

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

data/notes.txt

@@ -1,7 +1,7 @@
 to push new version to github
-git tag v1.0.4
+git tag v1.0.6
 git push origin --tags
 
 to push new version to rubygems.org
 gem build ttytest2.gemspec
-gem push ttytest2-1.0.4.gem
+gem push ttytest2-1.0.6.gem

data/todo.txt

@@ -0,0 +1,2 @@
+assert_exit_code(0)            # For success
+assert_exit_code(1)            # For expected failure

data/ttytest2.gemspec

@@ -24,9 +24,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 3.2.3'
 
-  spec.add_development_dependency 'bundler', '~> 2.4'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'open3', '~> 0.2'
-  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'yard', '~> 0.9'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ttytest2
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Alex Eski
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-12 00:00:00.000000000 Z
+date: 2025-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +105,7 @@ files:
 - lib/ttytest/tmux/tmux.conf
 - lib/ttytest/version.rb
 - notes.txt
+- todo.txt
 - ttytest2.gemspec
 homepage: https://github.com/a-eski/ttytest2
 licenses: