@@ -16,6 +16,6 @@ Returns nothing, but types the input require 'snippits' DEBUG = (ARGV[1] || 0).to_i -Typing::Typer.new(ARGV[0], DEBUG).type_text +Typing::Typer.new(ARGV[0], DEBUG).type_input_text bin/keyout @@ -13,4 +13,4 @@ require 'snippits' DEBUG = (ARGV[1] || 0).to_i contents = Snippits.snippit(ARGV.first) -Typing::Typer.new(contents, DEBUG).type_text +Typing::Typer.new(contents, DEBUG).type_input_text bin/ks @@ -342,26 +342,30 @@ module Typing output end + def type_input_text + type_text(@input) + end + # Type some text. Read method comments for more insight into the # process. - def type_text + def type_text(input) final = "" - @input = parse_input(@input) + input = parse_input(input) at_end = false i = 0 until at_end do - str = @input[i] + str = input[i] if (key = find(str)).class == Key #IDIOMATIC? if key.command_key? system(gen_exec(final)) unless final == '' # execute the command defined, and type the rest - @input = key.command.call(self) + @input[i+1..-1].join + input = key.command.call(self) + input[i+1..-1].join - if @input != "" - type_text + if input != "" + type_text(input) else exit end @@ -377,8 +381,8 @@ module Typing if str.size > 1 @clipboard = Typing.clip_buffers Typing.clipboard = str.strip - @input.insert(i+1,'{restore}') - @input.insert(i+1,'{paste}') + input.insert(i+1,'{restore}') + input.insert(i+1,'{paste}') else final << '"str ' + str + '" ' end @@ -391,7 +395,7 @@ module Typing end i += 1 - at_end = @input.size == i + at_end = input.size == i end # Unpress modifier keys at the very end lib/typing.rb @@ -155,17 +155,17 @@ module TestTyping assert_nothing_raised do @typer.debug = 1 end assert !@typer.modifiers_pressed? assert_nothing_raised do @typer.input = "{c}" end - assert_nothing_raised do @typer.type_text end + assert_nothing_raised do @typer.type_input_text end assert !@typer.modifiers_pressed? end - def test_type_text + def test_type_input_text assert_nothing_raised do @typer.debug = 1 end { 'simplestring' => '"str simplestring" ' }.each do |string, command| assert_nothing_raised do @typer.input = string end - assert_equal @typer.type_text, command + assert_equal @typer.type_input_text, command end end test/test_typing.rb 99bdd5d40bc3cffa4c0ce61a6fab3865a787c391 Benjamin Kudria ben@kudria.net http://github.com/bkudria/snippits/commit/4614f17430cb0378b281102a5f532c08cc79efd8 4614f17430cb0378b281102a5f532c08cc79efd8 2008-07-05T21:41:29-07:00 2008-07-05T21:41:29-07:00 convert type_text to take param, make type_input_text call it with @input, and modify external calls b98c208708af837cb15f3e65070eec0c57872af1 Benjamin Kudria ben@kudria.net