dgd-tools 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0025088ef0df415ef00766a3bfeb9416938e236f771f2bba67a3a9527116c009'
-  data.tar.gz: da1493ee48cf879fa86b24c9a551c19edb6ed9d99c11df6c28592361aad97909
+  metadata.gz: 7248b5e9b0f257568633b8f83c166430e1451da62c0d84acfa468f48a6bf4196
+  data.tar.gz: 435dfa244ae63087b45acd18f9220267cf4facf560f2c1a235392d6ec9fe00f6
 SHA512:
-  metadata.gz: 6b9d8e75885bed1f6f102bb7b8edd608c7ff72ae0ab68aecb153785cfe734ee3c446d58f0511e48b0e4aba4c5fdc73b98a7f4fd6578054524bdfa59a98c9bf34
-  data.tar.gz: 9d0aa1bd573057eb89be293ef43f5dab2f0228907455c489c00a1bab7a9971a872ee4cf5919cad2ae359363de8c51597e292f90d3740299dde38f55a06c7fa6f
+  metadata.gz: 0f6534cced478794994f6a85ebf10277d6c0455d095708a49901b3527bea1534a9d18b2c5dc6bffc5b3a03bf5949fd352644b019148f541f1e6f98660aee060b
+  data.tar.gz: 86c72de588f15ce2f1804068771e46a6ca71f707399fc807b74bdca02c52ef173dab11058eb24475e387852443de79c59cd553d9902a79611240a39f1ae72431

data/example_xml/t1/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/t2/Thing.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

@@ -6,7 +6,20 @@ if ARGV.size == 0
     ARGV.push "install"
 end
 
+if ARGV == ["--version"]
+    puts "dgd-tools version #{DGD::VERSION}"
+    exit
+end
+
 case ARGV[0]
+when "new"
+    unless ARGV.size == 2
+        puts "Usage: dgd-manifest new [project name]"
+        raise "Must supply exactly one argument to dgd-manifest new!"
+    end
+    appdir = DGD::Manifest::AppDirectory.new(File.expand_path ARGV[1])
+    appdir.name = ARGV[1]
+    appdir.create!
 when "test"
     unless File.exist?("dgd.manifest")
         raise "I don't see a dgd.manifest file in this directory!"

data/lib/dgd-tools/manifest.rb

@@ -233,7 +233,7 @@ CONTENTS
             @path = path
             @repo = repo
             raise("No such dgd.manifest file as #{path.inspect}!") unless File.exist?(path)
-            contents = JSON.load(File.read(path))
+            contents = AppFile.parse_manifest_file(path)
 
             read_manifest_file(contents)
 
@@ -263,6 +263,23 @@ CONTENTS
             nil
         end
 
+        # Load the JSON and then remove comments
+        def self.parse_manifest_file(path)
+            contents = JSON.parse(File.read path)
+            remove_comments!(contents)
+            contents
+        end
+
+        def self.remove_comments!(items)
+            if items.is_a?(Hash)
+                items.delete_if { |k, v| k[0] == "#" }
+                items.values.each { |v| remove_comments!(v) }
+            elsif items.is_a?(Array)
+                items.delete_if { |i| i.is_a?(String) && i[0] == "#" }
+                items.each { |i| remove_comments!(i) }
+            end
+        end
+
         def read_manifest_file(contents)
             raise "Expected a top-level JSON object in dgd.manifest!" unless contents.is_a?(Hash)
 
@@ -331,4 +348,98 @@ CONTENTS
             @paths = cleaned_paths
         end
     end
+
+    class AppDirectory
+        attr_reader :location
+        attr_accessor :name
+
+        DEFAULT_FILE_LOCATIONS = {
+            "manifest" => "dgd.manifest",
+            "gitignore" => ".gitignore",
+            "gems_rb" => "gems.rb",
+        }
+        DEFAULT_EMPTY_DIRS = [ "app", "state" ]
+
+        def initialize(directory)
+            @location = directory
+        end
+
+        def gitignore_contents
+            <<~FILE_CONTENTS
+                # DGD Manifest files
+                .root
+                dgd.config
+                state/*
+            FILE_CONTENTS
+        end
+
+        def manifest_contents
+            <<FILE_CONTENTS
+{
+    "name": "#{@name}",
+    "version": "0.1.0",
+    "description": "TODO: put description here",
+    "app_root": "app",
+    "goods": [
+        "# This is an example goods file - substitute your own.",
+        "https://raw.githubusercontent.com/noahgibbs/dgd-tools/main/goods/skotos_httpd.goods"
+    ],
+    "unbundled_goods": [
+        {
+            "#": "this is an example of unbundled goods - substitute your own",
+            "name": "kernellib",
+            "git": {
+                "url": "https://github.com/ChatTheatre/kernellib.git",
+                "branch": "master"
+            },
+            "paths": {
+                "src/doc/kernel": "doc/kernel",
+                "src/include/kernel": "include/kernel",
+                "src/include/*.h": "include",
+                "src/kernel": "kernel"
+            }
+        }
+    ]
+}
+FILE_CONTENTS
+        end
+
+        def gems_rb_contents
+            <<~FILE_CONTENTS
+                source "https://rubygems.org"
+
+                gem "dgd-tools", ">= #{DGD::VERSION}"
+            FILE_CONTENTS
+        end
+
+        def create!
+            if File.exist?(@location) && (!File.directory?(@location) || Dir["#{@location}/**"].size != 0)
+                raise "Cannot create a new DGD manifest project over a file or in an existing non-empty directory!"
+            end
+
+            puts "Creating new DGD manifest project at #{@location}..."
+            FileUtils.mkdir_p @location
+            Dir.chdir @location do
+                DEFAULT_FILE_LOCATIONS.each do |file_desc, file_location|
+                    File.open(file_location, "wb") do |f|
+                        contents = send("#{file_desc}_contents")
+                        f.write(contents)
+                    end
+                end
+
+                DEFAULT_EMPTY_DIRS.each do |dir|
+                    FileUtils.mkdir dir
+                    FileUtils.touch File.join(dir, ".keep")
+                end
+
+                result = system "bundle"
+                raise("Could not run bundler to install dgd-tools for #{@location}!") unless result
+
+                result = system "bundle exec dgd-manifest install"
+                raise("Error when running dgd-manifest for #{@location}!") unless result
+            end
+
+            puts "Successfully created project at #{@location}."
+        end
+    end
 end

data/lib/dgd-tools/version.rb

@@ -1,3 +1,3 @@
 module DGD
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dgd-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Noah Gibbs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -49,6 +49,8 @@ files:
 - example_xml/PropertyTypes.xml
 - example_xml/Thing.xml
 - example_xml/Thing2.xml
+- example_xml/t1/Thing.xml
+- example_xml/t2/Thing.xml
 - exe/dgd-manifest
 - exe/skotos-xml-diff
 - goods/skotos_httpd.goods