jsontemplate 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 650217220c4a794fb5a58dfcbc27271efbe3672c
-  data.tar.gz: 80c01ac97ce7a7a3a06cf526ce9ffb5929d58955
+  metadata.gz: 360933697b132664ef8783eeaa1d77a54b92ce96
+  data.tar.gz: 48601d2350b59574718f7365c788dee920e93330
 SHA512:
-  metadata.gz: 64274d0bb43ab4b8c98bd7f396b70bfe389e2bc7c53ffe0f12c2326ca58d30611f36b5330a47d91431467dbaca4388c2f4fe90e1683eeed65d16a1802ded76bb
-  data.tar.gz: 71524208b91d2b387b928c6e728ca2104d35ab8c63f470d14965d2d780f565f94e6c1ba431766a26882cb5e173687381be63887049304ff00d8ee125be10987a
+  metadata.gz: ee3d770335b3eea0a5efae708f5e479ad67eca32cdfccc566dbb87c13a236a214ea27efefce8c46901987270a3d510326aa6585b0c4d320959252a56beb07e89
+  data.tar.gz: fb74b90da549574c75b1ecf734330478539e4660edad8c5dd2d61dc6b1a30f91fe0fbd8c87f721b268b417b6e308b3fb6f3f6ddc3ed9709b98296a5aabf4e234

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jsontemplate (0.4.1)
+    jsontemplate (0.4.2)
 
 GEM
   remote: https://rubygems.org/
@@ -13,12 +13,12 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.4.2)
+    rake (10.5.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.1)
+    rspec-core (3.5.2)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)

data/exe/jsontemplate

@@ -11,6 +11,7 @@ src  = File.expand_path(ARGV.shift) rescue nil
 dest = File.expand_path(ARGV.shift) rescue nil
 
 if src.nil? || dest.nil?
+    STDERR.puts "jsontemplate (from jsontemplate gem) version #{JsonTemplate::VERSION}"
     STDERR.puts "USAGE: jsontemplate in-file out-file"
     exit(1)
 end

data/lib/jsontemplate.rb

@@ -11,9 +11,15 @@ class JsonTemplate
         @dir  = File.expand_path(path ? File.dirname(path) : ".")
 
         @properties_file = File.join(@dir,"properties.json")
-        @secrets_file = File.join(@dir,"secrets.json")
+        @secrets_file    = File.join(@dir,"secrets.json")
 
-        data = src.respond_to?(:read) ? src.read : File.read(src)
+        if src.respond_to?(:read)
+          @filename = "<stream>"
+          data = src.read
+        else
+          @filename = File.join(@dir, File.basename(src))
+          data = File.read(@filename)
+        end
         @json = JSON.load(data)
     end
 

data/lib/jsontemplate/version.rb

@@ -1,3 +1,3 @@
 class JsonTemplate
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsontemplate
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Vidar Hokstad