CC:R 1.94.0

.github/workflows/main-ci.yml

@@ -0,0 +1,50 @@
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+    build:
+        name: Build
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v2
+
+            - name: Set up Java 8
+              uses: actions/setup-java@v1
+              with:
+                  java-version: 8
+
+            - name: Cache gradle dependencies
+              uses: actions/cache@v1
+              with:
+                  path: ~/.gradle/caches
+                  key: ${{ runner.os }}-gradle-${{ hashFiles('gradle.properties') }}
+                  restore-keys: |
+                      ${{ runner.os }}-gradle-
+
+            - name: Build with Gradle
+              run: ./gradlew build --no-daemon || ./gradlew build --no-daemon
+
+            - name: Upload Jar
+              uses: actions/upload-artifact@v1
+              with:
+                  name: CC-Tweaked
+                  path: build/libs
+
+            - name: Upload Coverage
+              run: bash <(curl -s https://codecov.io/bash)
+              continue-on-error: true
+
+            - name: Generate Java documentation stubs
+              run: ./gradlew luaJavadoc --no-daemon
+
+            - name: Lint Lua code
+              run: |
+                  test -d bin || mkdir bin
+                  test -f bin/illuaminate || wget -q -Obin/illuaminate https://squiddev.cc/illuaminate/linux-x86-64/illuaminate
+                  chmod +x bin/illuaminate
+                  bin/illuaminate lint
+
+            - name: Check whitespace
+              run: python3 tools/check-lines.py

README.md

@@ -2,7 +2,7 @@
 # This is a Work In Progress Port
 *it runs and works-ish*
 
-## Reached Parity with CC:T 1.93.0
+## Reached Parity with CC:T 1.94.0
 
 THis is just a quick patchwork of my attempts at getting CC:R up to date with CC:T
 

gradle.properties

@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Mod properties
-mod_version=1.93.1
+mod_version=1.94.0
 
 # Minecraft properties
 mc_version=1.16.2

patchwork.md

@@ -160,3 +160,130 @@ In my defence, they weren't out when I started the 1.15 update.
 bf6053906dc6a3c7b0d40d5b097e745dce1f33bc
 Fix TBO norm issues on old GPUs
 ```
+
+``` 
+Not Needed
+113b560a201dbdea9de2a2ef536bcce1d6e51978
+Update configuration to match latest illuaminate
+
+Ooooooh, it's all fancy now. Well, that or horrifically broken.
+```
+
+```
+c334423d42ba3b653ac3a8c27bce7970457f8f96
+Add function to get window visibility
+
+Closes #562
+
+Co-authored-by: devomaa <lmao@distruzione.org>
+```
+
+[WARN] Could not implement changes to the following files
+* `src/main/java/dan200/computercraft/ComputerCraft.java` < Structure too different, cannot find equivalent to alter
+* `src/main/java/dan200/computercraft/shared/Config.java` < Files Does not exist in this repo
+```
+84a6bb1cf3b0668ddc7d8c409a2477a42390e3f7
+Make generic peripherals on by default
+
+This is a long way away from "feature complete" as it were. However,
+it's definitely at a point where it's suitable for general usage - I'm
+happy with the API, and don't think I'm going to be breaking things any
+time soon.
+
+That said, things aren't exposed yet for Java-side public consumption. I
+was kinda waiting until working on Plethora to actually do that, but not
+sure if/when that'll happen.
+
+If someone else wants to work on an integration mod (or just adding
+integrations for their own mod), do get in touch and I can work out how
+to expose this.
+
+Closes #452
+```
+
+``` 
+Not Needed
+6aae4e576621090840724e094aa25e51696530fc
+Remove superfluous imports
+
+Hah, this is embarassing
+```
+
+[TODO] [M3R1-01] Code has been applied, players still dont get achievments
+``` 
+f6160bdc57b3d9850607c2c7c2ce9734b4963478
+Fix players not getting advancements when they own turtles
+
+When we construct a new ServerPlayerEntity (and thus TurtlePlayer), we
+get the current (global) advancement state and call .setPlayer() on it.
+
+As grantCriterion blocks FakePlayers from getting advancements, this
+means a player will no longer receive any advancements, as the "wrong"
+player object is being consulted.
+
+As a temporary work around, we attempt to restore the previous player to
+the advancement store. I'll try to upstream something into Forge to
+resolve this properly.
+
+Fixes #564
+```
+
+``` 
+17a932920711a5c0361a5048c9e0a5e7a58e6364
+Bump cct-javadoc version
+
+Documentation will now be sorted (somewhat) correctly!
+```
+
+```
+a6fcfb6af2fc1bef8ca3a19122c9267549202424
+Draw in-hand pocket computers with blending
+
+It might be worth switching to RenderTypes here, rather than a pure
+Tesselator, but this'll do for now.
+
+Fixes Zundrel/cc-tweaked-fabric#20.
+```
+
+``` 
+c58441b29c3715f092e7f3747bb3ec65ae5a3d29
+Various SNBT parsing improvements
+
+Correctly handle:
+ - Typed arrays ([I; 1, 2, 3])
+ - All suffixed numbers (1.2d)
+ - Single-quoted strings
+
+Fixes #559
+```
+
+``` 
+e2a635b6e5f5942f999213434054e06833c5cb06
+Dont fail when codecov is being finicky
+```
+
+```
+666e83cf4fd0eb327f465d5b919a708790f99b00
+Fix JSON objects failing to pass
+
+Maybe I should run the whole test suite, not just the things I think
+matter? Nah....
+```
+
+``` 
+741adfa7bb2b950d2851c3f0072d6a4769f22773
+
+Use blit to draw boxes, add colors.toBlit (#570)
+```
+
+``` 
+d13bd2cce8d102ad7f61f557e707d6fe3731bc37
+
+use arg[0] in all usage printouts (#571)
+```
+
+```
+74ac5bb3d17e5bee30643a5d6702696600c06229
+
+Bump to 1.94.0
+```

src/main/java/dan200/computercraft/api/turtle/ITurtleAccess.java

@@ -135,7 +135,7 @@ public interface ITurtleAccess {
      *
      * @return This turtle's owner.
      */
-    @Nonnull
+    @Nullable
     GameProfile getOwningPlayer();
 
     /**

src/main/java/dan200/computercraft/client/render/ItemPocketRenderer.java

@@ -95,6 +95,7 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer {
     }
 
     private static void renderFrame(Matrix4f transform, ComputerFamily family, int colour, int width, int height) {
+        RenderSystem.enableBlend();
         MinecraftClient.getInstance()
                        .getTextureManager()
                        .bindTexture(colour != -1 ? ComputerBorderRenderer.BACKGROUND_COLOUR : ComputerBorderRenderer.getTexture(family));
@@ -113,7 +114,6 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer {
     }
 
     private static void renderLight(Matrix4f transform, int colour, int width, int height) {
-        RenderSystem.enableBlend();
         RenderSystem.disableTexture();
 
         float r = ((colour >>> 16) & 0xFF) / 255.0f;

src/main/java/dan200/computercraft/shared/computer/apis/CommandAPI.java

@@ -117,7 +117,6 @@ public class CommandAPI implements ILuaAPI {
      * @param command The command to execute.
      * @return The "task id". When this command has been executed, it will queue a `task_complete` event with a matching id.
      * @throws LuaException (hidden) If the task cannot be created.
-     * @cc.tparam string command The command to execute.
      * @cc.usage Asynchronously sets the block above the computer to stone.
      *     <pre>
      *     commands.execAsync("~ ~1 ~ minecraft:stone")

src/main/java/dan200/computercraft/shared/peripheral/diskdrive/DiskDrivePeripheral.java

@@ -155,7 +155,8 @@ public class DiskDrivePeripheral implements IPeripheral {
     /**
      * Returns the title of the inserted audio disk.
      *
-     * @return The title of the audio, or {@code nil} if no audio disk is inserted.
+     * @return The title of the audio, or {@code false} if no audio disk is inserted.
+     * @cc.treturn string|nil|false The title of the audio, {@code false} if no disk is inserted, or {@code nil} if the disk has no audio.
      */
     @LuaFunction
     @Nullable

src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java

@@ -19,6 +19,7 @@ import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import com.google.common.base.Objects;
 import com.mojang.authlib.GameProfile;
@@ -341,7 +342,7 @@ public class TurtleBrain implements ITurtleAccess {
         }
     }
 
-    @Nonnull
+    @Nullable
     @Override
     public GameProfile getOwningPlayer() {
         return this.m_owningPlayer;

src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java

@@ -33,6 +33,7 @@ import net.minecraft.inventory.Inventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.NamedScreenHandlerFactory;
 import net.minecraft.server.world.ServerWorld;
+import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
@@ -42,13 +43,33 @@ import net.minecraft.util.math.Vec3d;
 @SuppressWarnings ("EntityConstructor")
 public final class TurtlePlayer extends FakePlayer {
     private static final GameProfile DEFAULT_PROFILE = new GameProfile(UUID.fromString("0d0c4ca0-4ff1-11e4-916c-0800200c9a66"), "[ComputerCraft]");
-
-    private TurtlePlayer(ITurtleAccess turtle) {
-        super((ServerWorld) turtle.getWorld(), getProfile(turtle.getOwningPlayer()));
-        this.networkHandler = new FakeNetHandler(this);
-        this.setState(turtle);
+// TODO [M3R1-01] Fix Turtle not giving player achievement for actions
+    private TurtlePlayer( ServerWorld world, GameProfile name )
+    {
+        super( world, name );
     }
 
+    private static TurtlePlayer create( ITurtleAccess turtle )
+    {
+        ServerWorld world = (ServerWorld) turtle.getWorld();
+        GameProfile profile = turtle.getOwningPlayer();
+
+        TurtlePlayer player = new TurtlePlayer( world, getProfile( profile ) );
+        player.networkHandler = new FakeNetHandler( player );
+        player.setState( turtle );
+
+        if( profile != null && profile.getId() != null )
+        {
+            // Constructing a player overrides the "active player" variable in advancements. As fake players cannot
+            // get advancements, this prevents a normal player who has placed a turtle from getting advancements.
+            // We try to locate the "actual" player and restore them.
+            ServerPlayerEntity actualPlayer = world.getServer().getPlayerManager().getPlayer(player.getUuid());
+            if( actualPlayer != null ) player.getAdvancementTracker().setOwner(actualPlayer);
+        }
+
+        return player;
+        }
+
     private static GameProfile getProfile(@Nullable GameProfile profile) {
         return profile != null && profile.isComplete() ? profile : DEFAULT_PROFILE;
     }
@@ -70,14 +91,17 @@ public final class TurtlePlayer extends FakePlayer {
     }
 
     public static TurtlePlayer get(ITurtleAccess access) {
-        if (!(access instanceof TurtleBrain)) {
-            return new TurtlePlayer(access);
-        }
+         ServerWorld world = (ServerWorld) access.getWorld();
+        if( !(access instanceof TurtleBrain) ) return create( access );
+
+         /*if (!(access instanceof TurtleBrain)) {
+            return new TurtlePlayer(world, access.getOwningPlayer());
+        }*/
 
         TurtleBrain brain = (TurtleBrain) access;
         TurtlePlayer player = brain.m_cachedPlayer;
         if (player == null || player.getGameProfile() != getProfile(access.getOwningPlayer()) || player.getEntityWorld() != access.getWorld()) {
-            player = brain.m_cachedPlayer = new TurtlePlayer(brain);
+            player = brain.m_cachedPlayer = create(brain);
         } else {
             player.setState(access);
         }

src/main/resources/data/computercraft/lua/rom/apis/colors.lua

@@ -196,7 +196,7 @@ green = 0x2000
 red = 0x4000
 
 --- Black: Written as `f` in paint files and @{term.blit}, has a default
--- terminal colour of #191919.
+-- terminal colour of #111111.
 black = 0x8000
 
 --- Combines a set of colors (or sets of colors) into a larger set. Useful for
@@ -248,7 +248,6 @@ end
 --- Tests whether `color` is contained within `colors`. Useful for Bundled
 -- Cables.
 --
---
 -- @tparam number colors A color, or color set
 -- @tparam number color A color or set of colors that `colors` should contain.
 -- @treturn boolean If `colors` contains all colors within `color`.
@@ -279,7 +278,7 @@ function packRGB(r, g, b)
     expect(2, g, "number")
     expect(3, b, "number")
     return
-        bit32.band(r * 255, 0xFF) * 2 ^ 16 +
+    bit32.band(r * 255, 0xFF) * 2 ^ 16 +
         bit32.band(g * 255, 0xFF) * 2 ^ 8 +
         bit32.band(b * 255, 0xFF)
 end
@@ -299,9 +298,9 @@ end
 function unpackRGB(rgb)
     expect(1, rgb, "number")
     return
-        bit32.band(bit32.rshift(rgb, 16), 0xFF) / 255,
-        bit32.band(bit32.rshift(rgb, 8), 0xFF) / 255,
-        bit32.band(rgb, 0xFF) / 255
+    bit32.band(bit32.rshift(rgb, 16), 0xFF) / 255,
+    bit32.band(bit32.rshift(rgb, 8), 0xFF) / 255,
+    bit32.band(rgb, 0xFF) / 255
 end
 
 --- Either calls @{colors.packRGB} or @{colors.unpackRGB}, depending on how many
@@ -333,3 +332,21 @@ function rgb8(r, g, b)
         return packRGB(r, g, b)
     end
 end
+
+-- Colour to hex lookup table for toBlit
+local color_hex_lookup = {}
+for i = 0, 15 do
+    color_hex_lookup[2 ^ i] = string.format("%x", i)
+end
+
+--- Converts the given color to a paint/blit hex character (0-9a-f).
+--
+-- This is equivalent to converting floor(log_2(color)) to hexadecimal.
+--
+-- @tparam number color The color to convert.
+-- @treturn string The blit hex code of the color.
+function toBlit(color)
+    expect(1, color, "number")
+    return color_hex_lookup[color] or
+        string.format("%x", math.floor(math.log(color) / math.log(2)))
+end

src/main/resources/data/computercraft/lua/rom/apis/paintutils.lua

@@ -23,6 +23,25 @@ local function parseLine(tImageArg, sLine)
     table.insert(tImageArg, tLine)
 end
 
+-- Sorts pairs of startX/startY/endX/endY such that the start is always the min
+local function sortCoords(startX, startY, endX, endY)
+    local minX, maxX, minY, maxY
+
+    if startX <= endX then
+        minX, maxX = startX, endX
+    else
+        minX, maxX = endX, startX
+    end
+
+    if startY <= endY then
+        minY, maxY = startY, endY
+    else
+        minY, maxY = endY, startY
+    end
+
+    return minX, maxX, minY, maxY
+end
+
 --- Parses an image from a multi-line string
 --
 -- @tparam string image The string containing the raw-image data.
@@ -71,9 +90,6 @@ function drawPixel(xPos, yPos, colour)
     expect(2, yPos, "number")
     expect(3, colour, "number", "nil")
 
-    if type(xPos) ~= "number" then error("bad argument #1 (expected number, got " .. type(xPos) .. ")", 2) end
-    if type(yPos) ~= "number" then error("bad argument #2 (expected number, got " .. type(yPos) .. ")", 2) end
-    if colour ~= nil and type(colour) ~= "number" then error("bad argument #3 (expected number, got " .. type(colour) .. ")", 2) end
     if colour then
         term.setBackgroundColor(colour)
     end
@@ -111,17 +127,7 @@ function drawLine(startX, startY, endX, endY, colour)
         return
     end
 
-    local minX = math.min(startX, endX)
-    local maxX, minY, maxY
-    if minX == startX then
-        minY = startY
-        maxX = endX
-        maxY = endY
-    else
-        minY = endY
-        maxX = startX
-        maxY = startY
-    end
+    local minX, maxX, minY, maxY = sortCoords(startX, startY, endX, endY)
 
     -- TODO: clip to screen rectangle?
 
@@ -177,37 +183,33 @@ function drawBox(startX, startY, endX, endY, nColour)
     endY = math.floor(endY)
 
     if nColour then
-        term.setBackgroundColor(nColour)
+        term.setBackgroundColor(nColour) -- Maintain legacy behaviour
+    else
+        nColour = term.getBackgroundColour()
     end
+    local colourHex = colours.toBlit(nColour)
+
     if startX == endX and startY == endY then
         drawPixelInternal(startX, startY)
         return
     end
 
-    local minX = math.min(startX, endX)
-    local maxX, minY, maxY
-    if minX == startX then
-        minY = startY
-        maxX = endX
-        maxY = endY
-    else
-        minY = endY
-        maxX = startX
-        maxY = startY
-    end
+    local minX, maxX, minY, maxY = sortCoords(startX, startY, endX, endY)
+    local width = maxX - minX + 1
 
-    for x = minX, maxX do
-        drawPixelInternal(x, minY)
-        drawPixelInternal(x, maxY)
-    end
-
-    if maxY - minY >= 2 then
-        for y = minY + 1, maxY - 1 do
-            drawPixelInternal(minX, y)
-            drawPixelInternal(maxX, y)
+    for y = minY, maxY do
+        if y == minY or y == maxY then
+            term.setCursorPos(minX, y)
+            term.blit((" "):rep(width), colourHex:rep(width), colourHex:rep(width))
+        else
+            term.setCursorPos(minX, y)
+            term.blit(" ", colourHex, colourHex)
+            term.setCursorPos(maxX, y)
+            term.blit(" ", colourHex, colourHex)
         end
     end
 end
+
 --- Draws a filled box on the current term from the specified start position to
 -- the specified end position.
 --
@@ -233,29 +235,23 @@ function drawFilledBox(startX, startY, endX, endY, nColour)
     endY = math.floor(endY)
 
     if nColour then
-        term.setBackgroundColor(nColour)
+        term.setBackgroundColor(nColour) -- Maintain legacy behaviour
+    else
+        nColour = term.getBackgroundColour()
     end
+    local colourHex = colours.toBlit(nColour)
+
     if startX == endX and startY == endY then
         drawPixelInternal(startX, startY)
         return
     end
 
-    local minX = math.min(startX, endX)
-    local maxX, minY, maxY
-    if minX == startX then
-        minY = startY
-        maxX = endX
-        maxY = endY
-    else
-        minY = endY
-        maxX = startX
-        maxY = startY
-    end
+    local minX, maxX, minY, maxY = sortCoords(startX, startY, endX, endY)
+    local width = maxX - minX + 1
 
-    for x = minX, maxX do
-        for y = minY, maxY do
-            drawPixelInternal(x, y)
-        end
+    for y = minY, maxY do
+        term.setCursorPos(minX, y)
+        term.blit((" "):rep(width), colourHex:rep(width), colourHex:rep(width))
     end
 end
 

src/main/resources/data/computercraft/lua/rom/apis/textutils.lua

@@ -453,13 +453,13 @@ do
         error_at(pos, "Unexpected %s, expected %s.", actual, exp)
     end
 
-    local function parse_string(str, pos)
+    local function parse_string(str, pos, terminate)
         local buf, n = {}, 1
 
         while true do
             local c = sub(str, pos, pos)
             if c == "" then error_at(pos, "Unexpected end of input, expected '\"'.") end
-            if c == '"' then break end
+            if c == terminate then break end
 
             if c == '\\' then
                 -- Handle the various escapes
@@ -485,13 +485,13 @@ do
         return concat(buf, "", 1, n - 1), pos + 1
     end
 
-    local valid = { b = true, B = true, s = true, S = true, l = true, L = true, f = true, F = true, d = true, D = true }
+    local num_types = { b = true, B = true, s = true, S = true, l = true, L = true, f = true, F = true, d = true, D = true }
     local function parse_number(str, pos, opts)
         local _, last, num_str = find(str, '^(-?%d+%.?%d*[eE]?[+-]?%d*)', pos)
         local val = tonumber(num_str)
         if not val then error_at(pos, "Malformed number %q.", num_str) end
 
-        if opts.nbt_style and valid[sub(str, pos + 1, pos + 1)] then return val, last + 2 end
+        if opts.nbt_style and num_types[sub(str, last + 1, last + 1)] then return val, last + 2 end
 
         return val, last + 1
     end
@@ -501,9 +501,11 @@ do
         return val, last + 1
     end
 
+    local arr_types = { I = true, L = true, B = true }
     local function decode_impl(str, pos, opts)
         local c = sub(str, pos, pos)
-        if c == '"' then return parse_string(str, pos + 1)
+        if c == '"' then return parse_string(str, pos + 1, '"')
+        elseif c == "'" and opts.nbt_style then return parse_string(str, pos + 1, "\'")
         elseif c == "-" or c >= "0" and c <= "9" then return parse_number(str, pos, opts)
         elseif c == "t" then
             if sub(str, pos + 1, pos + 3) == "rue" then return true, pos + 4 end
@@ -528,7 +530,7 @@ do
 
             while true do
                 local key, value
-                if c == "\"" then key, pos = parse_string(str, pos + 1)
+                if c == "\"" then key, pos = parse_string(str, pos + 1, "\"")
                 elseif opts.nbt_style then key, pos = parse_ident(str, pos)
                 else return expected(pos, c, "object key")
                 end
@@ -560,6 +562,11 @@ do
             pos = skip(str, pos + 1)
             c = sub(str, pos, pos)
 
+            if arr_types[c] and sub(str, pos + 1, pos + 1) == ";" and opts.nbt_style then
+                pos = skip(str, pos + 2)
+                c = sub(str, pos, pos)
+            end
+
             if c == "" then return expected(pos, c, "']'") end
             if c == "]" then return empty_json_array, pos + 1 end
 
@@ -712,7 +719,7 @@ function urlEncode(str)
             else
                 -- Non-ASCII (encode as UTF-8)
                 return
-                    string.format("%%%02X", 192 + bit32.band(bit32.arshift(n, 6), 31)) ..
+                string.format("%%%02X", 192 + bit32.band(bit32.arshift(n, 6), 31)) ..
                     string.format("%%%02X", 128 + bit32.band(n, 63))
             end
         end)

src/main/resources/data/computercraft/lua/rom/apis/window.lua

@@ -125,7 +125,7 @@ function create(parent, nX, nY, nWidth, nHeight, bStartVisible)
     -- Helper functions
     local function updateCursorPos()
         if nCursorX >= 1 and nCursorY >= 1 and
-           nCursorX <= nWidth and nCursorY <= nHeight then
+            nCursorX <= nWidth and nCursorY <= nHeight then
             parent.setCursorPos(nX + nCursorX - 1, nY + nCursorY - 1)
         else
             parent.setCursorPos(0, 0)
@@ -474,6 +474,14 @@ function create(parent, nX, nY, nWidth, nHeight, bStartVisible)
         end
     end
 
+    --- Get whether this window is visible. Invisible windows will not be
+    -- drawn to the screen until they are made visible again.
+    --
+    -- @treturn boolean Whether this window is visible.
+    -- @see Window:setVisible
+    function window.isVisible()
+        return bVisible
+    end
     --- Draw this window. This does nothing if the window is not visible.
     --
     -- @see Window:setVisible

src/main/resources/data/computercraft/lua/rom/programs/alias.lua

@@ -1,6 +1,7 @@
 local tArgs = { ... }
 if #tArgs > 2 then
-    print("Usage: alias <alias> <program>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <alias> <program>")
     return
 end
 

src/main/resources/data/computercraft/lua/rom/programs/cd.lua

@@ -1,6 +1,7 @@
 local tArgs = { ... }
 if #tArgs < 1 then
-    print("Usage: cd <path>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <path>")
     return
 end
 

src/main/resources/data/computercraft/lua/rom/programs/command/exec.lua

@@ -4,7 +4,8 @@ if not commands then
     return
 end
 if #tArgs == 0 then
-    printError("Usage: exec <command>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    printError("Usage: " .. programName .. " <command>")
     return
 end
 

src/main/resources/data/computercraft/lua/rom/programs/copy.lua

@@ -1,6 +1,7 @@
 local tArgs = { ... }
 if #tArgs < 2 then
-    print("Usage: cp <source> <destination>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <source> <destination>")
     return
 end
 

src/main/resources/data/computercraft/lua/rom/programs/delete.lua

@@ -1,7 +1,8 @@
 local args = table.pack(...)
 
 if args.n < 1 then
-    print("Usage: rm <paths>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <paths>")
     return
 end
 

src/main/resources/data/computercraft/lua/rom/programs/edit.lua

@@ -1,7 +1,8 @@
 -- Get file to edit
 local tArgs = { ... }
 if #tArgs == 0 then
-    print("Usage: edit <path>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <path>")
     return
 end
 

src/main/resources/data/computercraft/lua/rom/programs/eject.lua

@@ -1,7 +1,8 @@
 -- Get arguments
 local tArgs = { ... }
 if #tArgs == 0 then
-    print("Usage: eject <drive>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <drive>")
     return
 end
 

src/main/resources/data/computercraft/lua/rom/programs/fun/advanced/paint.lua

@@ -34,7 +34,8 @@ end
 -- Determines if the file exists, and can be edited on this computer
 local tArgs = { ... }
 if #tArgs == 0 then
-    print("Usage: paint <path>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <path>")
     return
 end
 local sPath = shell.resolve(tArgs[1])

src/main/resources/data/computercraft/lua/rom/programs/fun/dj.lua

@@ -1,10 +1,11 @@
 local tArgs = { ... }
 
 local function printUsage()
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
     print("Usages:")
-    print("dj play")
-    print("dj play <drive>")
-    print("dj stop")
+    print(programName .. " play")
+    print(programName .. " play <drive>")
+    print(programName .. " stop")
 end
 
 if #tArgs > 2 then

src/main/resources/data/computercraft/lua/rom/programs/gps.lua

@@ -1,8 +1,9 @@
 local function printUsage()
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
     print("Usages:")
-    print("gps host")
-    print("gps host <x> <y> <z>")
-    print("gps locate")
+    print(programName .. " host")
+    print(programName .. " host <x> <y> <z>")
+    print(programName .. " locate")
 end
 
 local tArgs = { ... }

src/main/resources/data/computercraft/lua/rom/programs/http/pastebin.lua

@@ -1,8 +1,9 @@
 local function printUsage()
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
     print("Usages:")
-    print("pastebin put <filename>")
-    print("pastebin get <code> <filename>")
-    print("pastebin run <code> <arguments>")
+    print(programName .. " put <filename>")
+    print(programName .. " get <code> <filename>")
+    print(programName .. " run <code> <arguments>")
 end
 
 local tArgs = { ... }

src/main/resources/data/computercraft/lua/rom/programs/http/wget.lua

@@ -1,7 +1,8 @@
 local function printUsage()
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
     print("Usage:")
-    print("wget <url> [filename]")
-    print("wget run <url>")
+    print(programName .. " <url> [filename]")
+    print(programName .. " run <url>")
 end
 
 local tArgs = { ... }

src/main/resources/data/computercraft/lua/rom/programs/label.lua

@@ -1,13 +1,15 @@
 local function printUsage()
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
     print("Usages:")
-    print("label get")
-    print("label get <drive>")
-    print("label set <text>")
-    print("label set <drive> <text>")
-    print("label clear")
-    print("label clear <drive>")
+    print(programName .. " get")
+    print(programName .. " get <drive>")
+    print(programName .. " set <text>")
+    print(programName .. " set <drive> <text>")
+    print(programName .. " clear")
+    print(programName .. " clear <drive>")
 end
 
+
 local function checkDrive(sDrive)
     if peripheral.getType(sDrive) == "drive" then
         -- Check the disk exists

src/main/resources/data/computercraft/lua/rom/programs/mkdir.lua

@@ -1,7 +1,8 @@
 local tArgs = { ... }
 
 if #tArgs < 1 then
-    print("Usage: mkdir <paths>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <paths>")
     return
 end
 

src/main/resources/data/computercraft/lua/rom/programs/monitor.lua

@@ -1,5 +1,6 @@
 local function printUsage()
-    print("Usage: monitor <name> <program> <arguments>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <name> <program> <arguments>")
     return
 end
 

src/main/resources/data/computercraft/lua/rom/programs/move.lua

@@ -1,6 +1,7 @@
 local tArgs = { ... }
 if #tArgs < 2 then
-    print("Usage: mv <source> <destination>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <source> <destination>")
     return
 end
 

src/main/resources/data/computercraft/lua/rom/programs/rednet/chat.lua

@@ -1,9 +1,10 @@
 local tArgs = { ... }
 
 local function printUsage()
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
     print("Usages:")
-    print("chat host <hostname>")
-    print("chat join <hostname> <nickname>")
+    print(programName .. " host <hostname>")
+    print(programName .. " join <hostname> <nickname>")
 end
 
 local sOpenedModem = nil

src/main/resources/data/computercraft/lua/rom/programs/redstone.lua

@@ -1,11 +1,12 @@
 local tArgs = { ... }
 
 local function printUsage()
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
     print("Usages:")
-    print("redstone probe")
-    print("redstone set <side> <value>")
-    print("redstone set <side> <color> <value>")
-    print("redstone pulse <side> <count> <period>")
+    print(programName .. " probe")
+    print(programName .. " set <side> <value>")
+    print(programName .. " set <side> <color> <value>")
+    print(programName .. " pulse <side> <count> <period>")
 end
 
 local sCommand = tArgs[1]

src/main/resources/data/computercraft/lua/rom/programs/rename.lua

@@ -1,6 +1,7 @@
 local tArgs = { ... }
 if #tArgs < 2 then
-    print("Usage: rename <source> <destination>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <source> <destination>")
     return
 end
 

src/main/resources/data/computercraft/lua/rom/programs/turtle/craft.lua

@@ -1,5 +1,6 @@
 if not turtle then
-    printError("Requires a Turtle")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " [number]")
     return
 end
 

src/main/resources/data/computercraft/lua/rom/programs/turtle/equip.lua

@@ -5,7 +5,8 @@ end
 
 local tArgs = { ... }
 local function printUsage()
-    print("Usage: equip <slot> <side>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <slot> <side>")
 end
 
 if #tArgs ~= 2 then

src/main/resources/data/computercraft/lua/rom/programs/turtle/excavate.lua

@@ -5,7 +5,8 @@ end
 
 local tArgs = { ... }
 if #tArgs ~= 1 then
-    print("Usage: excavate <diameter>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <diameter>")
     return
 end
 

src/main/resources/data/computercraft/lua/rom/programs/turtle/go.lua

@@ -5,7 +5,8 @@ end
 
 local tArgs = { ... }
 if #tArgs < 1 then
-    print("Usage: go <direction> <distance>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <direction> <distance>")
     return
 end
 

src/main/resources/data/computercraft/lua/rom/programs/turtle/refuel.lua

@@ -6,7 +6,8 @@ end
 local tArgs = { ... }
 local nLimit = 1
 if #tArgs > 1 then
-    print("Usage: refuel [number]")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " [number]")
     return
 elseif #tArgs > 0 then
     if tArgs[1] == "all" then

src/main/resources/data/computercraft/lua/rom/programs/turtle/tunnel.lua

@@ -5,7 +5,8 @@ end
 
 local tArgs = { ... }
 if #tArgs ~= 1 then
-    print("Usage: tunnel <length>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <length>")
     return
 end
 

src/main/resources/data/computercraft/lua/rom/programs/turtle/turn.lua

@@ -5,7 +5,8 @@ end
 
 local tArgs = { ... }
 if #tArgs < 1 then
-    print("Usage: turn <direction> <turns>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <direction> <turns>")
     return
 end
 

src/main/resources/data/computercraft/lua/rom/programs/turtle/unequip.lua

@@ -5,7 +5,8 @@ end
 
 local tArgs = { ... }
 local function printUsage()
-    print("Usage: unequip <side>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <side>")
 end
 
 if #tArgs ~= 1 then

src/main/resources/data/computercraft/lua/rom/programs/type.lua

@@ -1,6 +1,7 @@
 local tArgs = { ... }
 if #tArgs < 1 then
-    print("Usage: type <path>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <path>")
     return
 end
 

src/test/resources/test-rom/spec/apis/colors_spec.lua

@@ -73,4 +73,20 @@ describe("The colors library", function()
         expect(colors.rgb8(0.3, 0.5, 0.6)):equals(0x4c7f99)
         expect({ colors.rgb8(0x4c7f99) }):same { 0x4c / 0xFF, 0x7f / 0xFF, 0.6 }
     end)
+
+    describe("colors.toBlit", function()
+        it("validates arguments", function()
+            expect.error(colors.toBlit, nil):eq("bad argument #1 (expected number, got nil)")
+        end)
+
+        it("converts all colors", function()
+            for i = 0, 15 do
+                expect(colors.toBlit(2 ^ i)):eq(string.format("%x", i))
+            end
+        end)
+
+        it("floors colors", function()
+            expect(colors.toBlit(16385)):eq("e")
+        end)
+    end)
 end)

src/test/resources/test-rom/spec/apis/paintutils_spec.lua

@@ -1,4 +1,19 @@
+local with_window = require "test_helpers".with_window
+
 describe("The paintutils library", function()
+    -- Verifies that a window's lines are equal to the given table of blit
+    -- strings ({{"text", "fg", "bg"}, {"text", "fg", "bg"}...})
+    local function window_eq(w, state)
+        -- Verification of the size isn't really important in the tests, but
+        -- better safe than sorry.
+        local _, height = w.getSize()
+        expect(#state):eq(height)
+
+        for line = 1, height do
+            expect({ w.getLine(line) }):same(state[line])
+        end
+    end
+
     describe("paintutils.parseImage", function()
         it("validates arguments", function()
             paintutils.parseImage("")
@@ -28,6 +43,30 @@ describe("The paintutils library", function()
             expect.error(paintutils.drawLine, 1, 1, 1, nil):eq("bad argument #4 (expected number, got nil)")
             expect.error(paintutils.drawLine, 1, 1, 1, 1, false):eq("bad argument #5 (expected number, got boolean)")
         end)
+
+        it("draws a line going across with custom colour", function()
+            local w = with_window(3, 2, function()
+                paintutils.drawLine(1, 1, 3, 1, colours.red)
+            end)
+
+            window_eq(w, {
+                { "   ", "000", "eee" },
+                { "   ", "000", "fff" },
+            })
+        end)
+
+        it("draws a line going diagonally with term colour", function()
+            local w = with_window(3, 3, function()
+                term.setBackgroundColour(colours.red)
+                paintutils.drawLine(1, 1, 3, 3)
+            end)
+
+            window_eq(w, {
+                { "   ", "000", "eff" },
+                { "   ", "000", "fef" },
+                { "   ", "000", "ffe" },
+            })
+        end)
     end)
 
     describe("paintutils.drawBox", function()
@@ -38,6 +77,45 @@ describe("The paintutils library", function()
             expect.error(paintutils.drawBox, 1, 1, 1, nil):eq("bad argument #4 (expected number, got nil)")
             expect.error(paintutils.drawBox, 1, 1, 1, 1, false):eq("bad argument #5 (expected number, got boolean)")
         end)
+
+        it("draws a box with term colour", function()
+            local w = with_window(3, 3, function()
+                term.setBackgroundColour(colours.red)
+                paintutils.drawBox(1, 1, 3, 3)
+            end)
+
+            window_eq(w, {
+                { "   ", "eee", "eee" },
+                { "   ", "e0e", "efe" },
+                { "   ", "eee", "eee" },
+            })
+        end)
+
+        it("draws a box with custom colour", function()
+            local w = with_window(3, 3, function()
+                paintutils.drawBox(1, 1, 3, 3, colours.red)
+            end)
+
+            window_eq(w, {
+                { "   ", "eee", "eee" },
+                { "   ", "e0e", "efe" },
+                { "   ", "eee", "eee" },
+            })
+        end)
+
+        it("draws a box without overwriting existing content", function()
+            local w = with_window(3, 3, function()
+                term.setCursorPos(2, 2)
+                term.write("a")
+                paintutils.drawBox(1, 1, 3, 3, colours.red)
+            end)
+
+            window_eq(w, {
+                { "   ", "eee", "eee" },
+                { " a ", "e0e", "efe" },
+                { "   ", "eee", "eee" },
+            })
+        end)
     end)
 
     describe("paintutils.drawFilledBox", function()
@@ -48,6 +126,31 @@ describe("The paintutils library", function()
             expect.error(paintutils.drawFilledBox, 1, 1, 1, nil):eq("bad argument #4 (expected number, got nil)")
             expect.error(paintutils.drawFilledBox, 1, 1, 1, 1, false):eq("bad argument #5 (expected number, got boolean)")
         end)
+
+        it("draws a filled box with term colour", function()
+            local w = with_window(3, 3, function()
+                term.setBackgroundColour(colours.red)
+                paintutils.drawFilledBox(1, 1, 3, 3)
+            end)
+
+            window_eq(w, {
+                { "   ", "eee", "eee" },
+                { "   ", "eee", "eee" },
+                { "   ", "eee", "eee" },
+            })
+        end)
+
+        it("draws a filled box with custom colour", function()
+            local w = with_window(3, 3, function()
+                paintutils.drawFilledBox(1, 1, 3, 3, colours.red)
+            end)
+
+            window_eq(w, {
+                { "   ", "eee", "eee" },
+                { "   ", "eee", "eee" },
+                { "   ", "eee", "eee" },
+            })
+        end)
     end)
 
     describe("paintutils.drawImage", function()

src/test/resources/test-rom/spec/apis/window_spec.lua

@@ -118,6 +118,56 @@ describe("The window library", function()
             expect.error(w.reposition, 1, 1, false, 1):eq("bad argument #3 (expected number, got boolean)")
             expect.error(w.reposition, 1, 1, nil, 1):eq("bad argument #3 (expected number, got nil)")
             expect.error(w.reposition, 1, 1, 1, nil):eq("bad argument #4 (expected number, got nil)")
+            expect.error(w.reposition, 1, 1, 1, 1, true):eq("bad argument #5 (expected table, got boolean)")
+        end)
+
+        it("can change the buffer", function()
+            local a, b = mk(), mk()
+            local target = window.create(a, 1, 1, a.getSize())
+
+            target.write("Test")
+            expect((a.getLine(1))):equal("Test ")
+            expect({ a.getCursorPos() }):same { 5, 1 }
+
+            target.reposition(1, 1, nil, nil, b)
+
+            target.redraw()
+            expect((a.getLine(1))):equal("Test ")
+            expect({ a.getCursorPos() }):same { 5, 1 }
+
+            target.setCursorPos(1, 1) target.write("More")
+            expect((a.getLine(1))):equal("Test ")
+            expect((b.getLine(1))):equal("More ")
+        end)
+    end)
+
+    describe("Window.getLine", function()
+        it("validates arguments", function()
+            local w = mk()
+            w.getLine(1)
+            local _, y = w.getSize()
+            expect.error(w.getLine, nil):eq("bad argument #1 (expected number, got nil)")
+            expect.error(w.getLine, 0):eq("Line is out of range.")
+            expect.error(w.getLine, y + 1):eq("Line is out of range.")
+        end)
+
+        it("provides a line's contents", function()
+            local w = mk()
+            w.blit("test", "aaaa", "4444")
+            expect({ w.getLine(1) }):same { "test ", "aaaa0", "4444f" }
+        end)
+    end)
+    describe("Window.setVisible", function()
+        it("validates arguments", function()
+            local w = mk()
+            expect.error(w.setVisible, nil):eq("bad argument #1 (expected boolean, got nil)")
+        end)
+    end)
+    describe("Window.isVisible", function()
+        it("gets window visibility", function()
+            local w = mk()
+            w.setVisible(false)
+            expect(w.isVisible()):same(false)
         end)
     end)
 end)

src/test/resources/test-rom/spec/programs/command/exec_spec.lua

@@ -0,0 +1,33 @@
+local capture = require "test_helpers".capture_program
+
+describe("The exec program", function()
+    it("displays an error without the commands api", function()
+        stub(_G, "commands", nil)
+        expect(capture(stub, "/rom/programs/command/exec.lua"))
+        :matches { ok = true, output = "", error = "Requires a Command Computer.\n" }
+    end)
+
+    it("displays its usage when given no argument", function()
+        stub(_G, "commands", {})
+        expect(capture(stub, "/rom/programs/command/exec.lua"))
+        :matches { ok = true, output = "", error = "Usage: /rom/programs/command/exec.lua <command>\n" }
+    end)
+
+    it("runs a command", function()
+        stub(_G, "commands", {
+            exec = function() return true, { "Hello World!" } end,
+        })
+
+        expect(capture(stub, "/rom/programs/command/exec.lua computercraft"))
+        :matches { ok = true, output = "Success\nHello World!\n", error = "" }
+    end)
+
+    it("reports command failures", function()
+        stub(_G, "commands", {
+            exec = function() return false, { "Hello World!" } end,
+        })
+
+        expect(capture(stub, "/rom/programs/command/exec.lua computercraft"))
+        :matches { ok = true, output = "Hello World!\n", error = "Failed\n" }
+    end)
+end)

src/test/resources/test-rom/spec/programs/copy_spec.lua

@@ -0,0 +1,40 @@
+local capture = require "test_helpers".capture_program
+
+describe("The copy program", function()
+    local function touch(file)
+        io.open(file, "w"):close()
+    end
+
+    it("copies a file", function()
+        touch("/test-files/copy/a.txt")
+
+        shell.run("copy /test-files/copy/a.txt /test-files/copy/b.txt")
+
+        expect(fs.exists("/test-files/copy/a.txt")):eq(true)
+        expect(fs.exists("/test-files/copy/b.txt")):eq(true)
+    end)
+
+    it("fails when copying a non-existent file", function()
+        expect(capture(stub, "copy nothing destination"))
+        :matches { ok = true, output = "", error = "No matching files\n" }
+    end)
+
+    it("fails when overwriting an existing file", function()
+        touch("/test-files/copy/c.txt")
+
+        expect(capture(stub, "copy /test-files/copy/c.txt /test-files/copy/c.txt"))
+        :matches { ok = true, output = "", error = "Destination exists\n" }
+    end)
+
+    it("fails when copying into read-only locations", function()
+        touch("/test-files/copy/d.txt")
+
+        expect(capture(stub, "copy /test-files/copy/d.txt /rom/test.txt"))
+        :matches { ok = true, output = "", error = "Destination is read-only\n" }
+    end)
+
+    it("displays the usage when given no arguments", function()
+        expect(capture(stub, "copy"))
+        :matches { ok = true, output = "Usage: copy <source> <destination>\n", error = "" }
+    end)
+end)

src/test/resources/test-rom/spec/programs/move_spec.lua

@@ -0,0 +1,74 @@
+local capture = require "test_helpers".capture_program
+
+describe("The move program", function()
+    local function cleanup() fs.delete("/test-files/move") end
+    local function touch(file)
+        io.open(file, "w"):close()
+    end
+
+    it("move a file", function()
+        cleanup()
+        touch("/test-files/move/a.txt")
+
+        shell.run("move /test-files/move/a.txt /test-files/move/b.txt")
+
+        expect(fs.exists("/test-files/move/a.txt")):eq(false)
+        expect(fs.exists("/test-files/move/b.txt")):eq(true)
+    end)
+
+    it("moves a file to a directory", function()
+        cleanup()
+        touch("/test-files/move/a.txt")
+        fs.makeDir("/test-files/move/a")
+
+        expect(capture(stub, "move /test-files/move/a.txt /test-files/move/a"))
+        :matches { ok = true }
+
+        expect(fs.exists("/test-files/move/a.txt")):eq(false)
+        expect(fs.exists("/test-files/move/a/a.txt")):eq(true)
+    end)
+
+    it("fails when moving a file which doesn't exist", function()
+        expect(capture(stub, "move nothing destination"))
+        :matches { ok = true, output = "", error = "No matching files\n" }
+    end)
+
+    it("fails when overwriting an existing file", function()
+        cleanup()
+        touch("/test-files/move/a.txt")
+
+        expect(capture(stub, "move /test-files/move/a.txt /test-files/move/a.txt"))
+        :matches { ok = true, output = "", error = "Destination exists\n" }
+    end)
+
+    it("fails when moving to read-only locations", function()
+        cleanup()
+        touch("/test-files/move/a.txt")
+
+        expect(capture(stub, "move /test-files/move/a.txt /rom/test.txt"))
+        :matches { ok = true, output = "", error = "Destination is read-only\n" }
+    end)
+
+    it("fails when moving from read-only locations", function()
+        expect(capture(stub, "move /rom/startup.lua /test-files/move/not-exist.txt"))
+        :matches { ok = true, output = "", error = "Cannot move read-only file /rom/startup.lua\n" }
+    end)
+
+    it("fails when moving mounts", function()
+        expect(capture(stub, "move /rom /test-files/move/rom"))
+        :matches { ok = true, output = "", error = "Cannot move mount /rom\n" }
+    end)
+
+    it("fails when moving a file multiple times", function()
+        cleanup()
+        touch("/test-files/move/a.txt")
+        touch("/test-files/move/b.txt")
+        expect(capture(stub, "move /test-files/move/*.txt /test-files/move/c.txt"))
+        :matches { ok = true, output = "", error = "Cannot overwrite file multiple times\n" }
+    end)
+
+    it("displays the usage with no arguments", function()
+        expect(capture(stub, "move"))
+        :matches { ok = true, output = "Usage: move <source> <destination>\n", error = "" }
+    end)
+end)

src/test/resources/test-rom/spec/programs/turtle/craft_spec.lua

@@ -0,0 +1,69 @@
+local capture = require "test_helpers".capture_program
+
+describe("The craft program", function()
+    it("errors when not a turtle", function()
+        stub(_G, "turtle", nil)
+
+        expect(capture(stub, "/rom/programs/turtle/craft.lua"))
+        :matches { ok = true, output = "", error = "Requires a Turtle\n" }
+    end)
+
+    it("fails when turtle.craft() is unavailable", function()
+        stub(_G, "turtle", {})
+
+        expect(capture(stub, "/rom/programs/turtle/craft.lua"))
+        :matches { ok = true, output = "Requires a Crafty Turtle\n", error = "" }
+    end)
+
+    it("displays its usage when given no arguments", function()
+        stub(_G, "turtle", { craft = function() end })
+
+        expect(capture(stub, "/rom/programs/turtle/craft.lua"))
+        :matches { ok = true, output = "Usage: /rom/programs/turtle/craft.lua [number]\n", error = "" }
+    end)
+
+    it("crafts multiple items", function()
+        local item_count = 3
+        stub(_G, "turtle", {
+            craft = function()
+                item_count = 1
+                return true
+            end,
+            getItemCount = function() return item_count end,
+            getSelectedSlot = function() return 1 end,
+        })
+
+        expect(capture(stub, "/rom/programs/turtle/craft.lua 2"))
+        :matches { ok = true, output = "2 items crafted\n", error = "" }
+    end)
+
+    it("craft a single item", function()
+        local item_count = 2
+        stub(_G, "turtle", {
+            craft = function()
+                item_count = 1
+                return true
+            end,
+            getItemCount = function() return item_count end,
+            getSelectedSlot = function() return 1 end,
+        })
+
+        expect(capture(stub, "/rom/programs/turtle/craft.lua 1"))
+        :matches { ok = true, output = "1 item crafted\n", error = "" }
+    end)
+
+    it("crafts no items", function()
+        local item_count = 2
+        stub(_G, "turtle", {
+            craft = function()
+                item_count = 1
+                return false
+            end,
+            getItemCount = function() return item_count end,
+            getSelectedSlot = function() return 1 end,
+        })
+
+        expect(capture(stub, "/rom/programs/turtle/craft.lua 1"))
+        :matches { ok = true, output = "No items crafted\n", error = "" }
+    end)
+end)

src/test/resources/test-rom/spec/programs/turtle/equip_spec.lua

@@ -0,0 +1,89 @@
+local capture = require "test_helpers".capture_program
+
+describe("The turtle equip program", function()
+    it("errors when not a turtle", function()
+        stub(_G, "turtle", nil)
+
+        expect(capture(stub, "/rom/programs/turtle/equip.lua"))
+        :matches { ok = true, output = "", error = "Requires a Turtle\n" }
+    end)
+
+
+    it("displays its usage when given no arguments", function()
+        stub(_G, "turtle", {})
+
+        expect(capture(stub, "/rom/programs/turtle/equip.lua"))
+        :matches { ok = true, output = "Usage: /rom/programs/turtle/equip.lua <slot> <side>\n", error = "" }
+    end)
+
+    it("equip nothing", function()
+        stub(_G, "turtle", {
+            select = function() end,
+            getItemCount = function() return 0 end,
+        })
+
+        expect(capture(stub, "/rom/programs/turtle/equip.lua 1 left"))
+        :matches { ok = true, output = "Nothing to equip\n", error = "" }
+        expect(capture(stub, "/rom/programs/turtle/equip.lua 1 right"))
+        :matches { ok = true, output = "Nothing to equip\n", error = "" }
+    end)
+
+    it("swaps existing upgrades", function()
+        stub(_G, "turtle", {
+            select = function() end,
+            getItemCount = function() return 1 end,
+            equipLeft = function() return true end,
+            equipRight = function() return true end,
+        })
+
+        expect(capture(stub, "/rom/programs/turtle/equip.lua 1 left"))
+        :matches { ok = true, output = "Items swapped\n", error = "" }
+        expect(capture(stub, "/rom/programs/turtle/equip.lua 1 right"))
+        :matches { ok = true, output = "Items swapped\n", error = "" }
+    end)
+
+    describe("equips a new upgrade", function()
+        local function setup()
+            local item_count = 1
+            stub(_G, "turtle", {
+                select = function() end,
+                getItemCount = function() return item_count end,
+                equipLeft = function()
+                    item_count  = 0
+                    return true
+                end,
+                equipRight = function()
+                    item_count = 0
+                    return true
+                end,
+            })
+        end
+
+        it("on the left", function()
+            setup()
+            expect(capture(stub, "/rom/programs/turtle/equip.lua 1 left"))
+            :matches { ok = true, output = "Item equipped\n", error = "" }
+        end)
+
+        it("on the right", function()
+            setup()
+            expect(capture(stub, "/rom/programs/turtle/equip.lua 1 right"))
+            :matches { ok = true, output = "Item equipped\n", error = "" }
+        end)
+    end)
+
+    it("handles when an upgrade cannot be equipped", function()
+        stub(_G, "turtle", {
+            select = function() end,
+            getItemCount = function() return 1 end,
+            equipLeft = function() return false end,
+            equipRight = function() return false end,
+        })
+
+        expect(capture(stub, "/rom/programs/turtle/equip.lua 1 left"))
+        :matches { ok = true, output = "Item not equippable\n", error = "" }
+        expect(capture(stub, "/rom/programs/turtle/equip.lua 1 right"))
+        :matches { ok = true, output = "Item not equippable\n", error = "" }
+    end)
+
+end)

src/test/resources/test-rom/spec/programs/turtle/refuel_spec.lua

@@ -0,0 +1,62 @@
+local capture = require "test_helpers".capture_program
+
+describe("The refuel program", function()
+    local function setup_turtle(fuel_level, fuel_limit, item_count)
+        stub(_G, "turtle", {
+            getFuelLevel = function()
+                return fuel_level
+            end,
+            getItemCount = function()
+                return item_count
+            end,
+            refuel = function(nLimit)
+                item_count = item_count - nLimit
+                fuel_level = fuel_level + nLimit
+            end,
+            select = function()
+            end,
+            getFuelLimit = function()
+                return fuel_limit
+            end,
+        })
+    end
+
+    it("errors when not a turtle", function()
+        stub(_G, "turtle", nil)
+
+        expect(capture(stub, "/rom/programs/turtle/refuel.lua"))
+        :matches { ok = true, output = "", error = "Requires a Turtle\n" }
+    end)
+
+
+    it("displays its usage when given too many argument", function()
+        setup_turtle(0, 5, 0)
+        expect(capture(stub, "/rom/programs/turtle/refuel.lua a b"))
+        :matches { ok = true, output = "Usage: /rom/programs/turtle/refuel.lua [number]\n", error = "" }
+    end)
+
+    it("requires a numeric argument", function()
+        setup_turtle(0, 0, 0)
+        expect(capture(stub, "/rom/programs/turtle/refuel.lua nothing"))
+        :matches { ok = true, output = "Invalid limit, expected a number or \"all\"\n", error = "" }
+    end)
+
+    it("refuels the turtle", function()
+        setup_turtle(0, 10, 5)
+
+        expect(capture(stub, "/rom/programs/turtle/refuel.lua 5"))
+        :matches { ok = true, output = "Fuel level is 5\n", error = "" }
+    end)
+
+    it("reports when the fuel limit is reached", function()
+        setup_turtle(0, 5, 5)
+        expect(capture(stub, "/rom/programs/turtle/refuel.lua 5"))
+        :matches { ok = true, output = "Fuel level is 5\nFuel limit reached\n", error = "" }
+    end)
+
+    it("reports when the fuel level is unlimited", function()
+        setup_turtle("unlimited", 5, 5)
+        expect(capture(stub, "/rom/programs/turtle/refuel.lua 5"))
+        :matches { ok = true, output = "Fuel level is unlimited\n", error = "" }
+    end)
+end)

src/test/resources/test-rom/spec/programs/turtle/unequip_spec.lua

@@ -0,0 +1,69 @@
+local capture = require "test_helpers".capture_program
+
+describe("The turtle unequip program", function()
+    it("errors when not a turtle", function()
+        stub(_G, "turtle", nil)
+
+        expect(capture(stub, "/rom/programs/turtle/unequip.lua"))
+        :matches { ok = true, output = "", error = "Requires a Turtle\n" }
+    end)
+
+
+    it("displays its usage when given no arguments", function()
+        stub(_G, "turtle", {})
+
+        expect(capture(stub, "/rom/programs/turtle/unequip.lua"))
+        :matches { ok = true, output = "Usage: /rom/programs/turtle/unequip.lua <side>\n", error = "" }
+    end)
+
+    it("says when nothing was unequipped", function()
+        stub(_G, "turtle", {
+            select = function() end,
+            getItemCount = function() return 0 end,
+            equipRight = function() return true end,
+            equipLeft = function() return true end,
+        })
+
+        expect(capture(stub, "/rom/programs/turtle/unequip.lua left"))
+        :matches { ok = true, output = "Nothing to unequip\n", error = "" }
+        expect(capture(stub, "/rom/programs/turtle/unequip.lua right"))
+        :matches { ok = true, output = "Nothing to unequip\n", error = "" }
+    end)
+
+    it("unequips a upgrade", function()
+        local item_count = 0
+        stub(_G, "turtle", {
+            select = function() end,
+            getItemCount = function() return item_count end,
+            equipRight = function()
+                item_count = 1
+                return true
+            end,
+            equipLeft = function()
+                item_count = 1
+                return true
+            end,
+        })
+
+        expect(capture(stub, "/rom/programs/turtle/unequip.lua left"))
+        :matches { ok = true, output = "Item unequipped\n", error = "" }
+        item_count = 0
+        expect(capture(stub, "/rom/programs/turtle/unequip.lua right"))
+        :matches { ok = true, output = "Item unequipped\n", error = "" }
+    end)
+
+    it("fails when the turtle is full", function()
+        stub(_G, "turtle", {
+            select = function() end,
+            getItemCount = function() return 1 end,
+            equipRight = function() return true end,
+            equipLeft = function() return true end,
+        })
+
+        expect(capture(stub, "/rom/programs/turtle/unequip.lua left"))
+        :matches { ok = true, output = "No space to unequip item\n", error = "" }
+        expect(capture(stub, "/rom/programs/turtle/unequip.lua right"))
+        :matches { ok = true, output = "No space to unequip item\n", error = "" }
+    end)
+
+end)