ytools 0.1.5 → 0.1.6

data/Rakefile

@@ -27,8 +27,8 @@ begin
     gem.authors        = ['Gabe McArthur']
     gem.homepage       = 'http://github.com/gabemc/ytools'
     gem.files          = FileList["[A-Z]*", "{bin,lib,spec}/**/*"]
-    
-    gem.add_development_dependency 'rspec', '>=2.0.1'
+
+    gem.add_development_dependency 'rspec', '~> 2.5'
   end
 rescue LoadError
   puts "Jeweler or dependencies are not available.  Install it with: sudo gem install jeweler"

data/lib/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/ytools/templates/cli.rb

@@ -13,11 +13,16 @@ module YTools::Templates
                       YTools::YamlObject.new
                     end
 
+      template = options[:expression]
+      if template.nil?
+        File.open(template, 'r') { |f| template = f.read}
+      end
+      
       if options[:literal]
         yaml_object.merge(YAML::load(options[:literal]))
       end
 
-      executor = Executor.new(options[:template], yaml_object)
+      executor = Executor.new(template, yaml_object)
 
       if options[:debug]
         STDERR.puts yaml_object
@@ -54,6 +59,11 @@ EOF
                 "The ERB template file to use for generation") do |t|
           options[:template] = t
         end
+        opts.on('-e', '--expression EXPR',
+                "The ERB expression to use for generation",
+                "overrides --template") do |e|
+          options[:expression] = e
+        end
         opts.on('-l', '--literal STRING',
                 "Evaluate a literal string in addition",
                 "to any file paths") do |l|
@@ -71,7 +81,7 @@ EOF
         end
         opts.separator ""
         
-        opts.on('-e', '--examples',
+        opts.on('--examples',
                 "Show some examples on how to use the",
                 "path syntax.") do
           print_examples(File.dirname(__FILE__))
@@ -94,11 +104,11 @@ EOF
     end
 
     def validate(args)
-      if options[:template].nil?
-        raise YTools::ConfigurationError.new("No template file was indicated")
+      if options[:expression].nil? && options[:template].nil?
+        raise YTools::ConfigurationError.new("No template expression or file was indicated")
       end
 
-      if !File.exists?(options[:template])
+      if options[:expression].nil? && !File.exists?(options[:template])
         raise YTools::ConfigurationError.new("Unable to locate the template file: #{options[:template]}")
       end
 

data/lib/ytools/templates/executor.rb

@@ -12,10 +12,7 @@ module YTools::Templates
     end
 
     def write!(outfile)
-      tcontents = nil
-      File.open(template, 'r') { |f| tcontents = f.read}
-
-      generator = ERB.new(tcontents)
+      generator = ERB.new(template)
       output = generator.result(yaml_object.erb_binding)
 
       if outfile

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ytools
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Gabe McArthur
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 -08:00
+date: 2011-02-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +23,12 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 2
-        - 0
-        - 1
-        version: 2.0.1
+        - 5
+        version: "2.5"
   type: :development
   version_requirements: *id001
 description: Installs the ypath tool for reading YAML files using an XPath-like syntax.  Installs the ytemplates tool for writing ERB templates using YAML files as the template binding object.
@@ -82,8 +79,8 @@ homepage: http://github.com/gabemc/ytools
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -91,7 +88,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -100,7 +96,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -113,8 +108,8 @@ specification_version: 3
 summary: For reading or writing configuration files using YAML.
 test_files: 
 - spec/helpers.rb
-- spec/yaml_object_spec.rb
-- spec/path/lexer_spec.rb
 - spec/path/executor_spec.rb
-- spec/path/selectors_spec.rb
+- spec/path/lexer_spec.rb
 - spec/path/parser_spec.rb
+- spec/path/selectors_spec.rb
+- spec/yaml_object_spec.rb