Merge pull request chriskuehl#8 from alexjurkiewicz/remove-shell-scripts

Remove the need for shell script shims

Author: chriskuehl

__fake_gem.gemspec

@@ -7,5 +7,4 @@ Gem::Specification.new do |s|
 
     s.bindir = 'ruby-stubs'
     s.executables = ['puppet-validate', 'erb-validate', 'epp-validate']
-    s.files = Dir['bin/*']
 end

bin/epp-validate

@@ -1,5 +1,14 @@
-# we can't deal with ruby, so we exec a shell script instead
-script = File.expand_path('../../bin/epp-validate', File.absolute_path(__FILE__))
-exec([script, script], *ARGV)
+require 'English'
+
+status = 0
+ARGV.each do |file|
+  output = `puppet epp validate "#{file}" 2>&1`
+  next if $CHILD_STATUS.exitstatus == 0
+  puts "#{file}: failed epp validation"
+  puts output
+  status = 1
+end
+
+exit status
 
 # vim: ft=ruby

bin/erb-validate

@@ -1,5 +1,14 @@
-# we can't deal with ruby, so we exec a shell script instead
-script = File.expand_path('../../bin/erb-validate', File.absolute_path(__FILE__))
-exec([script, script], *ARGV)
+require 'English'
+
+status = 0
+ARGV.each do |file|
+  output = `erb -x -P -T - -- "#{file}" | ruby -c 2>&1`
+  next if $CHILD_STATUS.exitstatus == 0
+  puts "#{file}: failed erb validation"
+  puts output
+  status = 1
+end
+
+exit status
 
 # vim: ft=ruby

bin/puppet-validate

@@ -1,5 +1,19 @@
-# we can't deal with ruby, so we exec a shell script instead
-script = File.expand_path('../../bin/puppet-validate', File.absolute_path(__FILE__))
-exec([script, script], *ARGV)
+require 'English'
+
+status = 0
+options = []
+ARGV.each do |arg|
+  if arg =~ /^--.+=.+$/
+    options.append arg
+    next
+  end
+  output = `puppet parser validate #{options.join(' ')} -- "#{arg}" 2>&1`
+  next if $CHILD_STATUS.exitstatus == 0
+  puts "#{arg}: failed Puppet validation"
+  puts output
+  status = 1
+end
+
+exit status
 
 # vim: ft=ruby