ytools 0.2.2 → 0.2.3

data/lib/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/ytools/basecli.rb

@@ -23,9 +23,8 @@ module YTools
     protected
     def tail(command)
       command.alter do
-        string :literal, "Evaluate a literal string in addition to any file paths."
         boolean :strict, "Checks to make sure all of the YAML files exist before proceeding."
-        boolean :examples, "Show some examples on how to use the path syntax." do
+        boolean_ :examples, "Show some examples on how to use the path syntax." do
           validate do |show, options|
             if show
               YTools::Utils.print_example(File.join(File.dirname(__FILE__), command.name.to_s.gsub(/^y/, '')))

data/lib/ytools/path/cli.rb

@@ -33,6 +33,8 @@ module YTools::Path
             end
           end
         end
+
+        string :literal, "Evaluate a literal string in addition to any file paths."
       end
     end
   end # CLI

data/lib/ytools/templates/cli.rb

@@ -14,12 +14,20 @@ module YTools::Templates
         header 'Description:'
         para 'This tool uses an ERB template file and a set of YAML files to generate a merged file.  For convenience, all of the keys in hashes in regular YAML can work like methods in the ERB templates. Thus, the YAML "{ \'a\' : {\'b\' : 3 } }" could be used in an ERB template with "<%= a.b %>" instead of the more verbose hash syntax.  Indeed, the root hash values can only be accessed by those method attributes, because the root YAML context object is simply assumed.'
         para "It accepts multiple yaml files, and will merge their contents in the order in which they are given.  Thus, files listed later, if their keys conflict with ones listed earlier, override the earlier listed values.  If you pass in files that don't exist, no error will be raised unless the '--strict' flag is passed."
+        para "Instead of reading from the template, you can also supply an expression to evaluate from the command line."
         para "Check out the '--examples' flag for more details."
 
         header 'Options:'
-        file :template, "The ERB template file to use for generation" do
-          required
+        string :template, "The ERB template file to use for generation" do
           depends_on :examples
+
+          validate do |path, options|
+            if !File.exists?(path)
+              die "file doesn't exist: #{path}"
+            end
+
+            options[:erb] = File.read(path)
+          end
         end
         string :output, "Write the generated output to a file instead of STDOUT" do
           validate do |path, options|
@@ -28,6 +36,17 @@ module YTools::Templates
             end
           end
         end
+        string :expression, "Evaluate the expression, instead of a given template file." do
+          depends_on :examples, :template
+
+          validate do |expr, options|
+            if options[:template]
+              die "allows only --expression or --template, not both"
+            end
+
+            options[:erb] = expr
+          end
+        end
       end
     end
   end # CLI

data/lib/ytools/templates/executor.rb

@@ -12,7 +12,7 @@ module YTools::Templates
     end
 
     def execute!(yaml_files, options)
-      @template = options[:template]
+      @template = options[:erb]
       @yaml_object = options[:yaml_object]
 
       if options[:debug]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ytools
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Gabe McArthur