relaxo-query-server 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78944e73c0640d81426a896195caf1dac016cccf
-  data.tar.gz: 32d6f60802a40842fbea80820c1914f06e6409cf
+  metadata.gz: 1bce12878810ea52b4511ded70da309034ae22ca
+  data.tar.gz: dc5c2821f3fbb7eed5bb48cbd2853028aee2863b
 SHA512:
-  metadata.gz: 5df2161444eee230a5eff87830986c5b060ea38d53e3823c48bc94c3a54969760c6ba91bd7bcb23a30673afafe654901305476efa7aec2c956b3e8c58a941f32
-  data.tar.gz: 403b146fb25f50a0dfc71b6d8cc845159c86d0491954d505af9f08419f64db569d0598ca68386c526779a1a0a96bdd0f887b4d42fa65492c728406f110038728
+  metadata.gz: 2671ca62a2ded30c04ca9012a4dc7f30a6fa0ce0e4abffee32a761b3081fe255ff4699023a73cf7b086cc84695850720cced0cca85d6a8d91abdc510671bdcfb
+  data.tar.gz: 8b08db83690523700b7a99ab36ab58a54a8b7f38aaf25b074fa142dbe7e2f5b7a05a3eb5405fb46834ad020deae70f89657ab8a850c5d83e03a919dd1d98fdde

data/bin/relaxo-query-server

@@ -4,7 +4,8 @@ require 'relaxo/query_server'
 require 'optparse'
 
 OPTIONS = {
-	:safe => 2
+	# Don't do completely unsafe operations, but most things continue to work correctly.
+	:safe => 1
 }
 
 ARGV.options do |o|
@@ -20,6 +21,10 @@ ARGV.options do |o|
 	o.on("--safe [level]", "Set the ruby $SAFE level to protect the execution environment.") do |level|
 		OPTIONS[:safe] = level.to_i
 	end
+	
+	o.on("--debug path", "Log all requests to the given log file") do |path|
+		OPTIONS[:debug] = path
+	end
 
 	o.separator ""
 

data/lib/relaxo/query_server.rb

@@ -28,6 +28,11 @@ module Relaxo
 			shell = Shell.new($stdin, $stdout)
 			context = Context.new(shell, options)
 			
+			if options[:debug]
+				log = File.open(options[:debug], 'a')
+				shell = DebugShell.new(log, shell)
+			end
+			
 			shell.run do |command|
 				context.run(command)
 			end

data/lib/relaxo/query_server/shell.rb

@@ -49,9 +49,9 @@ module Relaxo
 				begin
 					while true
 						command = read_object
-
+						
 						result = yield command
-
+						
 						write_object(result)
 					end
 				rescue EOFError
@@ -60,6 +60,26 @@ module Relaxo
 			end
 		end
 		
+		class DebugShell
+			def initialize(log, wrapper)
+				@log = log
+				@wrapper = wrapper
+			end
+			
+			# Read commands from `input`, execute them and then write out the results.
+			def run
+				@wrapper.run do |command|
+					@log.puts "-> #{command.inspect}"
+					
+					result = yield command
+					
+					@log.puts "<- #{result.inspect}"
+					
+					next result
+				end
+			end
+		end
+		
 		# Used primarily for testing, allows the input and output of the server to be provided directly.
 		class MockShell < Shell
 			def initialize

data/lib/relaxo/query_server/version.rb

@@ -20,6 +20,6 @@
 
 module Relaxo
 	module QueryServer
-		VERSION = "0.1.4"
+		VERSION = "0.1.5"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaxo-query-server
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaxo