syspy 0.0.21 → 0.0.22

data/bin/syspy

@@ -40,8 +40,10 @@ module Syspy
               replaced_statement.gsub!(match,param.to_s)
             elsif(param.instance_of?(Time))
               replaced_statement.gsub!(match,"\"#{param.strftime("%Y%m%d %H:%M:%S")}\"")                    
+            elsif(param.nil?)
+              replaced_statement.gsub!(match,"NULL")
             else
-              Log.warn(Non replacable parameter: #{match}: #{param.inspect})
+              Log.warn("Non replacable parameter: #{match}: #{param.inspect}")
             end
             index += 1
           }

data/lib/tds_package_stream.rb

@@ -4,7 +4,6 @@ require "thread"
 require "bytes"
 require "tds_types"
 require "tds_tokens"
-require "thread"
 
 module Syspy
   class TdsPackageStream
@@ -16,7 +15,7 @@ module Syspy
       @interface = interface
       @dst = dst
       @dst_port = dst_port
-      @packages = Queue.new()
+      @in,@out = IO.pipe()
     end
 
     def each_package()
@@ -29,7 +28,8 @@ module Syspy
             
             if(content.match(HEADER_REGEXP))                           
               payload = content[0..(-2 - HEADER_LENGTH)]
-              @packages << payload              
+              @out.write(payload)
+              @out.flush
               content = ""
             end
            
@@ -39,21 +39,19 @@ module Syspy
       }  
 
       content = ""
-      loop(){
-        io = StringIO.new(@packages.shift)
-        byte = Bytes.uint(io)
+      @in.each_byte(){|byte|
         if(byte == 0x0F)                 
-          last_packet_indicator = Bytes.uint(io)          
-          length = Bytes.uint16be(io)
+          last_packet_indicator = Bytes.uint(@in)          
+          length = Bytes.uint16be(@in)
            
           # skip next 4 bytes of the header
-          if(Bytes.uint32be(io) == 0x00)
+          if(Bytes.uint32be(@in) == 0x00)
             content << @in.read(length - 8)
             
             if(last_packet_indicator == 0x1)              
               begin
-                content_io = StringIO.new(content)
-                package = handle_package(content_io)
+                io = StringIO.new(content)
+                package = handle_package(io)
                 yield package if package               
               ensure
                 content = ""

data/lib/tds_packages/tds_language.rb

@@ -15,12 +15,13 @@ module Syspy
         if(token == TdsTokens::TDS_PARAMFMT || token == TdsTokens::TDS_PARAMFMT2)
           paramfmt_length = Bytes.uintle(io,TdsTokens.length_field_size(token))
           if(paramfmt_length < 1000000)          
-          @tds_paramfmt = TdsTokens.token_class(token).new(io,paramfmt_length)
-          if(@tds_paramfmt.params_count > 0)
-            token = read_uint(io)
-            if(token == TdsTokens::TDS_PARAMS)
-              @tds_params = TdsParams.new(io,@tds_paramfmt)
-            end          
+            @tds_paramfmt = TdsTokens.token_class(token).new(io,paramfmt_length)
+            if(@tds_paramfmt.params_count > 0)
+              token = read_uint(io)
+              if(token == TdsTokens::TDS_PARAMS)
+                @tds_params = TdsParams.new(io,@tds_paramfmt)
+              end
+            end
           else
             Log.warn("Illegal paramfmt length: #{paramfmt_length}")
           end          

data/lib/tds_packages/tds_paramfmt2.rb

@@ -30,8 +30,8 @@ module Syspy
             data_length = Bytes.int32le(io)
           when -2
             data_length = Bytes.int32le(io)
-          when data_length -1
-           data_length = Bytes.uint(io) 
+          when -1
+            data_length = Bytes.uint(io) 
         end       
         
         parameter[:length] = data_length

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syspy
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
-  requirement: &18848400 !ruby/object:Gem::Requirement
+  requirement: &12546580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18848400
+  version_requirements: *12546580
 description: 
 email: matthias.balmer@sysinf.ch
 executables: