ytools 0.1.4 → 0.1.5

data/lib/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/ytools/path/cli.rb

@@ -2,16 +2,27 @@ require 'optparse'
 require 'ytools/basecli'
 require 'ytools/errors'
 require 'ytools/path/executor'
+require 'yaml'
 
 module YTools::Path
   class CLI < YTools::BaseCLI
     protected 
     def execute(sargs)
       begin
-        executor = Executor.new(options[:path], sargs)
+        yaml_object = if sargs.length != 0
+                        YTools::YamlObject.from_files(sargs)
+                      else
+                        YTools::YamlObject.new
+                      end
+
+        if options[:literal]
+          yaml_object.merge(YAML::load(options[:literal]))
+        end
+
+        executor = Executor.new(options[:path], yaml_object)
 
         if options[:debug]
-          STDERR.puts executor.yaml_object
+          STDERR.puts yaml_object
         end
 
         output = executor.process!
@@ -44,6 +55,11 @@ EOF
                 "configuration.") do |p|
           options[:path] = p
         end
+        opts.on('-l', '--literal STRING',
+                "Evaluate a literal string in addition",
+                "to any file paths") do |l|
+          options[:literal] = l
+        end
         opts.on('-s', '--strict',
                 "Checks to make sure all of the YAML files",
                 "exist before proceeding.") do |s|
@@ -77,7 +93,7 @@ EOF
       if options[:path].nil?
         raise YTools::ConfigurationError.new("The path expression was empty.")
       end
-      if args.length == 0
+      if args.length == 0 && options[:literal].nil?
         raise YTools::ConfigurationError.new("No YAML files given as arguments")
       end
 

data/lib/ytools/path/executor.rb

@@ -6,9 +6,9 @@ module YTools::Path
   class Executor
     attr_reader :path, :yaml_object
 
-    def initialize(path, files)
+    def initialize(path, yaml_object)
       @path = path
-      @yaml_object = YTools::YamlObject.from_files(files)
+      @yaml_object = yaml_object
     end
 
     def process!

data/lib/ytools/templates/cli.rb

@@ -6,6 +6,26 @@ require 'ytools/templates/executor'
 module YTools::Templates
   class CLI < YTools::BaseCLI
     protected
+    def execute(args)
+      yaml_object = if args.length != 0
+                      YTools::YamlObject.from_files(args)
+                    else
+                      YTools::YamlObject.new
+                    end
+
+      if options[:literal]
+        yaml_object.merge(YAML::load(options[:literal]))
+      end
+
+      executor = Executor.new(options[:template], yaml_object)
+
+      if options[:debug]
+        STDERR.puts yaml_object
+      end
+      
+      executor.write!(options[:output])
+    end
+
     def parse(args)
       OptionParser.new do |opts|
         opts.banner = "Usage: #{File.basename($0)} [OPTIONS] YAML_FILES"
@@ -34,6 +54,11 @@ EOF
                 "The ERB template file to use for generation") do |t|
           options[:template] = t
         end
+        opts.on('-l', '--literal STRING',
+                "Evaluate a literal string in addition",
+                "to any file paths") do |l|
+          options[:literal] = l
+        end
         opts.on('-o', '--output FILE',
                 "Write the generated output to a file instead",
                 "of STDOUT") do |o|
@@ -82,7 +107,7 @@ EOF
         raise YTools::ConfigurationError.new("The output directory doesn't exist: #{option[:output]}")
       end
 
-      if args.length == 0
+      if args.length == 0 && options[:literal].nil?
         raise YTools::ConfigurationError.new("No YAML files were given")
       end
 
@@ -94,15 +119,5 @@ EOF
         end
       end
     end
-
-    def execute(args)
-      executor = Executor.new(options[:template], args)
-
-      if options[:debug]
-        STDERR.puts executor.yaml_object.to_s
-      end
-      
-      executor.write!(options[:output])
-    end
   end
 end

data/lib/ytools/templates/executor.rb

@@ -6,9 +6,9 @@ module YTools::Templates
   class Executor
     attr_reader :template, :yaml_object
 
-    def initialize(template, files)
+    def initialize(template, yaml_object)
       @template = template
-      @yaml_object = YTools::YamlObject.from_files(files)
+      @yaml_object = yaml_object
     end
 
     def write!(outfile)

data/spec/path/executor_spec.rb

@@ -1,5 +1,6 @@
 require 'helpers'
 require 'ytools/errors'
+require 'ytools/yaml_object'
 require 'ytools/path/executor'
 
 module YTools::Path
@@ -11,7 +12,8 @@ module YTools::Path
         real_files << File.join(File.dirname(__FILE__), 'yamls', file)
       end
 
-      Executor.new(path, real_files).process!
+      yaml_object = YTools::YamlObject.from_files(real_files)
+      Executor.new(path, yaml_object).process!
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ytools
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Gabe McArthur
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 -07:00
+date: 2010-11-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency