From a7ce660e3b1d98b106ae43bfc8cd009f3a501955 Mon Sep 17 00:00:00 2001 From: Ryan Ward Date: Sat, 10 Jul 2021 15:30:39 -0400 Subject: [PATCH] Changed names to reflect package --- client.lua | 2 +- {net => lnet}/core/clientbase.lua | 0 {net => lnet}/core/serverbase.lua | 2 +- {net => lnet}/http.lua | 2 +- {net => lnet}/https.lua | 2 +- {net => lnet}/init.lua | 0 {net => lnet}/tcp/init.lua | 2 +- {net => lnet}/udp/init.lua | 2 +- rockspec/lnet-5.0-0.rockspec | 26 +++++++++++++------------- server.lua | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) rename {net => lnet}/core/clientbase.lua (100%) rename {net => lnet}/core/serverbase.lua (98%) rename {net => lnet}/http.lua (99%) rename {net => lnet}/https.lua (97%) rename {net => lnet}/init.lua (100%) rename {net => lnet}/tcp/init.lua (99%) rename {net => lnet}/udp/init.lua (98%) diff --git a/client.lua b/client.lua index 38d7c3b..abe5169 100644 --- a/client.lua +++ b/client.lua @@ -1,5 +1,5 @@ package.path = "./?/init.lua;./?.lua;"..package.path -local net = require("net.tcp") +local net = require("lnet.tcp") local multi, thread = require("multi"):init() local client = net:newCastedClient("Test")--net:newTCPClient("localhost",12345) diff --git a/net/core/clientbase.lua b/lnet/core/clientbase.lua similarity index 100% rename from net/core/clientbase.lua rename to lnet/core/clientbase.lua diff --git a/net/core/serverbase.lua b/lnet/core/serverbase.lua similarity index 98% rename from net/core/serverbase.lua rename to lnet/core/serverbase.lua index 818cc2d..aea8f7e 100644 --- a/net/core/serverbase.lua +++ b/lnet/core/serverbase.lua @@ -1,6 +1,6 @@ local multi, thread = require("multi"):init() local socket = require("socket") -local net = require("net") +local net = require("lnet") local server = {} local bCaster = 0 server.__index = server diff --git a/net/http.lua b/lnet/http.lua similarity index 99% rename from net/http.lua rename to lnet/http.lua index 6bc0d78..5580f36 100644 --- a/net/http.lua +++ b/lnet/http.lua @@ -7,7 +7,7 @@ ----------------------------------------------------------------------------- -- Declare module and import dependencies ------------------------------------------------------------------------------- -local net = require("net") +local net = require("lnet") local multi, thread = require("multi"):init() local socket = require("socket") local url = require("socket.url") diff --git a/net/https.lua b/lnet/https.lua similarity index 97% rename from net/https.lua rename to lnet/https.lua index cfc4e40..078536e 100644 --- a/net/https.lua +++ b/lnet/https.lua @@ -9,7 +9,7 @@ local socket = require("socket") local ssl = require("ssl") local ltn12 = require("ltn12") -local http = require("net.http") -- Only real change that was needed to get things working +local http = require("lnet.http") -- Only real change that was needed to get things working local url = require("socket.url") local try = socket.try diff --git a/net/init.lua b/lnet/init.lua similarity index 100% rename from net/init.lua rename to lnet/init.lua diff --git a/net/tcp/init.lua b/lnet/tcp/init.lua similarity index 99% rename from net/tcp/init.lua rename to lnet/tcp/init.lua index e3cc387..0ac691c 100644 --- a/net/tcp/init.lua +++ b/lnet/tcp/init.lua @@ -1,4 +1,4 @@ -local net = require("net") +local net = require("lnet") local clientbase = require("net.core.clientbase") local serverbase = require("net.core.serverbase") local multi, thread = require("multi"):init() diff --git a/net/udp/init.lua b/lnet/udp/init.lua similarity index 98% rename from net/udp/init.lua rename to lnet/udp/init.lua index aea9bf6..817dbbc 100644 --- a/net/udp/init.lua +++ b/lnet/udp/init.lua @@ -1,4 +1,4 @@ -local net = require("net") +local net = require("lnet") local clientbase = require("net.core.clientbase") local serverbase = require("net.core.serverbase") local multi, thread = require("multi"):init() diff --git a/rockspec/lnet-5.0-0.rockspec b/rockspec/lnet-5.0-0.rockspec index b7bde75..d134395 100644 --- a/rockspec/lnet-5.0-0.rockspec +++ b/rockspec/lnet-5.0-0.rockspec @@ -1,15 +1,15 @@ -package = "lnet" +package = "llnet" version = "5.0-0" source = { - url = "git://github.com/rayaman/net.git", - tag = "net-v5", + url = "git://github.com/rayaman/lnet.git", + tag = "lnet-v5", } description = { - summary = "Lua networking library that wraps around lua-socket to make networking easy.", + summary = "Lua lnetworking library that wraps around lua-socket to make lnetworking easy.", detailed = [[ - This library uses the multi library. The new multitasking library and this one are now co-Dependant if using the networkManager integration for network parallelism. This has an event driven approach for networking which allows one to easily work async with the data. + This library uses the multi library. The new multitasking library and this one are now co-Dependant if using the lnetworkManager integration for lnetwork parallelism. This has an event driven approach for lnetworking which allows one to easily work async with the data. ]], - homepage = "https://github.com/rayaman/net", + homepage = "https://github.com/rayaman/lnet", license = "MIT" } dependencies = { @@ -20,12 +20,12 @@ dependencies = { build = { type = "builtin", modules = { - ["net.init"] = "net/init.lua", - ["net.tcp.init"] = "net/tcp/init.lua", - ["net.udp.init"] = "net/udp/init.lua", - ["net.core.clientbase"] = "net/core/clientbase.lua", - ["net.core.serverbase"] = "net/core/serverbase.lua", - ["net.http"] = "net/http.lua", - ["net.https"] = "net/https.lua" + ["lnet.init"] = "lnet/init.lua", + ["lnet.tcp.init"] = "lnet/tcp/init.lua", + ["lnet.udp.init"] = "lnet/udp/init.lua", + ["lnet.core.clientbase"] = "lnet/core/clientbase.lua", + ["lnet.core.serverbase"] = "lnet/core/serverbase.lua", + ["lnet.http"] = "lnet/http.lua", + ["lnet.https"] = "lnet/https.lua" } } \ No newline at end of file diff --git a/server.lua b/server.lua index 61b8c9b..2b8e834 100644 --- a/server.lua +++ b/server.lua @@ -1,5 +1,5 @@ package.path = "./?/init.lua;./?.lua;"..package.path -local net = require("net.tcp") +local net = require("lnet.tcp") local multi, thread = require("multi"):init() local server = net:newTCPServer(12345) server:broadcast("Test")