making bad socket table raise an error; also small style tweaks

Author: juce

README.md

@@ -11,7 +11,7 @@ idea is that the shell library connects to the unix domain socket of sockproc da
 sends the command along with any input data that the child program is expecting, and then
 reads back the exit code, output stream data, and error stream data of
 the child process. Because we use co-socket API, provided by
-[lua-nginx-module](https://github.com/chaoslawful/lua-nginx-module),
+[lua-nginx-module](https://github.com/openresty/lua-nginx-module),
 the nginx worker is never blocked.
 
 More info on sockproc server, including complete source code here:
@@ -30,7 +30,6 @@ In your OpenResty config:
         content_by_lua '
             local shell = require("resty.shell")
 
-
             -- define a table to hold arguments with the following elements:
             --
             -- timeout: timeout for the socket connection

lib/resty/shell.lua

@@ -9,34 +9,30 @@ local tonumber = tonumber
 
 
 local shell = {
-    _VERSION = '0.01'
+    _VERSION = '0.02'
 }
 
 local default_socket = "unix:/tmp/shell.sock"
 
+
 function shell.execute(cmd, args)
     local timeout = args and args.timeout
     local input_data = args and args.data or ""
     local socket = args and args.socket or default_socket
 
     local is_tcp
-
-	if (type(socket) == 'table') then
-		if (socket.host and socket.port) then
-			is_tcp = true
-		else
-			return -3, nil, 'invalid socket table options passed'
-		end
-	elseif (type(socket) == 'string') then
-		is_tcp = false
-	else
-		return -3, nil, 'socket was not a table with tcp options or a string'
-	end
+    if type(socket) == 'table' then
+        if socket.host and tonumber(socket.port) then
+            is_tcp = true
+        else
+            error('socket table must have host and port keys')
+        end
+    end
 
     local sock = tcp()
     local ok, err
-    if (is_tcp) then
-        ok, err = sock:connect(socket.host, socket.port)
+    if is_tcp then
+        ok, err = sock:connect(socket.host, tonumber(socket.port))
     else
         ok, err = sock:connect(socket)
     end