constancy 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae1133b21310c9e81bbfdec38f3f86196a0b18a9615bf4a09b9c6eccf9344355
-  data.tar.gz: d84ef8bfca702fade88dc33801b62abfc8c059bebb1cb853f3d2b5d071f90ffa
+  metadata.gz: a7ada530fb88ee051c876720fd885e77cf72ca7fcd5428a1b67b2ee4af6a8783
+  data.tar.gz: 55258aafabeb7c9e59fa99761f09ed7840271f4a0c48e621fa46f4c5a62b4059
 SHA512:
-  metadata.gz: f39f5e460b4e765149270303bc273fca953d48c0984c11ffb74d3e861b0a2234e226added35c2be205b401b245b8c8081414f0957607b01acae93dc52196366a
-  data.tar.gz: 5b2d4906f3a6e91fc4f1708241fd377e1e3be73c448f9d7fd84c36946a6b44803f8ec80a36ef691ea1cd8365fc2792022ef3b58a4accf3665ed55654a1ace231
+  metadata.gz: dea0a26adaa5c4c7497ce11748353c4219549fdff1a4a0035d45ec7620cda19b013d7f85f4d97da4167e8940eebc03ede5717d0a1c04092c1525468721df3b0b
+  data.tar.gz: f59c3ae823a87ac7e8c47ccea89cbc035a6676025c65b1a42907eae2567d5efee5f3413a145d7a554b827cf6a49d669ccc702947226b5e404a87360f6d605b22

data/README.md

@@ -180,6 +180,9 @@ required. An example `constancy.yml` is below including explanatory comments:
       #       ignored. At this time there is no provision for specifying
       #       prefixes or patterns. Each key must be fully and explicitly
       #       specified.
+      #     erb_enabled - Whether or not to run the local content through
+      #       ERB parsing before attempting to sync to the remote. Defaults
+      #       to `false`.
       - name: myapp-config
         prefix: config/myapp
         datacenter: dc1
@@ -199,6 +202,7 @@ required. An example `constancy.yml` is below including explanatory comments:
         datacenter: dc1
         path: consul/yourapp.yml
         delete: true
+        erb_enabled: true
 
 You can run `constancy config` to get a summary of the defined configuration
 and to double-check config syntax.
@@ -335,6 +339,12 @@ It's a good idea to sanity-check your ERB by running `constancy config` after
 making any changes.
 
 
+### Dynamic content
+
+You can also choose to enable ERB parsing for local content as well, by setting
+`erb_enabled: true` on any sync targets you wish to populate in this way.
+
+
 ### Environment configuration
 
 Constancy may be partially configured using environment variables:

data/bin/constancy

@@ -3,6 +3,6 @@
 # This software is public domain. No rights are reserved. See LICENSE for more information.
 #
 
-require 'constancy/cli'
+require_relative '../lib/constancy/cli'
 
 Constancy::CLI.run

data/lib/constancy.rb

@@ -6,10 +6,10 @@ require 'fileutils'
 require 'ostruct'
 require 'yaml'
 
-require 'constancy/version'
-require 'constancy/config'
-require 'constancy/diff'
-require 'constancy/sync_target'
+require_relative 'constancy/version'
+require_relative 'constancy/config'
+require_relative 'constancy/diff'
+require_relative 'constancy/sync_target'
 
 class Constancy
   class InternalError < RuntimeError; end

data/lib/constancy/cli.rb

@@ -1,12 +1,12 @@
 # This software is public domain. No rights are reserved. See LICENSE for more information.
 
-require 'constancy'
+require_relative '../constancy'
 require 'diffy'
-require 'constancy/cli/check_command'
-require 'constancy/cli/push_command'
-require 'constancy/cli/pull_command'
-require 'constancy/cli/config_command'
-require 'constancy/cli/targets_command'
+require_relative 'cli/check_command'
+require_relative 'cli/push_command'
+require_relative 'cli/pull_command'
+require_relative 'cli/config_command'
+require_relative 'cli/targets_command'
 
 class Constancy
   class CLI

data/lib/constancy/sync_target.rb

@@ -2,8 +2,8 @@
 
 class Constancy
   class SyncTarget
-    VALID_CONFIG_KEYS = %w( name type datacenter prefix path exclude chomp delete )
-    attr_accessor :name, :type, :datacenter, :prefix, :path, :exclude, :consul
+    VALID_CONFIG_KEYS = %w( name type datacenter prefix path exclude chomp delete erb_enabled )
+    attr_accessor :name, :type, :datacenter, :prefix, :path, :exclude, :consul, :erb_enabled
 
     REQUIRED_CONFIG_KEYS = %w( prefix )
     VALID_TYPES = [ :dir, :file ]
@@ -47,6 +47,11 @@ class Constancy
       end
 
       self.consul = Imperium::KV.new(imperium_config)
+      self.erb_enabled = config['erb_enabled']
+    end
+
+    def erb_enabled?
+      @erb_enabled
     end
 
     def chomp?
@@ -89,22 +94,41 @@ class Constancy
       when :dir
         self.local_files.each do |local_file|
           @local_items[local_file.sub(%r{^#{self.base_path}/?}, '')] =
-            if self.chomp?
-              File.read(local_file).chomp.force_encoding(Encoding::ASCII_8BIT)
-            else
-              File.read(local_file).force_encoding(Encoding::ASCII_8BIT)
-            end
+            load_local_file(local_file)
         end
 
       when :file
         if File.exist?(self.base_path)
-          @local_items = flatten_hash(nil, YAML.load_file(self.base_path))
+          @local_items = local_items_from_file
         end
       end
 
       @local_items
     end
 
+    def local_items_from_file
+      if erb_enabled?
+        loaded_file = YAML.load(ERB.new(File.read(self.base_path)).result)
+      else
+        loaded_file = YAML.load_file(self.base_path)
+      end
+
+      flatten_hash(nil, loaded_file)
+    end
+
+    def load_local_file(local_file)
+      file = File.read(local_file)
+
+      if self.chomp?
+        encoded_file = file.chomp.force_encoding(Encoding::ASCII_8BIT)
+      else
+        encoded_file = file.force_encoding(Encoding::ASCII_8BIT)
+      end
+
+      return ERB.new(encoded_file).result if erb_enabled?
+      encoded_file
+    end
+
     def remote_items
       return @remote_items if not @remote_items.nil?
       @remote_items = {}

data/lib/constancy/version.rb

@@ -1,5 +1,5 @@
 # This software is public domain. No rights are reserved. See LICENSE for more information.
 
 class Constancy
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constancy
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - David Adams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: imperium