scriptty 0.6.0-java → 0.7.0-java

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/lib/scriptty/apps/capture_app.rb

@@ -18,6 +18,8 @@
 
 require 'optparse'
 require 'scriptty/net/event_loop'
+require 'scriptty/net/console'
+require 'scriptty/net/password_prompt'
 require 'scriptty/util/transcript/writer'
 require 'scriptty/term'
 require 'scriptty/screen_pattern'
@@ -54,11 +56,11 @@ module ScripTTY
         @output_file = Util::Transcript::Writer.new(File.open(@options[:output], @options[:append] ? "a" : "w")) if @options[:output]
         @output_file.info("--- Capture started #{Time.now} ---") if @output_file
         @net.on_accept(@options[:console_addrs] || [], :multiple => true) do |conn|
-          p = PasswordPrompt.new(conn, "Console password: ")
+          p = ScripTTY::Net::PasswordPrompt.new(conn, "Console password: ")
           p.authenticate { |password| password == @console_password }
           p.on_fail { conn.write("Authentiation failed.\r\n") { conn.close } }
           p.on_success {
-            @attached_consoles << Console.new(conn, self)
+            @attached_consoles << ScripTTY::Net::Console.new(conn, self)
             @attached_consoles.each { |c| c.refresh! }
           }
         end
@@ -247,6 +249,3 @@ module ScripTTY
     end
   end
 end
-
-require 'scriptty/apps/capture_app/password_prompt'
-require 'scriptty/apps/capture_app/console'

data/lib/scriptty/apps/replay_app.rb

@@ -18,6 +18,8 @@
 
 require 'optparse'
 require 'scriptty/net/event_loop'
+require 'scriptty/net/console'
+require 'scriptty/net/password_prompt'
 require 'scriptty/util/transcript/reader'
 require 'scriptty/term'
 require 'logger'
@@ -53,11 +55,11 @@ module ScripTTY
       def main
         @output_file = Util::Transcript::Writer.new(File.open(@options[:output], "w")) if @options[:output]
         @net.on_accept(@options[:console_addrs] || [], :multiple => true) do |conn|
-          p = CaptureApp::PasswordPrompt.new(conn, "Console password: ")
+          p = ScripTTY::Net::PasswordPrompt.new(conn, "Console password: ")
           p.authenticate { |password| password == @console_password }
           p.on_fail { conn.write("Authentiation failed.\r\n") { conn.close } }
           p.on_success {
-            @attached_consoles << CaptureApp::Console.new(conn, self)
+            @attached_consoles << ScripTTY::Net::Console.new(conn, self)
             @attached_consoles.each { |c| c.refresh! }
           }
         end
@@ -224,6 +226,3 @@ module ScripTTY
     end
   end
 end
-
-require 'scriptty/apps/capture_app/password_prompt'
-require 'scriptty/apps/capture_app/console'

data/lib/scriptty/expect.rb

@@ -27,11 +27,12 @@ module ScripTTY
   class Expect
 
     # Methods to export to Evaluator
-    EXPORTED_METHODS = Set.new [:init_term, :term, :connect, :screen, :expect, :on, :wait, :send, :match, :push_patterns, :pop_patterns, :exit, :eval_script_file, :eval_script_inline, :sleep, :set_timeout, :load_screens ]
+    EXPORTED_METHODS = Set.new [:init_term, :term, :connect, :screen, :expect, :on, :wait, :send, :send_password, :capture, :match, :push_patterns, :pop_patterns, :exit, :eval_script_file, :eval_script_inline, :sleep, :set_timeout, :load_screens ]
 
     attr_reader :term   # The terminal emulation object
 
-    attr_reader :match  # The last non-background expect match.  For a ScreenPattern match, this is a Hash of fields.  For a String or Regexp match, this is a MatchData object.
+    attr_reader :capture  # The last non-background captured fields.  For a ScreenPattern match, this is a Hash of fields.  For a String or Regexp match, this is a MatchData object.
+    alias match capture   # "match" is the deprecated name for "capture"
 
     attr_accessor :transcript_writer # Set this to an instance of ScripTTY::Util::Transcript::Writer
 
@@ -52,6 +53,16 @@ module ScripTTY
       @screen_patterns = {}
     end
 
+    # Get instance variable from the Evaluator
+    def [](varname)
+      @evaluator.instance_variable_get("@#{varname}")
+    end
+
+    # Set an instance variable on the Evaluator
+    def []=(varname, value)
+      @evaluator.instance_variable_set("@#{varname}", value)
+    end
+
     def set_timeout(seconds)
       raise ArgumentError.new("argument to set_timeout must be Numeric or nil") unless seconds.is_a?(Numeric) or seconds.nil?
       if seconds
@@ -233,6 +244,16 @@ module ScripTTY
       true
     end
 
+    # Send password to the remote application.
+    #
+    # This works like the send method, but "**PASSWORD**" is shown in the
+    # transcript instead of the actual bytes sent.
+    def send_password(bytes)
+      @transcript_writer.from_client("**PASSWORD**") if @transcript_writer
+      @conn.write(bytes)
+      true
+    end
+
     # Close the connection and exit.
     def exit
       @transcript_writer.info("Script executing command", "exit") if @transcript_writer
@@ -316,11 +337,7 @@ module ScripTTY
 
       def transcribe_connect_error(e)
         if @transcript_writer
-          @transcript_writer.info("Connect error", e.class.name, e.to_s, e.backtrace.join("\n"))
-          # Write the backtrace out as separate records, for the convenience of people reading the logs without a parser.
-          e.backtrace.each do |line|
-            @transcript_writer.info("Connect error backtrace", line)
-          end
+          @transcript_writer.exception(e)
         end
       end
 
@@ -357,7 +374,7 @@ module ScripTTY
 
             # Make the next wait() call return
             unless ph.background?
-              @match = m
+              @capture = m
               @wait_finished = true
               @net.suspend
               return true

data/lib/scriptty/{apps/capture_app → net}/console.rb

@@ -1,8 +1,5 @@
-require 'scriptty/apps/capture_app'
-
 module ScripTTY
-  module Apps
-    class CaptureApp  # reopen
+  module Net
       class Console
         IAC_WILL_ECHO = "\377\373\001"
         IAC_WONT_ECHO = "\377\374\001"
@@ -99,6 +96,5 @@ module ScripTTY
             @app.detach_console(self)
           end
       end
-    end
   end
 end

data/lib/scriptty/{apps/capture_app → net}/password_prompt.rb

@@ -1,8 +1,5 @@
-require 'scriptty/apps/capture_app'
-
 module ScripTTY
-  module Apps
-    class CaptureApp  # reopen
+  module Net
       class PasswordPrompt
         IAC_WILL_ECHO = "\377\373\001"
         IAC_WONT_ECHO = "\377\374\001"
@@ -60,6 +57,5 @@ module ScripTTY
             nil
           end
       end
-    end
   end
 end

data/lib/scriptty/util/transcript/reader.rb

@@ -45,6 +45,8 @@ module ScripTTY
           "Cx" => :client_close,  # server closed connection
           "Sp" => :server_parsed,  # parsed escape sequence from server
           "Cp" => :client_parsed,  # parsed escape sequence from client
+          "EXC" => :exception_head,    # Exception header - exception class & message
+          "EX+" => :exception_backtrace,  # Exception backtrace - single line of a backtrace
         }
 
         def initialize(io=nil)

data/lib/scriptty/util/transcript/writer.rb

@@ -86,6 +86,31 @@ module ScripTTY
           write_event("*", *args)
         end
 
+        # Convenience function: Log an exception object
+        def exception(exc)
+          klass_name = exc.class.to_s
+          if exc.respond_to?(:message)
+            message = exc.message.to_s
+          else
+            message = exc.to_s
+          end
+          exception_head(klass_name, message)
+          exc.backtrace.each do |line|
+            exception_backtrace(line)
+          end
+          nil
+        end
+
+        # Log exception - header - class and message
+        def exception_head(klass_name, message)
+          write_event("EXC", klass_name, message)
+        end
+
+        # Log exception - single backtrace line
+        def exception_backtrace(line)
+          write_event("EX+", line)
+        end
+
         private
 
           def write_event(type, *args)

data/test/util/transcript/reader_test.rb

@@ -34,6 +34,9 @@ class TranscriptReaderTest < Test::Unit::TestCase
       [5.000] Sx "disconnect"
       [5.000] Sx
       [5] Cx
+      [6.000] EXC "RuntimeError" "foo"
+      [6.001] EX+ "line1"
+      [6.001] EX+ "line2"
     EOF
     expected = [
       [0.0, :info, ["Informational message", "with argument", "\xff"]],
@@ -48,6 +51,9 @@ class TranscriptReaderTest < Test::Unit::TestCase
       [5.0, :server_close, ["disconnect"]],
       [5.0, :server_close, []],
       [5.0, :client_close, []],
+      [6.0, :exception_head, ["RuntimeError", "foo"]],
+      [6.001, :exception_backtrace, ["line1"]],
+      [6.001, :exception_backtrace, ["line2"]],
     ]
     reader = ScripTTY::Util::Transcript::Reader.new
     actual = input_lines.map{|line| reader.parse_line(line) }

data/test/util/transcript/writer_test.rb

@@ -34,6 +34,9 @@ class TranscriptWriterTest < Test::Unit::TestCase
     writer.client_close("msg")
     writer.server_close("msg")
     writer.info("msg")
+    writer.exception_head("ArgumentError", "msg")
+    writer.exception_backtrace("line1")
+    writer.exception_backtrace("line2")
     writer.close
     expected = <<-'EOF'.strip.split("\n").map{|line| line.strip}.join("\n") + "\n"
       [88.000] Copen "10.0.0.5" "55555"
@@ -45,6 +48,9 @@ class TranscriptWriterTest < Test::Unit::TestCase
       [88.000] Cx "msg"
       [88.000] Sx "msg"
       [88.000] * "msg"
+      [88.000] EXC "ArgumentError" "msg"
+      [88.000] EX+ "line1"
+      [88.000] EX+ "line2"
     EOF
   end
 
@@ -123,4 +129,30 @@ class TranscriptWriterTest < Test::Unit::TestCase
     EOF
     assert_equal expected, sio.string
   end
+
+  # Test the exception_head and exception_backtrace messages
+  def test_exception
+    sio = StringIO.new
+    writer = ScripTTY::Util::Transcript::Writer.new(sio)
+    writer.override_timestamp = 0.0
+    begin
+      raise ArgumentError.new("foo")
+    rescue => e
+      writer.exception(e)
+    end
+    writer.close
+
+    # Parse the transcript
+    sio = StringIO.new(sio.string)
+    reader = ScripTTY::Util::Transcript::Reader.new(sio)
+    entries = []
+    while (entry = reader.next_entry)
+      entries << entry
+    end
+    assert_equal [0.0, :exception_head, ["ArgumentError", "foo"]], entries.shift
+    assert_match /^\[0\.0, :exception_backtrace, \["[^"]*:in `test_exception'"\]\]$/, entries.shift.inspect
+    until entries.empty?
+      assert_equal :exception_backtrace, entries.shift[1]
+    end
+  end
 end

metadata

@@ -3,44 +3,44 @@ name: scriptty
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 0
-  - 6
-  - 0
-  version: 0.6.0
+    - 0
+    - 7
+    - 0
+  version: 0.7.0
 platform: java
 authors: 
-- Dwayne Litzenberger
+  - Dwayne Litzenberger
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-24 00:00:00 -04:00
+date: 2010-03-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: treetop
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: multibyte
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: treetop
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: multibyte
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    type: :runtime
+    version_requirements: *id002
 description: |
   ScripTTY is a JRuby application and library that lets you control full-screen
   terminal applications using an expect-like scripting language and a full-screen
@@ -48,109 +48,109 @@ description: |
 
 email: dlitz@infonium.ca
 executables: 
-- scriptty-capture
-- scriptty-dump-screens
-- scriptty-replay
-- scriptty-term-test
-- scriptty-transcript-parse
+  - scriptty-capture
+  - scriptty-dump-screens
+  - scriptty-replay
+  - scriptty-term-test
+  - scriptty-transcript-parse
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+  - README.rdoc
 files: 
-- .gitattributes
-- .gitignore
-- COPYING
-- COPYING.LESSER
-- README.rdoc
-- Rakefile
-- VERSION
-- bin/scriptty-capture
-- bin/scriptty-dump-screens
-- bin/scriptty-replay
-- bin/scriptty-term-test
-- bin/scriptty-transcript-parse
-- examples/captures/xterm-overlong-line-prompt.bin
-- examples/captures/xterm-vim-session.bin
-- examples/demo-capture.rb
-- examples/demo-telnet-session-screens.txt
-- examples/demo-telnet-session.rb
-- examples/telnet-nego.rb
-- lib/scriptty/apps/capture_app.rb
-- lib/scriptty/apps/capture_app/console.rb
-- lib/scriptty/apps/capture_app/password_prompt.rb
-- lib/scriptty/apps/dump_screens_app.rb
-- lib/scriptty/apps/replay_app.rb
-- lib/scriptty/apps/term_test_app.rb
-- lib/scriptty/apps/transcript_parse_app.rb
-- lib/scriptty/cursor.rb
-- lib/scriptty/exception.rb
-- lib/scriptty/expect.rb
-- lib/scriptty/multiline_buffer.rb
-- lib/scriptty/net/event_loop.rb
-- lib/scriptty/screen_pattern.rb
-- lib/scriptty/screen_pattern/generator.rb
-- lib/scriptty/screen_pattern/parser.rb
-- lib/scriptty/term.rb
-- lib/scriptty/term/dg410.rb
-- lib/scriptty/term/dg410/dg410-client-escapes.txt
-- lib/scriptty/term/dg410/dg410-escapes.txt
-- lib/scriptty/term/dg410/parser.rb
-- lib/scriptty/term/xterm.rb
-- lib/scriptty/term/xterm/xterm-escapes.txt
-- lib/scriptty/util/fsm.rb
-- lib/scriptty/util/fsm/definition_parser.rb
-- lib/scriptty/util/fsm/scriptty_fsm_definition.treetop
-- lib/scriptty/util/transcript/reader.rb
-- lib/scriptty/util/transcript/writer.rb
-- test.watchr
-- test/apps/capture_app_test.rb
-- test/apps/transcript_parse_app_test.rb
-- test/cursor_test.rb
-- test/fsm_definition_parser_test.rb
-- test/fsm_test.rb
-- test/multiline_buffer_test.rb
-- test/net/event_loop_test.rb
-- test/screen_pattern/generator_test.rb
-- test/screen_pattern/parser_test.rb
-- test/screen_pattern/parser_test/explicit_cursor_pattern.txt
-- test/screen_pattern/parser_test/explicit_fields.txt
-- test/screen_pattern/parser_test/multiple_patterns.txt
-- test/screen_pattern/parser_test/simple_pattern.txt
-- test/screen_pattern/parser_test/truncated_heredoc.txt
-- test/screen_pattern/parser_test/utf16bebom_pattern.bin
-- test/screen_pattern/parser_test/utf16lebom_pattern.bin
-- test/screen_pattern/parser_test/utf8_pattern.bin
-- test/screen_pattern/parser_test/utf8_unix_pattern.bin
-- test/screen_pattern/parser_test/utf8bom_pattern.bin
-- test/term/dg410/parser_test.rb
-- test/term/xterm_test.rb
-- test/test_helper.rb
-- test/util/transcript/reader_test.rb
-- test/util/transcript/writer_test.rb
+  - .gitattributes
+  - .gitignore
+  - COPYING
+  - COPYING.LESSER
+  - README.rdoc
+  - Rakefile
+  - VERSION
+  - bin/scriptty-capture
+  - bin/scriptty-dump-screens
+  - bin/scriptty-replay
+  - bin/scriptty-term-test
+  - bin/scriptty-transcript-parse
+  - examples/captures/xterm-overlong-line-prompt.bin
+  - examples/captures/xterm-vim-session.bin
+  - examples/demo-capture.rb
+  - examples/demo-telnet-session-screens.txt
+  - examples/demo-telnet-session.rb
+  - examples/telnet-nego.rb
+  - lib/scriptty/apps/capture_app.rb
+  - lib/scriptty/apps/dump_screens_app.rb
+  - lib/scriptty/apps/replay_app.rb
+  - lib/scriptty/apps/term_test_app.rb
+  - lib/scriptty/apps/transcript_parse_app.rb
+  - lib/scriptty/cursor.rb
+  - lib/scriptty/exception.rb
+  - lib/scriptty/expect.rb
+  - lib/scriptty/multiline_buffer.rb
+  - lib/scriptty/net/console.rb
+  - lib/scriptty/net/event_loop.rb
+  - lib/scriptty/net/password_prompt.rb
+  - lib/scriptty/screen_pattern.rb
+  - lib/scriptty/screen_pattern/generator.rb
+  - lib/scriptty/screen_pattern/parser.rb
+  - lib/scriptty/term.rb
+  - lib/scriptty/term/dg410.rb
+  - lib/scriptty/term/dg410/dg410-client-escapes.txt
+  - lib/scriptty/term/dg410/dg410-escapes.txt
+  - lib/scriptty/term/dg410/parser.rb
+  - lib/scriptty/term/xterm.rb
+  - lib/scriptty/term/xterm/xterm-escapes.txt
+  - lib/scriptty/util/fsm.rb
+  - lib/scriptty/util/fsm/definition_parser.rb
+  - lib/scriptty/util/fsm/scriptty_fsm_definition.treetop
+  - lib/scriptty/util/transcript/reader.rb
+  - lib/scriptty/util/transcript/writer.rb
+  - test.watchr
+  - test/apps/capture_app_test.rb
+  - test/apps/transcript_parse_app_test.rb
+  - test/cursor_test.rb
+  - test/fsm_definition_parser_test.rb
+  - test/fsm_test.rb
+  - test/multiline_buffer_test.rb
+  - test/net/event_loop_test.rb
+  - test/screen_pattern/generator_test.rb
+  - test/screen_pattern/parser_test.rb
+  - test/screen_pattern/parser_test/explicit_cursor_pattern.txt
+  - test/screen_pattern/parser_test/explicit_fields.txt
+  - test/screen_pattern/parser_test/multiple_patterns.txt
+  - test/screen_pattern/parser_test/simple_pattern.txt
+  - test/screen_pattern/parser_test/truncated_heredoc.txt
+  - test/screen_pattern/parser_test/utf16bebom_pattern.bin
+  - test/screen_pattern/parser_test/utf16lebom_pattern.bin
+  - test/screen_pattern/parser_test/utf8_pattern.bin
+  - test/screen_pattern/parser_test/utf8_unix_pattern.bin
+  - test/screen_pattern/parser_test/utf8bom_pattern.bin
+  - test/term/dg410/parser_test.rb
+  - test/term/xterm_test.rb
+  - test/test_helper.rb
+  - test/util/transcript/reader_test.rb
+  - test/util/transcript/writer_test.rb
 has_rdoc: true
 homepage: http://github.com/infonium/scriptty
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
+  - --charset=UTF-8
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: 
@@ -159,20 +159,20 @@ signing_key:
 specification_version: 3
 summary: write expect-like script to control full-screen terminal-based applications
 test_files: 
-- test/apps/capture_app_test.rb
-- test/apps/transcript_parse_app_test.rb
-- test/cursor_test.rb
-- test/fsm_definition_parser_test.rb
-- test/fsm_test.rb
-- test/multiline_buffer_test.rb
-- test/net/event_loop_test.rb
-- test/screen_pattern/generator_test.rb
-- test/screen_pattern/parser_test.rb
-- test/term/dg410/parser_test.rb
-- test/term/xterm_test.rb
-- test/test_helper.rb
-- test/util/transcript/reader_test.rb
-- test/util/transcript/writer_test.rb
-- examples/demo-capture.rb
-- examples/demo-telnet-session.rb
-- examples/telnet-nego.rb
+  - test/cursor_test.rb
+  - test/fsm_definition_parser_test.rb
+  - test/fsm_test.rb
+  - test/multiline_buffer_test.rb
+  - test/test_helper.rb
+  - test/apps/capture_app_test.rb
+  - test/apps/transcript_parse_app_test.rb
+  - test/net/event_loop_test.rb
+  - test/screen_pattern/generator_test.rb
+  - test/screen_pattern/parser_test.rb
+  - test/term/xterm_test.rb
+  - test/term/dg410/parser_test.rb
+  - test/util/transcript/reader_test.rb
+  - test/util/transcript/writer_test.rb
+  - examples/demo-capture.rb
+  - examples/demo-telnet-session.rb
+  - examples/telnet-nego.rb