nwn-lib 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,3 +1,10 @@
+=== 0.2.2
+
+* Binary: nwn-gff-irb: interactive gff inspection/editing shell
+* Gff: Errors are now RuntimeErrors instead of Exceptions
+* Gff::Reader: properly read structures with no labels inside
+* Gff::Reader: void datatype support
+
 === 0.2.1
 
 * TwoDA allows creation of tables and proper writing, HAS NEW API. (sorry!)

data/Rakefile

@@ -9,7 +9,7 @@ include FileUtils
 # Configuration
 ##############################################################################
 NAME = "nwn-lib"
-VERS = "0.2.1"
+VERS = "0.2.2"
 CLEAN.include ["**/.*.sw?", "pkg", ".config", "rdoc", "coverage"]
 RDOC_OPTS = ["--quiet", "--line-numbers", "--inline-source", '--title', \
   'nwn-lib: a ruby library for accessing NWN resource files', \
@@ -37,7 +37,7 @@ spec = Gem::Specification.new do |s|
   s.author = "Bernhard Stoeckner"
   s.email = "elven@swordcoast.net"
   s.homepage = "http://nwn-lib.elv.es"
-  s.executables = ["nwn-gff-print"]
+  s.executables = ["nwn-gff-print", "nwn-gff-irb"]
   s.required_ruby_version = ">= 1.8.4"
   s.files = %w(COPYING CHANGELOG README Rakefile) + Dir.glob("{bin,doc,spec,lib}/**/*")
   s.require_path = "lib"

data/bin/nwn-gff-irb

@@ -0,0 +1,44 @@
+#!/usr/bin/ruby
+require 'rubygems'
+require 'optparse'
+require 'nwn/gff'
+require 'nwn/twoda'
+require 'yaml'
+require 'irb'
+
+OptionParser.new do |o|
+  o.banner = "Usage: nwn-gff-irb file"
+end.parse!
+
+file = ARGV.shift or begin
+  $stderr.puts "Required argument: filename to process, or - for stdin (try -h)."
+  exit 1
+end
+
+if file == "-"
+  bytes = $stdin.read
+else
+  bytes = IO.read(file)
+end
+$file = File.expand_path(file)
+
+GFF = NWN::Gff::Reader.read(bytes)
+
+def save destination = nil
+  destination ||= $file
+  puts "Saving to ´#{destination}' .."
+  bytes = NWN::Gff::Writer.dump(GFF)
+  File.open(destination, "w") {|f|
+    f.write(bytes)
+  }
+  puts "saved."
+end
+
+include NWN::Gff
+
+puts "Your GFF file is in `GFF' (type: #{GFF.type.inspect})."
+puts "Type `save' to save to the filename it came from (make a backup!), `exit' (or Ctrl+D) to exit (without saving)."
+puts "To save to a different location, type `save \"path/to/new/location.ext\"'."
+puts ""
+
+IRB.start

data/lib/nwn/gff.rb

@@ -1,7 +1,7 @@
 module NWN
   module Gff
     # This error gets thrown if reading or writing fails.
-    class GffError < Exception; end
+    class GffError < RuntimeError; end
 
     # This error gets thrown if a supplied value does not
     # fit into the given data type, or you are trying to assign
@@ -9,11 +9,11 @@ module NWN
     #
     # Example: You're trying to pass a value greater than 2**32
     # into a int.
-    class GffTypeError < Exception; end
+    class GffTypeError < RuntimeError; end
 
     # Gets raised if you are trying to access a path that does
     # not exist.
-    class GffPathInvalidError < Exception; end
+    class GffPathInvalidError < RuntimeError; end
 
     # This hash lists all possible NWN::Gff::Element types.
     Types = {
@@ -460,13 +460,14 @@ class NWN::Gff::Reader
       lbl, vl = * read_field(data_or_offset)
       struct[lbl] = vl
     else
-      return 1 if count == 0
-      raise GffError, "struct index not divisable by 4" if
-        data_or_offset % 4 != 0
-      data_or_offset /= 4
-      for i in data_or_offset...(data_or_offset+count)
-        lbl, vl = * read_field(@field_indices[i])
-        struct[lbl] = vl
+      if count > 0
+        raise GffError, "struct index not divisable by 4" if
+          data_or_offset % 4 != 0
+        data_or_offset /= 4
+        for i in data_or_offset...(data_or_offset+count)
+          lbl, vl = * read_field(@field_indices[i])
+          struct[lbl] = vl
+        end
       end
     end
 
@@ -555,9 +556,8 @@ class NWN::Gff::Reader
         r
 
       when :void
-        len = @field_data[data_or_offset, 4].unpack("V")
-        void = @field_data[data_or_offset + 4, len].unpack("H*")
-        raise "void: #{void.inspect}"
+        len = @field_data[data_or_offset, 4].unpack("V")[0]
+        @field_data[data_or_offset + 4, len].unpack("H*")[0]
 
       when :struct
         read_struct data_or_offset

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: nwn-lib
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 date: 2008-07-03 00:00:00 +02:00
 summary: a ruby library for accessing Neverwinter Nights resource files
 require_paths: 
@@ -33,6 +33,7 @@ files:
 - CHANGELOG
 - README
 - Rakefile
+- bin/nwn-gff-irb
 - bin/nwn-gff-print
 - spec/spec.opts
 - spec/rcov.opts
@@ -57,6 +58,7 @@ extra_rdoc_files:
 - COPYING
 executables: 
 - nwn-gff-print
+- nwn-gff-irb
 extensions: []
 
 requirements: []