foobara-files-generator 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cf98ecb24a6c06ed9168b0dbf7c14a4d6aa19b7a0365684634a295de86fed57
-  data.tar.gz: 2626b68d7005938cc276c044523857154aee0fbde4a4ce1717df847b7dc35cbe
+  metadata.gz: 73585897f289a970418fd4ad54b69c95dbda81c429b63ffdee6e8ad67e5da181
+  data.tar.gz: b3e10646b9e8968cf3b31b84d70a4683d5bbb068ee0804f60206a848883354e6
 SHA512:
-  metadata.gz: 65e71db48ca1463143cfbab679dba25423992018fddc5fe19858d2d7ccd8f5bd355600e4bb47727ac45e23c08a5b759b3e92908521422a6e07ac7c8b43356a52
-  data.tar.gz: a51167675d456aa2686f283f1679c929471d28f233f8599e7fc6d0909f0a7a392d224166ebc094fe25ffc00f7cf75359ed7129979717e44ff7396b7795de89f5
+  metadata.gz: ac958d96e17998a4332593331522c5cb8ab536686aecaf3327d4cc778ae641223ae982fe3f6e57226919a777e7a6d6978bc48b9ece71086efbde4b3f92e74c32
+  data.tar.gz: 90ee2be41ef24ded533f2c39a6b75d716668d3dda3af247e8432cdcee178816161d0219fbaf6047be5d061f0b5372d469e1a0b480a437d0e892826f0db681602

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.2.0] - 2026-10-02
+
+- Introduce a new foobara-generated.json format
+- Support start_marker/end_marker for adding/removing sections from an existing file
+
+## [0.1.5] - 2026-09-20
+
+- Don't fail if symlink already exists
+
 ## [0.1.4] - 2026-09-19
 
 - Support creating symlinks

data/lib/foobara/files_generator.rb

@@ -1,3 +1,9 @@
 require "foobara/all"
 
+module Foobara
+  class FilesGenerator
+    foobara_domain!
+  end
+end
+
 Foobara::Util.require_directory "#{__dir__}/../../src"

data/src/generate.rb

@@ -3,8 +3,7 @@ require "find"
 module Foobara
   module Generators
     class Generate < Foobara::Command
-      # TODO: specify a better type?
-      result :associative_array
+      result :generate_result
 
       attr_accessor :element_to_generate
 
@@ -64,8 +63,14 @@ module Foobara
         return unless element_to_generate.applicable?
         # simplecov:enable
 
-        paths_to_source_code[Util.array(element_to_generate.target_path).join("/")] =
-          element_to_generate.generate(elements_to_generate)
+        path = Util.array(element_to_generate.target_path).join("/")
+        generated_code = element_to_generate.generate(elements_to_generate)
+
+        if generated_code.is_a?(::String)
+          generated_code = ::Foobara::FilesGenerator::Types::GeneratedFile.new(content: generated_code)
+        end
+
+        paths_to_source_code[path] = generated_code
       end
 
       def include_non_templated_files
@@ -79,7 +84,10 @@ module Foobara
 
           relative_path = file_path.relative_path_from(templates_dir_pathname)
 
-          paths_to_source_code[relative_path.to_s] = File.read(file_path)
+          content = File.read(file_path)
+
+          paths_to_source_code[relative_path.to_s] =
+            ::Foobara::FilesGenerator::Types::GeneratedFile.new(content:)
         end
       end
 

data/src/types/generate_result.rb

@@ -0,0 +1,14 @@
+require_relative "generated_file"
+
+module Foobara
+  class FilesGenerator
+    module Types
+      GENERATE_RESULT = FilesGenerator.foobara_register_type(
+        [:Types, :generate_result],
+        :associative_array,
+        key_type_declaration: :string,
+        value_type_declaration: GeneratedFile
+      )
+    end
+  end
+end

data/src/types/generated_file.rb

@@ -0,0 +1,13 @@
+module Foobara
+  class FilesGenerator
+    module Types
+      class GeneratedFile < Foobara::Model
+        attributes do
+          content :string, :required
+          start_marker :string, :allow_nil
+          end_marker :string, :allow_nil
+        end
+      end
+    end
+  end
+end

data/src/types/generated_file_record.rb

@@ -0,0 +1,13 @@
+module Foobara
+  class FilesGenerator
+    module Types
+      class GeneratedFileRecord < Foobara::Model
+        attributes do
+          file_path :string, :required
+          start_marker :string, :allow_nil
+          end_marker :string, :allow_nil
+        end
+      end
+    end
+  end
+end

data/src/write_generated_files_to_disk.rb

@@ -20,45 +20,102 @@ module Foobara
 
       attr_accessor :paths_to_source_code
 
+      def empty_generated_files_json(version = FilesGenerator::VERSION)
+        {
+          files: [],
+          metadata: {
+            files_generator: version
+          }
+        }
+      end
+
       def generate_generated_files_json
-        paths_to_source_code[generated_files_json_filename] = "[\n#{
-          paths_to_source_code.keys.sort.map { |k| "  \"#{k}\"" }.join(",\n")
-        }\n]\n"
+        generated_files_hash = empty_generated_files_json
+        files = generated_files_hash[:files]
+
+        paths_to_source_code.keys.sort.each do |file_path|
+          generated_file = paths_to_source_code[file_path]
+          file_info = { file_path: }
+
+          start_marker = generated_file.start_marker
+          file_info[:start_marker] = start_marker if start_marker
+
+          end_marker = generated_file.end_marker
+          file_info[:end_marker] = end_marker if end_marker
+
+          files << file_info
+        end
+
+        content = JSON.generate(generated_files_hash)
+
+        paths_to_source_code[generated_files_json_filename] = FilesGenerator::Types::GeneratedFile.new(content:)
       end
 
-      def delete_old_files_if_needed
+      def old_generated_files_json_contents
         file_list_file = "#{output_directory}/#{generated_files_json_filename}"
 
-        if File.exist?(file_list_file)
-          # simplecov:disable
-          file_list = JSON.parse(File.read(file_list_file))
+        return unless File.exist?(file_list_file)
 
-          file_list.map do |file|
-            Thread.new { FileUtils.rm_f("#{output_directory}/#{file}") }
-          end.each(&:join)
-          # simplecov:enable
+        contents = JSON.parse(File.read(file_list_file))
+
+        if contents.is_a?(::Array)
+          file_paths = contents
+
+          contents = empty_generated_files_json("0.1.5")
+          files = contents[:files]
+
+          file_paths.each do |file_path|
+            files << FilesGenerator::Types::GeneratedFileRecord.new(file_path:)
+          end
+        else
+          contents = Util.deep_symbolize_keys(contents)
+
+          contents[:files].map! do |generated_file_data|
+            FilesGenerator::Types::GeneratedFileRecord.new(**generated_file_data)
+          end
         end
+
+        contents
       end
 
-      def write_all_files_to_disk
-        # simplecov:disable
-        if paths_to_source_code.key?(generated_files_json_filename)
-          # simplecov:enable
-          write_file_to_disk(generated_files_json_filename, paths_to_source_code[generated_files_json_filename])
-        end
+      def delete_old_files_if_needed
+        generated_files_info = old_generated_files_json_contents
+
+        return unless generated_files_info
 
-        paths_to_source_code.map do |path, contents|
-          Thread.new { write_file_to_disk(path, contents) unless path == generated_files_json_filename }
+        generated_files_info[:files].map do |generated_file_record|
+          Thread.new do
+            file_path = File.join(output_directory, generated_file_record.file_path)
+
+            if generated_file_record.start_marker
+              remove_generated_section_from_file(generated_file_record, file_path)
+            else
+              FileUtils.rm_f file_path
+            end
+          end
+        end.each(&:join)
+      end
+
+      def write_all_files_to_disk
+        paths_to_source_code.map do |path, generated_file|
+          Thread.new do
+            content = generated_file.content
+            write_file_to_disk(path, content) # unless path == generated_files_json_filename
+          end
         end.each(&:join)
       end
 
       def write_file_to_disk(path, contents)
-        path = "#{output_directory}/#{path}"
+        path = File.join(output_directory, path)
         FileUtils.mkdir_p(File.dirname(path))
 
         if contents.is_a?(FilesGenerator::Symlink)
           if FilesGenerator::Symlink.supported?
-            File.symlink(contents, path)
+            # simplecov:disable
+            unless File.symlink?(path)
+              # simplecov:enable
+              File.symlink(contents, path)
+            end
             # simplecov:disable
           else
             # TODO: come up with a way to test this path
@@ -145,6 +202,39 @@ module Foobara
       def stats
         "Wrote #{paths_to_source_code.size} files to #{output_directory}"
       end
+
+      def remove_generated_section_from_file(generated_file_record, file_path)
+        # simplecov:disable
+        return unless File.exist?(file_path)
+        # simplecov:enable
+
+        start_marker = generated_file_record.start_marker
+        end_marker = generated_file_record.end_marker
+
+        contents = File.read(file_path)
+
+        start_index = contents.index(start_marker)
+
+        # simplecov:disable
+        return unless start_index
+        # simplecov:enable
+
+        end_index = contents[(start_index + start_marker.size)..].index(end_marker)
+
+        # simplecov:disable
+        return unless end_index
+        # simplecov:enable
+
+        end_index += start_index + start_marker.size + 1
+        end_index += end_marker.size
+
+        keep_first = contents[0...start_index]
+        keep_last = contents[end_index..]
+
+        contents = keep_first + keep_last
+
+        File.write(file_path, contents)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara-files-generator
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Miles Georgi
@@ -45,6 +45,9 @@ files:
 - src/files_generator.rb
 - src/generate.rb
 - src/symlink.rb
+- src/types/generate_result.rb
+- src/types/generated_file.rb
+- src/types/generated_file_record.rb
 - src/write_generated_files_to_disk.rb
 homepage: https://github.com/foobara/files-generator
 licenses: