dgd-tools 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf28b15e9e5aa7fe5c3d52835011e37c2b34f8ed839b59e6faea3ff9b23433d7
-  data.tar.gz: 66d8280067875fe8dfbb056e3288dec4471eba855937ee182dd24db70f30cd9b
+  metadata.gz: 4bedae7ff16304641a20a9fe56eb1e6113bfe57641e6deedc05f23068303426b
+  data.tar.gz: 7d9956ee4dee5c1893e39d95a965e1ecc28ae5bda10cfb9b61c6cb0793174675
 SHA512:
-  metadata.gz: 79fb4a29346b26de15f1cf4b6fe0c81ad845f45e24688b83f91f03c6aca61b691b6fb0698d64eb2fd633ae0f52d8df2bdb2226549ba524d748201b8f728adab2
-  data.tar.gz: 1f4ffe31a23b5f0302b0d47815c74a4484847cfd9afce393d37c85515be981943447d5807eef11bca221269c2cde7c3137e5868561f306e8d83035ac5d03dd5b
+  metadata.gz: 81163aa4aca58ce6e5231c951244d74f9e979558d9164883ebc3ce11069c700b4ea15da3adca85cf668d053473060a721cfd56b3dc6830d22ab307ccf37d4678
+  data.tar.gz: c7bc8985bddaf46ca782ef9be6e84472b8f783c3edaa5477c9602975fb4b58aee8869b883582350fab613f53140bb91fd9d757354ae13d6231c127bf8c6b835d

data/Gemfile.lock

@@ -2,11 +2,15 @@ PATH
   remote: .
   specs:
     dgd-tools (0.1.2)
+      nokogiri (~> 1.10.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    mini_portile2 (2.4.0)
     minitest (5.14.2)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
     rake (12.3.3)
 
 PLATFORMS

data/bin/console

@@ -2,6 +2,7 @@
 
 require "bundler/setup"
 require "dgd-tools/manifest"
+require "dgd-tools/skotos_xml_obj"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/dgd-tools.gemspec

@@ -23,4 +23,6 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+
+  spec.add_runtime_dependency "nokogiri", "~>1.10.5"
 end

data/example_xml/CraftDaemon.xml

@@ -0,0 +1,42 @@
+<object program="/base/sys/craftd">
+  <Base:CraftDaemon>
+    <Base:Craftables>
+      <Base:Craftable item="OBJ(Regent:Props:Fabric:blanket)"/>
+      <Base:Craftable item="OBJ(Regent:Staff:Evett:Items:Clothes:Top)"/>
+      <Base:Craftable item="OBJ(Regent:Props:Fabric:Cloth-cleaning)"/>
+      <Base:Craftable item="OBJ(Regent:Staff:Debbie:IC:General:orderbook)"/>
+    </Base:Craftables>
+    <Base:AllTools>
+      <Base:AllToolDependents tool="mop floor"/>
+      <Base:AllToolDependents tool="new">
+        <Base:OneToolDependent item="OBJ(Regent:Props:Fabric:blanket)"/>
+        <Base:OneToolDependent item="OBJ(Regent:Props:Fabric:Cloth-cleaning)"/>
+        <Base:OneToolDependent item="OBJ(Regent:Staff:Debbie:IC:General:orderbook)"/>
+      </Base:AllToolDependents>
+      <Base:AllToolDependents tool="regent:props:sewing:tools:needle"/>
+      <Base:AllToolDependents tool="regent:props:sewing:tools:scissors"/>
+      <Base:AllToolDependents tool="tool:heatable:container:watertight"/>
+      <Base:AllToolDependents tool="tool:heatsource:fire"/>
+      <Base:AllToolDependents tool="tools:needle">
+        <Base:OneToolDependent item="OBJ(Regent:Props:Fabric:blanket)"/>
+        <Base:OneToolDependent item="OBJ(Regent:Props:Fabric:Cloth-cleaning)"/>
+      </Base:AllToolDependents>
+    </Base:AllTools>
+    <Base:AllIngredients>
+      <Base:AllIngredientDependents ingredient="bolt">
+        <Base:OneIngredientDependent item="OBJ(Regent:Props:Fabric:blanket)"/>
+        <Base:OneIngredientDependent item="OBJ(Regent:Props:Fabric:Cloth-cleaning)"/>
+      </Base:AllIngredientDependents>
+      <Base:AllIngredientDependents ingredient="ingredient:candle"/>
+      <Base:AllIngredientDependents ingredient="ingredient:lantern-candle-empty"/>
+      <Base:AllIngredientDependents ingredient="ingredient:lantern:candle"/>
+      <Base:AllIngredientDependents ingredient="ingredients:tallow"/>
+      <Base:AllIngredientDependents ingredient="ingredients:wick:hemp"/>
+      <Base:AllIngredientDependents ingredient="new">
+        <Base:OneIngredientDependent item="OBJ(Regent:Props:Fabric:blanket)"/>
+        <Base:OneIngredientDependent item="OBJ(Regent:Staff:Evett:Items:Clothes:Top)"/>
+        <Base:OneIngredientDependent item="OBJ(Regent:Props:Fabric:Cloth-cleaning)"/>
+      </Base:AllIngredientDependents>
+    </Base:AllIngredients>
+  </Base:CraftDaemon>
+</object>

data/example_xml/Materials.xml

@@ -0,0 +1,3 @@
+<object program="/base/sys/materials">
+  <Base:Materials/>
+</object>

data/example_xml/PropertyTypes.xml

@@ -0,0 +1,49 @@
+<object program="/base/sys/properties">
+  <Base:PropertyTypes>
+    <Base:PropertyTypeIntList>
+      <Base:PropertyTypeInt property="page:allowall"/>
+      <Base:PropertyTypeInt property="skill:advancedefensive"/>
+      <Base:PropertyTypeInt property="skill:attackingdefensive"/>
+      <Base:PropertyTypeInt property="skill:cutoffensive"/>
+      <Base:PropertyTypeInt property="skill:dodgedefensive"/>
+      <Base:PropertyTypeInt property="skill:feintoffensive"/>
+      <Base:PropertyTypeInt property="skill:fumbledefensive"/>
+      <Base:PropertyTypeInt property="skill:guarddefensive"/>
+      <Base:PropertyTypeInt property="skill:idledefensive"/>
+      <Base:PropertyTypeInt property="skill:lang1"/>
+      <Base:PropertyTypeInt property="skill:lang2"/>
+      <Base:PropertyTypeInt property="skill:lang3"/>
+      <Base:PropertyTypeInt property="skill:lang4"/>
+      <Base:PropertyTypeInt property="skill:lang5"/>
+      <Base:PropertyTypeInt property="skill:lang6"/>
+      <Base:PropertyTypeInt property="skill:lang7"/>
+      <Base:PropertyTypeInt property="skill:recoverdefensive"/>
+      <Base:PropertyTypeInt property="skill:restdefensive"/>
+      <Base:PropertyTypeInt property="skill:retiredefensive"/>
+      <Base:PropertyTypeInt property="skill:salutedefensive"/>
+      <Base:PropertyTypeInt property="skill:teaching"/>
+      <Base:PropertyTypeInt property="skill:thrustoffensive"/>
+      <Base:PropertyTypeInt property="skill_study"/>
+      <Base:PropertyTypeInt property="skotos:currentlang"/>
+    </Base:PropertyTypeIntList>
+    <Base:PropertyTypeFloatList>
+      <Base:PropertyTypeFloat property="skill:fatigue"/>
+    </Base:PropertyTypeFloatList>
+    <Base:PropertyTypeStringList>
+      <Base:PropertyTypeString property="skotos:charname"/>
+      <Base:PropertyTypeString property="skotos:creator"/>
+    </Base:PropertyTypeStringList>
+    <Base:PropertyTypeObjectList>
+      <Base:PropertyTypeObject property="virtualhome:home"/>
+      <Base:PropertyTypeObject property="virtualhome:oubliette"/>
+    </Base:PropertyTypeObjectList>
+    <Base:PropertyTypeArrayList>
+      <Base:PropertyTypeArray property="startstory:skilllist:done"/>
+      <Base:PropertyTypeArray property="startstory:skilllist:left"/>
+    </Base:PropertyTypeArrayList>
+    <Base:PropertyTypeMappingList>
+      <Base:PropertyTypeMapping property="page:allow"/>
+      <Base:PropertyTypeMapping property="page:pending"/>
+    </Base:PropertyTypeMappingList>
+  </Base:PropertyTypes>
+</object>

data/example_xml/Thing.xml

@@ -0,0 +1,41 @@
+<object program="/base/obj/thing">
+  <Base:Thing>
+    <Ur:UrObject/>
+    <Base:Bulk immobile="false" mass="1" density="1"/>
+    <Base:Container flexible="false" transparent-container="false" public-container="false" tight="false" capacity="0" maxweight="0"/>
+    <Base:Misc gender="neuter" volition="false" weapon="false" default_stance="none" combinable="false" discrete="false" by_weight="false" tight="false" scriptrunner="false">
+      <Base:Edible value="false"/>
+      <Base:Potable value="false"/>
+      <Base:DrinkMessageFirst/>
+      <Base:DrinkMessageThird/>
+      <Base:Transparency value="false"/>
+      <Base:Unsafe value="false"/>
+      <Base:Safe value="false"/>
+      <Base:ClothesExpected value="false"/>
+      <Base:DieMessageFirst/>
+      <Base:DieMessageThird/>
+    </Base:Misc>
+    <Base:Details/>
+    <Base:Combat>
+      <Base:Strength value="1"/>
+      <Base:MaxFatigue value="1"/>
+    </Base:Combat>
+    <Base:Clothing>
+      <Base:SingleWear value="false"/>
+    </Base:Clothing>
+    <Base:Crafting see_level="0" do_level="0" time="0" attention="false" held="false">
+      <Base:Ingredients/>
+      <Base:Tools/>
+      <Base:CraftVerbs/>
+    </Base:Crafting>
+    <Base:InitialContents/>
+    <Base:InitialProperties/>
+    <Core:Properties>
+      <Core:Property property="revisions">
+         (\{ 1065557891, "the_exiled", "E" \})
+      </Core:Property>
+      <Core:Property property="skill:fatigue">1.0</Core:Property>
+    </Core:Properties>
+    <Notes:Notes/>
+  </Base:Thing>
+</object>

data/example_xml/Thing2.xml

@@ -0,0 +1,42 @@
+<object program="/base/obj/thing" owner="bobo">
+  <Base:Thing>
+    <Ur:UrObject/>
+    <Base:Bulk immobile="false" mass="1" density="1"/>
+    <Base:Container flexible="false" transparent-container="false" public-container="false" tight="false" capacity="0" maxweight="0"/>
+    <Base:Misc gender="neuter" volition="false" weapon="false" default_stance="none" combinable="false" discrete="false" by_weight="false" tight="false" scriptrunner="false" bogusfield="nope">
+      <Base:Edible value="false"/>
+      <Base:Potable value="false"/>
+      <Base:DrinkMessageFirst/>
+      <Base:DrinkMessageThird/>
+      <Base:Transparency value="false"/>
+      <Base:Unsafe value="false"/>
+      <Base:Safe value="false"/>
+      <Base:ClothesExpected value="false"/>
+      <Base:DieMessageFirst/>
+      <Base:DieMessageThird/>
+      <Base:DieMessageFortySecond/>
+    </Base:Misc>
+    <Base:Details/>
+    <Base:Combat>
+      <Base:Strength value="1"/>
+      <Base:MaxFatigue value="1"/>
+    </Base:Combat>
+    <Base:Clothing>
+      <Base:SingleWear value="false"/>
+    </Base:Clothing>
+    <Base:Crafting see_level="0" do_level="0" time="0" attention="false" held="false">
+      <Base:Ingredients/>
+      <Base:Tools/>
+      <Base:CraftVerbs/>
+    </Base:Crafting>
+    <Base:InitialContents/>
+    <Base:InitialProperties/>
+    <Core:Properties>
+      <Core:Property property="revisions">
+         (\{ 1065557891, "the_exiled", "E" \})
+      </Core:Property>
+      <Core:Property property="skill:fatigue">1.0</Core:Property>
+    </Core:Properties>
+    <Notes:Notes/>
+  </Base:Thing>
+</object>

data/exe/dgd-manifest

@@ -14,6 +14,7 @@ when "test"
     puts "Running dgd.manifest installer..."
     repo = DGD::Manifest::Repo.new
     repo.manifest_file("dgd.manifest")
+    repo.precheck(".")
     puts "Verified Manifest packages: this looks likely correct."
 when "install"
     unless File.exist?("dgd.manifest")
@@ -22,7 +23,10 @@ when "install"
     puts "Running DGD Manifest installer..."
     repo = DGD::Manifest::Repo.new
     repo.manifest_file("dgd.manifest")
-    repo.assemble_app(".")
+    current_dir = File.expand_path(".")
+    repo.precheck(current_dir)
+    repo.assemble_app(current_dir)
+    puts "Assembled DGD application into #{current_dir}"
 when "server"
     puts "Starting DGD server..."
     DGD::Manifest.system_call("~/.dgd-tools/dgd/bin/dgd dgd.config")

data/exe/skotos-xml-diff

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+
+# Diff multiple Skotos-XML-format objects dumped from a
+# SkotOS-or-similar game to find out what updates should
+# be merged between them.
+
+require "dgd-tools/skotos_xml_obj"
+
+if ARGV.size != 2
+    STDERR.puts "Usage: skotos-xml-diff <obj_or_dir_1> <obj_or_dir_2>"
+    exit -1
+end
+
+if File.directory?(ARGV[0]) ^ File.directory?(ARGV[1])
+    STDERR.puts "Please give two files or two directories, not one of each!"
+    exit -1
+end
+
+if File.directory?(ARGV[0])
+    diff = SkotOS::XMLObject.diff_dirs(*ARGV)
+    if diff.empty?
+        puts "No difference."
+    else
+        puts diff.join("\n\n=====\n\n")
+    end
+else
+    obj1 = SkotOS::XMLObject.from_file(ARGV[0])
+    obj2 = SkotOS::XMLObject.from_file(ARGV[1])
+    diff = SkotOS::XMLObject.diff_between(obj1, obj2)
+    if diff.empty?
+        puts "No difference."
+    else
+        puts diff
+    end
+end

data/lib/dgd-tools/manifest.rb

@@ -65,6 +65,43 @@ module DGD::Manifest
             @manifest_file ||= AppFile.new(self, path)
         end
 
+        def files_to_assemble
+            subdirs = []
+
+            @manifest_file.specs.each do |spec|
+                git_repo = spec.source
+                git_repo.use_details(spec.source_details)
+
+                spec.paths.each do |from, to|
+                    from_path = "#{git_repo.local_dir}/#{from}"
+                    if File.directory?(from_path)
+                        files = Dir["#{from_path}/**/*"].to_a + Dir["#{from_path}/**/.*"].to_a
+                        dirs = files.select { |file| File.directory?(file) }
+                        non_dirs = files - dirs
+                        subdirs << { from: from_path, to: to, dirs: dirs, non_dirs: non_dirs, source: git_repo }
+                    elsif from_path["*"]  # If from_path contains at least one asterisk
+                        components = from.split("/")
+                        first_wild_idx = components.index { |item| item["*"] }
+                        no_wild_from_path = components[0..(first_wild_idx-1)].join("/")
+                        wild_path = components[first_wild_idx..-1].join("/")
+
+                        files = Dir["#{git_repo.local_dir}/#{no_wild_from_path}/#{wild_path}"].to_a
+                        dirs = files.select { |file| File.directory?(file) }
+                        dirs += files.map { |f| File.dirname(f) }
+                        dirs.uniq!
+
+                        non_dirs = files - dirs
+                        subdirs << { from: "#{git_repo.local_dir}/#{no_wild_from_path}", to: to, dirs: dirs, non_dirs: non_dirs, source: git_repo }
+                    else
+                        # A single file
+                        subdirs << { from: from_path, to: to, dirs: [], non_dirs: [from], source: git_repo }
+                    end
+                end
+            end
+
+            subdirs
+        end
+
         def assemble_app(location)
             dgd_root = "#{File.expand_path(location)}/#{GENERATED_ROOT}"
             app_path = "#{File.expand_path(location)}/#{@manifest_file.app_root}"
@@ -72,26 +109,37 @@ module DGD::Manifest
             FileUtils.cp_r(app_path, dgd_root)
 
             write_config_file("#{location}/dgd.config")
-            specs = @manifest_file.specs
+            FileUtils.mkdir_p("#{location}/state") # Statedir for statedumps, editor files, etc.
 
-            copies = []
+            files_to_assemble.sort_by { |sd| sd[:to] }.each do |sd_hash|
+                to_path = "#{dgd_root}/#{sd_hash[:to]}"
 
-            specs.each do |spec|
-                git_repo = spec.source
-                git_repo.use_details(spec.source_details)
+                # Make appropriate dirs, including empty ones
+                sd_hash[:dirs].each do |dir|
+                    FileUtils.mkdir_p dir.sub(sd_hash[:from], to_path)
+                end
 
-                spec.paths.each do |from, to|
-                    from_path = "#{git_repo.local_dir}/#{from}"
-                    to_path = "#{dgd_root}/#{to}"
-                    copies << [from_path, to_path]
+                # Copy all files
+                sd_hash[:non_dirs].each do |from_file|
+                    to_file = from_file.sub(sd_hash[:from], "#{dgd_root}/#{sd_hash[:to]}")
+                    to_dir = File.dirname(to_file)
+                    FileUtils.mkdir_p to_dir
+                    FileUtils.cp from_file, to_file
                 end
             end
+        end
 
-            copies.sort_by { |c| c[1] }.each do |from_path, to_path|
-                to_dir = to_path.split("/")[0..-2].join("/")
-                FileUtils.mkdir_p to_dir
-                STDERR.puts "COPYING #{from_path.inspect} #{to_path.inspect}"
-                FileUtils.cp_r(from_path, to_path)
+        def precheck(location)
+            app_path = "#{File.expand_path(location)}/#{@manifest_file.app_root}"
+            app_files = Dir["#{app_path}/**"].to_a.select { |f| !File.directory?(f) }
+
+            subdirs = files_to_assemble
+            all_files = subdirs.flat_map { |sd| sd[:non_dirs] } + app_files
+            all_files.sort!
+
+            if all_files.size != all_files.uniq.size
+                repeated = all_files.uniq.select { |f| all_files.count(f) > 1 }
+                raise "Error in dgd.manifest! Repeated files: #{repeated.inspect} / #{all_files.inspect}"
             end
         end
 
@@ -197,20 +245,20 @@ CONTENTS
                 raise "Repeated (conflicting?) paths in dgd.manifest! #{repeated_paths.inspect}"
             end
 
-            # Make sure the dgd.manifest file overrides either no kernel paths or both/all
-            if KERNEL_PATHS.any? { |kp| output_paths.include?(kp) }
-                unless KERNEL_PATHS.all? { |kp| output_paths.include?(kp) }
-                    raise "dgd.manifest file #{path.inspect} includes some Kernel Library paths but not all! All needed: #{KERNEL_PATHS}!"
-                end
-                puts "This dgd.manifest file overrides the Kernel Library with its own."
-            else
-                puts "This dgd.manifest needs the default Kernel Library."
-                # This app has specified no kernellib paths -- add them
-                git_repo = @repo.git_repo(DEFAULT_KERNELLIB_URL)
-                klib_spec = GoodsSpec.new @repo, name: "default Kernel Library",
-                    source: git_repo, paths: KERNEL_PATH_MAP
-                specs.unshift klib_spec
-            end
+            ## Make sure the dgd.manifest file overrides either no kernel paths or both/all
+            #if KERNEL_PATHS.any? { |kp| output_paths.include?(kp) }
+            #    unless KERNEL_PATHS.all? { |kp| output_paths.include?(kp) }
+            #        raise "dgd.manifest file #{path.inspect} includes some Kernel Library paths but not all! All needed: #{KERNEL_PATHS}!"
+            #    end
+            #    puts "This dgd.manifest file overrides the Kernel Library with its own."
+            #else
+            #    puts "This dgd.manifest needs the default Kernel Library."
+            #    # This app has specified no kernellib paths -- add them
+            #    git_repo = @repo.git_repo(DEFAULT_KERNELLIB_URL)
+            #    klib_spec = GoodsSpec.new @repo, name: "default Kernel Library",
+            #        source: git_repo, paths: KERNEL_PATH_MAP
+            #    specs.unshift klib_spec
+            #end
 
             nil
         end

data/lib/dgd-tools/skotos_xml_obj.rb

@@ -0,0 +1,169 @@
+require "dgd-tools/version"
+
+# Nokogiri is unusually permissive as an XML parser, which is
+# good - SkotOS XML objects don't parse with most XML parsers.
+require "nokogiri"
+
+require "tempfile"
+
+module SkotOS; end
+
+class SkotOS::XMLObject
+    attr_reader :pretty
+
+    def initialize(pretty)
+        @pretty = pretty
+    end
+
+    def self.from_file(filename)
+        # SkotOS files often have references to undefined namespaces,
+        # but we can get Nokogiri to parse it.
+        doc = Nokogiri::XML(File.read filename)
+
+        remove_undiffed(doc)
+
+        pretty = doc.to_xml(indent:3)
+        #data = doc.to_hash
+        #prune_whitespace(data)
+        SkotOS::XMLObject.new pretty
+    end
+
+    def self.diff_between(obj1, obj2, o1_name: "Object 1", o2_name: "Object 2")
+        of1 = Tempfile.new("skotos_xml_diff1_")
+        of2 = Tempfile.new("skotos_xml_diff2_")
+
+        begin
+            of1.write(obj1.pretty)
+            of2.write(obj2.pretty)
+            of1.close
+            of2.close
+
+            # Diff 'fails' if there's a difference between the two files.
+            diff = system_call("diff -c #{of1.path} #{of2.path}", fail_ok: true)
+            diff.sub!(of1.path, o1_name)
+            diff.sub!(of2.path, o2_name)
+        ensure
+            of1.unlink
+            of2.unlink
+        end
+        diff
+    end
+
+    def self.diff_dirs(dir1, dir2)
+        entries1 = Dir.glob("*", base: dir1).to_a
+        entries2 = Dir.glob("*", base: dir2).to_a
+
+        only_in_1 = entries1 - entries2
+        only_in_2 = entries2 - entries1
+        in_both = entries1 & entries2
+
+        diff = []
+        diff << "Only in first: #{only_in_1.join(", ")}" unless only_in_1.empty?
+        diff << "Only in second: #{only_in_2.join(", ")}" unless only_in_2.empty?
+
+        in_both.each do |file|
+            in_1 = "#{dir1}/#{file}"
+            in_2 = "#{dir2}/#{file}"
+            if File.directory?(in_1) ^ File.directory?(in_2)
+                diff << "Only a directory in one, not both: #{dir1}/#{file}"
+            elsif File.directory?(in_1)
+                d = diff_dirs(in_1, in_2)
+                diff.concat(d)
+            else
+                o1 = from_file(in_1)
+                o2 = from_file(in_2)
+                diff << diff_between(o1, o2, o1_name: in_1, o2_name: in_2)
+            end
+        end
+        diff
+    end
+
+    def self.remove_undiffed(doc)
+        if doc.root && doc.root.element? && doc.root.attribute("owner")
+            doc.root.remove_attribute("owner")
+        end
+    end
+
+    def self.system_call(cmd, fail_ok: false)
+        f = Tempfile.new("system_call_xml_diff_")
+        begin
+            puts "Running command: #{cmd.inspect}..."
+            system(cmd, out: f)
+            unless fail_ok || $?.success?
+                f.rewind
+                out = f.read
+                raise "Error running command: #{cmd.inspect}!\n\nOutput:\n#{out}\n\n"
+            end
+            f.rewind
+            return f.read
+        ensure
+            f.close
+            f.unlink
+        end
+    end
+end
+
+=begin
+# Abandoned approach follows
+# Some code taken from: https://stackoverflow.com/a/10144623
+class Nokogiri::XML::Node
+  TYPENAMES = {1=>'element',2=>'attribute',3=>'plaintext',4=>'cdata',8=>'comment'}
+  def to_hash
+    {kind:TYPENAMES[node_type],name:name}.tap do |h|
+      h.merge! nshref:namespace.href, nsprefix:namespace.prefix if namespace
+      h.merge! text:text
+      h.merge! attr:attribute_nodes.map(&:to_hash) if element?
+      h.merge! kids:children.map(&:to_hash) if element?
+    end
+  end
+end
+class Nokogiri::XML::Document
+  def to_hash; root.to_hash; end
+end
+
+class SkotOS::XMLObject
+    OBJ_FIELDS = [:kind, :name, :text, :attr, :nshref, :nsprefix]
+    def self.diff_between(obj1, obj2, diff = [])
+        single_obj1 = obj1.slice(*OBJ_FIELDS)
+        single_obj2 = obj2.slice(*OBJ_FIELDS)
+
+        this_diff = []
+        OBJ_FIELDS.each do |field|
+            if single_obj1[field] != single_obj2[field]
+                this_diff.concat ["+#{field}: #{single_obj2[field]}", "-#{field}: #{single_obj1[field]}"]
+            end
+        end
+
+        single_obj1[:kids]
+
+        diff
+    end
+
+    def self.prune_whitespace(data)
+        data[:text].gsub!(/\W+/, " ")
+        data[:text].strip!
+        new_kids = data[:kids].flat_map do |node|
+            if node[:kind] == "comment"
+                []
+            elsif node[:kind] == "plaintext"
+                new_text = node[:text].gsub(/\W+/, " ").strip
+                if new_text == ""
+                    []
+                else
+                    node[:text] = new_text
+                    [node]
+                end
+            elsif node[:kind] == "element" || node[:kind] == "attribute"
+                node[:text].gsub!(/\W+/, " ")
+                node[:text].strip!
+                prune_whitespace(node)
+                [node]
+            else
+                raise "Is this illegal or did I just not anticipate it?"
+            end
+        end
+        data[:kids] = new_kids
+        nil
+    end
+end
+=end

data/lib/dgd-tools/version.rb

@@ -1,3 +1,3 @@
 module DGD
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,21 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: dgd-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Noah Gibbs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
-dependencies: []
+date: 2020-11-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.10.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.10.5
 description: dgd-tools supplies DGD Manifest and eventually perhaps other tools. DGD
   Manifest is an experimental DGD library and packaging system.
 email:
 - the.codefolio.guy@gmail.com
 executables:
 - dgd-manifest
+- skotos-xml-diff
 extensions: []
 extra_rdoc_files: []
 files:
@@ -29,9 +44,16 @@ files:
 - bin/console
 - bin/setup
 - dgd-tools.gemspec
+- example_xml/CraftDaemon.xml
+- example_xml/Materials.xml
+- example_xml/PropertyTypes.xml
+- example_xml/Thing.xml
+- example_xml/Thing2.xml
 - exe/dgd-manifest
+- exe/skotos-xml-diff
 - goods/skotos_httpd.goods
 - lib/dgd-tools/manifest.rb
+- lib/dgd-tools/skotos_xml_obj.rb
 - lib/dgd-tools/version.rb
 homepage: https://github.com/noahgibbs/dgd-tools
 licenses: