rack-webconsole-pry 0.1.8 → 0.1.9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-webconsole-pry (0.1.8)
+    rack-webconsole-pry (0.1.9)
       json
       multi_json (>= 1.0.3)
       pry
@@ -11,23 +11,23 @@ GEM
   remote: http://rubygems.org/
   specs:
     bluecloth (2.2.0)
-    coderay (1.0.6)
-    json (1.7.3)
+    coderay (1.0.8)
+    json (1.7.6)
     metaclass (0.0.1)
-    method_source (0.7.1)
+    method_source (0.8.1)
     minitest (2.11.4)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
-    multi_json (1.3.6)
-    pry (0.9.9.6)
+    multi_json (1.5.0)
+    pry (0.9.10)
       coderay (~> 1.0.5)
-      method_source (~> 0.7.1)
-      slop (>= 2.4.4, < 3)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
     purdytest (1.0.0)
       minitest (~> 2.2)
-    rack (1.4.1)
+    rack (1.4.4)
     rake (0.9.2.2)
-    slop (2.4.4)
+    slop (3.3.3)
     yard (0.7.5)
 
 PLATFORMS

data/lib/rack/webconsole.rb

@@ -23,7 +23,7 @@ module Rack
   # variables and giving a true IRB-esque experience.
   #
   class Webconsole
-    @@config = {:inject_jquery => false, :key_code => "96"}
+    @@config = {:inject_jquery => false, :key_code => "[96]"}
 
     class << self
       # Returns whether the Asset injecter must inject JQuery or not.

data/lib/rack/webconsole/assets.rb

@@ -24,6 +24,8 @@ module Rack
       # @param [Hash] env a Rack request environment.
       def call(env)
         status, headers, response = @app.call(env)
+        response.extend(ResponseMethods)
+        
         return [status, headers, response] unless check_html?(headers, response) && status == 200
 
         if response.respond_to?(:body)
@@ -69,5 +71,14 @@ module Rack
           body =~ %r{<html.*</html>}m
       end
     end
+  
+    module ResponseMethods
+      def first
+        obj = nil
+        self.each { |e| obj = e; break }
+        obj
+      end
+    end
+  
   end
 end

data/lib/rack/webconsole/repl.rb

@@ -21,6 +21,7 @@ module Rack
             @@tokens.delete(k) if v <= Time.now
           end
         end
+
         # Returns the autogenerated security token
         #
         # @return [String] the autogenerated token
@@ -50,6 +51,7 @@ module Rack
         def request=(request)
           @@request = request
         end
+
       end
 
       # Honor the Rack contract by saving the passed Rack application in an ivar.
@@ -58,6 +60,7 @@ module Rack
       #   middleware chain.
       def initialize(app)
         @app = app
+
       end
 
       # Evaluates a string as Ruby code and returns the evaluated result as
@@ -83,6 +86,7 @@ module Rack
         if $pry.nil?
           Pry.pager = false
           $pry = Pry.new(:output => $pry_output, :pager => false)
+          Pry.initial_session_setup
         end
         pry = $pry
         
@@ -96,16 +100,50 @@ module Rack
         pry.inject_sticky_locals(target)
         code = params['query']
         hash[:prompt] = pry.select_prompt("", target) + Pry::Code.new(code).to_s
+        got_output = false
         begin
-        if !pry.process_command(code, "", target)
-          result = target.eval(code, Pry.eval_path, Pry.current_line)
-          pry.set_last_result(result, target, code)
-          pry.show_result(result) if pry.should_print?
-        end
+          read_pipe, write_pipe = IO.pipe
+          end_line = "~~~~~ rack-webconsole end output ~~~~~\n"
+
+          thr = Thread.new do
+            while true
+              new_line = read_pipe.readline
+              break if new_line == end_line
+              $pry_output << new_line
+            end
+          end
+
+          old_stdout = STDOUT.dup
+          old_stderr = STDERR.dup
+          STDOUT.reopen(write_pipe)
+          STDERR.reopen(write_pipe)
+          if !pry.process_command(code, "", target)
+            result = target.eval(code, Pry.eval_path, Pry.current_line)
+            got_output = true
+          end
         rescue StandardError => e
-          $pry_output.write("Error: " + e.message)
+          error_out = "Error: " + e.message
+        ensure
+          write_pipe << end_line
+
+          thr.join
+          read_pipe.close
+          write_pipe.close
+          STDOUT.reopen(old_stdout)
+          STDERR.reopen(old_stderr)
+
         end
-        
+
+        if got_output
+          pry.set_last_result(result, target, code)
+          Pry.print.call($pry_output, result) if pry.should_print?
+          # the below line doesn't work well with custom printers
+          # (like awesome_print) for some reason
+          #pry.show_result(result) if pry.should_print?
+        end
+
+        $pry_output.write(error_out) if error_out
+
         # cleanup (supposed to call when $pry is destroyed)
         # pry.repl_epilogue(target)
         

data/lib/rack/webconsole/version.rb

@@ -2,6 +2,6 @@
 module Rack
   class Webconsole
     # rack-webconsole version number.
-    VERSION = "0.1.8"
+    VERSION = "0.1.9"
   end
 end

data/public/jquery.html

@@ -1 +0,0 @@
-<script type="text/javascript" src="http://code.jquery.com/jquery-1.6.2.min.js"></script>

data/spec/rack/webconsole/repl_spec.rb

@@ -12,76 +12,96 @@ module Rack
     end
 
     describe "#call" do
-      it 'evaluates the :query param in a sandbox and returns the result' do
-        @app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['hello world']] }
-        env = {}
-        Webconsole::Repl.stubs(:token_valid?).returns(true)
-        request = OpenStruct.new(:params => {'query' => 'a = 4; a * 2'}, :post? => true)
+      let(:app) { lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['hello world']] } }
+      let(:repl) { Webconsole::Repl.new(app) }
+      before(:each) do
+        @app = app
+      end
+      let(:environment) { {} }
+      let(:use_post) { true }
+
+      # sends input query using the webconsole, returning the response
+      # query: The pry input to use
+      # token:(optional) The authentication token
+      def response_to(query, token = nil)
+        params = {'query' => query }
+        params['token'] = token if token
+        request = OpenStruct.new(:params => params, :post? => use_post)
         Rack::Request.stubs(:new).returns request
+        repl.call(environment)
+      end
 
-        @repl = Webconsole::Repl.new(@app)
-
-        response = @repl.call(env).last.first
+      # same as send_input, but extracts the result out of the query
+      def query(input, token = nil)
+        response = response_to(input, token)
+        MultiJson.load(response.last.first)['result']
+      end
 
-        MultiJson.load(response)['result'].must_include "8" # include because of coloring characters
+      def with_token(token)
+        Webconsole::Repl.send(:class_variable_set, :@@tokens, {token => Time.now + 30 * 60})
       end
 
-      it 'maintains local state in subsequent calls thanks to an evil global variable' do
-        @app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['hello world']] }
-        env = {}
-        Webconsole::Repl.stubs(:token_valid?).returns(true)
-        request = OpenStruct.new(:params => {'query' => 'a = 4'}, :post? => true)
-        Rack::Request.stubs(:new).returns request
-        @repl = Webconsole::Repl.new(@app)
+      it 'handles a request with a correct token' do
+        with_token('abc')
+        response_to('unknown_method', 'abc').wont_equal app.call(environment)
+      end
 
-        @repl.call(env) # call 1 sets a to 4
+      it 'rejects a request with an invalid token' do
+        with_token('abc')
+        response_to('unknown_method', 'cba').must_equal app.call(environment)
+      end
 
-        request = OpenStruct.new(:params => {'query' => 'a * 8', 'token' => 'abc'}, :post? => true)
-        Rack::Request.stubs(:new).returns request
+      describe "with a valid token" do
+        before(:each) do
+          Webconsole::Repl.stubs(:token_valid?).returns(true)
+        end
 
-        response = @repl.call(env).last.first # call 2 retrieves a and multiplies it by 8
+        it 'evaluates the :query param in a sandbox and returns the result' do
+          query('a = 4; a * 2').must_include "8"
+        end
 
-        MultiJson.decode(response)['result'].must_include "32" # include because of coloring characters
-      end
+        it 'displays data sent to stdout' do
+          query('puts "hello world"').must_include "hello world"
+        end
 
-      it "returns any found errors prepended with 'Error:'" do
-        @app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['hello world']] }
-        env = {}
-        Webconsole::Repl.stubs(:token_valid?).returns(true)
-        request = OpenStruct.new(:params => {'query' => 'unknown_method'}, :post? => true)
-        Rack::Request.stubs(:new).returns request
-        @repl = Webconsole::Repl.new(@app)
+        it 'displays data sent to stderr' do
+          query('warn "Warning"').must_include "Warning"
+        end
 
-        response = @repl.call(env).last.first
+        it 'displays data sent to stdout after a delay' do
+          query('.sleep 0.5; echo command output').must_include 'command output'
+        end
 
-        MultiJson.decode(response)['result'].must_match /Error:/
-      end
+        it "Outputs the result of the computation after an stdout data" do
+          output = query('puts "stdout";"result"')
+          result_loc = output.match("result").begin(0)
+          stdout_loc = output.match("stdout").begin(0)
+          (stdout_loc < result_loc).must_equal true
+        end
 
-      it 'rejects non-post requests' do
-        @app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['hello world']] }
-        env = {}
-        Webconsole::Repl.stubs(:token).returns('abc')
-        request = OpenStruct.new(:params => {'query' => 'unknown_method', 'token' => 'abc'}, :post? => false)
-        Rack::Request.stubs(:new).returns request
-        @repl = Webconsole::Repl.new(@app)
+        it 'displays stdout data from external processes' do
+          query('.echo command output').must_include 'command output'
+        end
 
-        $sandbox.expects(:instance_eval).never
+        it 'maintains local state in subsequent calls thanks to an evil global variable' do
+          query('a = 4')
+          query('a * 8').must_include "32"
+        end
 
-        @repl.call(env).must_equal @app.call(env)
+        it "returns any found errors prepended with 'Error:'" do
+          query('unknown_method').must_match /Error:/
+        end
       end
 
-      it 'rejects requests with invalid token' do
-        @app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['hello world']] }
-        env = {}
-        Webconsole::Repl.stubs(:token).returns('abc')
-        request = OpenStruct.new(:params => {'query' => 'unknown_method', 'token' => 'cba'}, :post? => true)
-        Rack::Request.stubs(:new).returns request
-        @repl = Webconsole::Repl.new(@app)
-
-        $sandbox.expects(:instance_eval).never
-
-        @repl.call(env).must_equal @app.call(env)
+      describe "with non-post requests" do
+        let(:use_post) { false }
+        it "rejects the request" do
+          with_token('abc')
+          response = response_to('unknown_method', 'abc')
+          response.must_equal app.call(environment)
+        end
       end
+
     end
 
     describe 'class methods' do

data/spec/rack/webconsole_spec.rb

@@ -10,6 +10,11 @@ module Rack
       @webconsole.instance_variable_get(:@app).must_equal @app
     end
 
+    it 'initializes config' do
+      Webconsole.inject_jquery.must_equal false
+      Webconsole.key_code.must_equal "[96]"
+    end
+
     describe "#call" do
       it 'delegates the call to the Repl middleware when the path is /webconsole' do
         @app = stub

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-webconsole-pry
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -203,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1992267155081239539
+      hash: 1934120066910343012
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1992267155081239539
+      hash: 1934120066910343012
 requirements: []
 rubyforge_project: rack-webconsole-pry
 rubygems_version: 1.8.24