label_weaver 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dff838800cddec3836326d71abbd93a5a386f30d2fd1ef870fdd9c0e32f3d27c
-  data.tar.gz: d4be0c5ba051a8a24ea1ed3882cd56ca72d7ec866fb39a06b61b089ad3ee7be7
+  metadata.gz: 8f84d950482825eab6d7306ec2ea04c3434ab0c79cb1ae0b7a836b6ff6fe4208
+  data.tar.gz: 56c21daba6bfd11e1d774efc734ddb03c8867fece5a63181934aef561823cf40
 SHA512:
-  metadata.gz: 0b3f97f3dba6ded676bb59701b4cf3bb2b13a4c5c9f3b35b8b45925ae9feb106bb4028cb3fde7751e1137c088f03b3308d9627e4c9584b80ee5a12be219128e2
-  data.tar.gz: 2a55c44f662101c8c66041a550264f0ba4ad63ed900e6850f4b67333a36023510ee2d2898c4bd2a44ac32336d66ba6ec86b7e851a1ad646d17b191ba90600515
+  metadata.gz: b2fb78c636d8a63f7617dffe8511b422906b63109a97074cf6f27002b94fc22c49ae8a3b8ee102e72cd0ce782e22bbab3b2c33590919aad1bd125b1c9e2069ac
+  data.tar.gz: 71e54ccbd1de7f76252287427741a1bcbe1af97bfad6904b21c130d226534ec63d86eca5916dbfe18b62fdb1004c64803fd1273feb7e8a64b1605924c0e2e756

data/label_weaver.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "label_weaver"
-  spec.version = "0.0.6"
+  spec.version = "0.0.8"
   spec.authors = ["Stefan Exner"]
   spec.email = ["stex@stex.codes"]
   spec.homepage = "https://gitlab.com/lopo-tech/label_weaver"
@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = "~> 3.3"
   spec.add_dependency "cogger", "~> 0.21"
   spec.add_dependency "containable", "~> 0.0"
+  spec.add_dependency "dot-properties", "~> 0.1"
   spec.add_dependency "dry-schema", "~> 1.6"
   spec.add_dependency "diffy", "~> 3.4"
   spec.add_dependency "git", "~> 2.1.1"

data/lib/label_weaver/cli/actions/develop/start.rb

@@ -38,7 +38,10 @@ module LabelWeaver
               relative_filename = repo.relative_path(repository_file)
               project_file = context.project_root_dir + relative_filename
 
-              if project_file.exist?
+              if repo.forced_file?(repository_file)
+                # If the file is forced, we need to delete the existing file if it exists.
+                FileUtils.rm_f(project_file) if project_file.exist?
+              elsif Util.file_exists?(project_file)
                 if repo.timestamp_for(repository_file) > project_file.mtime
                   logger.warn "File '#{relative_filename}' has a newer version in the remote repository (#{repo.timestamp_for(repository_file)} vs #{project_file.mtime})."
                 end
@@ -67,7 +70,8 @@ module LabelWeaver
               context.repository_dir,
               repository_url: configuration.git[:repository],
               branch: configuration.git[:branch],
-              excludes: configuration.excludes,
+              excluded_upstream_files: configuration.excluded_upstream_files,
+              forced_upstream_files: configuration.forced_upstream_files,
               logger: logger
             )
           end

data/lib/label_weaver/cli/actions/develop/stop.rb

@@ -37,13 +37,16 @@ module LabelWeaver
               relative_filename = repo.relative_path(repository_file)
               project_file = context.project_root_dir + relative_filename
 
-              if project_file.exist?
-                if digest(project_file) != digest(repository_file)
+              if repo.forced_file?(repository_file) && Util.file_exists?(project_file)
+                logger.debug "Force-Deleting file '#{relative_filename}'..."
+                project_file.unlink
+                remove_empty_tree(project_file.dirname)
+              elsif Util.file_exists?(project_file)
+                if Util.digest(project_file) != Util.digest(repository_file)
                   logger.debug "File '#{relative_filename}' is kept as it was changed in the whitelabel project (r: #{repo.timestamp_for(repository_file)} vs w: #{project_file.mtime})."
                 else
                   logger.debug "Deleting file '#{relative_filename}'..."
                   project_file.unlink
-
                   remove_empty_tree(project_file.dirname)
                 end
               end
@@ -68,16 +71,13 @@ module LabelWeaver
             end
           end
 
-          def digest(file)
-            Digest::SHA1.file(file).hexdigest
-          end
-
           def repo
             @repo ||= LabelWeaver::TempRepo.new(
               context.repository_dir,
               repository_url: configuration.git[:repository],
               branch: configuration.git[:branch],
-              excludes: configuration.excludes,
+              excluded_upstream_files: configuration.excluded_upstream_files,
+              forced_upstream_files: configuration.forced_upstream_files,
               logger: logger
             )
           end

data/lib/label_weaver/cli/commands/diff.rb

@@ -39,7 +39,6 @@ module LabelWeaver
           else
             logger.error "Unknown format: #{context.input[:format]}"
           end
-          logger.info context.input.inspect
         end
 
         private
@@ -57,9 +56,10 @@ module LabelWeaver
         def repo
           @repo ||= LabelWeaver::TempRepo.new(
             context.repository_dir,
-            repository_url: configuration.git_repository,
-            branch: configuration.git_branch,
-            excludes: configuration.excludes,
+            repository_url: configuration.git[:repository],
+            branch: configuration.git[:branch],
+            excluded_upstream_files: configuration.excluded_upstream_files,
+            forced_upstream_files: configuration.forced_upstream_files,
             logger: logger
           )
         end

data/lib/label_weaver/configuration/contract.rb

@@ -9,7 +9,8 @@ module LabelWeaver
         required(:repository).filled(:string)
         required(:branch).filled(:string)
       end
-      optional(:excludes).array :string
+      optional(:excluded_upstream_files).array(:string)
+      optional(:forced_upstream_files).array(:string)
       optional(:hooks).hash do
         optional(:develop).hash do
           optional(:before_start).array(:string)

data/lib/label_weaver/configuration/defaults.yml

@@ -1,14 +1,16 @@
 git:
   repository: "git@gitlab.com:lopo-tech/label_weaver.git"
   branch: "main"
-# Files to exclude from the base repository, they will not be copied over to the whitelabel project.
+
+# Files to exclude from the upstream repository, they will not be copied over to the whitelabel project.
 # Shell filename globbing rules apply, not regular expressions
-excludes:
-  - .git/**
-hooks:
-  develop:
-    after_start:
-      - echo "Development Mode Started"
+#excluded_upstream_files:
+#  - .git/**
+
+#hooks:
+#  develop:
+#    after_start:
+#      - echo "Development Mode Started"
 
 # Define files from the base and whitelabel projects that should be merged into
 # a new or existing file.
@@ -18,6 +20,13 @@ hooks:
 #    target_file: package.json
 #    overrides_file: package.whitelabel.json
 
+# Files to be **always** taken from the upstream repository.
+# They will always be copied over on development start and will be removed from the
+# whitelabel project on stop.
+# Shell filename globbing rules apply, not regular expressions
+#forced_upstream_files:
+#  - test/**
+
 # Files here will be appended on whitelabel development instead of being skipped if the
 # file already exists in a project
 #append:

data/lib/label_weaver/configuration/model.rb

@@ -4,12 +4,13 @@ module LabelWeaver
   module Configuration
     # Defines the configuration model for use throughout the gem.
     Model = Data.define(
-      :excludes,
+      :excluded_upstream_files,
       :git,
       :hooks,
-      :merges
+      :merges,
+      :forced_upstream_files
     ) do
-      def initialize(git:, hooks: {}, excludes: [], merges: [])
+      def initialize(git:, hooks: {}, excluded_upstream_files: [], forced_upstream_files: [], merges: [])
         super
       end
     end

data/lib/label_weaver/merger.rb

@@ -1,3 +1,5 @@
+require "dot_properties"
+
 module LabelWeaver
   class Merger
     include Import[:configuration, :logger]
@@ -38,7 +40,17 @@ module LabelWeaver
       source = load_file(source_file)
       overrides = load_file(overrides_file)
 
-      write_file(target_file, source.deep_merge(overrides))
+      validate_compatibility!(source, overrides)
+
+      case target_file.extname
+      when ".properties"
+        overrides.to_h.each do |k, v|
+          source[k] = v
+        end
+        write_file(target_file, source)
+      else
+        write_file(target_file, source.deep_merge(overrides))
+      end
     end
 
     def restore_file(relative_file_path)
@@ -52,8 +64,23 @@ module LabelWeaver
       configuration.merges.map { _1.transform_keys(&:to_sym) }
     end
 
+    def validate_compatibility!(source, overrides)
+      # Check for property files
+      if source.is_a?(DotProperties) || overrides.is_a?(DotProperties)
+        if nested_hash?(source) || nested_hash?(overrides)
+          raise ArgumentError, "Property files can only be merged with other property files or one-dimensional hashes"
+        end
+      end
+    end
+
+    def nested_hash?(value)
+      value.is_a?(Hash) && value.values.any? { |v| v.is_a?(Hash) }
+    end
+
     def load_file(file)
       case file.extname
+      when ".properties"
+        DotProperties.load(file)
       when ".yaml", ".yml"
         YAML.load_file(file)
       when ".json"
@@ -65,10 +92,13 @@ module LabelWeaver
 
     def write_file(file, content)
       case file.extname
+      when ".properties"
+        # TODO: Handle content that is not already a DotProperties instance
+        File.write(file, content.to_s)
       when ".yaml", ".yml"
-        File.write(file, content.to_yaml)
+        File.write(file, content.to_h.to_yaml)
       when ".json"
-        File.write(file, JSON.pretty_generate(content))
+        File.write(file, JSON.pretty_generate(content.to_h))
       else
         raise ArgumentError, "Unsupported file type: #{file.extname}"
       end

data/lib/label_weaver/temp_repo.rb

@@ -7,13 +7,21 @@ module LabelWeaver
   class TempRepo
     using Refinements::Pathname
 
-    attr_reader :repository_path, :repository_url, :branch, :excludes, :logger
-
-    def initialize(repository_path, repository_url:, branch: "main", excludes: [], logger: Logger.new($stdout))
+    attr_reader :repository_path, :repository_url, :branch, :logger, :excluded_upstream_files, :forced_upstream_files
+
+    def initialize(
+      repository_path,
+      repository_url:,
+      branch: "main",
+      excluded_upstream_files: [],
+      forced_upstream_files: [],
+      logger: Logger.new($stdout)
+    )
       @repository_path = repository_path
       @repository_url = repository_url
       @branch = branch
-      @excludes = excludes + %w[. ..]
+      @excluded_upstream_files = excluded_upstream_files + %w[. ..]
+      @forced_upstream_files = forced_upstream_files
       @logger = logger
     end
 
@@ -27,7 +35,7 @@ module LabelWeaver
     end
 
     def digest_for(file)
-      Digest::SHA1.file(file).hexdigest
+      Util.digest(file)
     end
 
     def changed_file?(repository_file, project_root_dir:)
@@ -60,12 +68,26 @@ module LabelWeaver
     def relevant_files
       files.filter do |file|
         # Reject any files that are set up to be excluded. Shell filename globbing rules apply
-        next false if excludes.any? { relative_path(file).fnmatch?(_1, File::FNM_DOTMATCH) }
+        next false if excluded_file?(file)
 
         true
       end
     end
 
+    #
+    # @return [Boolean] +true+ if the file should never be copied over from the repository
+    #
+    def excluded_file?(repository_file)
+      excluded_upstream_files.any? { relative_path(repository_file).fnmatch?(_1, File::FNM_DOTMATCH) }
+    end
+
+    #
+    # @return [Boolean] +true+ if the file should **always** be copied over from the repository
+    #
+    def forced_file?(repository_file)
+      forced_upstream_files.any? { relative_path(repository_file).fnmatch?(_1, File::FNM_DOTMATCH) }
+    end
+
     #
     # Updates the atime and mtime of each file in the repository to their latest commit time
     # TODO: Check if still needed
@@ -103,7 +125,9 @@ module LabelWeaver
     # @return [Array<Pathname>] All files inside the repository, including dotfiles. No folders.
     #
     def files
-      repository_path.glob("**/*", File::FNM_DOTMATCH).select(&:file?)
+      # The symlink check is necessary to include directory symlinks, but leave out
+      # regular directories
+      repository_path.glob("**/*", File::FNM_DOTMATCH).select { _1.file? || _1.symlink? }
     end
 
     def repo

data/lib/label_weaver/util.rb

@@ -0,0 +1,18 @@
+module LabelWeaver
+  module Util
+    def digest(file)
+      if file.symlink?
+        # for symlinks we just use the target path
+        file.readlink
+      else
+        Digest::SHA1.file(file).hexdigest
+      end
+    end
+    module_function :digest
+
+    def file_exists?(file)
+      file.symlink? || file.exist?
+    end
+    module_function :file_exists?
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: label_weaver
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Stefan Exner
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-06 00:00:00.000000000 Z
+date: 2024-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cogger
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: dot-properties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: dry-schema
   requirement: !ruby/object:Gem::Requirement
@@ -236,6 +250,7 @@ files:
 - lib/label_weaver/import.rb
 - lib/label_weaver/merger.rb
 - lib/label_weaver/temp_repo.rb
+- lib/label_weaver/util.rb
 homepage: https://gitlab.com/lopo-tech/label_weaver
 licenses:
 - MIT