From 93310850d27286919c162d2387d6540430e2cbe6 Mon Sep 17 00:00:00 2001
From: SquidDev <bonzoweb@hotmail.co.uk>
Date: Sat, 27 Jul 2019 11:34:36 +0100
Subject: [PATCH] Use the "cc" module namespace instead of "craftos"

This is what we actually discussed in the issue, and I failed to
remember.
---
 src/main/resources/assets/computercraft/lua/bios.lua          | 2 +-
 .../resources/assets/computercraft/lua/rom/apis/colors.lua    | 2 +-
 src/main/resources/assets/computercraft/lua/rom/apis/gps.lua  | 2 +-
 src/main/resources/assets/computercraft/lua/rom/apis/help.lua | 2 +-
 src/main/resources/assets/computercraft/lua/rom/apis/io.lua   | 2 +-
 src/main/resources/assets/computercraft/lua/rom/apis/keys.lua | 2 +-
 .../assets/computercraft/lua/rom/apis/paintutils.lua          | 2 +-
 .../assets/computercraft/lua/rom/apis/peripheral.lua          | 2 +-
 .../resources/assets/computercraft/lua/rom/apis/rednet.lua    | 2 +-
 .../resources/assets/computercraft/lua/rom/apis/settings.lua  | 2 +-
 src/main/resources/assets/computercraft/lua/rom/apis/term.lua | 2 +-
 .../resources/assets/computercraft/lua/rom/apis/textutils.lua | 2 +-
 .../resources/assets/computercraft/lua/rom/apis/window.lua    | 2 +-
 .../lua/rom/modules/main/{craftos => cc}/expect.lua           | 0
 .../computercraft/lua/rom/programs/advanced/multishell.lua    | 2 +-
 .../resources/assets/computercraft/lua/rom/programs/shell.lua | 2 +-
 .../resources/test-rom/spec/modules/{ => cc}/expect_spec.lua  | 4 ++--
 17 files changed, 17 insertions(+), 17 deletions(-)
 rename src/main/resources/assets/computercraft/lua/rom/modules/main/{craftos => cc}/expect.lua (100%)
 rename src/test/resources/test-rom/spec/modules/{ => cc}/expect_spec.lua (93%)

diff --git a/src/main/resources/assets/computercraft/lua/bios.lua b/src/main/resources/assets/computercraft/lua/bios.lua
index eb3600379..417b55bc9 100644
--- a/src/main/resources/assets/computercraft/lua/bios.lua
+++ b/src/main/resources/assets/computercraft/lua/bios.lua
@@ -6,7 +6,7 @@
 local expect
 
 do
-    local h = fs.open("rom/modules/main/craftos/expect.lua", "r")
+    local h = fs.open("rom/modules/main/cc/expect.lua", "r")
     local f, err = loadstring(h.readAll(), "@expect.lua")
     h.close()
 
diff --git a/src/main/resources/assets/computercraft/lua/rom/apis/colors.lua b/src/main/resources/assets/computercraft/lua/rom/apis/colors.lua
index bf3444724..969f984e5 100644
--- a/src/main/resources/assets/computercraft/lua/rom/apis/colors.lua
+++ b/src/main/resources/assets/computercraft/lua/rom/apis/colors.lua
@@ -1,4 +1,4 @@
-local expect = dofile("rom/modules/main/craftos/expect.lua").expect
+local expect = dofile("rom/modules/main/cc/expect.lua").expect
 
 -- Colors
 white = 1
diff --git a/src/main/resources/assets/computercraft/lua/rom/apis/gps.lua b/src/main/resources/assets/computercraft/lua/rom/apis/gps.lua
index b36e0b79a..08f698eb2 100644
--- a/src/main/resources/assets/computercraft/lua/rom/apis/gps.lua
+++ b/src/main/resources/assets/computercraft/lua/rom/apis/gps.lua
@@ -1,4 +1,4 @@
-local expect = dofile("rom/modules/main/craftos/expect.lua").expect
+local expect = dofile("rom/modules/main/cc/expect.lua").expect
 
 CHANNEL_GPS = 65534
 
diff --git a/src/main/resources/assets/computercraft/lua/rom/apis/help.lua b/src/main/resources/assets/computercraft/lua/rom/apis/help.lua
index fd9b22289..b4e69921f 100644
--- a/src/main/resources/assets/computercraft/lua/rom/apis/help.lua
+++ b/src/main/resources/assets/computercraft/lua/rom/apis/help.lua
@@ -1,4 +1,4 @@
-local expect = dofile("rom/modules/main/craftos/expect.lua").expect
+local expect = dofile("rom/modules/main/cc/expect.lua").expect
 
 local sPath = "/rom/help"
 
diff --git a/src/main/resources/assets/computercraft/lua/rom/apis/io.lua b/src/main/resources/assets/computercraft/lua/rom/apis/io.lua
index b50c724bf..efbc13b40 100644
--- a/src/main/resources/assets/computercraft/lua/rom/apis/io.lua
+++ b/src/main/resources/assets/computercraft/lua/rom/apis/io.lua
@@ -1,6 +1,6 @@
 -- Definition for the IO API
 
-local expect, typeOf = dofile("rom/modules/main/craftos/expect.lua").expect, _G.type
+local expect, typeOf = dofile("rom/modules/main/cc/expect.lua").expect, _G.type
 
 --- If we return nil then close the file, as we've reached the end.
 -- We use this weird wrapper function as we wish to preserve the varargs
diff --git a/src/main/resources/assets/computercraft/lua/rom/apis/keys.lua b/src/main/resources/assets/computercraft/lua/rom/apis/keys.lua
index b4b3daccd..8411883cf 100644
--- a/src/main/resources/assets/computercraft/lua/rom/apis/keys.lua
+++ b/src/main/resources/assets/computercraft/lua/rom/apis/keys.lua
@@ -1,7 +1,7 @@
 -- Minecraft key code bindings
 -- See http://www.minecraftwiki.net/wiki/Key_codes for more info
 
-local expect = dofile("rom/modules/main/craftos/expect.lua").expect
+local expect = dofile("rom/modules/main/cc/expect.lua").expect
 
 local tKeys = {
     nil,	 	"one", 		"two", 		"three", 	"four",			-- 1
diff --git a/src/main/resources/assets/computercraft/lua/rom/apis/paintutils.lua b/src/main/resources/assets/computercraft/lua/rom/apis/paintutils.lua
index a0a028aac..0988945e0 100644
--- a/src/main/resources/assets/computercraft/lua/rom/apis/paintutils.lua
+++ b/src/main/resources/assets/computercraft/lua/rom/apis/paintutils.lua
@@ -1,4 +1,4 @@
-local expect = dofile("rom/modules/main/craftos/expect.lua").expect
+local expect = dofile("rom/modules/main/cc/expect.lua").expect
 
 local function drawPixelInternal( xPos, yPos )
     term.setCursorPos( xPos, yPos )
diff --git a/src/main/resources/assets/computercraft/lua/rom/apis/peripheral.lua b/src/main/resources/assets/computercraft/lua/rom/apis/peripheral.lua
index 4b6fee2dc..3f4fdc150 100644
--- a/src/main/resources/assets/computercraft/lua/rom/apis/peripheral.lua
+++ b/src/main/resources/assets/computercraft/lua/rom/apis/peripheral.lua
@@ -1,4 +1,4 @@
-local expect = dofile("rom/modules/main/craftos/expect.lua").expect
+local expect = dofile("rom/modules/main/cc/expect.lua").expect
 
 local native = peripheral
 
diff --git a/src/main/resources/assets/computercraft/lua/rom/apis/rednet.lua b/src/main/resources/assets/computercraft/lua/rom/apis/rednet.lua
index 84a20c0cb..5af3a4706 100644
--- a/src/main/resources/assets/computercraft/lua/rom/apis/rednet.lua
+++ b/src/main/resources/assets/computercraft/lua/rom/apis/rednet.lua
@@ -1,4 +1,4 @@
-local expect = dofile("rom/modules/main/craftos/expect.lua").expect
+local expect = dofile("rom/modules/main/cc/expect.lua").expect
 
 CHANNEL_BROADCAST = 65535
 CHANNEL_REPEAT = 65533
diff --git a/src/main/resources/assets/computercraft/lua/rom/apis/settings.lua b/src/main/resources/assets/computercraft/lua/rom/apis/settings.lua
index 68f2ba2d7..d60510937 100644
--- a/src/main/resources/assets/computercraft/lua/rom/apis/settings.lua
+++ b/src/main/resources/assets/computercraft/lua/rom/apis/settings.lua
@@ -1,4 +1,4 @@
-local expect = dofile("rom/modules/main/craftos/expect.lua").expect
+local expect = dofile("rom/modules/main/cc/expect.lua").expect
 
 local tSettings = {}
 
diff --git a/src/main/resources/assets/computercraft/lua/rom/apis/term.lua b/src/main/resources/assets/computercraft/lua/rom/apis/term.lua
index baaeccf25..e9ad00408 100644
--- a/src/main/resources/assets/computercraft/lua/rom/apis/term.lua
+++ b/src/main/resources/assets/computercraft/lua/rom/apis/term.lua
@@ -1,4 +1,4 @@
-local expect = dofile("rom/modules/main/craftos/expect.lua").expect
+local expect = dofile("rom/modules/main/cc/expect.lua").expect
 
 local native = (term.native and term.native()) or term
 local redirectTarget = native
diff --git a/src/main/resources/assets/computercraft/lua/rom/apis/textutils.lua b/src/main/resources/assets/computercraft/lua/rom/apis/textutils.lua
index 05f32117c..447babb44 100644
--- a/src/main/resources/assets/computercraft/lua/rom/apis/textutils.lua
+++ b/src/main/resources/assets/computercraft/lua/rom/apis/textutils.lua
@@ -1,4 +1,4 @@
-local expect = dofile("rom/modules/main/craftos/expect.lua").expect
+local expect = dofile("rom/modules/main/cc/expect.lua").expect
 
 function slowWrite( sText, nRate )
     expect(2, nRate, "number", "nil")
diff --git a/src/main/resources/assets/computercraft/lua/rom/apis/window.lua b/src/main/resources/assets/computercraft/lua/rom/apis/window.lua
index fb4820be8..b1e1b3db4 100644
--- a/src/main/resources/assets/computercraft/lua/rom/apis/window.lua
+++ b/src/main/resources/assets/computercraft/lua/rom/apis/window.lua
@@ -1,4 +1,4 @@
-local expect = dofile("rom/modules/main/craftos/expect.lua").expect
+local expect = dofile("rom/modules/main/cc/expect.lua").expect
 
 local tHex = {
     [ colors.white ] = "0",
diff --git a/src/main/resources/assets/computercraft/lua/rom/modules/main/craftos/expect.lua b/src/main/resources/assets/computercraft/lua/rom/modules/main/cc/expect.lua
similarity index 100%
rename from src/main/resources/assets/computercraft/lua/rom/modules/main/craftos/expect.lua
rename to src/main/resources/assets/computercraft/lua/rom/modules/main/cc/expect.lua
diff --git a/src/main/resources/assets/computercraft/lua/rom/programs/advanced/multishell.lua b/src/main/resources/assets/computercraft/lua/rom/programs/advanced/multishell.lua
index 9bca4b166..51c1c1753 100644
--- a/src/main/resources/assets/computercraft/lua/rom/programs/advanced/multishell.lua
+++ b/src/main/resources/assets/computercraft/lua/rom/programs/advanced/multishell.lua
@@ -1,4 +1,4 @@
-local expect = dofile("rom/modules/main/craftos/expect.lua").expect
+local expect = dofile("rom/modules/main/cc/expect.lua").expect
 
 -- Setup process switching
 local parentTerm = term.current()
diff --git a/src/main/resources/assets/computercraft/lua/rom/programs/shell.lua b/src/main/resources/assets/computercraft/lua/rom/programs/shell.lua
index 2fea697d7..3c15e04b3 100644
--- a/src/main/resources/assets/computercraft/lua/rom/programs/shell.lua
+++ b/src/main/resources/assets/computercraft/lua/rom/programs/shell.lua
@@ -1,4 +1,4 @@
-local expect = dofile("rom/modules/main/craftos/expect.lua").expect
+local expect = dofile("rom/modules/main/cc/expect.lua").expect
 
 local multishell = multishell
 local parentShell = shell
diff --git a/src/test/resources/test-rom/spec/modules/expect_spec.lua b/src/test/resources/test-rom/spec/modules/cc/expect_spec.lua
similarity index 93%
rename from src/test/resources/test-rom/spec/modules/expect_spec.lua
rename to src/test/resources/test-rom/spec/modules/cc/expect_spec.lua
index 6b6aa77c0..36f076f60 100644
--- a/src/test/resources/test-rom/spec/modules/expect_spec.lua
+++ b/src/test/resources/test-rom/spec/modules/cc/expect_spec.lua
@@ -1,5 +1,5 @@
-describe("craftos.expect", function()
-    local e = require("craftos.expect")
+describe("cc.expect", function()
+    local e = require("cc.expect")
 
     it("checks a single type", function()
         expect(e.expect(1, "test", "string")):eq(true)