freyia 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8bd259691bbaf2231759c068dcadc22f08c32fa861d97e0d418b59aa4b990fa
-  data.tar.gz: 2a3dc7b0330e29d78322f2d803e2a029353f63d050ad89b92bbeddd31db0dcf7
+  metadata.gz: d54ccbc4b592196cfe46016215a003b906914ef048207860adede0805a925d3b
+  data.tar.gz: 1284b8773037791455e7e30c6adef3152212b7a4a169d678fb0899ef227af1e1
 SHA512:
-  metadata.gz: 6f1442a870e82a6b84d0396a318d8e3e15ef5553b98a86dfe90424bec0356c381867d8109e0420ec5a0c15e575b1ac775cf2fde82a16f7510a2d8a6e8b995763
-  data.tar.gz: 1c9907516537c39d1a980abe3461b17ceb1e8f17fb4fe4fc4b31badbd4e73b24d235f00d585924f6d9b66ce29c58fe660a22d6832c1e9728281423634f7d11e7
+  metadata.gz: 0c18007dcf382d0f6bfbdecf323583cad5e1e7d4dd8193af5533cd31ee5a06fef5e1f64bc925de6245df000a6391076fb29a5b6bb10ae8fddc2c5269b5eb64bd
+  data.tar.gz: 32c0d6fbf9ca5329e61630ce39457423e6afbf5b97bdd91aa3779a72aa69a0541b1ccd3f63c2c1491f46a408447965251269d5505ac7810bf8258057b9f8fce6

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.5.2] - 2025-11-21
+
+- Fix for missing `escape_globs`, refactoring of calling automation classes
+
 ## [0.5.1] - 2025-11-21
 
 - Only check class `exit_on_failure?` if it has been defined

data/lib/freyia/automations/create_file.rb

@@ -24,7 +24,7 @@ module Freyia
     def create_file(destination, *args, &block)
       config = args.last.is_a?(Hash) ? args.pop : {}
       data = args.first
-      action CreateFile.new(self, destination, block || data.to_s, config)
+      CreateFile.new(self, destination, block || data.to_s, config).()
     end
     alias_method :add_file, :create_file
 
@@ -53,13 +53,13 @@ module Freyia
       #
       def render
         @render ||= if data.is_a?(Proc)
-                      data.call
+                      data.()
                     else
                       data
                     end
       end
 
-      def invoke!
+      def call
         invoke_with_conflict_check do
           require "fileutils"
           FileUtils.mkdir_p(File.dirname(destination))

data/lib/freyia/automations/create_link.rb

@@ -19,7 +19,7 @@ module Freyia
     def create_link(destination, *args)
       config = args.last.is_a?(Hash) ? args.pop : {}
       source = args.first
-      action CreateLink.new(self, destination, source, config)
+      CreateLink.new(self, destination, source, config).()
     end
     alias_method :add_link, :create_link
 
@@ -39,7 +39,7 @@ module Freyia
         exists? && File.identical?(source, destination)
       end
 
-      def invoke!
+      def call
         invoke_with_conflict_check do
           require "fileutils"
           FileUtils.mkdir_p(File.dirname(destination))

data/lib/freyia/automations/directory.rb

@@ -51,7 +51,7 @@ module Freyia
     def directory(source, *args, &)
       config = args.last.is_a?(Hash) ? args.pop : {}
       destination = args.first || source
-      action Directory.new(self, source, destination || source, config, &)
+      Directory.new(self, source, destination || source, config, &).()
     end
 
     class Directory < EmptyDirectory #:nodoc:
@@ -59,13 +59,13 @@ module Freyia
 
       def initialize(base, source, destination = nil, config = {}, &block)
         @source = File.expand_path(
-          Dir[Util.escape_globs(base.find_in_source_paths(source.to_s))].first
+          Dir[Automations.escape_globs(base.find_in_source_paths(source.to_s))].first
         )
         @block = block
         super(base, destination, { recursive: true }.merge(config))
       end
 
-      def invoke!
+      def call
         base.empty_directory given_destination, config
         execute!
       end
@@ -77,7 +77,7 @@ module Freyia
       protected
 
       def execute! # rubocop:todo Metrics
-        lookup = Util.escape_globs(source)
+        lookup = Automations.escape_globs(source)
         lookup = File.join(lookup, "**") if config[:recursive]
         lookup = file_level_lookup(lookup)
 

data/lib/freyia/automations/empty_directory.rb

@@ -13,7 +13,7 @@ module Freyia
     #   empty_directory "doc"
     #
     def empty_directory(destination, config = {})
-      action EmptyDirectory.new(self, destination, config)
+      EmptyDirectory.new(self, destination, config).()
     end
 
     # Class which holds create directory logic. This is the base class for
@@ -48,7 +48,7 @@ module Freyia
         ::File.exist?(destination)
       end
 
-      def invoke!
+      def call
         invoke_with_conflict_check do
           require "fileutils"
           ::FileUtils.mkdir_p(destination)

data/lib/freyia/automations/inject_into_file.rb

@@ -36,7 +36,7 @@ module Freyia
       config[:after] = %r{\z} unless config.key?(:before) || config.key?(:after)
       config = config.merge({ error_on_no_change: true })
 
-      action InjectIntoFile.new(self, destination, data, config)
+      InjectIntoFile.new(self, destination, data, config).()
     end
     alias_method :inject_into_file!, :insert_into_file!
 
@@ -66,7 +66,7 @@ module Freyia
       config = args.shift || {}
       config[:after] = %r{\z} unless config.key?(:before) || config.key?(:after)
 
-      action InjectIntoFile.new(self, destination, data, config)
+      InjectIntoFile.new(self, destination, data, config).()
     end
     alias_method :inject_into_file, :insert_into_file
 
@@ -82,12 +82,12 @@ module Freyia
                              [:before, @config.delete(:before)]
                            end
 
-        @replacement = data.is_a?(Proc) ? data.call : data
+        @replacement = data.is_a?(Proc) ? data.() : data
         @flag = Regexp.escape(@flag) unless @flag.is_a?(Regexp)
         @error_on_no_change = @config.fetch(:error_on_no_change, false)
       end
 
-      def invoke! # rubocop:todo Metrics
+      def call # rubocop:todo Metrics
         content = if @behavior == :after
                     "\\0#{replacement}"
                   else

data/lib/freyia/automations.rb

@@ -9,10 +9,16 @@ require_relative "automations/inject_into_file"
 
 module Freyia
   module Automations
-    # Wraps an action object and call it accordingly to the freyia class behavior.
+    # Returns a string that has had any glob characters escaped.
+    # The glob characters are `* ? { } [ ]`.
     #
-    def action(instance) #:nodoc:
-      instance.invoke!
+    # @example
+    #   Freya::Automations.escape_globs('[apps]')   # => '\[apps\]'
+    #
+    # @param path [String]
+    # @return [String]
+    def self.escape_globs(path)
+      path.to_s.gsub(%r{[*?{}\[\]]}, '\\\\\\&')
     end
 
     # Returns the root for this freyia class (also aliased as destination root).

data/lib/freyia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Freyia
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freyia
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Jared White