label_weaver 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 290288a3de5f82f2011f9dbd603e6b9f8ee369bb64ffdc77c544004f4dc6e5e8
-  data.tar.gz: 9377d8b8a5a46c8630a9d0f3ba6e38189ff68dd1679b84cc6b4a2bdc1058c11a
+  metadata.gz: 05fe807fe77e2b113196ff90e2aaba53c75594a68d95c1164e304640836b7ba0
+  data.tar.gz: 95325968105011a5ab6a3252f6cc445c5e7df848114f2c456e4d15d93e913098
 SHA512:
-  metadata.gz: 8b12f4ed0bb7cef83d3066680a623ba9d8ef03b67ea643b684ba985aee57e7d1502b573519d242942dc01f1af91a422c79ae605eada47d4510265c874924e9c8
-  data.tar.gz: 1cf1ff573c45a3972e46dce59bca1f432aec28e7f275ce15c0dcd98401f0f75b54063aae5db24763339a275b0329eab77ae2b022e53fc6b09ed9b81a702282fd
+  metadata.gz: 9ac762eebf1ece654e3dd2ef6e37e8154d2e5a9794d999bfed55ae52a92b86b0066e333c209cac5c844d12e898aef172752bd36803ccefc609cae03ee2c7f58a
+  data.tar.gz: 1d2a7cace4b93d1d04939382f892d5442abe36861855926218c7682f62b5182007fea0b09910addb7ee427ab5d6a230b19b5ea3a608887bdc3a1fcaf920605b5

data/label_weaver.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "label_weaver"
-  spec.version = "0.0.10"
+  spec.version = "0.0.12"
   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)

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

@@ -31,7 +31,7 @@ module LabelWeaver
     # @return [Time] the last time the file was part of a commit, closest we can get to an mtime
     #
     def timestamp_for(file)
-      repo.log(1).path(file).first.date
+      git.log(1).path(file).first.date
     end
 
     def digest_for(file)
@@ -45,13 +45,19 @@ 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})..."
+        logger.info "Pulling latest changes from remote repository (#{repository_url}##{branch})..."
 
-        repo.pull("origin", branch)
+        git.fetch(all: true, force: true)
+        git.checkout(branch)
       else
-        logger.info "Cloning remote repository, this might take a while..."
+        logger.info "Cloning remote repository (#{repository_url}##{branch}), this might take a while..."
 
         Git.clone(
           repository_url,
@@ -96,7 +102,7 @@ module LabelWeaver
       logger.info "Updating repository timestamps..."
       repository_path.glob("**/*", File::FNM_DOTMATCH).each do |file|
         # Set the file modification times to the last time they were updated in a commit
-        time = repo.all.log.path(file).first.date
+        time = git.all.log.path(file).first.date
         file.utime(time, time)
       end
     end
@@ -130,8 +136,8 @@ module LabelWeaver
       repository_path.glob("**/*", File::FNM_DOTMATCH).select { _1.file? || _1.symlink? }
     end
 
-    def repo
-      @repo ||= Git.open(repository_path)
+    def git
+      @git ||= Git.open(repository_path)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: label_weaver
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Stefan Exner
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-13 00:00:00.000000000 Z
+date: 2024-12-22 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