Merge pull request #94 from kazupon/refactored

Remove 'lev' imports;

Author: kristate

examples/client-echo.lua

@@ -1,5 +1,3 @@
-local lev = require('lev')
-
 local client = lev.tcp.new()
 client:connect("0.0.0.0", 8080, function(...)
   p("connected")

tests/test-buffer.lua

@@ -16,8 +16,6 @@ limitations under the License.
 
 --]]
 
-local lev = require("lev")
-
 local exports = {}
 
 local OUTSIDE_BUFFER = Buffer.new("HELLO, SIR!")

tests/test-core.lua

@@ -16,7 +16,6 @@ limitations under the License.
 
 --]]
 
-local lev = require("lev")
 
 local exports = {}
 

tests/test-dns.lua

@@ -24,7 +24,6 @@ if process.getenv('TRAVIS') then
   print("SKIP lev.dns:\tSKIP on TRAVIS")
 else
   exports['lev.dns:\tresolve4'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local net = lev.net
     dns.resolve4('www.google.com', function(err, ips)
@@ -39,7 +38,6 @@ else
 
   --[[ TODO: fix callback never called
   exports['lev.dns:\tresolve4_nonexist'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local net = lev.net
     dns.resolve4('there_is_no_such_domain', function(err, ips)
@@ -50,7 +48,6 @@ else
   --]]
 
   exports['lev.dns:\tresolve6'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local net = lev.net
     local process = lev.process
@@ -65,7 +62,6 @@ else
   end
 
   exports['lev.dns:\tresolve_mx'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local err = dns.resolveMx('gmail.com', function(err, addresses)
       test.is_nil(err)
@@ -82,7 +78,6 @@ else
   end
 
   exports['lev.dns:\tresolve_txt'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local err = dns.resolveTxt('gmail.com', function(err, records)
       test.is_nil(err)
@@ -97,7 +92,6 @@ else
   end
 
   exports['lev.dns:\tresolve_srv'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local err = dns.resolveSrv('_jabber._tcp.google.com', function(err, services)
       test.is_nil(err)
@@ -116,7 +110,6 @@ else
   end
 
   exports['lev.dns:\tresolve_ns'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local err = dns.resolveNs('google.com', function(err, addresses)
       test.is_nil(err)
@@ -131,7 +124,6 @@ else
   end
 
   exports['lev.dns:\tresolve_cname'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local err = dns.resolveCname('www.google.com', function(err, names)
       test.is_nil(err)
@@ -149,7 +141,6 @@ else
   end
 
   exports['lev.dns:\tgeneric_ipv4'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local net = lev.net
     dns.resolve('www.google.com', 'A', function(err, ips)
@@ -163,7 +154,6 @@ else
   end
 
   exports['lev.dns:\tgeneric_resolve_ipv6'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local net = lev.net
     dns.resolve('ipv6.google.com', 'AAAA', function(err, ips)
@@ -177,7 +167,6 @@ else
   end
 
   exports['lev.dns:\tgeneric_resolve_mx'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local err = dns.resolve('gmail.com', 'MX', function(err, addresses)
       test.is_nil(err)
@@ -194,7 +183,6 @@ else
   end
 
   exports['lev.dns:\tgeneric_resolve_txt'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local err = dns.resolve('gmail.com', 'TXT', function(err, records)
       test.is_nil(err)
@@ -209,7 +197,6 @@ else
   end
 
   exports['lev.dns:\tgeneric_resolve_srv'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local err = dns.resolve('_jabber._tcp.google.com', 'SRV',
         function(err, services)
@@ -229,7 +216,6 @@ else
   end
 
   exports['lev.dns:\tgeneric_resolve_ns'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local err = dns.resolve('google.com', 'NS', function(err, addresses)
       test.is_nil(err)
@@ -245,7 +231,6 @@ else
 
   -- NOTE: This test sometimes fails on Ubunt 12.04.
   exports['lev.dns:\tgeneric_resolve_cname'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local err = dns.resolve('www.google.com', 'CNAME', function(err, names)
       test.is_nil(err)
@@ -263,7 +248,6 @@ else
   end
 
   exports['lev.dns:\tgeneric_resolve_reverse_ipv4'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local net = lev.net
     local err = dns.resolve('8.8.8.8', 'PTR', function(err, domains)
@@ -278,7 +262,6 @@ else
   end
 
   exports['lev.dns:\tgeneric_resolve_reverse_ipv6'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local net = lev.net
     local err = dns.resolve('2001:4860:4860::8888', 'PTR', function(err, domains)
@@ -293,7 +276,6 @@ else
   end
 
   exports['lev.dns:\treverse_ipv4'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local net = lev.net
     local err = dns.reverse('8.8.8.8', function(err, domains)
@@ -308,7 +290,6 @@ else
   end
 
   exports['lev.dns:\treverse_ipv6'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local net = lev.net
     local err = dns.reverse('2001:4860:4860::8888', function(err, domains)
@@ -323,7 +304,6 @@ else
   end
 
   exports['lev.dns:\treverse_bad_ip'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local net = lev.net
     local err = dns.reverse('this_is_invalid_ip', function(err, domains)
@@ -334,7 +314,6 @@ else
   end
 
   exports['lev.dns:\tlookup_ipv4_implicit'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local net = lev.net
     local err = dns.lookup('www.google.com', function(err, ip, family)
@@ -347,7 +326,6 @@ else
   end
 
   exports['lev.dns:\tlookup_ipv6_implicit'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local net = lev.net
     local err = dns.lookup('ipv6.google.com', function(err, ip, family)
@@ -361,7 +339,6 @@ else
 
   --[[ TODO: fix callback never called
   exports['lev.dns:\tlookup_nonexist'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local net = lev.net
     local err = dns.lookupFamily('does.not.exist', 4, function(err, ip, family)
@@ -373,7 +350,6 @@ else
   --]]
 
   exports['lev.dns:\tlookup_ipv4_explicit'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local net = lev.net
     local err = dns.lookupFamily('www.google.com', 4, function(err, ip, family)
@@ -386,7 +362,6 @@ else
   end
 
   exports['lev.dns:\tlookup_ipv6_explicit'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local net = lev.net
     local err = dns.lookupFamily('ipv6.google.com', 6, function(err, ip, family)
@@ -399,7 +374,6 @@ else
   end
 
   exports['lev.dns:\tlookup_ip_ipv4'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local net = lev.net
     local err = dns.lookupFamily('127.0.0.1', 4, function(err, ip, family)
@@ -413,7 +387,6 @@ else
   end
 
   exports['lev.dns:\tlev.lookup_ip_ipv6'] = function(test)
-    local lev = require('lev')
     local dns = lev.dns
     local net = lev.net
     local err = dns.lookupFamily('::1', 6, function(err, ip, family)

tests/test-fs-fsync.lua

@@ -19,7 +19,6 @@ limitations under the License.
 local exports = {}
 
 exports['lev.fs:\tfs_fsync'] = function(test)
-  local lev = require('lev')
   local fs = lev.fs
 
   local path = '_test_tmp1.txt'

tests/test-fs-link.lua

@@ -19,7 +19,6 @@ limitations under the License.
 local exports = {}
 
 exports['lev.fs:\tfs_link'] = function(test)
-  local lev = require('lev')
   local fs = lev.fs
 
   local path1 = '_test_tmp1.txt'

tests/test-fs-readdir.lua

@@ -19,7 +19,6 @@ limitations under the License.
 local exports = {}
 
 exports['lev.fs:\tfs_readdir'] = function(test)
-  local lev = require('lev')
   local table = require('table')
   local fs = lev.fs
 

tests/test-fs-rename.lua

@@ -19,7 +19,6 @@ limitations under the License.
 local exports = {}
 
 exports['lev.fs:\tfs_sync_rename'] = function(test)
-  local lev = require('lev')
   local fs = lev.fs
   local path = '_tmp_file1.txt'
   local new_path = '_tmp_file2.txt'

tests/test-fs-stat.lua

@@ -19,7 +19,6 @@ limitations under the License.
 local exports = {}
 
 exports['lev.fs:\tfs_sync_stat'] = function(test)
-  local lev = require('lev')
   local fs = lev.fs
   local err, stat = fs.stat('LICENSE.txt')
   test.is_nil(err)

tests/test-fs-truncate.lua

@@ -19,7 +19,6 @@ limitations under the License.
 local exports = {}
 
 exports['lev.fs:\tfs_sync_truncate'] = function(test)
-  local lev = require('lev')
   local fs = lev.fs
   local path = '_tmp_file1.txt'
   assert(not fs.exists(path))

tests/test-fs-utime.lua

@@ -19,7 +19,6 @@ limitations under the License.
 local exports = {}
 
 exports['lev.fs:\tfs_utime'] = function(test)
-  local lev = require('lev')
   local fs = lev.fs
 
   local path = '_test_tmp1.txt'

tests/test-fs-write-read.lua

@@ -19,7 +19,6 @@ limitations under the License.
 local exports = {}
 
 exports['lev.fs:\tfs_sync_write_read'] = function(test)
-  local lev = require('lev')
   local fs = lev.fs
   local path = '_tmp_file1.txt'
   local err, fd = fs.open(path, 'w+', '0666')
@@ -54,7 +53,6 @@ exports['lev.fs:\tfs_sync_write_read'] = function(test)
 end
 
 exports['lev.fs:\treadFile (callback)'] = function(test)
-  local lev = require('lev')
   local fs = lev.fs
   fs.readFile("AUTHORS", function(err, buf)
     test.is_nil(err)
@@ -64,7 +62,6 @@ exports['lev.fs:\treadFile (callback)'] = function(test)
 end
 
 exports['lev.fs:\treadFile (sync)'] = function(test)
-  local lev = require('lev')
   local fs = lev.fs
   local err, buf = fs.readFile("AUTHORS")
   test.is_nil(err)

tests/test-fs.lua

@@ -19,7 +19,6 @@ limitations under the License.
 local exports = {}
 
 exports['lev.fs:\tfs_sync_test'] = function(test)
-  local lev = require('lev')
   local fs = lev.fs
   local err, fd
   local is_exists
@@ -53,7 +52,6 @@ exports['lev.fs:\tfs_sync_test'] = function(test)
 end
 
 exports['lev.fs:\tfs_async_test'] = function(test)
-  local lev = require('lev')
   local fs = lev.fs
 
   fs.open('LICENSE.txt', 'r', '0666', function(err, fd)

tests/test-json.lua

@@ -19,7 +19,6 @@ limitations under the License.
 local exports = {}
 
 exports['lev.json:\tencode'] = function(test)
-  local lev = require('lev')
   local json = lev.json
   test.ok(json.encode({kristopher="tate"}) == '{"kristopher":"tate"}')
   test.ok(json.encode({1,2,3,4,-12352,5,2934029323094}) == '[1,2,3,4,-12352,5,2934029323094]')
@@ -246,7 +245,6 @@ local TWITTER_JSON_EXAMPLE = [[{
 }]]
 
 exports['lev.json:\tdecode'] = function(test)
-  local lev = require('lev')
   local json = lev.json
   local decoded = json.decode( TWITTER_JSON_EXAMPLE )
   test.ok( decoded )
@@ -263,7 +261,6 @@ exports['lev.json:\tdecode'] = function(test)
 end
 
 exports['lev.json:\tnull'] = function(test)
-  local lev = require('lev')
   local json = lev.json
   test.ok(json.encode({this_is_null=json.null}) == '{"this_is_null":null}')
   local decoded = json.decode('{"this_is_null":null}')

tests/test-msgpack.lua

@@ -16,7 +16,7 @@ limitations under the License.
 
 --]]
 
-local mp = require('lev').mpack
+local mp = lev.mpack
 local string = require('string')
 local math = require('math')
 local table = require('table')

tests/test-net.lua

@@ -19,7 +19,6 @@ limitations under the License.
 local exports = {}
 
 exports['lev.net:\tisIPv4'] = function(test)
-  local lev = require('lev')
   local net = lev.net
   test.ok(net.isIPv4("127.0.0.1"))
   test.ok(net.isIPv4("192.168.0.1"))
@@ -31,7 +30,6 @@ exports['lev.net:\tisIPv4'] = function(test)
 end
 
 exports['lev.net:\tisIPv6'] = function(test)
-  local lev = require('lev')
   local net = lev.net
   test.ok(net.isIPv6("2001:0db8:bd05:01d2:288a:1fc0:0001:10ee"))
   test.ok(net.isIPv6("2001:db8::9abc"))

tests/test-process.lua

@@ -16,7 +16,6 @@ limitations under the License.
 
 --]]
 
-local lev = require("lev")
 local process = lev.process
 
 local exports = {}