rsql 0.2.3 → 0.2.4

data/bin/rsql

@@ -59,7 +59,7 @@ else
     rc_fn = File.join(ENV['HOME'], ".#{bn}rc")
 end
 
-eval_context.load(rc_fn, false) if File.exists?(rc_fn)
+eval_context.load(rc_fn, :skip_init_registrations) if File.exists?(rc_fn)
 
 def get_password(prompt)
     STDOUT.print(prompt)

data/lib/rsql.rb

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

data/lib/rsql/eval_context.rb

@@ -29,7 +29,8 @@ module RSQL
     #
     class EvalContext
 
-        Registration = Struct.new(:name, :args, :bangs, :block, :usage, :desc, :source)
+        Registration = Struct.new(:name, :args, :bangs, :block, :usage,
+                                  :desc, :source, :source_fn)
 
         HEXSTR_LIMIT = 32
 
@@ -80,7 +81,17 @@ module RSQL
             end
         end
 
-        def load(fn, init=true)
+        def load(fn, opt=nil)
+            # this should only be done after we have established a
+            # mysql connection, so this option allows rsql to load the
+            # init file immediately and then later make the init
+            # registration calls--we set this as an instance variable
+            # to allow for loaded files to call load again and yet
+            # still maintain the skip logic
+            if opt == :skip_init_registrations
+                reset_skipping = @skipping_init_registrations = true
+            end
+
             ret = Thread.new {
                 begin
                     eval(File.read(fn), binding, fn)
@@ -91,12 +102,22 @@ module RSQL
             }.value
 
             if Exception === ret
-                bt = ret.backtrace.collect{|line| line.start_with?(fn) ? line : nil}.compact
-                $stderr.puts("#{ret.class}: #{ret.message}", bt, '')
+                if @verbose
+                    $stderr.puts("#{ex.class}: #{ex.message}", ex.backtrace)
+                else
+                    bt = ret.backtrace.collect{|line| line.start_with?(fn) ? line : nil}.compact
+                    $stderr.puts("#{ret.class}: #{ret.message}", bt, '')
+                end
+                ret = false
             else
                 @loaded_fns << fn unless @loaded_fns.include?(fn)
-                call_init_registrations if init
+                call_init_registrations unless @skipping_init_registrations
+                ret = true
             end
+
+            @skipping_init_registrations = false if reset_skipping
+
+            return ret
         end
 
         def reload
@@ -316,6 +337,10 @@ module RSQL
                 return params
             end
 
+            # Similiar to the MySQL "desc" command, show the content
+            # of nearly any registered recipe including where it was
+            # sourced (e.g. what file:line it came from).
+            #
             def desc(sym)
                 unless Symbol === sym
                     $stderr.puts("must provide a Symbol--try prefixing it with a colon (:)")
@@ -346,6 +371,8 @@ module RSQL
                         return
                     end
 
+                    reg.source_fn = "#{fn}:#{lineno}"
+
                     File.open(fn) do |f|
                         source = ''
                         i = 0
@@ -380,7 +407,7 @@ module RSQL
                 end
 
                 if reg.source && !reg.source.empty?
-                    puts reg.source
+                    puts '', "[#{reg.source_fn}]", '', reg.source
                 else
                     $stderr.puts "unable to locate body for #{sym}"
                 end
@@ -401,6 +428,9 @@ module RSQL
                 MySQLResults.query(content, self, *args)
             end
 
+            # Show the most recent queries made to the MySQL server in
+            # this session. Default is to show the last one.
+            #
             def history(cnt=1)
                 if h = MySQLResults.history(cnt)
                     h.each{|q| puts '', q}
@@ -422,6 +452,10 @@ module RSQL
             # sql with variable interpolation.
             #
             def register(sym, *args, &block) # :doc:
+                if m = caller.first.match(/^([^:]+:\d+)/)
+                    source_fn = m[1]
+                end
+
                 name = usage = sym.to_s
 
                 if Hash === args.last
@@ -434,7 +468,7 @@ module RSQL
                 desc = '' unless desc
 
                 if block.nil?
-                    source = args.pop
+                    source = args.pop.strip
                     sql = squeeze!(source.dup)
 
                     argstr = args.join(',')
@@ -448,7 +482,8 @@ module RSQL
                     usage << params(name, block)
                 end
 
-                @registrations[sym] = Registration.new(name, args, bangs, block, usage, desc, source)
+                @registrations[sym] = Registration.new(name, args, bangs, block, usage,
+                                                       desc, source, source_fn)
             end
 
             # Convert a list of values into a comma-delimited string,

data/test/test_eval_context.rb

@@ -27,9 +27,11 @@ class TestEvalContext < Test::Unit::TestCase
         @ctx.load(File.join(File.dirname(__FILE__),'..','example.rsqlrc'))
     end
 
-    def test_load
+    def test_reload
         orig = $stdout
         $stdout = out = StringIO.new
+        @conn.expects(:query).with(instance_of(String)).returns(nil).times(2)
+        @conn.expects(:affected_rows).returns(0).times(2)
         @ctx.safe_eval('reload', nil, out)
         assert_match(/loaded: .+?example.rsqlrc/, out.string)
     ensure
@@ -100,15 +102,18 @@ class TestEvalContext < Test::Unit::TestCase
         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)
+        assert_match(
+            /^\s*\[.+\/example.rsqlrc:\d+\]\s+DROP TEMPORARY TABLE IF EXISTS \#\{@rsql_table\}\s*$/,
+            out.string)
 
         out.string = ''
         val = @ctx.safe_eval('desc :to_report', nil, out)
-        lines = out.string.split($/)
-        assert_match(/^register .+ do$/, lines[0])
+        lines = out.string.split($/).select{|l|l.any?}
+        assert_match(/^\[.+\/example.rsqlrc:\d+\]$/, lines[0])
+        assert_match(/^register .+ do$/, lines[1])
         assert_match(/^\s+puts/, lines[-2])
         assert_match(/^end$/, lines[-1])
-        assert_equal(12, lines.size)
+        assert_equal(13, lines.size)
     end
 
     def test_complete

metadata

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