label_weaver 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e80b3c26d499a033afc34ecd7fb14173b01037e7cd438870ec3e8287f4bb82c8
-  data.tar.gz: dd696f8f74079db3333e1be27d141733a2b01129ba4db5f897ced196150b8b4b
+  metadata.gz: c0e81d732a25f3c7ed75a3c975633aefcefe0ba5b0c6c33fbb2565d31469e3f4
+  data.tar.gz: c90c1d33620e1b5c76aac616db225c431fe350f0a2a7cd935a6e77d29b6e4af9
 SHA512:
-  metadata.gz: 5fbf1d2d15c9f10fbc08731d735485bda5d3c3fef8dc8f346e5f585612ba8b5b4d0a34078eb6b531fdc4e0b9e528a00dd19efe3fe902f233bc434a51b59ccfe4
-  data.tar.gz: 40e6d0bf6cf2d5ae2052bae1b80460a9d8a10fe23d6a5a884bcab4059eadff113b2403174abf994bb3707297a36a2700a03bb0958c46f59d11fd76f6fb66de70
+  metadata.gz: 02ebb42b5c87d1ad2e4a5eeadb0d7baf731566144f0296b853345fbe83d292083fa5b1ff7f63ac07a9538bca53bf247aa0732d7f3306a92153382a8c0ae956c7
+  data.tar.gz: 78c68d51a19bfc52cc16993bf02b758f5759027f90044d066818a742c541bf45cc7106b0563b0365ff54ee8d6effa2daafa2acbb3ab110b2166037bb408df11c

data/label_weaver.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "label_weaver"
-  spec.version = "0.0.9"
+  spec.version = "0.0.11"
   spec.authors = ["Stefan Exner"]
   spec.email = ["stex@stex.codes"]
   spec.homepage = "https://gitlab.com/lopo-tech/label_weaver"

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

@@ -23,7 +23,7 @@ module LabelWeaver
             end
 
             Hooks.new.run(:develop, :before_start)
-            repo.clone_or_update
+            repo.clone_or_update(always_clone: configuration.always_clone)
             copy_repository_files
             handle_file_merges
             Hooks.new.run(:develop, :after_start)
@@ -42,8 +42,8 @@ module LabelWeaver
                 # 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})."
+                if repo.timestamp_for(repository_file) > Util.mtime(project_file)
+                  logger.warn "File '#{relative_filename}' has a newer version in the remote repository (#{repo.timestamp_for(repository_file)} vs #{Util.mtime(project_file)})."
                 end
 
                 logger.debug "Skipping '#{relative_filename}'..."

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

@@ -43,7 +43,7 @@ module LabelWeaver
                 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})."
+                  logger.debug "File '#{relative_filename}' is kept as it was changed in the whitelabel project (r: #{repo.timestamp_for(repository_file)} vs w: #{Util.mtime(project_file)})."
                 else
                   logger.debug "Deleting file '#{relative_filename}'..."
                   project_file.unlink

data/lib/label_weaver/cli/actions/print_configuration.rb

@@ -0,0 +1,17 @@
+module LabelWeaver
+  module CLI
+    module Actions
+      class PrintConfiguration < Sod::Action
+        include Import[:logger, :configuration]
+
+        on "--print-configuration"
+
+        description "Prints out the currently active configuration after evaluation"
+
+        def call(*)
+          puts JSON.pretty_generate(configuration.to_h)
+        end
+      end
+    end
+  end
+end

data/lib/label_weaver/cli/shell.rb

@@ -26,6 +26,7 @@ module LabelWeaver
         dsl.new :label_weaver, banner: specification.banner do
           on(::LabelWeaver::CLI::Actions::Init, context:)
           on(::LabelWeaver::CLI::Actions::PrepareBaseProject, context:)
+          on(::LabelWeaver::CLI::Actions::PrintConfiguration, context:)
           on(::LabelWeaver::CLI::Commands::Develop, context:)
           on(::LabelWeaver::CLI::Commands::Diff, context:)
           on(Sod::Prefabs::Actions::Version, context:)

data/lib/label_weaver/configuration/contract.rb

@@ -9,6 +9,7 @@ module LabelWeaver
         required(:repository).filled(:string)
         required(:branch).filled(:string)
       end
+      optional(:always_clone).filled(:bool)
       optional(:excluded_upstream_files).array(:string)
       optional(:forced_upstream_files).array(:string)
       optional(:hooks).hash do

data/lib/label_weaver/configuration/defaults.yml

@@ -1,7 +1,18 @@
+# This is the main configuration file for label_weaver in your project.
+# It is parsed as ERb, feel free to use e.g. environment variables like
+# "<%= ENV['BRANCH_NAME'] %>" or conditionals.
+# The result still has to be valid YAML though.
+
 git:
   repository: "git@gitlab.com:lopo-tech/label_weaver.git"
   branch: "main"
 
+# If set to +true+, the upstream repository is always cloned
+# instead of the newest changes being pulled for an already cloned repository.
+# This is useful if you change the upstream branch a lot and want to make
+# sure you always have a clean state.
+# always_clone: false
+
 # 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
 #excluded_upstream_files:

data/lib/label_weaver/configuration/model.rb

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

data/lib/label_weaver/container.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "erb"
 require "cogger"
 require "containable"
 require "runcom"
@@ -12,7 +13,10 @@ module LabelWeaver
 
     register :configuration do
       if self[:xdg_config].active
-        data = self[:defaults].merge(YAML.load_file(self[:xdg_config].active, symbolize_names: true))
+        configuration_file = File.read(self[:xdg_config].active)
+        config = ERB.new(configuration_file).result
+
+        data = self[:defaults].merge(YAML.load(config, symbolize_names: true))
         contract = Configuration::Contract.call(**data)
 
         raise ArgumentError.new(contract.errors.to_h) if contract.failure?

data/lib/label_weaver/temp_repo.rb

@@ -45,7 +45,12 @@ module LabelWeaver
     #
     # Clones the repository if it doesn't exist yet locally or fetches the latest updates
     #
-    def clone_or_update
+    def clone_or_update(always_clone: false)
+      if always_clone
+        logger.info "Set to always clone the repository. Deleting any previously checked out version..."
+        FileUtils.rm_rf(repository_path)
+      end
+
       if repository_path.exist?
         logger.info "Pulling latest changes from remote repository (#{repository_url})..."
 

data/lib/label_weaver/util.rb

@@ -14,5 +14,14 @@ module LabelWeaver
       file.symlink? || file.exist?
     end
     module_function :file_exists?
+
+    def mtime(file)
+      if file.symlink? && !file.exist?
+        0
+      else
+        file.mtime
+      end
+    end
+    module_function :mtime
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: label_weaver
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - Stefan Exner
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-12 00:00:00.000000000 Z
+date: 2024-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cogger
@@ -239,6 +239,7 @@ files:
 - lib/label_weaver/cli/actions/diff/format.rb
 - lib/label_weaver/cli/actions/init.rb
 - lib/label_weaver/cli/actions/prepare_base_project.rb
+- lib/label_weaver/cli/actions/print_configuration.rb
 - lib/label_weaver/cli/commands/develop.rb
 - lib/label_weaver/cli/commands/diff.rb
 - lib/label_weaver/cli/shell.rb