rex-ole 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc27ce56ab010e58bb5b5821e4c5f779c3c12288
-  data.tar.gz: c187167ec97972ef745fa80ab584308eb8fc1a05
+  metadata.gz: beb7b3024bd0d9479efc9e3f31d7ef8d89a9e3a7
+  data.tar.gz: 0d69d7cd4fd7058379a490c7db52e077efd3710f
 SHA512:
-  metadata.gz: d45001f55683783a74ae1dd58d255f53a3e6338f1558ab0a6eefe7fc23219f418467bcab2dce89ade96cf4aa44974b1ffa33ded873c695daeb9f6db4abee22fe
-  data.tar.gz: 06931a4acb8fe7ad6816d52a56813501ed4f90c06c3e91724fc14593b759a29054ee954955e78b533a0dc4a4c3cb44a95f8f7a3e69107edb86f9b6c742706c50
+  metadata.gz: 351da48d0716cb5537a5787bdd2958e03d40715c5836d71459e1c881e0725ae05c2a9094ba8a91eeafd0a2167007ffbd00267793122fa8839a8c6a4517ee5155
+  data.tar.gz: f56ccb022ecf49cfcb0a3550dc46e908f1e51c76e4903da0b60d853d7277e1b4c0168314fa3f726813cad9a381542a6e2d6959789449f68f167b974ca1ee0cf3

data/lib/rex/ole/directory.rb

@@ -51,20 +51,20 @@ class Directory < DirEntry
     # link item to siblings and/or parent
     if (parent._sidChild == DIR_NOSTREAM)
       parent._sidChild = child.sid
-      dlog("Linking #{child.name} as THE child of #{parent.name} as sid #{child.sid}", 'rex', LEV_3)
+      # Linking 'child' as THE child of 'parent', sid is child.sid...
     else
       sib = nil
       parent.each { |el|
         if (el._sidLeftSib == DIR_NOSTREAM)
           sib = el
           el._sidLeftSib = child.sid
-          dlog("Linking #{child.name} as the LEFT sibling of #{sib.name} as sid #{child.sid}", 'rex', LEV_3)
+          # Linking 'child' as the LEFT sibling of 'sib', sid is child.sid...
           break
         end
         if (el._sidRightSib == DIR_NOSTREAM)
           sib = el
           el._sidRightSib = child.sid
-          dlog("Linking #{child.name} as the RIGHT sibling of #{sib.name} as sid #{child.sid}", 'rex', LEV_3)
+          # Linking 'child' as the RIGHT sibling of 'sib', sid is child.sid...
           break
         end
       }
@@ -152,7 +152,6 @@ class Directory < DirEntry
   # recursively add entries to their proper parents :)
   def populate_children(entries, parent, sid)
     node = entries[sid]
-    dlog("populate_children(entries, \"#{parent.name}\", #{sid}) - node: #{node.name}", 'rex', LEV_3)
     parent << node
     if (node.type == STGTY_STORAGE) and (node._sidChild != DIR_NOSTREAM)
       populate_children(entries, node, node._sidChild)
@@ -178,7 +177,6 @@ class Directory < DirEntry
     # flatten the directory again
     entries = []
     flatten_tree(entries, self)
-    dlog("flattened tree has #{entries.length} entries...", 'rex', LEV_3)
 
     # count directory sectors
     ds_count = entries.length / 4
@@ -198,7 +196,7 @@ class Directory < DirEntry
       next if (de.type == STGTY_ROOT)
 
       dir = de.pack
-      dlog("writing dir entry #{de.name}", 'rex', LEV_3)
+      # Writing dir entry de...
       sbuf << dir
 
       if (sbuf.length == @stg.header.sector_size)

data/lib/rex/ole/storage.rb

@@ -126,7 +126,7 @@ class Storage
     stm = Stream.new self
     stm.name = name
     parent_stg ||= @directory
-    dlog("Adding stream #{name} to storage #{parent_stg.name}", 'rex', LEV_3)
+    # Adding stream 'name' to storage parent_stg...
     @directory.link_item(parent_stg, stm)
     @modified = true
     stm
@@ -150,7 +150,7 @@ class Storage
     stg = SubStorage.new self
     stg.name = name
     parent_stg ||= @directory
-    dlog("Adding storage #{name} to storage #{parent_stg.name}", 'rex', LEV_3)
+    # Adding storage 'name' to storage parent_stg...
     @directory.link_item(parent_stg, stg)
     stg
   end
@@ -209,7 +209,7 @@ class Storage
   end
 
   def write_sector_raw(sect, sbuf)
-    dlog("Writing sector 0x%02x" % sect, 'rex', LEV_3)
+    # Writing sector 'sect'...
     @fd.seek((sect + 1) * @header.sector_size, ::IO::SEEK_SET)
     @fd.write(sbuf)
   end
@@ -236,7 +236,7 @@ class Storage
   end
 
   def write_mini_sector_raw(sect, sbuf)
-    dlog("Writing mini sector 0x%02x" % sect, 'rex', LEV_3)
+    # Writing mini sector 'sect'...
     @ministream << sbuf
   end
 
@@ -257,7 +257,7 @@ class Storage
   end
 
   def write_stream(stm)
-    dlog("Writing \"%s\" to regular stream" % stm.name, 'rex', LEV_3)
+    # Writing 'stm.name' to regular stream...
     stm_start = nil
     prev_sect = nil
     stm.seek(0)
@@ -270,7 +270,7 @@ class Storage
   end
 
   def write_mini_stream(stm)
-    dlog("Writing \"%s\" to mini stream" % stm.name, 'rex', LEV_3)
+    # Writing 'stm.name' to mini stream...
     prev_sect = nil
     stm.seek(0)
     while (sbuf = stm.read(@header.mini_sector_size))
@@ -306,7 +306,7 @@ class Storage
       block = left if (block > left)
 
       # read it.
-      dlog("read_data - reading 0x%x bytes" % block, 'rex', LEV_3)
+      # Reading 'block' number of bytes...
       buf = read_sector(sect, block)
       ret << buf
       left -= buf.length
@@ -335,7 +335,7 @@ class Storage
       block = left if (block > left)
 
       # read it.
-      dlog("read_data_mini - reading 0x%x bytes" % block, 'rex', LEV_3)
+      # Reading 'block' number of bytes...
       buf = read_mini_sector(sect, block)
       ret << buf
       left -= buf.length
@@ -373,9 +373,9 @@ class Storage
 
 
   def read_mini_sector(sect, len)
-    dlog("Reading mini sector 0x%x" % sect, 'rex', LEV_3)
+    # Reading mini sector 'sect'...
     off = (@header.mini_sector_size * sect)
-    dlog("Reading from offset 0x%x of ministream" % off, 'rex', LEV_3)
+    # Reading from offset 'off' of ministream...
     @ministream.seek(off)
     data = @ministream.read(len)
     data

data/lib/rex/ole/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module OLE
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-ole
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Pearce Barry
@@ -85,7 +85,7 @@ cert_chain:
   2SpuQH+SWteq3NXkAmFEEqvLJQ4sbptZt8OP8ghL3pVAvZNFmww/YVszSkShSzcg
   QdihYCSEL2drS2cFd50jBeq71sxUtxbv82DUa2b+
   -----END CERTIFICATE-----
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler