dgd-tools 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7248b5e9b0f257568633b8f83c166430e1451da62c0d84acfa468f48a6bf4196
-  data.tar.gz: 435dfa244ae63087b45acd18f9220267cf4facf560f2c1a235392d6ec9fe00f6
+  metadata.gz: f64aa1b29bc2fb6a0c10292a25246ce4fbe5a43b7fa23dc19a84ab01abc58013
+  data.tar.gz: 60fb058d6f25ca80348e5236450ed3c5fe812137d04e0fce237d36b6b252dfca
 SHA512:
-  metadata.gz: 0f6534cced478794994f6a85ebf10277d6c0455d095708a49901b3527bea1534a9d18b2c5dc6bffc5b3a03bf5949fd352644b019148f541f1e6f98660aee060b
-  data.tar.gz: 86c72de588f15ce2f1804068771e46a6ca71f707399fc807b74bdca02c52ef173dab11058eb24475e387852443de79c59cd553d9902a79611240a39f1ae72431
+  metadata.gz: 30b54b93e1b4e5da44c7cf0bc6e526dd489d74301df20cd4d9644c69aab509416d3082d2646dd6394331f81643a92cbc24933141fdca024057ed6e003866b37a
+  data.tar.gz: 525305f71a39842d01f7ce99f3bce1d85d7dc0e5493411e09759cf003a8632609130281f40ba8ff25bf7edb8ffa73de5e9b53d3c3022c4143a8b99be70a9c4f9

data/.gitignore

@@ -7,3 +7,5 @@
 /spec/reports/
 /tmp/
 *.gem
+test/data/**/dgd.config
+test/data/*/.root

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dgd-tools (0.1.4)
+    dgd-tools (0.1.5)
       nokogiri (~> 1.10.5)
 
 GEM

data/exe/dgd-manifest

@@ -11,6 +11,17 @@ if ARGV == ["--version"]
     exit
 end
 
+if ARGV.size == 1 && ["-h", "--help"].include?(ARGV[0])
+    puts <<HELP_INFO
+dgd-manifest commands:
+
+new [project_name]: create a new DGD-manifest project
+test: make sure the dgd.manifest file is well-formed and usable
+install: compile the DGD application to a config file and a root directory
+HELP_INFO
+    exit
+end
+
 case ARGV[0]
 when "new"
     unless ARGV.size == 2

data/exe/skotos-xml-diff

@@ -6,6 +6,17 @@
 
 require "dgd-tools/skotos_xml_obj"
 
+if ARGV.size == 1 && ["-h", "--help"].include?(ARGV[0])
+    print <<HELP_INFO
+skotos-xml-diff [file1] [file2]
+
+OR
+
+skotos-xml-diff [dir1] [dir2]
+HELP_INFO
+    exit
+end
+
 if ARGV.size != 2
     STDERR.puts "Usage: skotos-xml-diff <obj_or_dir_1> <obj_or_dir_2>"
     exit -1

data/lib/dgd-tools/manifest.rb

@@ -30,24 +30,26 @@ module DGD::Manifest
     # This is a repo of everything DGD Manifest saves between runs.
     # It includes downloaded Git repos, Goods files and more.
     class Repo
-        attr_reader :manifest_dir
+        attr_reader :shared_dir
 
         def initialize
+            @no_manifest_file = true
             @home = ENV["HOME"]
-            @manifest_dir = "#{@home}/.dgd-tools"
-            Dir.mkdir(@manifest_dir) unless File.directory?(@manifest_dir)
+            @shared_dir = "#{@home}/.dgd-tools"
+            Dir.mkdir(@shared_dir) unless File.directory?(@shared_dir)
+
             ["git", "goods"].each do |subdir|
-                full_subdir = "#{@manifest_dir}/#{subdir}"
+                full_subdir = "#{@shared_dir}/#{subdir}"
                 Dir.mkdir(full_subdir) unless File.directory?(full_subdir)
             end
 
-            unless File.exist?("#{@manifest_dir}/dgd/bin/dgd")
-                dgd_dir = "#{@manifest_dir}/dgd"
+            unless File.exist?("#{@shared_dir}/dgd/bin/dgd")
+                dgd_dir = "#{@shared_dir}/dgd"
                 if File.directory?(dgd_dir)
                     # Not clear to me what to do here...
                 else
                     DGD::Manifest.system_call("git clone https://github.com/ChatTheatre/dgd.git #{dgd_dir}")
-                    Dir.chdir("#{@manifest_dir}/dgd/src") do
+                    Dir.chdir("#{@shared_dir}/dgd/src") do
                         DGD::Manifest.system_call(DGD_BUILD_COMMAND)
                     end
                 end
@@ -60,25 +62,33 @@ module DGD::Manifest
         end
 
         def manifest_file(path)
-            raise "Already have a dgd.manifest file!" if @manifest_file
+            raise "Already have a dgd.manifest file!" unless @no_manifest_file
 
+            @no_manifest_file = false
             @manifest_file ||= AppFile.new(self, path)
         end
 
-        def files_to_assemble
-            subdirs = []
+        protected
+
+        # This includes files to assemble... But also subdirectories and commands. This format is
+        # unstable and ugly, and should not be exposed to outside parties who might later depend on it.
+        def assembly_operations(location)
+            operations = []
+
+            raise("No manifest file!") if @no_manifest_file
 
             @manifest_file.specs.each do |spec|
                 git_repo = spec.source
-                git_repo.use_details(spec.source_details)
+                git_repo.use_details(spec.source_details)  # This sets things like checked-out branch
 
                 spec.paths.each do |from, to|
+                    # Note: git_repo.local_dir is an absolute path.
                     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 }
+                        operations << { cmd: "cp", from: from_path, to: to, dirs: dirs, non_dirs: non_dirs, comment: :single_dir }
                     elsif from_path["*"]  # If from_path contains at least one asterisk
                         components = from.split("/")
                         first_wild_idx = components.index { |item| item["*"] }
@@ -91,51 +101,56 @@ module DGD::Manifest
                         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 }
+                        operations << { cmd: "cp", from: "#{git_repo.local_dir}/#{no_wild_from_path}", to: to, dirs: dirs, non_dirs: non_dirs, comment: :path_wildcard }
                     else
                         # A single file
-                        subdirs << { from: from_path, to: to, dirs: [], non_dirs: [from], source: git_repo }
+                        operations << { cmd: "cp", from: from_path, to: to, dirs: [], non_dirs: [from_path], comment: :single_file }
                     end
                 end
             end
 
-            subdirs
+            app_path = "#{File.expand_path(location)}/#{@manifest_file.app_root}"
+            app_files = Dir["#{app_path}/**/*"].to_a
+            app_dirs = app_files.select { |f| File.directory?(f) }
+            app_non_dirs = app_files - app_dirs
+            unless app_dirs.empty? && app_non_dirs.empty?
+                operations << { cmd: "cp", from: app_path, to: ".", dirs: app_dirs, non_dirs: app_non_dirs, comment: :app_files }  # No source
+            end
+
+            operations
         end
 
+        public
+
         def assemble_app(location)
             dgd_root = "#{File.expand_path(location)}/#{GENERATED_ROOT}"
-            app_path = "#{File.expand_path(location)}/#{@manifest_file.app_root}"
             FileUtils.rm_rf(dgd_root)
-            FileUtils.cp_r(app_path, dgd_root)
 
-            write_config_file("#{location}/dgd.config")
-            FileUtils.mkdir_p("#{location}/state") # Statedir for statedumps, editor files, etc.
+            Dir.chdir(location) do
+                write_config_file("#{location}/dgd.config")
+                FileUtils.mkdir_p("#{location}/state") # Statedir for statedumps, editor files, etc.
 
-            files_to_assemble.sort_by { |sd| sd[:to] }.each do |sd_hash|
-                to_path = "#{dgd_root}/#{sd_hash[:to]}"
+                assembly_operations(location).each do |sd_hash|
+                    to_path = "#{dgd_root}/#{sd_hash[:to]}"
 
-                # Make appropriate dirs, including empty ones
-                sd_hash[:dirs].each do |dir|
-                    FileUtils.mkdir_p dir.sub(sd_hash[:from], to_path)
-                end
+                    # Make appropriate dirs, including empty ones
+                    sd_hash[:dirs].each do |dir|
+                        FileUtils.mkdir_p dir.sub(sd_hash[:from], to_path)
+                    end
 
-                # 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
+                    # 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
         end
 
         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!
+            all_files = assembly_operations(location).flat_map { |sd| sd[:non_dirs] }
 
             if all_files.size != all_files.uniq.size
                 repeated = all_files.uniq.select { |f| all_files.count(f) > 1 }
@@ -146,7 +161,7 @@ module DGD::Manifest
         def write_config_file(path)
             File.open(path, "wb") do |f|
                 f.write <<CONTENTS
-/* These are SkotOS limits. They are enormous. They should
+/* These are SkotOS limits. They are larger than you are likely to need. They should
    be configurable but they are not yet. */
 telnet_port = ([
     "*":50100  /* telnet port number */
@@ -193,7 +208,7 @@ CONTENTS
             @git_url = git_url
             @repo = repo
             local_path = git_url.tr("/\\", "_")
-            @local_dir = "#{@repo.manifest_dir}/git/#{local_path}"
+            @local_dir = "#{@repo.shared_dir}/git/#{local_path}"
 
             if File.directory?(@local_dir)
                 Dir.chdir(@local_dir) do
@@ -205,9 +220,7 @@ CONTENTS
         end
 
         def default_branch
-            return @default_branch if @default_branch
-            output = `git rev-parse --abbrev-ref origin/HEAD`.chomp
-            @default_branch = output.gsub(/^origin\//, "")
+            @default_branch ||= `git rev-parse --abbrev-ref origin/HEAD`.chomp.gsub(/^origin\//, "")
         end
 
         def use_details(details)

data/lib/dgd-tools/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dgd-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Noah Gibbs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri