rsql 0.2.2 → 0.2.3

data/bin/rsql

@@ -428,6 +428,18 @@ Signal.trap('INT') do
     cmd_thread.kill
 end
 
+Signal.trap('CHLD') do
+    $stderr.puts "SSH child (#{ssh_pid}) stopped--shutting down..."
+    if cmd_thread[:running] && MySQLResults.conn
+        $stderr.puts 'Interrupting MySQL query...'
+        safe_timeout(MySQLResults.conn, :close, 'MySQL')
+        MySQLResults.conn = nil
+    end
+    cmd_thread[:shutdown] = true
+    sleep(0.3)
+    cmd_thread.kill
+end
+
 begin
     cmd_thread.join
 rescue Exception => ex
@@ -451,6 +463,11 @@ if Readline::HISTORY.any?
 end
 
 if ssh_pid && 0 <= ssh_pid
-    Process.kill('INT', ssh_pid)
-    Process.waitpid(ssh_pid)
+    begin
+        Process.kill('INT', ssh_pid)
+        Process.waitpid(ssh_pid)
+    rescue Exception => ex
+        $stderr.puts ex.message
+        $stderr.puts ex.backtrace if verbose
+    end
 end

data/lib/rsql.rb

@@ -2,7 +2,7 @@
 # Commands using an EvalContext for handling recipes.
 #
 module RSQL
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
 
     require 'rsql/mysql_results'
     require 'rsql/eval_context'

data/lib/rsql/commands.rb

@@ -64,7 +64,7 @@ module RSQL
                     sep = nil
                 end
 
-                if esc.any?
+                unless esc.empty?
                     esc << match
                     match = esc
                     esc = ''
@@ -177,7 +177,7 @@ module RSQL
                     displayer = @default_displayer
                 end
 
-                if content.any?
+                unless content.empty?
                     @cmds << Command.new(content, bangs, declarator, displayer)
                     return true
                 end

data/lib/rsql/eval_context.rb

@@ -100,7 +100,6 @@ module RSQL
         end
 
         def reload
-            MySQLResults.reset_cache
             @loaded_fns.each{|fn| self.load(fn, false)}
             puts "loaded: #{@loaded_fns.inspect}"
         end
@@ -108,7 +107,7 @@ module RSQL
         def bang_eval(field, val)
             if bang = @bangs[field]
                 begin
-                    val = Thread.new{ eval("$SAFE=2;#{bang}(val)") }.value
+                    val = Thread.new{ eval("#{bang}(val)") }.value
                 rescue Exception => ex
                     $stderr.puts(ex.message, ex.backtrace.first)
                 end
@@ -153,7 +152,7 @@ module RSQL
                 # that we have file/line info, we need to rescue their
                 # exceptions inside the evaluation
                 th = Thread.new do
-                    eval('$SAFE=2;begin;' << content << %q{
+                    eval('begin;' << content << %q{
                       rescue Exception => ex
                         if @verbose
                             $stderr.puts("#{ex.class}: #{ex.message}", ex.backtrace)
@@ -223,7 +222,7 @@ module RSQL
                     end
                     limit -= 1
                 end
-                '%02x' % ch[0]
+                '%02x' % ch.bytes.first
             end
 
             if limit && limit < 1 && 0 < cnt
@@ -358,13 +357,14 @@ module RSQL
                             next unless ending || i == lineno
                             source << line
                             unless ending
-                                unless m = line.match(/\{|do/)
+                                unless m = line.match(/\{|do\b/)
                                     $stderr.puts "unable to locate block beginning at #{fn}:#{lineno}"
                                     return
                                 end
                                 ending = m[0] == '{' ? '\}' : 'end'
                                 next
                             end
+
                             if m = line.match(/^#{ending}/)
                                 found = true
                                 break
@@ -379,7 +379,7 @@ module RSQL
                     end
                 end
 
-                if reg.source && reg.source.any?
+                if reg.source && !reg.source.empty?
                     puts reg.source
                 else
                     $stderr.puts "unable to locate body for #{sym}"
@@ -440,7 +440,7 @@ module RSQL
                     argstr = args.join(',')
                     usage << "(#{argstr})" unless argstr.empty?
 
-                    blockstr = %{$SAFE=2;lambda{|#{argstr}|%{#{sql}} % [#{argstr}]}}
+                    blockstr = %{lambda{|#{argstr}|%{#{sql}} % [#{argstr}]}}
                     block = Thread.new{ eval(blockstr) }.value
                     args = []
                 else

data/lib/rsql/mysql_results.rb

@@ -260,7 +260,7 @@ module RSQL
             # we set this here so that (a) it occurs _after_ we are
             # successful and so we can show an appropriate messge in a
             # displayer
-            if @sql.match(/use\s+(\S+)/)
+            if @sql.match(/use\s+(\S+)/i)
                 @database_changed = true
                 @@database_name = $1
             end

data/test/test_commands.rb

@@ -53,7 +53,7 @@ class TestCommands < Test::Unit::TestCase
 
         # make sure our logic to handle eval'd blocks with args works
         @strout.string = ''
-        cmds = Commands.new('. Proc.new{|a| p a} | @results.value.call(:fancy)', :display_by_column)
+        cmds = Commands.new('. Proc.new{|a| puts a.inspect} | @results.value.call(:fancy)', :display_by_column)
         cmds.run!(@ctx)
         assert_equal(':fancy', @strout.string.chomp)
     end
@@ -61,7 +61,7 @@ class TestCommands < Test::Unit::TestCase
     def test_multiple
         @conn.expects(:query).with('one thing').returns(nil)
         @conn.expects(:affected_rows).returns(1)
-        cmds = Commands.new('. "one thing" ; . p :hello', :display_by_column)
+        cmds = Commands.new('. "one thing" ; . puts :hello.inspect', :display_by_column)
         cmds.run!(@ctx)
         assert_match(/^QueryOK,1rowaffected\(\d+.\d+sec\):hello$/,
                      @strout.string.gsub(/\s+/,''))

data/test/test_eval_context.rb

@@ -28,7 +28,6 @@ class TestEvalContext < Test::Unit::TestCase
     end
 
     def test_load
-        @conn.expects(:list_dbs).returns([])
         orig = $stdout
         $stdout = out = StringIO.new
         @ctx.safe_eval('reload', nil, out)
@@ -97,8 +96,10 @@ class TestEvalContext < Test::Unit::TestCase
         assert_equal('', out.string)
         assert_equal('refusing to describe the version method', err.string.chomp)
 
+        err.string = ''
         out.string = ''
         val = @ctx.safe_eval('desc :cleanup_example', nil, out)
+        assert_equal('', err.string)
         assert_equal('DROP TEMPORARY TABLE IF EXISTS #{@rsql_table}', out.string.strip)
 
         out.string = ''

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rsql
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Brad Robel-Forrest
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-25 00:00:00 Z
+date: 2011-09-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh