web-repl 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9cb6f9d73523c501441de89215c76c8e7343161
-  data.tar.gz: bdb3396923e7fca4fc2a267162c9d5f1ff81cd53
+  metadata.gz: b4e0434060703c3bc75cf67d85d2897d4990da1a
+  data.tar.gz: 0378db709e99f75dc4a9e83cf6c017b6159103ac
 SHA512:
-  metadata.gz: 32a4b0890411729f1c1fbaec5ad54b0e78c81b6fdf98e54a342c6244d059db54f7386694adadde2d0767d771eb8123995afb2a0c6a007880a1be7a6d7846d357
-  data.tar.gz: 8abdfd2e5050b6c79671a77e24fb827343104b6b679f34c20986878aa0772153df88a6e24b0fb861fc930f66bf7bef4c36c01f6118ecdd1c699b970a6d9e71fc
+  metadata.gz: 814a12b0fb7b606f3d84e4879f570a9f0e9e38c141ef0e58d4bb57120db97e8019181f564d4bba74e7f4e2d27c5d12707b646b97f846dc31703200c10ce1bbc2
+  data.tar.gz: 8fcdf3dd69be65c74111f2acaba1400808a50a1d42fde538125259e12de002c5bbb41b7bbe41516f4dfef6bcf2c67a20e790af1f3800a5d16f0ac5e4348bfa33

data/lib/web-repl.rb

@@ -6,14 +6,14 @@ require "readline"
 require "socket"
 
 # classes
-require "web-repl/messager"
+require "web-repl/messenger"
 require "web-repl/patch"
 require "web-repl/repl"
 
 # A Javascript REPL that runs in Ruby. Evaluation is done by a web browser instance.
 module WebRepl
 
-  VERSION = "0.6"
+  VERSION = "0.7"
 
   # Shortcut to REPL.start
   def self.start(*a)

data/lib/web-repl/{messager.rb → messenger.rb}

@@ -1,7 +1,7 @@
 module WebRepl
 
   # Handles sending and receiving messages to/from the socket
-  class Messager
+  class Messenger
  
     # @param [EventMachine::WebSocket] socket
     # @param [Hash] options

data/lib/web-repl/repl.rb

@@ -21,7 +21,7 @@ module WebRepl
     def initialize(config, options = {})
       @config = config
       @socket = nil
-      @messager = nil
+      @messenger = nil
       @buffer = []
       @debug = options[:debug]
     end
@@ -30,28 +30,54 @@ module WebRepl
     # @param [Fixnum, String] statement A Javascript statement to be evaluated
     # @return [String, nil] The data that was sent to the browser, or nil if sending could not be completed. 
     def evaluate(statement)
-      @messager.out({ :statement => statement }) unless @messager.nil?
+      @messenger.out({ :statement => statement }) unless @messenger.nil?
     end
 
     # Prompt the Ruby user for input and send that input to the browser for evaluation (blocking)
     # @return [String, nil] The data that was sent to the browser, or nil if sending could not be completed
-    def gets
+    def input(options = {})
       line = Readline.readline('> ', true)
-      return nil if line.nil?
-      if line =~ /^\s*$/ or Readline::HISTORY.to_a[-2] == line
+      if invalid_input?(line)
         Readline::HISTORY.pop
-      end      
-      statement = line.strip
-      case statement
-      when "exit" then exit
+        input(options)
       else
-        evaluate(statement)
+        Readline::HISTORY.pop if repeat_input?(line)
+        statement = line.strip
+        case statement
+        when "exit", "quit" then exit
+        else
+          evaluate(statement)
+          wait_for_response(options)
+        end
       end
     end
 
+    def repeat_input?(line)
+      line == Readline::HISTORY.to_a[-2]
+    end
+
+    def invalid_input?(line)
+      line.nil? || line =~ /^\s*$/
+    end
+
     # Wait for a response from the browser
-    def wait_for_response
-      loop until !@buffer.empty?
+    def wait_for_response(options)
+      until !@buffer.empty? do
+      end
+      @buffer.each { |resp| puts_message(resp) }
+      @buffer.clear
+      input unless !!options[:background]
+    end
+
+    def puts_message(message)
+      keys = { :error => :red, :value => :white }
+      text = nil
+      keys.each do |k,v| 
+        text ||= message[k].to_s.send(v) unless message[k].nil?
+      end
+      text ||= "(void)"
+      puts(text)
+      text
     end
 
     # Start the Websocket connection (blocking)
@@ -62,25 +88,24 @@ module WebRepl
         EM::WebSocket.run(@config) do |ws|
           if @socket.nil?
             @socket = ws
-            @messager = Messager.new(@socket)
+            @messenger = Messenger.new(@socket)
             configure_event_handling(:background => options[:background], &block)
           end
         end
       end
+      Thread.abort_on_exception = true
       acknowledge_handshake do
         yield if block_given?
-        gets unless !!options[:background]
+        input(options) unless !!options[:background]
       end
-      @thread.join unless !!options[:background]
+      #@thread.join unless !!options[:background]
     end
 
     # Execute a block when a connection is made
     # @return [TrueClass]
     def acknowledge_handshake(&block)
-      Thread.new do
-        loop until !@handshake.nil?
-        yield
-      end
+      loop until !@handshake.nil?
+      yield
     end
 
     # Close the REPL
@@ -102,17 +127,9 @@ module WebRepl
     end
 
     def handle_message_received(raw_message, options = {})
-      @messager.in(raw_message) do |message|
-        @buffer.clear
+      @messenger.in(raw_message) do |message|
         @buffer << message
-        keys = { :error => :red, :value => :white }
-        text = nil
-        keys.each do |k,v| 
-          text ||= message[k].to_s.send(v) unless message[k].nil?
-        end
-        puts(text)
       end
-      gets unless !!options[:background]
     end
 
     # Configure the Websocket event handling

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web-repl
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +112,7 @@ files:
 - js/replConnection-0.6.min.js
 - js/replConnection.js
 - lib/web-repl.rb
-- lib/web-repl/messager.rb
+- lib/web-repl/messenger.rb
 - lib/web-repl/patch.rb
 - lib/web-repl/repl.rb
 - test/helper.rb