resedit 1.7 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 778c2b706f9f0dc7daf38221fdd1b31c1bcb24e0
-  data.tar.gz: e55fc3fdbd514f958173df1d9f0f315df937e161
+  metadata.gz: f7e16c3699611b9460ed0052a254ef215152d3cf
+  data.tar.gz: b345f5bdeaae974a6de7668ebf162a30161f3853
 SHA512:
-  metadata.gz: 50651c92183dd3bbdeb1305cb7e6ea03d482f23d2f21bbdc3dc9815b04f9c48e898243f32f21f7237f74ed5fb4028e2c9e08e8dba4c15def232509c61539ca93
-  data.tar.gz: 31a923d1fc346ee0aac0534670d21df368cb97a725a83cb4be6761d98000e86615d903cfe4cf13fbaa65beb58cdc97a518ce8698e4cef2d36e481b216308b86b
+  metadata.gz: '08bde765ab8afa2e69ecc4658b3462c6080f1ec6082c1d95107f635e0b21d3630cfd22a391be52f596c88b5bae32d254bdf965d883f69cf3eb70e85c473fe26b'
+  data.tar.gz: 06f763b0b8f4e019a5e2b465007524d629506de90cfaa4ce67e1521f628b5f84fb4b3fabd254960b1f50a03f7ea9be62b4bb81a80e5425bf539e71cd2a46ad78

data/lib/resedit.rb

@@ -9,6 +9,7 @@ require 'resedit/text/huffman'
 require 'resedit/app/font_convert'
 require 'resedit/app/text_convert'
 require 'resedit/convert/bitconv'
+require 'resedit/convert/bitstream'
 require 'resedit/convert/codepatch'
 require 'resedit/convert/colors'
 require 'resedit/mz/mz'
@@ -18,5 +19,5 @@ require 'resedit/classes/changeable'
 
 
 module Resedit
-    VERSION = "1.7"
+    VERSION = "1.7.2"
 end

data/lib/resedit/app/font_convert.rb

@@ -4,8 +4,8 @@ module Resedit
 
     class FontConvertCommand < ConvertCommand
 
-        def initialize(fname)
-            super('font', fname)
+        def initialize(fname, cmdname='font')
+            super(cmdname, fname)
             @font = nil
         end
 

data/lib/resedit/app/text_convert.rb

@@ -4,8 +4,8 @@ module Resedit
 
     class TextConvertCommand < ConvertCommand
 
-        def initialize(fname)
-            super('text', fname)
+        def initialize(fname, cmdname='text')
+            super(cmdname, fname)
             @font = nil
             addOption('format','f',nil,'output file format')
             addOption('encoding','e',nil,'output file encoding')
@@ -16,7 +16,7 @@ module Resedit
             back = backup()
             File.open(back,"rb"){|file|
                 @text = mktext(file, @params['format'], @params['encoding'])
-                @text.load(inname, linesCount())
+                @text.load(inname, expectedLines())
                 StringIO.open("","w+b"){|stream|
                     pack(file, stream)
                     stream.seek(0)
@@ -29,7 +29,7 @@ module Resedit
 
 
         def export(outname)
-            logd("exporting txet #{@resname} to #{outname}")
+            logd("exporting text #{@resname} to #{outname}")
             File.open(@resname, "rb"){|file|
                 @text = mktext(file, @params['format'], @params['encoding'])
                 unpack(file) if @text
@@ -40,12 +40,10 @@ module Resedit
 
 
         def mktext(file, format, encoding)
-            raise "Not implemented."
+            return Resedit::Text.new(format, encoding)
         end
 
-        def linesCount(file)
-            raise "Not implemented"
-        end
+        def expectedLines(file); nil end
 
         def pack(file, outstream)
             raise "Not implemented."

data/lib/resedit/convert/bitstream.rb

@@ -0,0 +1,38 @@
+module Resedit
+
+    class BitStream
+
+        def initialize(bytes=nil, chunksize=1)
+            @bytes = bytes ? bytes : ''
+            @chunksize = chunksize
+            @bytes.force_encoding(Encoding::ASCII_8BIT)
+            @buf = 0
+            @bsize = 0
+            @pos = 0
+        end
+
+        def eof?; @pos>=@bytes.length end
+
+        def read(bits)
+            while @bsize < bits
+                for _ in 1..@chunksize
+                    @buf |= (@pos<@bytes.length ? (@bytes[@pos].ord & 0xFF) : 0) << @bsize
+                    @pos += 1
+                    @bsize += 8
+                end
+            end
+            mask = (1 << bits) - 1
+            ret = @buf & mask
+            @buf >>= bits
+            @bsize -= bits
+            return ret
+        end
+
+        def write(val, bits)
+        end
+
+        def finish()
+        end
+
+    end
+end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: resedit
 version: !ruby/object:Gem::Version
-  version: '1.7'
+  version: 1.7.2
 platform: ruby
 authors:
 - bjfn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-11 00:00:00.000000000 Z
+date: 2017-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: free-image
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: 
 email: 
 executables:
@@ -58,6 +72,7 @@ files:
 - lib/resedit/classes/colorizer.rb
 - lib/resedit/classes/hexwriter.rb
 - lib/resedit/convert/bitconv.rb
+- lib/resedit/convert/bitstream.rb
 - lib/resedit/convert/codepatch.rb
 - lib/resedit/convert/colors.rb
 - lib/resedit/font/font.rb