diff --git a/fsd.vxserver.dev/archive/fes/fes-0.1.0.tar.gz b/fsd.vxserver.dev/archive/fes-0.1.0.tar.gz similarity index 100% rename from fsd.vxserver.dev/archive/fes/fes-0.1.0.tar.gz rename to fsd.vxserver.dev/archive/fes-0.1.0.tar.gz diff --git a/fsd.vxserver.dev/archive/fes/fes-0.2.0.tar.gz b/fsd.vxserver.dev/archive/fes-0.2.0.tar.gz similarity index 100% rename from fsd.vxserver.dev/archive/fes/fes-0.2.0.tar.gz rename to fsd.vxserver.dev/archive/fes-0.2.0.tar.gz diff --git a/fsd.vxserver.dev/archive/fes/fes-0.2.1.tar.gz b/fsd.vxserver.dev/archive/fes/fes-0.2.1.tar.gz deleted file mode 100644 index bf0ed8c..0000000 Binary files a/fsd.vxserver.dev/archive/fes/fes-0.2.1.tar.gz and /dev/null differ diff --git a/fsd.vxserver.dev/archive/fes/fes-0.3.0.tar.gz b/fsd.vxserver.dev/archive/fes/fes-0.3.0.tar.gz deleted file mode 100644 index 376e801..0000000 Binary files a/fsd.vxserver.dev/archive/fes/fes-0.3.0.tar.gz and /dev/null differ diff --git a/fsd.vxserver.dev/archive/fes/fes-beta.tar.gz b/fsd.vxserver.dev/archive/fes/fes-beta.tar.gz deleted file mode 100644 index 4cc5166..0000000 Binary files a/fsd.vxserver.dev/archive/fes/fes-beta.tar.gz and /dev/null differ diff --git a/fsd.vxserver.dev/archive/yait/yait-1.0.tar.gz b/fsd.vxserver.dev/archive/yait-1.0.tar.gz similarity index 100% rename from fsd.vxserver.dev/archive/yait/yait-1.0.tar.gz rename to fsd.vxserver.dev/archive/yait-1.0.tar.gz diff --git a/fsd.vxserver.dev/article/Versioning.md b/fsd.vxserver.dev/article/Versioning.md new file mode 100644 index 0000000..fef6601 --- /dev/null +++ b/fsd.vxserver.dev/article/Versioning.md @@ -0,0 +1,67 @@ +# Versioning + +### Summary + +Given a version number MAJOR.MINOR.PATCH, increment the: + +* MAJOR version when you make incompatible API changes +* MINOR version when you add functionality in a backward compatible manner +* PATCH version when you make backward compatible bug fixes + +Additional labels for pre-release and build metadata are available as extensions to the MAJOR.MINOR.PATCH format. + +***EXCEPT*** when the MAJOR version is zero, then MINOR versions are treated the same as MAJOR versions. + +### Semantic Versioning Specification (SemVer) + +The key words “MUST”, “MUST NOT”, “REQUIRED”, “SHALL”, “SHALL NOT”, “SHOULD”, “SHOULD NOT”, “RECOMMENDED”, “MAY”, and “OPTIONAL” in this document are to be interpreted as described in RFC 2119. + +Software using Semantic Versioning MUST declare a public API. This API could be declared in the code itself or exist strictly in documentation. However it is done, it SHOULD be precise and comprehensive. + +A normal version number MUST take the form X.Y.Z where X, Y, and Z are non-negative integers, and MUST NOT contain leading zeroes. X is the major version, Y is the minor version, and Z is the patch version. Each element MUST increase numerically. For instance: 1.9.0 -> 1.10.0 -> 1.11.0. + +Once a versioned package has been released, the contents of that version MUST NOT be modified. Any modifications MUST be released as a new version. + +Major version zero (0.y.z) is for initial development. Anything MAY change at any time. The public API SHOULD NOT be considered stable. + +Version 1.0.0 defines the public API. The way in which the version number is incremented after this release is dependent on this public API and how it changes. + +Patch version Z (x.y.Z | x > 0) MUST be incremented if only backward compatible bug fixes are introduced. A bug fix is defined as an internal change that fixes incorrect behavior. + +Minor version Y (x.Y.z | x > 0) MUST be incremented if new, backward compatible functionality is introduced to the public API. It MUST be incremented if any public API functionality is marked as deprecated. It MAY be incremented if substantial new functionality or improvements are introduced within the private code. It MAY include patch level changes. Patch version MUST be reset to 0 when minor version is incremented. + +Major version X (X.y.z | X > 0) MUST be incremented if any backward incompatible changes are introduced to the public API. It MAY also include minor and patch level changes. Patch and minor versions MUST be reset to 0 when major version is incremented. + +A pre-release version MAY be denoted by appending a hyphen and a series of dot separated identifiers immediately following the patch version. Identifiers MUST comprise only ASCII alphanumerics and hyphens [0-9A-Za-z-]. Identifiers MUST NOT be empty. Numeric identifiers MUST NOT include leading zeroes. Pre-release versions have a lower precedence than the associated normal version. A pre-release version indicates that the version is unstable and might not satisfy the intended compatibility requirements as denoted by its associated normal version. Examples: 1.0.0-alpha, 1.0.0-alpha.1, 1.0.0-0.3.7, 1.0.0-x.7.z.92, 1.0.0-x-y-z.--. + +Build metadata MAY be denoted by appending a plus sign and a series of dot separated identifiers immediately following the patch or pre-release version. Identifiers MUST comprise only ASCII alphanumerics and hyphens [0-9A-Za-z-]. Identifiers MUST NOT be empty. Build metadata MUST be ignored when determining version precedence. Thus two versions that differ only in the build metadata, have the same precedence. Examples: 1.0.0-alpha+001, 1.0.0+20130313144700, 1.0.0-beta+exp.sha.5114f85, 1.0.0+21AF26D3----117B344092BD. + +Precedence refers to how versions are compared to each other when ordered. + +Precedence MUST be calculated by separating the version into major, minor, patch and pre-release identifiers in that order (Build metadata does not figure into precedence). + +Precedence is determined by the first difference when comparing each of these identifiers from left to right as follows: Major, minor, and patch versions are always compared numerically. + +Example: 1.0.0 < 2.0.0 < 2.1.0 < 2.1.1. + +When major, minor, and patch are equal, a pre-release version has lower precedence than a normal version: + +Example: 1.0.0-alpha < 1.0.0. + +Precedence for two pre-release versions with the same major, minor, and patch version MUST be determined by comparing each dot separated identifier from left to right until a difference is found as follows: + +Identifiers consisting of only digits are compared numerically. + +Identifiers with letters or hyphens are compared lexically in ASCII sort order. + +Numeric identifiers always have lower precedence than non-numeric identifiers. + +A larger set of pre-release fields has a higher precedence than a smaller set, if all of the preceding identifiers are equal. + +Example: 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0. + +### Attributions + +The summary of Semantic Versioning 2.0.0 is based on the offical specification at [semver.org](https://semver.org/spec/v2.0.0.html) and is published under a [Creative Commons -- CC BY 3.0](https://creativecommons.org/licenses/by/3.0/) license. + +The specification of Semantic Versioning 2.0.0 is based on the offical specification at [semver.org](https://semver.org/spec/v2.0.0.html) and is published under a [Creative Commons -- CC BY 3.0](https://creativecommons.org/licenses/by/3.0/) license. diff --git a/fsd.vxserver.dev/include/header.lua b/fsd.vxserver.dev/include/header.lua index 2cf790d..d67a981 100644 --- a/fsd.vxserver.dev/include/header.lua +++ b/fsd.vxserver.dev/include/header.lua @@ -7,7 +7,7 @@ header.render = function(std) std.nav("/about", "About"), std.nav("/faq", "FAQ"), std.nav("/release", "Releases"), - std.nav("/news", "Site news"), + std.nav("/article", "Articles"), })) }) end diff --git a/fsd.vxserver.dev/news/00-happy-holidays.md b/fsd.vxserver.dev/news/00-happy-holidays.md deleted file mode 100644 index 2d360d7..0000000 --- a/fsd.vxserver.dev/news/00-happy-holidays.md +++ /dev/null @@ -1,7 +0,0 @@ -# Happy Holidays - -Merry Christmas and Happy Holidays! - -This article mostly exists to test the article system at `news` - -2025-02-12 diff --git a/fsd.vxserver.dev/news/01-alpha-release.md b/fsd.vxserver.dev/news/01-alpha-release.md deleted file mode 100644 index 6bc069a..0000000 --- a/fsd.vxserver.dev/news/01-alpha-release.md +++ /dev/null @@ -1,32 +0,0 @@ -# Alpha Release - -# Pages - -This is the first release of this site so far we have the following pages: - -* About -* FAQ -* Releases -* Site news - -### About - -This page contains information about fSD. - -### FAQ - -Answers common questions about fSD and things pertaining to it. - -### Releases - -A list of fSD with a short description and link to repository. - -### Site news - -A location for news about this website, fSD, etc. - -## Future - -I hope that this gets expanded and polished as to expand the usefulness to the fSD project. - -2025-02-12 diff --git a/fsd.vxserver.dev/news/02-prospects.md b/fsd.vxserver.dev/news/02-prospects.md deleted file mode 100644 index bb9cf1e..0000000 --- a/fsd.vxserver.dev/news/02-prospects.md +++ /dev/null @@ -1,13 +0,0 @@ -# fSD Prospects - -In the future I hope to the fsdproject.org domain. fsd.org is owned by someone, -yet they do not do anything with it. So is fsd.dev, fsd.com, fsd.xyz, fsd.io, -fsd.cc. So I have very few options. - -Here they are: - - fsdproject.org - - fsd.site - - As I stated I am leaning towards fsdproject.org because I like that .org. - -2025-17-12 diff --git a/fsd.vxserver.dev/www/news.lua b/fsd.vxserver.dev/www/article.lua similarity index 61% rename from fsd.vxserver.dev/www/news.lua rename to fsd.vxserver.dev/www/article.lua index 98b5660..b8475b7 100644 --- a/fsd.vxserver.dev/www/news.lua +++ b/fsd.vxserver.dev/www/article.lua @@ -6,7 +6,7 @@ local site = fes.fes() local title = "Free Software Distributions" -site.title = title .. " - Site news" +site.title = title .. " - Site articles" site.copyright = u.copyright("[https://git.vxserver.dev/fSD](https://git.vxserver.dev/fSD)", "fSD") site.favicon = "/static/favicon.ico" site:banner(fes.app.header.render(std)) @@ -17,38 +17,6 @@ local function url_encode(s) return s end -local function list_files_in_dir(dir) - local files = {} - local ok, lfs = pcall(require, "lfs") - if ok and lfs then - for name in lfs.dir(dir) do - if name ~= "." and name ~= ".." then - local attr = lfs.attributes(dir .. "/" .. name) - if attr and attr.mode == "file" then - table.insert(files, name) - end - end - end - table.sort(files) - return files - end - local p = io.popen('ls -1 "' .. dir:gsub('"', '\"') .. '" 2>/dev/null') - if not p then return files end - for line in p:lines() do - if line ~= "." and line ~= ".." then - local f = dir .. "/" .. line - local fh = io.open(f, "r") - if fh then - fh:close() - table.insert(files, line) - end - end - end - p:close() - table.sort(files) - return files -end - local function read_file(path) local f = io.open(path, "r") if not f then return nil end @@ -57,8 +25,8 @@ local function read_file(path) return data end -local dir = "news" -local files = list_files_in_dir(dir) +local dir = "article" +local files = u.ls(dir) local params = fes.bus.params or {} local article = params.article @@ -76,7 +44,8 @@ if article then end site.title = article if body then - site:custom(fes.markdown_to_html(body)) + site:g("") + site:g(fes.markdown_to_html(body)) else site:note(u.cc { std.h1(article), @@ -91,7 +60,7 @@ local articles = {} local n = 0 for _, v in ipairs(files) do local display = v:gsub("%.[^%.]+$", "") - local link = "/news?article=" .. url_encode(display) + local link = "/article?article=" .. url_encode(display) table.insert(articles, std.a(link, display)) n = n + 1 end @@ -101,7 +70,7 @@ table.sort(articles, function (x, y) end) if n > 0 then - site:h1("Site news") + site:h1("Articles") site:note(std.ul(articles)) else site:h1("No articles") diff --git a/fsd.vxserver.dev/www/index.lua b/fsd.vxserver.dev/www/index.lua index d5891cb..12904ff 100644 --- a/fsd.vxserver.dev/www/index.lua +++ b/fsd.vxserver.dev/www/index.lua @@ -12,7 +12,7 @@ site.favicon = "/static/favicon.ico" site:banner(fes.app.header.render(std)) -site:custom(fes.markdown_to_html([[ +site:g(fes.markdown_to_html([[ News === 2026-03-01 diff --git a/fsd.vxserver.dev/www/releases/fes.lua b/fsd.vxserver.dev/www/releases/fes.lua index a8be8b6..ac93e9d 100644 --- a/fsd.vxserver.dev/www/releases/fes.lua +++ b/fsd.vxserver.dev/www/releases/fes.lua @@ -14,16 +14,60 @@ site:h2("Fes") site:muted("fes is a lightweight, static, and optionated microframework.") site:h2("Development") -site:p("You can " .. std.external("https://git.vxserver.dev/fSD/fes", "browse") .. " its source code or get a copy using the following command:") +site:p("You can " .. +std.external("https://git.vxserver.dev/fSD/fes", "browse") .. +" its source code or get a copy using the following command:") site:code("git clone https://git.vxserver.dev/fSD/fes") site:h2("Docker") -site:p("You can deploy websites using the " .. std.external("https://git.vxserver.dev/fSD/-/packages/container/fes/latest", "docker") .. " image:") +site:p("You can deploy websites using the " .. +std.external("https://git.vxserver.dev/fSD/-/packages/container/fes/latest", "docker") .. " image:") site:code("docker pull git.vxserver.dev/fsd/fes:latest") +local tars = u.ls("archive") + +local function parseVersion(pkg) + local version = pkg:match("-(.+)$") + local parts = {} + for n in version:gmatch("%d+") do + parts[#parts + 1] = tonumber(n) + end + return parts +end + +local function isNewer(a, b) + local va, vb = parseVersion(a), parseVersion(b) + local len = math.max(#va, #vb) + + for i = 1, len do + local na, nb = va[i] or 0, vb[i] or 0 + if na ~= nb then + return na > nb + end + end + return false +end + +local function latestRelease(packages, name) + local latest = nil + local prefix = "^" .. name .. "%-" + + for _, pkg in ipairs(packages) do + if pkg:match(prefix) then + if not latest or isNewer(pkg, latest) then + latest = pkg + end + end + end + + return latest +end + +local latest = latestRelease(tars, "fes") + site:h2("Download") site:ul { - std.p(std.a("/archive/fes/fes-0.3.0.tar.gz", "fes-0.3.0") .. " (2026-04-1)"), + std.p(std.a("/archive/" .. latest, latest) .. " (2026-04-1)"), std.a("/archive/fes", "Looking for specific version?") }