ast-template 7.1.13 → 7.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbc61fe75fbdb53b90e2f4b76b1348862d26d2d4215ab34da72a61d7b5b24791
-  data.tar.gz: 459d9c3b1a202073e9fd7c3fd54a7fb25c53cc05970d95cf6b9e704c69f8e10e
+  metadata.gz: 8af1c17c8d3cbf7839dc6705e5f85804b6ce5882e3053d8d533e2c9e609c0c07
+  data.tar.gz: 85a25701587ee6db8cef8612b781aa1c5de7d4444faac36403a10a4f67bc9cfe
 SHA512:
-  metadata.gz: 7952eff0eff71d94bfde35b9b2dcdff96d72f0d05085cb0a6ec4ba849ec106a44804225e953b4cd7ecfd136349bb5b5b74881799e977f5c81768da2cfb1a37c3
-  data.tar.gz: 60b307b73360c4043243d6a8925b58cd6919541023b68f2be5e739b19ae935e89a1e3e5e20fbe41ab49f75f7b8a083b537940ac45f5e4bf244fd9cd1714a711a
+  metadata.gz: '02449c18f0d65e364564ed18a6735e1895b8330a472894b73c33c2491beb30cd3da80d2a5ba8973d736e68940b6f690362ec6ad6a489cd68ba96c8e531c33bd6'
+  data.tar.gz: aa2cecce0d580735916cba4790534c1d2737b60b22663ebfcd4b4a506b586bfd078cc03c1e15e9396231ca5835be42a071a103018ad06d0bf1b3d7e97f9b43c8

data/lib/ast/template/file_types.rb

@@ -25,23 +25,23 @@ module Ast
         relative_path = path.to_s
         basename = File.basename(relative_path)
         extension = File.extname(relative_path).downcase
-        return :gitignore if basename == ".gitignore"
-        return :gemfile if basename == "Gemfile" || basename.end_with?(".gemfile")
-        return :appraisals if basename.start_with?("Appraisals")
-        return :gemspec if basename.end_with?(".gemspec")
-        return :rakefile if basename == "Rakefile" || extension == ".rake"
+        return :gitignore if basename == '.gitignore'
+        return :gemfile if basename == 'Gemfile' || basename.end_with?('.gemfile')
+        return :appraisals if basename.start_with?('Appraisals')
+        return :gemspec if basename.end_with?('.gemspec')
+        return :rakefile if basename == 'Rakefile' || extension == '.rake'
         return :ruby if RUBY_BASENAMES.include?(basename) ||
-          RUBY_SUFFIXES.any? { |suffix| basename.end_with?(suffix) } ||
-          RUBY_EXTENSIONS.include?(extension)
-        return :yaml if extension.match?(/\A\.ya?ml\z/) || basename.casecmp("citation.cff").zero?
-        return :toml if extension == ".toml"
-        return :jsonc if relative_path == ".devcontainer/devcontainer.json"
-        return :jsonc if extension == ".jsonc"
-        return :json5 if extension == ".json5"
-        return :json if extension == ".json"
+                        RUBY_SUFFIXES.any? { |suffix| basename.end_with?(suffix) } ||
+                        RUBY_EXTENSIONS.include?(extension)
+        return :yaml if extension.match?(/\A\.ya?ml\z/) || basename.casecmp('citation.cff').zero?
+        return :toml if extension == '.toml'
+        return :jsonc if relative_path == '.devcontainer/devcontainer.json'
+        return :jsonc if extension == '.jsonc'
+        return :json5 if extension == '.json5'
+        return :json if extension == '.json'
         return :markdown if extension.match?(/\A\.md(?:own)?\z/)
-        return :dotenv if basename.start_with?(".env") || basename.end_with?(".env") || extension == ".env"
-        return :rbs if extension == ".rbs"
+        return :dotenv if basename.start_with?('.env') || basename.end_with?('.env') || extension == '.env'
+        return :rbs if extension == '.rbs'
 
         :text
       end

data/lib/ast/template/merge_dispatch.rb

@@ -15,9 +15,15 @@ module Ast
       Adapter = Struct.new(:gem_name, :require_path, :invoke)
 
       DEFAULT_ADAPTERS = {
-        yaml: Adapter.new("psych-merge", "psych/merge", ->(t, d, **opts) { Psych::Merge.merge_yaml(t, d, "yaml", **opts) }),
-        toml: Adapter.new("citrus-toml-merge", "citrus/toml/merge", ->(t, d, **opts) { Citrus::Toml::Merge.merge_toml(t, d, "toml", **opts) }),
-        markdown: Adapter.new("markdown-merge", "markdown/merge", ->(t, d, **opts) { Markdown::Merge.merge_markdown(t, d, "markdown", **opts) })
+        yaml: Adapter.new('psych-merge', 'psych/merge', lambda { |t, d, **opts|
+          Psych::Merge.merge_yaml(t, d, 'yaml', **opts)
+        }),
+        toml: Adapter.new('citrus-toml-merge', 'citrus/toml/merge', lambda { |t, d, **opts|
+          Citrus::Toml::Merge.merge_toml(t, d, 'toml', **opts)
+        }),
+        markdown: Adapter.new('markdown-merge', 'markdown/merge', lambda { |t, d, **opts|
+          Markdown::Merge.merge_markdown(t, d, 'markdown', **opts)
+        })
       }.freeze
 
       @adapters = {}
@@ -28,7 +34,7 @@ module Ast
         # merger result hash ({ok:, output:, diagnostics:}).
         def register(file_type, callable = nil, &block)
           adapter = callable || block
-          raise ArgumentError, "adapter callable required" unless adapter.respond_to?(:call)
+          raise ArgumentError, 'adapter callable required' unless adapter.respond_to?(:call)
 
           adapters[file_type.to_sym] = adapter
         end

data/lib/ast/template/strategies.rb

@@ -13,7 +13,7 @@ module Ast
     module Strategies
       # The four strategy names a destination config may declare.
       STRATEGIES = %w[merge keep_destination raw_copy accept_template].freeze
-      DEFAULT_STRATEGY = "merge"
+      DEFAULT_STRATEGY = 'merge'
 
       module_function
 
@@ -25,9 +25,9 @@ module Ast
       # @param overrides [Array<Hash>] per-path strategy overrides
       # @param path [String] logical destination path
       # @return [String] the effective strategy
-      def resolve(default: DEFAULT_STRATEGY, overrides: [], path:)
-        override = Array(overrides).find { |entry| (entry[:path] || entry["path"]) == path }
-        strategy = override && (override[:strategy] || override["strategy"])
+      def resolve(path:, default: DEFAULT_STRATEGY, overrides: [])
+        override = Array(overrides).find { |entry| (entry[:path] || entry['path']) == path }
+        strategy = override && (override[:strategy] || override['strategy'])
         strategy.to_s.empty? ? default : strategy.to_s
       end
 
@@ -43,25 +43,25 @@ module Ast
       # @return [Hash] {execution_action:, write_action:, status:, content:}
       def plan_entry(strategy:, template_content:, destination_content:)
         strategy = strategy.to_s
-        return keep_decision if strategy == "keep_destination"
+        return keep_decision if strategy == 'keep_destination'
 
         absent = destination_content.nil?
-        if strategy == "merge"
+        if strategy == 'merge'
           trivial = trivial_merge_outcome(template_content, destination_content)
           return keep_decision if trivial == :identical
-          return write_decision("merge_prepared_content", absent, template_content) if trivial == :empty_destination
+          return write_decision('merge_prepared_content', absent, template_content) if trivial == :empty_destination
         end
 
         # accept_template and merge-of-differences both write prepared content;
         # for merge-of-differences the content is the merger's, not ours.
-        content = (strategy == "merge") ? nil : template_content
+        content = strategy == 'merge' ? nil : template_content
         write_decision(execution_action_for(strategy), absent, content)
       end
 
       # Whether the strategy leaves the destination untouched. Absent
       # destinations are not created under keep_destination.
       def keep_destination?(strategy)
-        strategy.to_s == "keep_destination"
+        strategy.to_s == 'keep_destination'
       end
 
       # The merge short-circuits that never invoke a merger:
@@ -76,16 +76,16 @@ module Ast
       end
 
       def keep_decision
-        {execution_action: "keep", write_action: "keep", status: "keep", content: nil}
+        { execution_action: 'keep', write_action: 'keep', status: 'keep', content: nil }
       end
 
       def write_decision(execution_action, create, content)
-        action = create ? "create" : "update"
-        {execution_action: execution_action, write_action: action, status: action, content: content}
+        action = create ? 'create' : 'update'
+        { execution_action: execution_action, write_action: action, status: action, content: content }
       end
 
       def execution_action_for(strategy)
-        (strategy == "raw_copy") ? "raw_copy" : "merge_prepared_content"
+        strategy == 'raw_copy' ? 'raw_copy' : 'merge_prepared_content'
       end
     end
   end

data/lib/ast/template/token_application.rb

@@ -39,7 +39,8 @@ module Ast
       # @raise [UnresolvedTokensError] unresolved namespaced tokens remain
       def apply_tokens(content, replacements, config:, namespace:, scan_unresolved: true)
         document = Token::Resolver::Document.new(content.to_s, config: config)
-        resolved = Token::Resolver::Resolve.new(on_missing: :keep).resolve(document, stringify_replacements(replacements))
+        resolved = Token::Resolver::Resolve.new(on_missing: :keep).resolve(document,
+                                                                           stringify_replacements(replacements))
         return resolved unless scan_unresolved
 
         unresolved = unresolved_namespaced_tokens(resolved, config: config, namespace: namespace)
@@ -54,10 +55,14 @@ module Ast
       # @return [Array<String>]
       def unresolved_namespaced_tokens(content, config:, namespace:)
         Token::Resolver::Document.new(content.to_s, config: config)
-          .token_keys
-          .select { |key| key.split(config.separators.first, 2).first == namespace }
-          .uniq
-          .sort
+                                 .token_keys
+                                 .select do |key|
+          key.split(
+            config.separators.first, 2
+          ).first == namespace
+        end
+                                                        .uniq
+                                                        .sort
       end
 
       # Normalize replacements for the resolver: string keys and values.

data/lib/ast/template/version.rb

@@ -5,7 +5,7 @@ module Ast
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = '7.1.13'
+      VERSION = '7.1.15'
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ast-template
 version: !ruby/object:Gem::Version
-  version: 7.1.13
+  version: 7.1.15
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.13
+        version: 7.1.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.13
+        version: 7.1.15
 - !ruby/object:Gem::Dependency
   name: token-resolver
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -110,7 +110,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.19
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +208,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.23
+        version: 2.0.27
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -218,27 +218,27 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.23
+        version: 2.0.27
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -319,10 +319,10 @@ licenses:
 - PolyForm-Small-Business-1.0.0
 metadata:
   homepage_uri: https://structuredmerge.org
-  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.13
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.13/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.15
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.15/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/ast-template/7.1.13
+  documentation_uri: https://www.rubydoc.info/gems/ast-template/7.1.15
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/ast-template