rndr 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ff7164803b3d0b959e9affe1bc763f90a970e4c
-  data.tar.gz: 5009bf155381b14a71db1bb0c5c4ae17137f6db1
+  metadata.gz: 8466c3c45a0ee825f49d621e584d4a12ac6a965b
+  data.tar.gz: 4ecee6dcb0d4bdbd1c027413abb1ea38f602d692
 SHA512:
-  metadata.gz: dcfee8e536056d7592b5b4af1016c3b3aa8dd0c1f7c58fea49d151d2e659705963f8b4bbf8ec7097c3a0466b9b2588366cff774fd784c440e471cf9b4724a2d8
-  data.tar.gz: eefd0a3e16d95c94057a7a78a13a85f633f08f2ea7fd5aa29bc9ce3769a3a32b2c5f48e21936c18f0c9bae652d695dae71cb5de551751a0109dcab9c3ae6202e
+  metadata.gz: f4cebd0a275001d39c721de703a64b65067cdfcdecbaa078a00550e2c9c3e1bd414ce4e10488b1ff4f2a2fd035667613135783878d810c7c5a82d6f7c2fe5964
+  data.tar.gz: 91c0211d83f6edc8c7051f841ae1c7f029ce58a0ac3867c174cc58c6d79a2cde78d5b9656ae64b324e2d587468ccf65cf4788978560153cf7acee6cfdfaae5ad

data/.rubocop.yml

@@ -1,6 +1,9 @@
 AllCops:
   TargetRubyVersion: 2.3
 
+Lint/UnneededDisable:
+  Enabled: false
+
 Metrics/AbcSize:
   Max: 20
 

data/CHANGELOG

@@ -1,2 +1,7 @@
+0.0.4:
+  - Add merge-opts directive.
+  - Fix issue with ignore-file directive.
+  - Restructure spec tests.
+
 0.0.3:
-  - add default trim mode
+  - Add default trim mode.

data/README.md

@@ -4,6 +4,8 @@
 
 Rndr is a small Ruby cli gem that provides a method of rendering discovered erb templates. Variables for use in template rendering can be used directly by providing a either a `yaml` or `json` file, or alternatively a directory may be supplied along with the variable merging strategy. Rndr supports both standard hash merges or recursive (default).
 
+In addition to supporting recursive hash merges, additional hash control options may be passed via the `--merge-opts` hash directive. This supports the available options as supported by the [deep_merge](https://github.com/danielsdeleo/deep_merge) gem.
+
 Paths can be ignored by either creating a `.rndrignore` file within the current working directly, or supplying a path to a desired ignore file.
 
 
@@ -35,16 +37,17 @@ Usage:
   rndr check
 
 Options:
-  e, [--extension=EXTENSION]  # Extension of templates.
-                              # Default: erb
-  i, [--ignore=IGNORE]        # Path to file containing list of files to be ignored.
-                              # Default: /Users/demo/ruby/rndr/.rndrignore
-  m, [--merge], [--no-merge]  # Recursively merge variables instead of replacing.
-                              # Default: true
-  t, [--template=TEMPLATE]    # Path to erb template or directory.
-                              # Default: /Users/demo/ruby/rndr/rndr
-  V, [--vars=VARS]            # Path to var file or directory.
-                              # Default: /Users/demo/ruby/rndr/vars
+  e, [--extension=EXTENSION]   # Extension of templates.
+                               # Default: erb
+  i, [--ignore=IGNORE]         # Path to file containing list of files to be ignored.
+                               # Default: /Users/demo/ruby/rndr/.rndrignore
+  m, [--merge], [--no-merge]   # Recursively merge variables instead of replacing.
+                               # Default: true
+  t, [--template=TEMPLATE]     # Path to erb template or directory.
+                               # Default: /Users/demo/ruby/rndr
+  V, [--vars=VARS]             # Path to var file or directory.
+                               # Default: /Users/demo/ruby/rndr/vars
+  o, [--merge-opts=key:value]  # Hash of options to pass to deep_merge function
 
 Verifies discovered erb templates.
 ```
@@ -85,6 +88,7 @@ Options:
                               # Default: /Users/demo/ruby/rndr/rndr
   V, [--vars=VARS]            # Path to var file or directory.
                               # Default: /Users/demo/ruby/rndr/vars
+  o, [--merge-opts=key:value]  # Hash of options to pass to deep_merge function
 
 Renders discovered templates.
 ```
@@ -103,6 +107,7 @@ Options:
                               # Default: true
   V, [--vars=VARS]            # Path to var file or directory.
                               # Default: /Users/demo/ruby/rndr/vars
+  o, [--merge-opts=key:value]  # Hash of options to pass to deep_merge function
 
 Lists Combined Variables.
 ```

data/Rakefile

@@ -1,9 +1,16 @@
+# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'coveralls/rake/task'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 Coveralls::RakeTask.new
 
-task :default => :spec
-task :coveralls => [ :spec, :features, 'coveralls:push' ]
+task default: :spec
+task coveralls: [:spec, :features, 'coveralls:push']
+RuboCop::RakeTask.new(:style) do |task|
+  task.options << '--display-cop-names'
+end

data/lib/rndr/cli.rb

@@ -22,10 +22,14 @@ module Rndr
     method_option :vars,
                   aliases: :V, type: :string, default: File.join(Dir.pwd, 'vars'),
                   desc: 'Path to var file or directory.'
+    method_option :merge_opts,
+                  aliases: :o, type: :hash, default: {},
+                  desc: 'Hash of options to pass to deep_merge function'
     def check
       results = Rndr.matches(path: options[:template], ext: options[:extension],
                              ignore_path: options[:ignore])
-      template_vars = Rndr.read_vars(path: options[:vars], merge: options[:merge])
+      template_vars = Rndr.read_vars(path: options[:vars], merge: options[:merge],
+                                     merge_opts: options[:merge_opts])
       results.each do |path|
         template = Template.new(path: path, vars: template_vars)
         print_check_result(path: path, result: template.render?)
@@ -44,7 +48,7 @@ module Rndr
                   desc: 'Path to erb template or directory.'
     def list
       results = Rndr.matches(path: options[:template], ext: options[:extension],
-                             ignore_path: '.rndrignore')
+                             ignore_path: options[:ignore])
       if results.empty?
         puts 'No matching results.'
       else
@@ -68,10 +72,14 @@ module Rndr
     method_option :vars,
                   aliases: :V, type: :string, default: File.join(Dir.pwd, 'vars'),
                   desc: 'Path to var file or directory.'
-    def render
+    method_option :merge_opts,
+                  aliases: :o, type: :hash, default: {},
+                  desc: 'Hash of options to pass to deep_merge function'
+    def render # rubocop:disable Metrics/AbcSize
       results = Rndr.matches(path: options[:template], ext: options[:extension],
-                             ignore_path: '.rndrignore')
-      template_vars = Rndr.read_vars(path: options[:vars], merge: options[:merge])
+                             ignore_path: options[:ignore])
+      template_vars = Rndr.read_vars(path: options[:vars], merge: options[:merge],
+                                     merge_opts: options[:merge_opts])
       results.each do |path|
         template = Template.new(path: path, vars: template_vars)
         render_path = path.gsub(/.#{options[:extension]}$/, '')
@@ -90,8 +98,12 @@ module Rndr
     method_option :vars,
                   aliases: :V, type: :string, default: File.join(Dir.pwd, 'vars'),
                   desc: 'Path to var file or directory.'
+    method_option :merge_opts,
+                  aliases: :o, type: :hash, default: {},
+                  desc: 'Hash of options to pass to deep_merge function'
     def vars
-      result = Rndr.read_vars(path: options[:vars], merge: options[:merge])
+      result = Rndr.read_vars(path: options[:vars], merge: options[:merge],
+                              merge_opts: options[:merge_opts])
       case options[:format].downcase
       when 'json'
         puts result.to_json

data/lib/rndr/util.rb

@@ -15,11 +15,9 @@ module Rndr
   def self.matches(path:, ext: 'erb', ignore_path: File.join(Dir.pwd, '.rndrignore'))
     matched_paths = match_files(path: File.absolute_path(path), ext: ext)
     ignore_file_path = File.absolute_path(ignore_path)
-    if !matched_paths.empty? && File.exist?(ignore_file_path)
-      return filter_ignored_paths(path_list: matched_paths, ignore_path: ignore_file_path)
-    else
-      return matched_paths
-    end
+    return filter_ignored_paths(path_list: matched_paths, ignore_path: ignore_file_path) if
+           !matched_paths.empty? && File.exist?(ignore_file_path)
+    matched_paths
   end
 
   # Accepts a file or directory and will attempt to parse the discovered file(s) as either json
@@ -27,12 +25,14 @@ module Rndr
   # template rendering in {Template#render}.
   # @param path [String] The path to the vars file or directory. Will process both json and yaml.
   # @param merge [Boolean] True to enable recursive merge of hashes.
+  # @param merge_opts [Hash] A hash of options to be passed to the deep_merge method
   # @return [Hash] A hash containing the processed variables. Will be used to send to the binding
   #    of a rendered template. See {Template#render} for more information.
-  def self.read_vars(path:, merge: true)
+  def self.read_vars(path:, merge: true, merge_opts: {})
     vars_path = File.absolute_path(path)
     return read_vars_file(vars_path) if File.file?(vars_path)
-    return read_vars_dir(path: vars_path, merge: merge) if File.directory?(vars_path)
+    return read_vars_dir(path: vars_path, merge: merge, merge_opts: merge_opts) if
+           File.directory?(vars_path)
     {}
   end
 
@@ -87,7 +87,7 @@ module Rndr
     # @return [Hash, nil] Hash of processed data read from var passed var file.
     def read_vars_file(path)
       data = File.read(path)
-      return JSON.load(data) if json?(data)
+      return JSON.parse(data) if json?(data)
       return YAML.load(data) if yaml?(data)
       nil
     end
@@ -97,15 +97,16 @@ module Rndr
     # @param path [String] Path to directory containing files to be ingested and vars
     #    processed.
     # @param merge [Boolean] True if variables from files should be recursively merged.
+    # @param merge_opts [Hash] A hash of options to be passed to the deep_merge method
     # @return [Hash] Hash of processed variables read from files within the passed.
-    def read_vars_dir(path:, merge:)
+    def read_vars_dir(path:, merge:, merge_opts: {})
       processed_vars = {}
       Dir[File.join(path, '*')].each do |file|
         file_vars = read_vars_file(file)
-        unless file_vars.nil?
-          processed_vars =
-            merge_vars(base_hash: processed_vars, hash: file_vars, merge: merge)
-        end
+        next if file_vars.nil?
+        processed_vars =
+          merge_vars(base_hash: processed_vars, hash: file_vars, merge: merge,
+                     merge_opts: merge_opts)
       end
       processed_vars
     end
@@ -130,15 +131,42 @@ module Rndr
       false
     end
 
+    # to_bool converts the passed string to its associated bool value
+    # @param value [String] String to be converted to bool value
+    # @return [Boolean] True, False, or nil depending on input.
+    def to_bool(value)
+      return true if value.casecmp('true')
+      return false if value.casecmp('false')
+      nil
+    end
+
+    # deep_merge_opts converts the passed hash to the format that the deep_merge
+    # function accepts.
+    # @param hash [Hash] The options hash to be converted
+    # @return [Hash] A converted options hash to be passed to the deep_merge method
+    def deep_merge_opts(hash)
+      opts = {}
+      bool_vars = %w(extend_existing_arrays keep_array_duplicates merge_debug merge_hash_arrays
+                     overwrite_arrays preserve_unmergeables sort_merged_arrays)
+      string_vars = %w(knockout_prefix unpack_arrays)
+      hash.each do |k, v|
+        opts[k.to_sym] = v if string_vars.include?(k)
+        opts[k.to_sym] = to_bool(v) if bool_vars.include?(k)
+      end
+      opts
+    end
+
     # merge_vars handles merging hashes, either with a recursive merge (default) or with
     # a standard merge, which has a 'replace' effect.
     # @param base_hash [Hash] Original Hash to have values merged into.
     # @param hash [Hash] Secondary hash to be merged into base hash.
     # @param merge [Boolean] True to enable recursive merging of hashes.
+    # @param merge_opts [Hash] A hash of options to be passed to the deep_merge method
     # @return [Hash] The merged hash.
-    def merge_vars(base_hash:, hash:, merge: true)
+    def merge_vars(base_hash:, hash:, merge: true, merge_opts: {})
       if base_hash.is_a?(Hash) && hash.is_a?(Hash)
-        return base_hash.deep_merge!(hash) if merge == true
+        return base_hash.deep_merge!(hash, deep_merge_opts(merge_opts)) if
+          merge == true
         return base_hash.merge!(hash) if merge == false
       end
       {}

data/rndr.gemspec

@@ -20,11 +20,12 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.3'
 
-  gem.add_dependency 'deep_merge', '>= 1.1.1'
-  gem.add_dependency 'thor', '>= 0.19.1'
+  gem.add_dependency 'deep_merge', '~> 1.1'
+  gem.add_dependency 'thor', '~> 0.19'
 
-  gem.add_development_dependency 'bundler', '>= 1.12.5'
-  gem.add_development_dependency 'rake', '>= 11.2.2'
-  gem.add_development_dependency 'rspec', '>= 3.5.0'
-  gem.add_development_dependency 'coveralls', '>= 0.8.15'
+  gem.add_development_dependency 'bundler', '~> 1.12'
+  gem.add_development_dependency 'rake', '~> 11.2'
+  gem.add_development_dependency 'rspec', '~> 3.5'
+  gem.add_development_dependency 'rubocop', '~> 0.46'
+  gem.add_development_dependency 'coveralls', '~> 0.8'
 end

data/spec/cli_spec.rb

@@ -5,19 +5,29 @@ require 'fileutils'
 require 'rndr'
 require_relative 'spec_helper'
 
-module Rndr # rubocop:disable Metris/ModuleLength
-  RSpec.describe CLI do
-    before(:all) { Dir.chdir(File.join(Dir.pwd, 'test')) }
-    after(:all) { Dir.chdir('../') }
-
+module Rndr # rubocop:disable Metrics/ModuleLength
+  RSpec.describe CLI do # rubocop:disable Metrics/BlockLength
+    before(:all) { Dir.chdir(File.join(Dir.pwd, 'spec/resources')) }
     let(:cli) { CLI.new }
-
-    describe '#check' do
+    describe '#check' do # rubocop:disable Metrics/BlockLength
       context 'When the default options are supplied' do
         before do
           cli.options = {
-            extension: 'erb', ignore: '.rndrignore',
-            merge: true, template: 'templates', vars: 'vars'
+            extension: 'erb', ignore: 'rndrignore', merge: true,
+            merge_opts: {}, template: 'templates', vars: 'vars'
+          }
+        end
+        it 'should list the correctly matched results' do
+          expect { cli.check }.to output(/rendertest.txt.erb \[OK\]$/).to_stdout
+          expect { cli.check }.to_not output(/ignoretest.txt.erb [OK]$/).to_stdout
+        end
+      end
+
+      context 'When a bool merge option is supplied' do
+        before do
+          cli.options = {
+            extension: 'erb', ignore: 'rndrignore', merge: true,
+            merge_opts: { 'overwrite_arrays' => 'true' }, template: 'templates', vars: 'vars'
           }
         end
         it 'should list the correctly matched results' do
@@ -29,8 +39,8 @@ module Rndr # rubocop:disable Metris/ModuleLength
       context 'When an alternate exntesion is provided' do
         before do
           cli.options = {
-            extension: 'tmplt', ignore: '.rndrignore',
-            merge: true, template: 'templates', vars: 'vars'
+            extension: 'tmplt', ignore: 'rndrignore', merge: true,
+            merge_opts: {}, template: 'templates', vars: 'vars'
           }
         end
         it 'should list the correctly matched results' do
@@ -42,7 +52,7 @@ module Rndr # rubocop:disable Metris/ModuleLength
 
     describe '#list' do
       context 'When the default options are supplied' do
-        before { cli.options = { extension: 'erb', ignore: '.rndrignore', template: 'templates' } }
+        before { cli.options = { extension: 'erb', ignore: 'rndrignore', template: 'templates' } }
         it 'should list the correctly matched results' do
           expect { cli.list }.to output(/rendertest.txt.erb$/).to_stdout
           expect { cli.list }.to_not output(/ignoretest.txt.erb/).to_stdout
@@ -50,7 +60,7 @@ module Rndr # rubocop:disable Metris/ModuleLength
       end
       context 'When an alternate extension is provided' do
         before do
-          cli.options = { extension: 'tmplt', ignore: '.rndrignore', template: 'templates' }
+          cli.options = { extension: 'tmplt', ignore: 'rndrignore', template: 'templates' }
         end
         it 'should list the correctly matched results' do
           expect { cli.list }.to output(/exttest.txt.tmplt$/).to_stdout
@@ -59,70 +69,106 @@ module Rndr # rubocop:disable Metris/ModuleLength
       end
     end
 
-    describe '#render' do
-      let(:rendered_file) { File.absolute_path('../test/templates/rendertest.txt') }
-      let(:rendered_ext) { File.absolute_path('../test/templates/exttest.txt') }
-      let(:rendered_merged) do
-        File.join(File.dirname(__FILE__), 'resources/rendered_merged.txt')
-      end
-      let(:rendered_replaced) do
-        File.join(File.dirname(__FILE__), 'resources/rendered_replaced.txt')
-      end
+    describe '#render' do # rubocop:disable Metrics/BlockLength
+      let(:rendered_file) { File.absolute_path('templates/rendertest.txt') }
+      let(:rendered_ext) { File.absolute_path('templates/exttest.txt') }
+      let(:spec_merged) { File.absolute_path('spec_merged.txt') }
+      let(:spec_opts) { File.absolute_path('spec_opts.txt') }
+      let(:spec_replaced) { File.absolute_path('spec_replaced.txt') }
       after(:each) do
         File.delete(rendered_file) if File.exist?(rendered_file)
         File.delete(rendered_ext) if File.exist?(rendered_ext)
       end
 
-      context 'When the defaults are spplied' do
+      context 'When the defaults are supplied' do
+        before do
+          cli.options = {
+            extension: 'erb', ignore: 'rndrignore', merge: true,
+            merge_opts: {}, template: 'templates', vars: 'vars'
+          }
+        end
+        it 'should render items correctly' do
+          expect { cli.render }.to output(/rendertest.txt \[OK\]$/).to_stdout
+          expect { cli.render }.to_not output(/ignoretest.txt/).to_stdout
+          expect(FileUtils.compare_file(spec_merged, rendered_file)).to be_truthy
+        end
+      end
+
+      context 'When a boolean merge option is supplied' do
         before do
           cli.options = {
-            extension: 'erb', ignore: '.rndrignore',
-            merge: true, template: 'templates', vars: 'vars'
+            extension: 'erb', ignore: 'rndrignore', merge: true,
+            merge_opts: { 'overwrite_arrays' => 'true' }, template: 'templates', vars: 'vars'
           }
         end
         it 'should render items correctly' do
           expect { cli.render }.to output(/rendertest.txt \[OK\]$/).to_stdout
           expect { cli.render }.to_not output(/ignoretest.txt/).to_stdout
-          expect(FileUtils.compare_file(rendered_merged, rendered_file)).to be_truthy
+          expect(FileUtils.compare_file(spec_opts, rendered_file)).to be_truthy
         end
       end
 
-      context ' When the replace merege strategy is specified' do
+      context 'When the replace merege strategy is specified' do
         before do
           cli.options = {
-            extension: 'erb', ignore: '.rndrignore',
-            merge: false, template: 'templates', vars: 'vars'
+            extension: 'erb', ignore: 'rndrignore', merge: false,
+            merge_opts: {}, template: 'templates', vars: 'vars'
           }
         end
         it 'should render items correctly' do
           expect { cli.render }.to output(/rendertest.txt \[OK\]$/).to_stdout
           expect { cli.render }.to_not output(/ignoretest.txt/).to_stdout
-          expect(FileUtils.compare_file(rendered_replaced, rendered_file)).to be_truthy
+          expect(FileUtils.compare_file(spec_replaced, rendered_file)).to be_truthy
         end
       end
 
       context 'When provided an alternate extension' do
         before do
           cli.options = {
-            extension: 'tmplt', ignore: '.rndrignore',
-            merge: true, template: 'templates', vars: 'vars'
+            extension: 'tmplt', ignore: 'rndrignore', merge: true,
+            merge_opts: {}, template: 'templates', vars: 'vars'
           }
         end
         it 'should render items correctly' do
           expect { cli.render }.to output(/exttest.txt \[OK\]$/).to_stdout
           expect { cli.render }.to_not output(/rendertest.txt/).to_stdout
-          expect(FileUtils.compare_file(rendered_merged, rendered_ext)).to be_truthy
+          expect(FileUtils.compare_file(spec_merged, rendered_ext)).to be_truthy
         end
       end
     end
 
-    describe '#vars' do
-      context 'When a directory is supplied.' do
+    describe '#vars' do # rubocop:disable Metrics/BlockLength
+      context 'When a directory is supplied.' do # rubocop:disable Metrics/BlockLength
         context 'should serialize and recursively merge variables' do
           before do
-            cli.options = { format: 'yaml', merge: true, vars: 'vars' }
-            @merged =
-              File.read(File.join(File.dirname(__FILE__), 'resources/vars_merged.txt'))
+            cli.options = { format: 'yaml', merge: true, merge_opts: {}, vars: 'vars' }
+            @merged = File.read(File.absolute_path('vars_merged.txt'))
+          end
+          it 'should perform a deep merge' do
+            expect { cli.vars }.to output(@merged).to_stdout
+          end
+        end
+
+        context 'should serialize and recursively merge variables with a boolean merge option' do
+          before do
+            cli.options = {
+              format: 'yaml', merge: true,
+              merge_opts: { 'overwrite_arrays' => 'true' }, vars: 'vars'
+            }
+            @merged = File.read(File.absolute_path('vars_opts_bool.txt'))
+          end
+          it 'should perform a deep merge' do
+            expect { cli.vars }.to output(@merged).to_stdout
+          end
+        end
+
+        context 'should serialize and recursively merge variables with a string merge option' do
+          before do
+            cli.options = {
+              format: 'yaml', merge: true,
+              merge_opts: { 'unpack_arrays' => ',' }, vars: 'vars'
+            }
+            @merged = File.read(File.absolute_path('vars_opts_string.txt'))
           end
           it 'should perform a deep merge' do
             expect { cli.vars }.to output(@merged).to_stdout
@@ -131,9 +177,8 @@ module Rndr # rubocop:disable Metris/ModuleLength
 
         context 'should serialize and merge variables with replace behaviour' do
           before do
-            cli.options = { format: 'yaml', merge: false, vars: 'vars' }
-            @replaced =
-              File.read(File.join(File.dirname(__FILE__), 'resources/vars_replaced.txt'))
+            cli.options = { format: 'yaml', merge: false, merge_opts: {}, vars: 'vars' }
+            @replaced = File.read(File.absolute_path('vars_replaced.txt'))
           end
           it 'should perform a standard merge' do
             expect { cli.vars }.to output(@replaced).to_stdout
@@ -143,9 +188,8 @@ module Rndr # rubocop:disable Metris/ModuleLength
 
       context 'When a json file is supplied' do
         before do
-          cli.options = { format: 'yaml', merge: true, vars: 'vars/a.json' }
-          @vars =
-            File.read(File.join(File.dirname(__FILE__), 'resources/vars_a.txt'))
+          cli.options = { format: 'yaml', merge: true, merge_opts: {}, vars: 'vars/a.json' }
+          @vars = File.read(File.absolute_path('vars_a.txt'))
         end
         it 'should serialize the data' do
           expect { cli.vars }.to output(@vars).to_stdout
@@ -153,9 +197,8 @@ module Rndr # rubocop:disable Metris/ModuleLength
       end
       context 'When a yaml file is supplied' do
         before do
-          cli.options = { format: 'yaml', merge: true, vars: 'vars/b.yaml' }
-          @vars =
-            File.read(File.join(File.dirname(__FILE__), 'resources/vars_b.txt'))
+          cli.options = { format: 'yaml', merge: true, merge_opts: {}, vars: 'vars/b.yaml' }
+          @vars = File.read(File.absolute_path('vars_b.txt'))
         end
         it 'should serialize the data' do
           expect { cli.vars }.to output(@vars).to_stdout

data/spec/resources/spec_opts.txt

@@ -0,0 +1,15 @@
+---
+child:
+  childarray:
+  - arraykey3: arrayval3
+  - arraykey4: arrayval4
+  childhash:
+    childhashkey1: childhashval1
+    childhashkey2: childhashval2
+    childhashkey3: childhashval3
+    childhashkey4: childhashval4
+
+
+{"boolkey":false,"numkey":2}
+
+parent3: mergeval

data/spec/resources/vars_opts_bool.txt

@@ -0,0 +1,16 @@
+---
+parent1:
+  child:
+    childarray:
+    - arraykey3: arrayval3
+    - arraykey4: arrayval4
+    childhash:
+      childhashkey1: childhashval1
+      childhashkey2: childhashval2
+      childhashkey3: childhashval3
+      childhashkey4: childhashval4
+parent2:
+  boolkey: false
+  numkey: 2
+parent3:
+  mergetest: mergeval

data/spec/resources/vars_opts_string.txt

@@ -0,0 +1,18 @@
+---
+parent1:
+  child:
+    childarray:
+    - '{"arraykey1"=>"arrayval1"}'
+    - '{"arraykey2"=>"arrayval2"}'
+    - '{"arraykey3"=>"arrayval3"}'
+    - '{"arraykey4"=>"arrayval4"}'
+    childhash:
+      childhashkey1: childhashval1
+      childhashkey2: childhashval2
+      childhashkey3: childhashval3
+      childhashkey4: childhashval4
+parent2:
+  boolkey: false
+  numkey: 2
+parent3:
+  mergetest: mergeval

data/spec/spec_helper.rb

@@ -20,5 +20,4 @@ RSpec.configure do |config|
   config.shared_context_metadata_behavior = :apply_to_host_groups
   config.disable_monkey_patching!
   config.warnings = true
-#  config.formatter = 'documentation' unless defined? config.formatter
 end

data/spec/template_spec.rb

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 # frozen_string_literal: true
+# rubocop:disable Metrics/BlockLength
 
 require 'rndr'
 require 'yaml'
@@ -8,17 +9,15 @@ require_relative 'spec_helper'
 module Rndr
   RSpec.describe Template do
     before(:all) do
-      Dir.chdir(File.join(Dir.pwd, 'test'))
       @success_tmplt = File.absolute_path('templates/rendertest.txt.erb')
       @fail_tmplt = File.absolute_path('templates/failtest.txt.erb')
       @rendered_success = File.absolute_path('templates/rendertest.txt')
       @rendered_fail = File.absolute_path('templates/failtest.txt')
-      @compare_success = File.join(File.dirname(__FILE__), 'resources/rendered_merged.txt')
+      @compare_success = File.absolute_path('spec_merged.txt')
       @vars =
-        YAML.load(File.read(File.join(File.dirname(__FILE__), 'resources/vars_merged.txt')))
+        YAML.load(File.read(File.absolute_path('vars_merged.txt')))
     end
     after(:all) do
-      Dir.chdir('../')
       File.delete(@rendered_success) if File.exist?(@rendered_success)
       File.delete(@rendered_fail) if File.exist?(@rendered_fail)
     end
@@ -59,3 +58,4 @@ module Rndr
     end
   end
 end
+# rubocop:enable Metrics/BlockLength

data/spec/util_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 # frozen_string_literal: true
-
+# rubocop:disable Metrics/BlockLength
 require 'json'
 require 'rndr'
 require 'rspec'
@@ -9,9 +9,6 @@ require_relative 'spec_helper'
 
 module Rndr
   RSpec.describe Rndr do
-    before(:all) { Dir.chdir(File.join(Dir.pwd, 'test')) }
-    after(:all) { Dir.chdir('../') }
-
     describe '#matches' do
       context 'When using the defaults' do
         let(:matched) { [File.absolute_path('templates/rendertest.txt.erb')] }
@@ -19,7 +16,7 @@ module Rndr
           [File.absolute_path('templates/ignoretest.txt.erb'),
            File.absolute_path('templates/failtest.txt.erb')]
         end
-        subject(:results) { Rndr.matches(path: 'templates') }
+        subject(:results) { Rndr.matches(path: 'templates', ignore_path: 'rndrignore') }
         it 'should be an Array of filtered paths with default extension' do
           expect(results).to be_a(Array)
           expect(results).to match_array(matched)
@@ -32,7 +29,9 @@ module Rndr
           [File.absolute_path('templates/ignoretest.txt.erb'),
            File.absolute_path('templates/failtest.txt.erb')]
         end
-        subject(:results) { Rndr.matches(path: 'templates', ext: 'tmplt') }
+        subject(:results) do
+          Rndr.matches(path: 'templates', ext: 'tmplt', ignore_path: 'rndrignore')
+        end
         it 'should be an Array of paths with alternate extension' do
           expect(results).to be_a(Array)
           expect(results).to match_array(matched)
@@ -43,9 +42,7 @@ module Rndr
     describe '#read_vars' do
       context 'When a directory is supplied' do
         context 'should serialize and recursively merges variables' do
-          let(:results) do
-            YAML.load(File.read(File.join(File.dirname(__FILE__), 'resources/vars_merged.txt')))
-          end
+          let(:results) { YAML.load(File.read('vars_merged.txt')) }
           subject(:vars) { Rndr.read_vars(path: 'vars', merge: true) }
           it 'should perform a deep merge' do
             expect(vars).to eql(results)
@@ -53,7 +50,7 @@ module Rndr
         end
         context 'should serialize and merge variables with replace behaviour' do
           let(:results) do
-            YAML.load(File.read(File.join(File.dirname(__FILE__), 'resources/vars_replaced.txt')))
+            YAML.load(File.read('vars_replaced.txt'))
           end
           subject(:vars) { Rndr.read_vars(path: 'vars', merge: false) }
           it 'should perform a standard merge' do
@@ -63,7 +60,7 @@ module Rndr
       end
 
       context 'When a json file is supplied' do
-        let(:results) { JSON.load(File.read('vars/a.json')) }
+        let(:results) { JSON.parse(File.read('vars/a.json')) }
         subject(:vars) { Rndr.read_vars(path: 'vars/a.json', merge: true) }
         it 'should serialize the data' do
           expect(vars).to eql(results)
@@ -80,3 +77,4 @@ module Rndr
     end
   end
 end
+# rubocop:enable Metrics/BlockLength

data/version.txt

@@ -1 +1 @@
-0.0.3
+0.0.4

metadata

@@ -1,99 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: rndr
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Bob Killen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.5
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.5
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.2.2
+        version: '11.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.2.2
+        version: '11.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.46'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.46'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.15
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.15
+        version: '0.8'
 description: rndr is a tool that simply renders Ruby erb templates for use with other
   applications.
 email:
@@ -120,22 +134,26 @@ files:
 - lib/rndr/version.rb
 - rndr.gemspec
 - spec/cli_spec.rb
-- spec/resources/rendered_merged.txt
-- spec/resources/rendered_replaced.txt
+- spec/resources/rndrignore
+- spec/resources/spec_merged.txt
+- spec/resources/spec_opts.txt
+- spec/resources/spec_replaced.txt
+- spec/resources/templates/exttest.txt.tmplt
+- spec/resources/templates/failtest.txt.erb
+- spec/resources/templates/ignoretest.txt
+- spec/resources/templates/ignoretest.txt.erb
+- spec/resources/templates/rendertest.txt.erb
+- spec/resources/vars/a.json
+- spec/resources/vars/b.yaml
 - spec/resources/vars_a.txt
 - spec/resources/vars_b.txt
 - spec/resources/vars_merged.txt
+- spec/resources/vars_opts_bool.txt
+- spec/resources/vars_opts_string.txt
 - spec/resources/vars_replaced.txt
 - spec/spec_helper.rb
 - spec/template_spec.rb
 - spec/util_spec.rb
-- test/.rndrignore
-- test/templates/exttest.txt.tmplt
-- test/templates/failtest.txt.erb
-- test/templates/ignoretest.txt.erb
-- test/templates/rendertest.txt.erb
-- test/vars/a.json
-- test/vars/b.yaml
 - version.txt
 homepage: https://github.com/arc-ts/rndr
 licenses: