nwn-lib 0.3.5 → 0.3.6

data/CHANGELOG

@@ -93,3 +93,15 @@ Bernhard Stoeckner <elven@swordcoast.net> (6):
       doc: update BINARIES, CHEATSHEET
       nwn-gff-import: fix reading stdin as -
       0.3.5-rel
+
+=== 0.3.6
+Bernhard Stoeckner <elven@swordcoast.net> (5):
+      NWN::Gff::Struct: do not sort yaml_properties
+      kivinen_format: print out structs in sorted order
+      nwn-gff-irb: support for reading/writing .yml files
+      NWN::Gff::Gff: do not sort yaml_properties
+      Rakefile: use gem1.8 instead of gem
+      0.3.6-rel
+
+Stuart Coyle <stuart.coyle@gmail.com> (1):
+      TwoDA: use four spaces for field separation instead of tabs, indent columns

data/Rakefile

@@ -9,7 +9,7 @@ include FileUtils
 # Configuration
 ##############################################################################
 NAME = "nwn-lib"
-VERS = "0.3.5"
+VERS = "0.3.6"
 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', \
@@ -52,18 +52,18 @@ end
 desc "Install nwn-lib gem"
 task :install do
   sh %{rake package}
-  sh %{sudo gem install pkg/#{NAME}-#{VERS}}
+  sh %{sudo gem1.8 install pkg/#{NAME}-#{VERS}}
 end
 
 desc "Install nwn-lib gem without docs"
 task :install_no_docs do
   sh %{rake package}
-  sh %{sudo gem install pkg/#{NAME}-#{VERS} --no-rdoc --no-ri}
+  sh %{sudo gem1.8 install pkg/#{NAME}-#{VERS} --no-rdoc --no-ri}
 end
 
 desc "Uninstall nwn-lib gem"
 task :uninstall => [:clean] do
-  sh %{sudo gem uninstall #{NAME}}
+  sh %{sudo gem1.8 uninstall #{NAME}}
 end
 
 desc "Upload nwn-lib gem to rubyforge"

data/bin/nwn-gff-irb

@@ -23,12 +23,20 @@ else
 end
 $file = File.expand_path(file)
 
-GFF = NWN::Gff::Reader.read(bytes)
+if File.extname($file) == ".yml"
+  GFF = YAML.load(bytes)
+else
+  GFF = NWN::Gff::Reader.read(bytes)
+end
 
 def save destination = nil
   destination ||= $file
   puts "Saving to ´#{destination}' .."
-  bytes = NWN::Gff::Writer.dump(GFF)
+  if File.extname($file) == ".yml"
+    bytes = GFF.to_yaml
+  else
+    bytes = NWN::Gff::Writer.dump(GFF)
+  end
   File.open(destination, "w") {|f|
     f.write(bytes)
   }

data/lib/nwn/gff.rb

@@ -95,7 +95,7 @@ module NWN
       case s.type
         when :struct
           yield(prefix + " ____struct_type", struct_id.nil? ? s.value.struct_id : struct_id) if types_too
-          s.value.each {|k,v|
+          s.value.sort.each {|k,v|
             kivinen_format v, prefix + s.label + (s.label == "" ? "" : "/"), types_too do |l,v|
               yield(l, v)
             end
@@ -163,6 +163,16 @@ class NWN::Gff::Gff
     @hash
   end
 
+  def to_yaml( opts = {} )
+    YAML::quick_emit( self, opts ) do |out|
+      out.map( taguri, to_yaml_style ) do |map|
+        to_yaml_properties.each do |m|
+          map.add( m[1..-1], instance_variable_get( m ) )
+        end
+      end
+    end
+  end
+
   # A simple accessor that can be used to
   # retrieve or set properties in the struct, delimited by slashes.
   #
@@ -412,7 +422,7 @@ class NWN::Gff::Struct
             NWN::Gff::Element::NonInline.index(x.type)
           }.size == 0
 
-        to_yaml_properties.sort.each do |m|
+        to_yaml_properties.each do |m|
           map.add( m[1..-1], instance_variable_get( m ) ) # unless instance_variable_get( m ).nil?
         end
       end

data/lib/nwn/twoda.rb

@@ -122,9 +122,9 @@ module NWN
         ret = []
         ret << "2DA V2.0"
         ret << ""
-        ret << @columns.join("\t")
+        ret << "    " + @columns.join("    ")
         @rows.each_with_index {|row, idx|
-          ret << [idx].concat(row).join("\t")
+          ret << [idx].concat(row).join("    ")
         }
         ret.join("\r\n")
       end

metadata

@@ -1,33 +1,32 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: nwn-lib
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
-date: 2008-08-11 00:00:00 +02:00
-summary: a ruby library for accessing Neverwinter Nights resource files
-require_paths: 
-- lib
-email: elven@swordcoast.net
-homepage: http://nwn-lib.elv.es
-rubyforge_project: nwn-lib
-description: a ruby library for accessing Neverwinter Nights resource files
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.4
-  version: 
+  version: 0.3.6
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Bernhard Stoeckner
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-12-10 00:00:00 +01:00
+default_executable: 
+dependencies: []
+
+description: a ruby library for accessing Neverwinter Nights resource files
+email: elven@swordcoast.net
+executables: 
+- nwn-gff-print
+- nwn-gff-irb
+- nwn-gff-import
+extensions: []
+
+extra_rdoc_files: 
+- README
+- BINARIES
+- CHEATSHEET
+- CHANGELOG
+- COPYING
 files: 
 - COPYING
 - CHANGELOG
@@ -45,8 +44,9 @@ files:
 - lib/nwn/helpers.rb
 - BINARIES
 - CHEATSHEET
-test_files: []
-
+has_rdoc: true
+homepage: http://nwn-lib.elv.es
+post_install_message: 
 rdoc_options: 
 - --quiet
 - --line-numbers
@@ -57,19 +57,26 @@ rdoc_options:
 - README
 - --exclude
 - ^(examples|extras)/
-extra_rdoc_files: 
-- README
-- BINARIES
-- CHEATSHEET
-- CHANGELOG
-- COPYING
-executables: 
-- nwn-gff-print
-- nwn-gff-irb
-- nwn-gff-import
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.4
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: nwn-lib
+rubygems_version: 1.3.0
+signing_key: 
+specification_version: 2
+summary: a ruby library for accessing Neverwinter Nights resource files
+test_files: []