From 394e9fa918d4e0a0a7dddd344487498e9b912897 Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Fri, 3 Nov 2017 15:10:28 -0700 Subject: [PATCH] Move to lib folder instead of src/X --- .gitignore | 4 +--- .luacheckrc | 2 +- .luacov | 2 +- .travis.yml | 2 +- README.md | 2 -- build-installer | 2 +- install-dependencies | 4 ++-- {src/roact => lib}/Component.lua | 0 {src/roact => lib}/Component.spec.lua | 0 {src/roact => lib}/Core.lua | 0 {src/roact => lib}/Core.spec.lua | 0 {src/roact => lib}/Debug.lua | 0 {src/roact => lib}/PureComponent.lua | 0 {src/roact => lib}/PureComponent.spec.lua | 0 {src/roact => lib}/Reconciler.lua | 0 {src/roact => lib}/SingleEventManager.lua | 0 {src/roact => lib}/SingleEventManager.spec.lua | 0 {src/roact => lib}/Symbol.lua | 0 {src/roact => lib}/Symbol.spec.lua | 0 {src/roact => lib}/getDefaultPropertyValue.lua | 0 {src/roact => lib}/getDefaultPropertyValue.spec.lua | 0 {src/roact => lib}/init.lua | 0 {src/roact => lib}/init.spec.lua | 0 spec.lua | 6 +++--- 24 files changed, 10 insertions(+), 14 deletions(-) rename {src/roact => lib}/Component.lua (100%) rename {src/roact => lib}/Component.spec.lua (100%) rename {src/roact => lib}/Core.lua (100%) rename {src/roact => lib}/Core.spec.lua (100%) rename {src/roact => lib}/Debug.lua (100%) rename {src/roact => lib}/PureComponent.lua (100%) rename {src/roact => lib}/PureComponent.spec.lua (100%) rename {src/roact => lib}/Reconciler.lua (100%) rename {src/roact => lib}/SingleEventManager.lua (100%) rename {src/roact => lib}/SingleEventManager.spec.lua (100%) rename {src/roact => lib}/Symbol.lua (100%) rename {src/roact => lib}/Symbol.spec.lua (100%) rename {src/roact => lib}/getDefaultPropertyValue.lua (100%) rename {src/roact => lib}/getDefaultPropertyValue.spec.lua (100%) rename {src/roact => lib}/init.lua (100%) rename {src/roact => lib}/init.spec.lua (100%) diff --git a/.gitignore b/.gitignore index 7ec4734a..d56c29fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ /modules /luacov.* -/roact-installer.lua -/lemur -/testez \ No newline at end of file +/roact-installer.lua \ No newline at end of file diff --git a/.luacheckrc b/.luacheckrc index 49aa9ce8..bb134be5 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -40,6 +40,6 @@ ignore = { std = "lua51+roblox" -files["src/**/*.spec.lua"] = { +files["**/*.spec.lua"] = { std = "+testez", } \ No newline at end of file diff --git a/.luacov b/.luacov index aa7a0f48..f4a945cd 100644 --- a/.luacov +++ b/.luacov @@ -1,6 +1,6 @@ return { include = { - "src", + "lib", }, exclude = { "%.spec$", diff --git a/.travis.yml b/.travis.yml index 8abe8f74..9ef2f340 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ install: - ./install-dependencies script: - - luacheck src + - luacheck lib - lua -lluacov spec.lua after_success: diff --git a/README.md b/README.md index f83389ff..d01edba7 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,6 @@ If building a Roblox place by importing scripts from the filesystem, copy the `s # Roact Roact is a declarative Lua view framework intended to mirror Facebook's *React* framework. It exposes a very similar API to React and implements nearly identical semantics. -**This document is a work in progress. See the `Examples` folder for pure code examples of how to use Roact.** - ## Hello, Roact! This sample creates a full-screen `TextLabel` with a greeting: diff --git a/build-installer b/build-installer index 0184c39a..c5377cca 100644 --- a/build-installer +++ b/build-installer @@ -1,3 +1,3 @@ #!/bin/sh -rbxpacker --exclude **/*.spec.lua --folder Roact --name Roact src/roact > roact-installer.lua \ No newline at end of file +rbxpacker --exclude **/*.spec.lua --folder Roact --name Roact lib > roact-installer.lua \ No newline at end of file diff --git a/install-dependencies b/install-dependencies index 53eb837a..06c74b51 100644 --- a/install-dependencies +++ b/install-dependencies @@ -1,4 +1,4 @@ #!/bin/sh -git clone --depth=1 https://github.com/LPGhatguy/lemur.git lemur -git clone --depth=1 https://github.com/Roblox/TestEZ.git testez \ No newline at end of file +git clone --depth=1 https://github.com/LPGhatguy/lemur.git modules/lemur +git clone --depth=1 https://github.com/Roblox/TestEZ.git modules/testez \ No newline at end of file diff --git a/src/roact/Component.lua b/lib/Component.lua similarity index 100% rename from src/roact/Component.lua rename to lib/Component.lua diff --git a/src/roact/Component.spec.lua b/lib/Component.spec.lua similarity index 100% rename from src/roact/Component.spec.lua rename to lib/Component.spec.lua diff --git a/src/roact/Core.lua b/lib/Core.lua similarity index 100% rename from src/roact/Core.lua rename to lib/Core.lua diff --git a/src/roact/Core.spec.lua b/lib/Core.spec.lua similarity index 100% rename from src/roact/Core.spec.lua rename to lib/Core.spec.lua diff --git a/src/roact/Debug.lua b/lib/Debug.lua similarity index 100% rename from src/roact/Debug.lua rename to lib/Debug.lua diff --git a/src/roact/PureComponent.lua b/lib/PureComponent.lua similarity index 100% rename from src/roact/PureComponent.lua rename to lib/PureComponent.lua diff --git a/src/roact/PureComponent.spec.lua b/lib/PureComponent.spec.lua similarity index 100% rename from src/roact/PureComponent.spec.lua rename to lib/PureComponent.spec.lua diff --git a/src/roact/Reconciler.lua b/lib/Reconciler.lua similarity index 100% rename from src/roact/Reconciler.lua rename to lib/Reconciler.lua diff --git a/src/roact/SingleEventManager.lua b/lib/SingleEventManager.lua similarity index 100% rename from src/roact/SingleEventManager.lua rename to lib/SingleEventManager.lua diff --git a/src/roact/SingleEventManager.spec.lua b/lib/SingleEventManager.spec.lua similarity index 100% rename from src/roact/SingleEventManager.spec.lua rename to lib/SingleEventManager.spec.lua diff --git a/src/roact/Symbol.lua b/lib/Symbol.lua similarity index 100% rename from src/roact/Symbol.lua rename to lib/Symbol.lua diff --git a/src/roact/Symbol.spec.lua b/lib/Symbol.spec.lua similarity index 100% rename from src/roact/Symbol.spec.lua rename to lib/Symbol.spec.lua diff --git a/src/roact/getDefaultPropertyValue.lua b/lib/getDefaultPropertyValue.lua similarity index 100% rename from src/roact/getDefaultPropertyValue.lua rename to lib/getDefaultPropertyValue.lua diff --git a/src/roact/getDefaultPropertyValue.spec.lua b/lib/getDefaultPropertyValue.spec.lua similarity index 100% rename from src/roact/getDefaultPropertyValue.spec.lua rename to lib/getDefaultPropertyValue.spec.lua diff --git a/src/roact/init.lua b/lib/init.lua similarity index 100% rename from src/roact/init.lua rename to lib/init.lua diff --git a/src/roact/init.spec.lua b/lib/init.spec.lua similarity index 100% rename from src/roact/init.spec.lua rename to lib/init.spec.lua diff --git a/spec.lua b/spec.lua index 5757e567..21e4ec59 100644 --- a/spec.lua +++ b/spec.lua @@ -1,10 +1,10 @@ -local lemur = require("lemur") +local lemur = require("modules.lemur") local habitat = lemur.Habitat.new() local Roact = lemur.Instance.new("Folder") Roact.Name = "Roact" -habitat:loadFromFs("src/roact", Roact) +habitat:loadFromFs("lib", Roact) -- Simulate rbxpacker's 'collapse' mechanism do @@ -21,7 +21,7 @@ end local TestEZ = lemur.Instance.new("Folder") TestEZ.Name = "TestEZ" -habitat:loadFromFs("testez/lib", TestEZ) +habitat:loadFromFs("modules/testez/lib", TestEZ) local TestBootstrap = habitat:require(TestEZ.TestBootstrap) local TextReporter = habitat:require(TestEZ.Reporters.TextReporter)