kojo 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ceddafefd50a366d970ffa2da55908736609f5d99bd05510b68ebc40e171e493
-  data.tar.gz: a373ff818df798d086da4d9dac7b34fb571f0cf4f51a9115ba6e81cb0ff6dfaf
+  metadata.gz: 61ba22b7003667b908b01d8a1c6c4b3996ba18653d9424574700a7c75086cf1e
+  data.tar.gz: 1a5da4957a819a19e0fc31bd6229e3aaf4aae72e45ed807da9424c3ee03a52de
 SHA512:
-  metadata.gz: d606609cc01e294f8af9d187fc5e52496551fa43d56e91cd5c610a5477c5b91503ffd3107599a409e3ff68a1080e8037178131cb79bfd8a793586075e9e9827b
-  data.tar.gz: f58e33f3d9493f9143c299d17241acec28db267765337e94d2d6cc979000e711f95dc81c6f954bffc4b21048c4e81f6502ad3af0471f3a9c1c536583a901458d
+  metadata.gz: 2f2496aee4ebee3a2b2d9acb89361f8646abe2b84173f4b24d7938ac4270b653e49424fdc26fa4102b0f6e625087a1c57a4d00767f6a27c38a6c0138fb025966
+  data.tar.gz: 5bbaf81bb30c7794b00cc630025d9af12e280b4e440b4389eff4284071ccd79a70cb338ddc3df82f361b785fec2ceb527788db8f86a8a1be0491a83fde6382ca

data/bin/kojo-config.rb

@@ -3,28 +3,36 @@ require 'fileutils'
 
 help "Generate based on instructions from a config file"
 
-usage "kojo config CONFIG [--save DIR] [ARGS...]"
+usage "kojo config CONFIG [--save DIR --args FILE] [ARGS...]"
 usage "kojo config (-h|--help)"
 
 option "-s --save DIR", "Save output to directory instead of printing"
+option "-a --args FILE", "Load arguments from YAML file"
 
 param "ARGS", "Optional key=value pairs"
 
 example "kojo config config.yml"
 example "kojo config config.yml --save output"
 example "kojo config config.yml -s output scale=3"
+example "kojo config config.yml -s output --args args.yml"
 
 action do |args|
   gen = Kojo::Generator.new args['CONFIG']
   outdir = args['--save']
-  
-  if outdir and !Dir.exist? outdir
-    FileUtils.mkdir_p outdir
+  opts = args['ARGS'].args_to_hash
+  argfile = args['--args']
+
+  if argfile
+    fileopts = YAML.load_file(argfile).symbolize_keys
+    opts = fileopts.merge opts
   end
 
-  gen.generate do |file, output|
+  gen.generate opts do |file, output|
     path = "#{outdir}/#{file}"
     if outdir
+      dir = File.dirname path
+      FileUtils.mkdir_p dir unless Dir.exist? dir
+
       File.write path, output
       say "Saved #{path}"
     else

data/bin/kojo-dir.rb

@@ -2,27 +2,36 @@ require 'kojo'
 
 help "Compile a folder of templates to a similar output folder"
 
-usage "kojo dir INDIR [--save DIR --import DIR] [ARGS...]"
+usage "kojo dir INDIR [--save DIR --import DIR --args FILE] [ARGS...]"
 usage "kojo dir (-h|--help)"
 
 option "-s --save DIR", "Save output to directory instead of printing"
 option "-i --import DIR", "Specify base directory for @import directives"
+option "-a --args FILE", "Load arguments from YAML file"
 
 param "ARGS", "Optional key=value pairs"
 
 example "kojo dir indir"
 example "kojo dir in --save out env=production"
 example "kojo dir in --save out --import snippets env=production"
+example "kojo dir in -s out -i snippets -a args.yml"
 
 action do |args|
   opts = args['ARGS'].args_to_hash
   indir = args['INDIR']
   outdir = args['--save']
   import_base = args['--import']
+  argfile = args['--args']
+
+  if argfile
+    fileopts = YAML.load_file(argfile).symbolize_keys
+    opts = fileopts.merge opts
+  end
 
   files = Dir["#{indir}/**/*"].reject { |file| File.directory? file }
 
   files.each do |file|
+
     template = Kojo::Template.new(file, opts)
     template.import_base = import_base if import_base
     output = template.render

data/bin/kojo-file.rb

@@ -2,21 +2,29 @@ require 'kojo'
 
 help "Compile a file from a template"
 
-usage "kojo file INFILE [--save FILE] [ARGS...]"
+usage "kojo file INFILE [--save FILE --args FILE] [ARGS...]"
 usage "kojo file (-h|--help)"
 
 option "-s --save FILE", "Save to file instead of printing"
+option "-a --args FILE", "Load arguments from YAML file"
 
 param "ARGS", "Optional key=value pairs"
 
 example "kojo file main.yml"
 example "kojo file main.yml --save out.yml"
 example "kojo file main.yml -s out.yml app=lause"
+example "kojo file main.yml -s out.yml --args args.yml"
 
 action do |args|
   opts = args['ARGS'].args_to_hash
   outfile = args['--save']
   infile = args['INFILE']
+  argfile = args['--args']
+
+  if argfile
+    fileopts = YAML.load_file(argfile).symbolize_keys
+    opts = fileopts.merge opts
+  end
 
   output = Kojo::Template.new(infile, opts).render
 

data/lib/kojo/generator.rb

@@ -12,8 +12,9 @@ module Kojo
       base_dir = File.dirname config_file
       infile = "#{base_dir}/#{config['input']}"
 
-      config['output'].each do |outfile, opts|      
-        output = render infile, opts.symbolize_keys
+      config['output'].each do |outfile, config_opts|      
+        local_opts = opts.merge config_opts.symbolize_keys
+        output = render infile, local_opts
         yield outfile, output
       end
     end
@@ -25,7 +26,7 @@ module Kojo
     end
 
     def render(infile, opts={})
-      Template.new(infile, opts).render
+      Template.new(infile, opts).render      
     end
   end
 

data/lib/kojo/version.rb

@@ -1,3 +1,3 @@
 module Kojo
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kojo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-04 00:00:00.000000000 Z
+date: 2018-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mister_bin