dgd-tools 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2637c36239c1aabf37dbac03f0404cab8bb2ea493753bebc2710d44e03f78e11
-  data.tar.gz: f544c13905cceb2c080385edc9122a4b89905700ac8195b97410ae58d829e5b6
+  metadata.gz: bf28b15e9e5aa7fe5c3d52835011e37c2b34f8ed839b59e6faea3ff9b23433d7
+  data.tar.gz: 66d8280067875fe8dfbb056e3288dec4471eba855937ee182dd24db70f30cd9b
 SHA512:
-  metadata.gz: ce3e707b25251764367464866d71c64ece85e69cb8c39d2589d3342f263f9ba3c98270d3f130c05b481fac04d0c06e613d9992b87ab54bf99851e3fcd98ebc58
-  data.tar.gz: 41acb15b29ca4667590ca59cace0a5563f1129845d205c32dbe662f6222aad9c174a09548e98f0e0b450c63b3e073cb5baa614eddbe390ab9e4084f1a8ca9e7d
+  metadata.gz: 79fb4a29346b26de15f1cf4b6fe0c81ad845f45e24688b83f91f03c6aca61b691b6fb0698d64eb2fd633ae0f52d8df2bdb2226549ba524d748201b8f728adab2
+  data.tar.gz: 1f4ffe31a23b5f0302b0d47815c74a4484847cfd9afce393d37c85515be981943447d5807eef11bca221269c2cde7c3137e5868561f306e8d83035ac5d03dd5b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dgd-tools (0.1.1)
+    dgd-tools (0.1.2)
 
 GEM
   remote: https://rubygems.org/

data/TODO

@@ -0,0 +1 @@
+* Persistent data dirs. Symlinks in app-root dir for now?

data/exe/dgd-manifest

@@ -24,7 +24,8 @@ when "install"
     repo.manifest_file("dgd.manifest")
     repo.assemble_app(".")
 when "server"
-    puts "Starting DGD server... (not yet)"
+    puts "Starting DGD server..."
+    DGD::Manifest.system_call("~/.dgd-tools/dgd/bin/dgd dgd.config")
 else
     raise "Unrecognised #{$0} command: #{ARGV[0].inspect}!"
 end

data/lib/dgd-tools/manifest.rb

@@ -9,7 +9,12 @@ module DGD; end
 module DGD::Manifest
     DGD_BUILD_COMMAND = %(make DEFINES='-DUINDEX_TYPE="unsigned int" -DUINDEX_MAX=UINT_MAX -DEINDEX_TYPE="unsigned short" -DEINDEX_MAX=USHRT_MAX -DSSIZET_TYPE="unsigned int" -DSSIZET_MAX=1048576' install
 )
-    KERNEL_PATHS = ["include/kernel", "kernel"]
+    KERNEL_PATH_MAP = {
+        "src/kernel" => "/kernel",
+        "src/include" => "/include",
+        "src/doc/kernel" => "/doc/kernel"
+    }
+    KERNEL_PATHS = KERNEL_PATH_MAP.values
     DEFAULT_KERNELLIB_URL = "https://github.com/ChatTheatre/kernellib"
 
     GENERATED_ROOT = ".root"
@@ -69,6 +74,8 @@ module DGD::Manifest
             write_config_file("#{location}/dgd.config")
             specs = @manifest_file.specs
 
+            copies = []
+
             specs.each do |spec|
                 git_repo = spec.source
                 git_repo.use_details(spec.source_details)
@@ -76,12 +83,16 @@ module DGD::Manifest
                 spec.paths.each do |from, to|
                     from_path = "#{git_repo.local_dir}/#{from}"
                     to_path = "#{dgd_root}/#{to}"
-                    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)
+                    copies << [from_path, to_path]
                 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)
+            end
         end
 
         def write_config_file(path)
@@ -93,7 +104,7 @@ telnet_port = ([
     "*":50100  /* telnet port number */
 ]);
 binary_port = ([
-    "*":50110, /* Failsafe */
+    "*":50110 /* Failsafe */
 ]);   /* binary ports */
 directory = "./#{GENERATED_ROOT}";
 
@@ -196,10 +207,9 @@ CONTENTS
                 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)
-                kl_paths = { "src/kernel" => "/kernel", "src/include/kernel" => "/include/kernel", "src/doc/kernel" => "/doc/kernel" }
                 klib_spec = GoodsSpec.new @repo, name: "default Kernel Library",
-                    source: git_repo, paths: kl_paths
-                specs.push klib_spec
+                    source: git_repo, paths: KERNEL_PATH_MAP
+                specs.unshift klib_spec
             end
 
             nil

data/lib/dgd-tools/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dgd-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Noah Gibbs
@@ -25,6 +25,7 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- TODO
 - bin/console
 - bin/setup
 - dgd-tools.gemspec