jsontemplate 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 341367051a162f6aa01706ffa58ea3a298870438
-  data.tar.gz: db0ebf309531391d9b8de428582202bbd1cbb746
+  metadata.gz: e973f4782b9b49398b971d7a06d9c2e4bd650507
+  data.tar.gz: cba28240636fd024c12ff89dcbf36ea59af936f6
 SHA512:
-  metadata.gz: 49d81e57206b00c714e20f17c88b10089f9f877f41f07469076c09f17b869f7752426151a63e27b68939bd7ddd6e18cd90e20f3e3836f88d51fa2b3117e8ac1e
-  data.tar.gz: b2de6bc3d5f681e751e9ff5e0b2bfbb22ee4627aa4f8ce99a93435128d43717a77e69f553d4634fb0c952ba9762172c7ea642aa90a53d61b5f26fdb972f9adda
+  metadata.gz: 74c098eb69e20f99ee8fae5ad5aef728a777468626dcb2f5c61c6a7e9971ab45e09598f40cf39608c7ca64adf02247a3b4e0c94c1f2cde8338a598968aa8a7c6
+  data.tar.gz: 1da023d5075fd4f43ab9ace8f98207ae5acb8d84d492857dae358a62f8f4c25dc188df4f204c87754513223a2c0dffbb98c65b9c8b680339b8dd7967a4b1468d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jsontemplate (0.2.0)
+    jsontemplate (0.3.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/jsontemplate/version.rb

@@ -1,3 +1,3 @@
 class JsonTemplate
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/jsontemplate.rb

@@ -3,12 +3,16 @@ require "jsontemplate/version"
 
 class JsonTemplate
     attr_reader :json
+    attr_accessor :properties_file, :secrets_file
 
     def initialize(src, path=nil)
         path ||= src.kind_of?(String) ? src : nil
         @path = path || (src.respond_to?(:path) ? src.path : nil)
         @dir  = File.expand_path(path ? File.dirname(path) : ".")
 
+        @properties_file = File.join(@dir,"properties.json")
+        @secrets_file = File.join(@dir,"secrets.json")
+
         data = src.respond_to?(:read) ? src.read : File.read(src)
         @json = JSON.load(data)
     end
@@ -39,6 +43,10 @@ class JsonTemplate
                 process_dirmerge(v)
             elsif k == "$FLookup"
                 process_flookup(*v)
+            elsif k == "$Prop"
+                process_flookup(@properties_file, v)
+            elsif k == "$Secret"
+                process_flookup(@secrets_file, v)
             elsif k[0] == "$"
                 raise "Unknown directive #{k}"
             else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsontemplate
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Vidar Hokstad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry