kojo 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bfe6b265587d1655d021af564aefee81cb53ef83d91f8fa00a4118bf7a0923f
-  data.tar.gz: fb6fefecfb5b4f39b249c7e0402b571814ad7c6a326951b700cdc9f3a95eedbe
+  metadata.gz: cf86e9c731c19158840673852b2edb3fdb047ff1e80170ba8f33685c40e677c1
+  data.tar.gz: 38d5f668d58d4681e635cfb73944f4a5927a9865a9e72f1040cfa968f119186c
 SHA512:
-  metadata.gz: ddf2dd1579527285d918ac439bfac43470b9c764decb6310e2a596fc4e0caf738570fd0ff04bab06cb0a4b6ac5940514ebb7f701bc4b3dac344aebd1d6047774
-  data.tar.gz: bc80e7fc451a1e214530bcae3aa89052e70cb9f8ab20b686c57e18679c95487e6bfc58a840fbbb0b87b22e991d7b4a596d9a333dc455c828a81ce307b60e0954
+  metadata.gz: d9abd6c45fc2cf8a92659db86914ed4baa0e4754d117ae348444b5dcceed7301f7e3f822d3fcf7ad0602be4bdcaa29d8c58e19aff5071c3321c849e1a4e937df
+  data.tar.gz: 4358ffb8cde4c83ec10aa73e2f5bae4c34b369200cfeb1abe837249528a7cfcc16d5ed2c80967232795a38c14dc49a95a9f96ee9bfa0f6c70c199c4d225fcb4d

data/README.md

@@ -50,13 +50,12 @@ relevant files, and the expected output.
 
 ![kojo](images/features-vars.svg)
 
-Include variables in your configuration templates using this syntax:
-
-```ruby
-%{varname}
-```
+Include variables in your configuration templates by using this syntax: 
+`%{varname}`
 
 - Variables can be provided through the command line, or when using `@import`.
+- When one or more variables are not provided, you will be prompted to provide
+  a value.
 - Variables from the top level will be forwarded downstream, and aggregated 
   with any additional variables that are defined in subsequent `@imports`.
 
@@ -92,6 +91,8 @@ The space after `filename` is optional.
 Process a folder containing templates and `@imports`, and generate a mirror
 output folder, with all the variables and `@imports` evaluated.
 
+You may use `%{variables}` in filenames.
+
 
 
 ### One to Many Generation

data/lib/kojo/collection.rb

@@ -22,7 +22,7 @@ module Kojo
       template = Template.new file
       template.import_base = import_base
 
-      path = file.sub(/#{dir}\//, '') % args
+      path = file.sub(/#{dir}\//, '').resolve args
 
       yield path, template.render(args)
     end

data/lib/kojo/extensions/string.rb

@@ -15,4 +15,18 @@ class String
 
     end
   end
+
+  def resolve(vars)
+    self % vars
+  
+  rescue KeyError => e
+    print "> #{e.key}: "
+    response = $stdin.gets
+    
+    raise Kojo::TemplateError, e.message unless response
+
+    vars[e.key] = response.chomp
+    retry
+  end
+
 end

data/lib/kojo/template.rb

@@ -38,8 +38,8 @@ module Kojo
     end
 
     def eval_vars(content)
-      content % args
-    rescue ArgumentError, KeyError => e
+      content.resolve args
+    rescue ArgumentError => e
       raise Kojo::TemplateError, "#{e.message}\nin: #{file}"
     end
 

data/lib/kojo/version.rb

@@ -1,3 +1,3 @@
 module Kojo
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kojo
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mister_bin