ytools 0.1.8 → 0.1.9

data/lib/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/lib/ytools/templates/cli.rb

@@ -17,7 +17,12 @@ module YTools::Templates
         yaml_object.merge(YAML::load(options[:literal]))
       end
 
-      executor = Executor.new(template_contents, yaml_object)
+      template = options[:expression]
+      if template.nil?
+        File.open(options[:template], 'r') { |f| template = f.read}
+      end
+
+      executor = Executor.new(template, yaml_object)
 
       if options[:debug]
         STDERR.puts yaml_object
@@ -26,15 +31,6 @@ module YTools::Templates
       executor.write!(options[:output])
     end
 
-    def template_contents
-      template = options[:stdin] || options[:expression]
-      if template.nil?
-        File.open(options[:template], 'r') { |f| template = f.read}
-      end
-
-      template
-    end
-
     def parse(args)
       OptionParser.new do |opts|
         opts.banner = "Usage: #{File.basename($0)} [OPTIONS] YAML_FILES"
@@ -55,9 +51,6 @@ Description:
     values.  If you pass in files that don't exist, no error will be 
     raised unless the '--strict' flag is passed.
 
-    Instead of supplying an expression via --expression or a template
-    via --template, you can also pipe in an expression via STDIN.
-
     Check out the '--examples' flag for more details.
 
 Options:
@@ -111,20 +104,11 @@ EOF
     end
 
     def validate(args)
-      if RUBY_PLATFORM =~ /win/ && $stdin.stat.size > 0
-        options[:stdin] = STDIN.read
-      else
-        require 'fcntl'
-        if STDIN.fcntl(Fcntl::F_GETFL, 0) == 0
-          options[:stdin] = STDIN.read
-        end
-      end
-      
-      if options[:stdin].nil? && options[:expression].nil? && options[:template].nil?
+      if options[:expression].nil? && options[:template].nil?
         raise YTools::ConfigurationError.new("No template expression or file was indicated")
       end
 
-      if options[:stdin].nil? && options[:expression].nil? && !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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ytools
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &79211790 !ruby/object:Gem::Requirement
+  requirement: &85986530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,7 +22,7 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *79211790
+  version_requirements: *85986530
 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.