ttytest 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78021e6870947818ac2d9be3fe3d83fe5070662d
-  data.tar.gz: d3cc412b912956ef3ea44948f6a656b3bfca644f
+  metadata.gz: d0175fa2266c1f56f709051162f3419862a24355
+  data.tar.gz: 949439a6f922cd8b71c8c92e10a9721161c152b7
 SHA512:
-  metadata.gz: 6fc3b334c3c43bbe3fe518f74ca5be4b262f60014f564443433a41fb2b503905264ff2df725379cd173729ce5fdca7638848a991a78ee6056f36c75c8c838669
-  data.tar.gz: 371818454cdc7df5cd7d6ceef162ddf0075ad5f6bd425122457fb0ef1e4c02e99d776c9eda2faf3adf31a01530fdbe57e04905a31f52fc216c76b6359c589df3
+  metadata.gz: 8af22aa0fb0f3896c113c7e5cb5d929c82e642c44d93e03f5b75729fc3d1e2a2eb5f796f6e09300f6d21bc4d5bc1b70e6a7c3676e0dd0f5bc4ff7d6e91a52c8d
+  data.tar.gz: 7871021b99ebef74812db882e8ada619135697c114c6df31c19ed282dec13a155237d6162c467cab6f440887ebbf76d43a93eedd9812d3eef139ca47acf00c65

data/Rakefile

@@ -7,4 +7,8 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
+task :console do
+  system 'irb -Ilib -rttytest'
+end
+
 task :default => :test

data/lib/ttytest/capture.rb

@@ -16,10 +16,6 @@ module TTYtest
       @cursor_visible = cursor_visible
     end
 
-    def cursor_position
-      [@cursor_x, @cursor_y]
-    end
-
     def rows
       @rows
     end

data/lib/ttytest/dummy.rb

@@ -1,15 +1,13 @@
 module TTYtest
   class Dummy
-    attr_accessor :contents, :cursor_position
+    attr_accessor :contents
 
     def initialize
       @contents = "\n"*23
-      @cursor_position = [0,0]
     end
 
     def capture
-      x, y = cursor_position
-      Capture.new(contents, cursor_x: x, cursor_y: y)
+      Capture.new(contents)
     end
   end
 end

data/lib/ttytest/matchers.rb

@@ -9,7 +9,7 @@ module TTYtest
 
     def assert_cursor_position(x:, y:)
       expected = [x, y]
-      actual = cursor_position
+      actual = [cursor_x, cursor_y]
       if actual != expected
         raise MatchError, "expected cursor to be at #{expected.inspect} but was at #{actual.inspect}\nEntire screen:\n#{to_s}"
       end
@@ -27,6 +27,26 @@ module TTYtest
       end
     end
 
+    def assert_matches(expected)
+      expected_rows = expected.split("\n")
+      diff = []
+      matched = true
+      rows.each_with_index do |actual_row, index|
+        expected_row = (expected_rows[index] || "").rstrip
+        if actual_row != expected_row
+          diff << "-#{expected_row}"
+          diff << "+#{actual_row}"
+          matched = false
+        else
+          diff << " #{actual_row}".rstrip
+        end
+      end
+
+      if !matched
+        raise MatchError, "screen did not match expected content:\n--- expected\n+++ actual\n#{diff.join("\n")}"
+      end
+    end
+
     METHODS = public_instance_methods
   end
 end

data/lib/ttytest/terminal.rb

@@ -16,7 +16,7 @@ module TTYtest
     end
 
     def_delegators :@driver_terminal, :send_keys, :send_raw, :capture
-    def_delegators :capture, :rows, :row, :cursor_position, :width, :height, :cursor_visible?, :cursor_hidden?
+    def_delegators :capture, :rows, :row, :width, :height, :cursor_visible?, :cursor_hidden?
 
     TTYtest::Matchers::METHODS.each do |matcher_name|
       define_method matcher_name do |*args|

data/lib/ttytest/tmux/driver.rb

@@ -24,7 +24,7 @@ module TTYtest
       end
 
       def new_terminal(cmd, width: 80, height: 24)
-        cmd = "#{cmd};#{SLEEP_INFINITY}"
+        cmd = "#{cmd}\n#{SLEEP_INFINITY}"
 
         session_name = "ttytest-#{SecureRandom.uuid}"
         tmux(*%W[-f #{CONF_PATH} new-session -s #{session_name} -d -x #{width} -y #{height} #{cmd}])

data/lib/ttytest/version.rb

@@ -1,3 +1,3 @@
 module TTYtest
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/ttytest.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.1.0'
+
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ttytest
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - John Hawthorn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2016-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,7 +87,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="