scriptty 0.8.0-java → 0.9.0-java

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.9.0

data/lib/scriptty/expect.rb

@@ -65,6 +65,7 @@ module ScripTTY
     end
 
     def set_timeout(seconds)
+      fail_unexpected_block if block_given?
       raise ArgumentError.new("argument to set_timeout must be Numeric or nil") unless seconds.is_a?(Numeric) or seconds.nil?
       if seconds
         @timeout = seconds.to_f
@@ -77,11 +78,13 @@ module ScripTTY
 
     # Load and evaluate a script from a file.
     def eval_script_file(path)
+      fail_unexpected_block if block_given?
       eval_script_inline(File.read(path), path)
     end
 
     # Evaluate a script specified as a string.
     def eval_script_inline(str, filename=nil, lineno=nil)
+      fail_unexpected_block if block_given?
       @evaluator.instance_eval(str, filename || "(inline)", lineno || 1)
     end
 
@@ -166,11 +169,13 @@ module ScripTTY
 
     # Return the named ScreenPattern (or nil if no such pattern exists)
     def screen(name)
+      fail_unexpected_block if block_given?
       @screen_patterns[name.to_sym]
     end
 
     # Load screens from the specified filenames
     def load_screens(filenames_or_glob)
+      fail_unexpected_block if block_given?
       if filenames_or_glob.is_a?(String)
         filenames = Dir.glob(filenames_or_glob)
       elsif filenames_or_glob.is_a?(Array)
@@ -213,11 +218,13 @@ module ScripTTY
 
     # Push a copy of the effective pattern list to an internal stack.
     def push_patterns
+      fail_unexpected_block if block_given?
       @pattern_stack << @effective_patterns.dup
     end
 
     # Pop the effective pattern list from the stack.
     def pop_patterns
+      fail_unexpected_block if block_given?
       raise ArgumentError.new("pattern stack empty") if @pattern_stack.empty?
       @effective_patterns = @pattern_stack.pop
     end
@@ -226,6 +233,7 @@ module ScripTTY
     #
     # Clears the character-match buffer on return.
     def wait
+      fail_unexpected_block if block_given?
       @transcript_writer.info("Script executing command", "wait") if @transcript_writer
       check_expect_match unless @wait_finished
       dispatch until @wait_finished
@@ -240,6 +248,7 @@ module ScripTTY
     # finished being sent.  Remaining bytes will be sent during an expect,
     # wait, or sleep call.
     def send(bytes)
+      fail_unexpected_block if block_given?
       @transcript_writer.from_client(bytes) if @transcript_writer
       @conn.write(bytes)
       true
@@ -250,6 +259,7 @@ module ScripTTY
     # This works like the send method, but "**PASSWORD**" is shown in the
     # transcript instead of the actual bytes sent.
     def send_password(bytes)
+      fail_unexpected_block if block_given?
       @transcript_writer.from_client("**PASSWORD**") if @transcript_writer
       @conn.write(bytes)
       true
@@ -257,6 +267,7 @@ module ScripTTY
 
     # Close the connection and exit.
     def exit
+      fail_unexpected_block if block_given?
       @transcript_writer.info("Script executing command", "exit") if @transcript_writer
       @net.exit
       dispatch until @net.done?
@@ -269,6 +280,7 @@ module ScripTTY
     # NOTE: This method is intended for script development only; it is not
     # exported to the Evaluator.
     def dump(filename=nil)
+      fail_unexpected_block if block_given?
       result = ScreenPattern.from_term(@term).generate
       if filename
         File.open(filename, "a") { |outfile|
@@ -306,6 +318,12 @@ module ScripTTY
 
     private
 
+      def fail_unexpected_block
+        caller[0] =~ /`(.*?)'/
+        method_name = $1
+        raise ArgumentError.new("`#{method_name}' method given but does not take a block")
+      end
+
       # Kick the watchdog timer
       def refresh_timeout
         disable_timeout

data/test/apps/capture_app_test.rb

@@ -23,6 +23,12 @@ require 'tempfile'
 class CaptureAppTest < Test::Unit::TestCase
   LISTEN_PORT = 46457   # Randomly-chosen port; change if necessary
 
+  if true # FIXME
+    def test_dummy_disabled
+      $stderr.puts "warning: CaptureAppTest disabled"  # FIXME
+    end
+  else  # FIXME
+
   def setup
     require 'scriptty/apps/capture_app'
     require 'scriptty/net/event_loop'
@@ -120,4 +126,6 @@ class CaptureAppTest < Test::Unit::TestCase
     app.exit if app
     app_thread.join if app_thread
   end
+
+  end # FIXME
 end

data/test/expect/screens.txt

@@ -0,0 +1,30 @@
+[hello_world]
+size: (24, 80)
+text: <<END
++--------------------------------------------------------------------------------+
+|Hello world!                                                                    |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
+|                                                                                |
++--------------------------------------------------------------------------------+
+END

data/test/expect_test.rb

@@ -0,0 +1,60 @@
+# = Tests for ScripTTY::Expect
+# Copyright (C) 2010  Infonium Inc.
+#
+# This file is part of ScripTTY.
+#
+# ScripTTY is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# ScripTTY is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with ScripTTY.  If not, see <http://www.gnu.org/licenses/>.
+require File.dirname(__FILE__) + "/test_helper.rb"
+require 'scriptty/expect'
+require 'scriptty/net/event_loop'
+
+class ExpectTest < Test::Unit::TestCase
+
+  if !defined?(Java)
+    # This test gets executed when JRuby is not detected
+    def test_dummy_no_jruby
+      raise LoadError.new("Cannot test ScripTTY::Expect: Not running under JRuby")
+    end
+
+  else  # defined?(Java)
+
+    # Expect#screen should raise an exception if it's passed a block
+    #
+    # This is to catch incorrect code like this:
+    #
+    #     expect {
+    #       on screen(:foo) { send(".\n") }
+    #     }
+    #
+    # which needs to be written like this (note extra parens):
+    #
+    #     expect {
+    #       on(screen(:foo)) { send(".\n") }
+    #     }
+    #
+    def test_screen_given_block_raises_exception
+      e = ScripTTY::Expect.new
+      e.load_screens File.dirname(__FILE__) + "/expect/screens.txt"
+      exc = nil
+      assert_raise ArgumentError do
+        begin
+          e.screen(:hello_world) { true }
+        rescue => exc
+          raise
+        end
+      end
+      assert_equal "`screen' method given but does not take a block", exc.message
+    end
+  end
+end

data/test/net/event_loop_test.rb

@@ -27,6 +27,11 @@ class EventLoopTest < Test::Unit::TestCase
       raise LoadError.new("Cannot test ScripTTY::Net::EventLoop: Not running under JRuby")
     end
 
+  elsif true
+    def test_dummy_disabled
+      $stderr.puts "warning: EventLoopTest disabled"  # FIXME
+    end
+
   else  # defined?(Java)
 
     # XXX - These tests are ugly, using a mix of different styles.  Clean them up (only if you know what you are doing!)
@@ -37,10 +42,6 @@ class EventLoopTest < Test::Unit::TestCase
 
     CONNECTION_REFUSE_ADDR = ['localhost', 2]   # address on which connections will be refused
 
-    def setup
-      raise "EventLoopTest disabled" # FIXME
-    end
-
     def test_callback_error_handling_on_connect_error
       result = []
       evloop = ScripTTY::Net::EventLoop.new

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
     - 0
-    - 8
+    - 9
     - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: java
 authors: 
   - Dwayne Litzenberger
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 -04:00
+date: 2010-04-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -107,6 +107,8 @@ files:
   - test/apps/capture_app_test.rb
   - test/apps/transcript_parse_app_test.rb
   - test/cursor_test.rb
+  - test/expect/screens.txt
+  - test/expect_test.rb
   - test/fsm_definition_parser_test.rb
   - test/fsm_test.rb
   - test/multiline_buffer_test.rb
@@ -160,6 +162,7 @@ specification_version: 3
 summary: write expect-like script to control full-screen terminal-based applications
 test_files: 
   - test/cursor_test.rb
+  - test/expect_test.rb
   - test/fsm_definition_parser_test.rb
   - test/fsm_test.rb
   - test/multiline_buffer_test.rb