oaf 0.1.15 → 0.1.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDY5ZmIzZmNiOTk3MDVjMjRhYWI1ZTc2Y2E4NjJkZWExM2MxMjg2NQ==
+    YWEwNzM1MGU4YmJkNGRmYmZiZmQ5N2I3YWQyNjEyYzkyYjM0ZWRiOQ==
   data.tar.gz: !binary |-
-    OTBlZmIwYTYxMTNiOTkyYjIwZjc4ZjBkMDIxNDA2NjZhZGMxOGFiMQ==
+    ZDVhMjQ1ZWJkMWNlNmY1ZjYxOGI3Y2ZkOTZjOWNiYmFhNWI2MmJlMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDk1ZWExZjdiZjUzYjY2ZjI1OGFkN2MzZGJiZDM4ODAxMDgzYmIyYmU1MDkw
-    M2EzMTcwZGEzZGQ5ZDVlODc5YWI3MTU3MmM5ODY5MjhiMDQ2YTQwNGZlZDAw
-    Nzg5MTRmZDZiMzk3NGZjYzg1M2I1NmE1MmJhZDAzZmJhOTgzYTA=
+    ZWM5ODdmYTQzNDE4Y2YxMWEwZTViMmQwOTQ2YzRjYWNiNTA4Yjk5N2EyZDdi
+    YjI0ZTMwZTlhODMzMGRiZTFiNmRjYzVkMjVjOWQ0NmEyODRiYTg5YjA0ZGUy
+    MGRiNGQzODExYzcxMzdiYzJlMTI1MjhhYzEzMjBkY2ViZGUwM2E=
   data.tar.gz: !binary |-
-    NGEyMjMxOWU0NGEwZmIxZjEyOTJhMjgwOGNhYmNlMWJhZTE4ZWFhMzhiNjI3
-    MDAzMzc4MGZiZDdiODQyZTQzZDc3NTRmY2M4NjMzMmVhZGNjNGUyMzY4ZDFl
-    NmI1NTMwOGViN2VkZjUyYjFlMzk5MGZlNjQ2ODhlMmY2ZWQ3ODY=
+    OTAzMjI5OTcxMTk1ZGY5MzY0MjVjMTE1NTE4ZDVlMWNmZWRjM2M5NTdmY2Qw
+    ZTE0ZmRkZTNhNTRkYjExMjA5MjJjOTIwOTlkYjM4NDAyMDg5MWRmM2ZkY2Q5
+    ZTEzMDdlOGNhNTUxN2YyMmUxZjI1ODRiNzA1YThiNWM3MmIwY2Q=

data/lib/oaf/http.rb

@@ -62,7 +62,7 @@ module Oaf
       server = WEBrick::HTTPServer.new :Port => port
       server.mount_proc '/' do |req, res|
         req_body = ''
-        req_headers = Oaf::Util.format_request_headers req.header
+        req_headers = Oaf::Util.format_hash req.header
         if ['POST', 'PUT'].member? req.request_method
           begin
             req_body = req.body
@@ -73,7 +73,7 @@ module Oaf
           req_body = req.query
         end
         file = Oaf::Util.get_request_file path, req.path, req.request_method
-        out = Oaf::Util.get_output file, req.header, req_body
+        out = Oaf::Util.get_output file, req_headers, req_body
         headers, status, body = Oaf::HTTP.parse_response out
         headers.each do |name, value|
           res.header[name] = value

data/lib/oaf/util.rb

@@ -20,6 +20,8 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+require 'open3'
+
 module Oaf
 
   module Util
@@ -83,8 +85,8 @@ module Oaf
         .concat((500..505).to_a).include? code.to_i
     end
 
-    # Format a hash of request headers in preparation for passing it to an
-    # executable program as an argument.
+    # Format a hash in preparation for passing it to an executable program as
+    # an argument on the command line.
     #
     # == Parameters:
     # headers::
@@ -94,9 +96,9 @@ module Oaf
     #   A comma-delimited, colon-separated list of header names and values. The
     #   return value of this function should be parsed according to RFC2616.
     #
-    def format_request_headers headers
+    def format_hash hash
       result = ''
-      headers.each do |name, value|
+      hash.each do |name, value|
         result += "#{name}:#{value},"
       end
       result.sub!(/,$/, '')
@@ -174,6 +176,22 @@ module Oaf
       File.exist?(file) ? file : nil
     end
 
+    # Run a command with stdout and stderr buffered. This suppresses error
+    # messages from the server process and enables us to return them in the
+    # HTTP response instead.
+    #
+    # == Parameters:
+    # command::
+    #   The command to execute against the server
+    #
+    # == Returns:
+    # A string of stderr concatenated to stdout.
+    #
+    def run_buffered command
+      stdin, stdout, stderr = Open3.popen3 command
+      stdout.read + stderr.read
+    end
+
     # Executes a file, or reads its contents if it is not executable, passing
     # it the request headers and body as arguments, and returns the result.
     #
@@ -192,7 +210,7 @@ module Oaf
       if file.nil?
         out = Oaf::Util.get_default_response
       elsif File.executable? file
-        out = %x(#{file} "#{headers}" "#{body}")
+        out = Oaf::Util.run_buffered "#{file} '#{headers}' '#{body}'"
       else
         out = File.open(file).read
       end

data/lib/oaf/version.rb

@@ -21,5 +21,5 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Oaf
-  VERSION = '0.1.15'
+  VERSION = '0.1.16'
 end

data/spec/oaf/util_spec.rb

@@ -83,19 +83,19 @@ module Oaf
   describe "Format Request Headers" do
     it "should return a single key/value for just one header" do
       headers = [['x-powered-by', 'oaf']]
-      result = Oaf::Util.format_request_headers headers
+      result = Oaf::Util.format_hash headers
       result.should eq('x-powered-by:oaf')
     end
 
     it "should return a comma-delimited list for multiple headers" do
       headers = [['x-powered-by', 'oaf'], ['content-type', 'text/plain']]
-      result = Oaf::Util.format_request_headers headers
+      result = Oaf::Util.format_hash headers
       result.should eq('x-powered-by:oaf,content-type:text/plain')
     end
 
     it "should return nil if no headers present" do
       headers = []
-      result = Oaf::Util.format_request_headers headers
+      result = Oaf::Util.format_hash headers
       result.should be_nil
     end
   end
@@ -189,11 +189,17 @@ module Oaf
       @f2.chmod 0644
       @f2.write "This is a test\n"
       @f2.close
+
+      @f3 = Tempfile.new 'oaf'
+      @f3.chmod 0755
+      @f3.write "#!/bin/bash\necho 'This is a test' 1>&2\n"
+      @f3.close
     end
 
     after(:all) do
       @f1.delete
       @f2.delete
+      @f3.delete
     end
 
     it "should execute a file if it is executable" do
@@ -210,5 +216,10 @@ module Oaf
       result = Oaf::Util.get_output nil, nil, nil
       result.should eq(Oaf::Util.get_default_response)
     end
+
+    it "should catch stderr output instead of dumping it" do
+      result = Oaf::Util.get_output @f3.path, nil, nil
+      result.should eq("This is a test\n")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oaf
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Ryan Uber