syspy 0.0.20 → 0.0.21

data/bin/syspy

@@ -40,6 +40,8 @@ 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")}\"")                    
+            else
+              Log.warn(Non replacable parameter: #{match}: #{param.inspect})
             end
             index += 1
           }

data/lib/tds_package_stream.rb

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

data/lib/tds_packages/tds_language.rb

@@ -20,8 +20,7 @@ module Syspy
             token = read_uint(io)
             if(token == TdsTokens::TDS_PARAMS)
               @tds_params = TdsParams.new(io,@tds_paramfmt)
-            end
-          end
+            end          
           else
             Log.warn("Illegal paramfmt length: #{paramfmt_length}")
           end          

data/lib/tds_packages/tds_paramfmt2.rb

@@ -23,13 +23,14 @@ module Syspy
 
         data_length = TdsTypes.fixed_length(data_type)         
 
-        if(data_length == -5)
-          data_length = Bytes.int32le(io)
-        elsif(data_length == -4)
-          data_length = Bytes.int32le(io)
-        elsif(data_length == -2)
-          data_length = Bytes.int32le(io)
-        elsif(data_length == -1)
+        case data_length
+          when -5
+            data_length = Bytes.int32le(io)
+          when -4
+            data_length = Bytes.int32le(io)
+          when -2
+            data_length = Bytes.int32le(io)
+          when data_length -1
            data_length = Bytes.uint(io) 
         end       
         

data/lib/tds_packages/tds_params.rb

@@ -45,12 +45,13 @@ module Syspy
     TIME_DIFF = Time.at(0) - Time.local(1900,1,1)
 
     def read_datetime(io,data_type)
-      if (data_type == TdsTypes::SYBDATETIMN)
-        len = read_uint(io)
-      elsif (data_type == TdsTypes::SYBDATETIME4)
-        len = 4;
-      else 
-        len = 8;
+      case data_type
+        when TdsTypes::SYBDATETIMN
+          len = read_uint(io)
+        when TdsTypes::SYBDATETIME4
+          len = 4;
+        else 
+          len = 8;
       end
       
       #gmt_offset = Time.new().gmt_offset

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syspy
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
-  requirement: &20472460 !ruby/object:Gem::Requirement
+  requirement: &18848400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20472460
+  version_requirements: *18848400
 description: 
 email: matthias.balmer@sysinf.ch
 executables: