refact: port to Jule v0.1.7

Author: koibtw

.github/workflows/jule.yml

@@ -14,18 +14,20 @@ jobs:
           submodules: 'true'
 
       - name:  Install JuleC
-        run: |
-          mkdir julec
-          cd julec
-          bash <(curl -s https://raw.githubusercontent.com/julelang/julec-ir/main/compile-ir.sh)
-          echo "$(pwd)/jule-master/bin" >> $GITHUB_PATH
-          cd ..
+        uses: Panquesito7/setup-jule@v1.1.3
+        with:
+          version: dev
+          directory: .julec
+
+      - name: Add JuleC to PATH
+        run: echo "$(pwd)/.julec/julec-dev/bin" >> $GITHUB_PATH
+
       - name: Install JuleFmt
         run: |
-          git clone https://github.com/julelang/julefmt.git --depth=1
-          cd julefmt
+          git clone https://github.com/julelang/julefmt.git --depth=1 .julefmt
+          cd .julefmt
           mkdir -p bin
-          julec --opt-deadcode -o bin/julefmt ./src
+          julec build --opt-deadcode -o bin/julefmt ./src
           echo "$(pwd)/bin" >> $GITHUB_PATH
           cd ..
 
@@ -37,17 +39,15 @@ jobs:
       - name: Build
         run: |
           make
-      - name: Test
-        run: |
-          make test
+
       - name: Format
         run: |
           make format
 
       - name: Clean up
         run: |
           make clean
-          rm -rf julec julefmt
+          rm -rf .julec .julefmt
 
       - name: Check formatting
         run: |

.gitignore

@@ -1,3 +1,4 @@
+main
 **/*.out
 **/dist
 **/build

Makefile

@@ -13,13 +13,14 @@ all: build
 
 build:
 	mkdir -p build
-	$(JULEC) $(JULECFLAGS) src
+	$(JULEC) build src $(JULECFLAGS)
 
 run: build
 	./build/$(BINARY)
 
 test:
-	$(JULEC) test src
+	$(JULEC) test src $(JULECFLAGS)-test
+	./build/$(BINARY)-test
 
 format:
 	julefmt -w src

README.md

@@ -4,10 +4,6 @@ A lightweight and fast tool for installing, updating and managing [Proton], [Pro
 jpu is written in [Jule], a low-level, compiled, memory-safe fast programming language.<br>
 The tool's main goal is to provide a **faster** [ProtonUp] implementation. The original project is written in Python, which is quite slow.
 
-Supported Jule versions:
-- `0.1.4`
-- `0.1.5@master`
-
 ## Installation
 
 ### Arch Linux

src/crypto.h crypto.hsrc/crypto.h renamed to crypto.h

@@ -10,7 +10,7 @@
 #include <string.h>
 #include <openssl/evp.h>
 
-jule::Str sha512sum(const jule::Str input) {
+__jule_Str sha512sum(const __jule_Str input) {
     EVP_MD_CTX* ctx = EVP_MD_CTX_new();
     unsigned char hash[EVP_MAX_MD_SIZE];
     unsigned int length;
@@ -23,7 +23,7 @@ jule::Str sha512sum(const jule::Str input) {
 
     char* output = (char*)malloc((length * 2) + 1);
     if (output == NULL) {
-        return jule::Str();
+        return __jule_Str();
     }
 
     for (unsigned int i = 0; i < length; i++) {

jule.mod

@@ -0,0 +1 @@
+module jpu

snapbox

@@ -3,26 +3,21 @@
 // Use of this source code is governed by the BSD 3-Clause License.
 // See the LICENSE file for details.
 
-#pass "-lcurl -lcrypto"
+#pass "-lcrypto"
 
-use sbx "snapbox"
-use sbh "snapbox/header"
-use sbs "snapbox/status"
+use sbx "jpu/snapbox"
+use sbh "jpu/snapbox/header"
+use sbs "jpu/snapbox/status"
+use "std/bufio"
 use "std/conv"
 use "std/os"
 use "std/os/filepath"
 use ss "std/strings"
 
-cpp use "crypto.h"
+cpp use "jpu/crypto.h"
 
 const tempDir = "/tmp/jpu"
 
-static headerMap: sbh::HeaderMap = {
-	sbh::ACCEPT: "application/vnd.github+json",
-	sbh::USER_AGENT: "jpu",
-	"X-GitHub-Api-Version": "2022-11-28",
-}
-
 cpp fn sha512sum(str): str
 
 struct Proton {
@@ -32,7 +27,7 @@ struct Proton {
 }
 
 impl Proton {
-	fn Download(self)! {
+	fn Download(*self)! {
 		os::Mkdir(tempDir) else {}
 
 		tempProtonFile := tempDir + "/" + self.tagName + ".tar.gz"
@@ -64,7 +59,7 @@ impl Proton {
 		}
 	}
 
-	fn Install(self)! {
+	fn Install(*self)! {
 		tempProtonFile := tempDir + "/" + self.tagName + ".tar.gz"
 		tempChecksumFile := tempDir + "/" + self.tagName + ".sha512sum"
 
@@ -86,6 +81,12 @@ fn GetProton(tagRaw: str, urlRaw: str, mut installDir: str)!: Proton {
 		tag = "/tags/" + tagRaw
 	}
 
+	let headerMap: sbh::HeaderMap = {
+		sbh::ACCEPT: "application/vnd.github+json",
+		sbh::USER_AGENT: "jpu",
+		"X-GitHub-Api-Version": "2022-11-28",
+	}
+
 	url := urlRaw + tag
 	request := sbx::GET(url).Headers(headerMap).Send()
 
@@ -131,7 +132,12 @@ fn GetProton(tagRaw: str, urlRaw: str, mut installDir: str)!: Proton {
 	println(" MB\n    Date: " + publishedAt)
 	print("  Continue? [Y/n]: ")
 
-	input := os::Stdin().ReadLine()!
+	mut scanner := bufio::Scanner.New(os::Stdin())
+	scanner.Scan() else {
+		error("Failed to read input")
+	}
+	input := scanner.Text()
+
 	match ss::ToLower(input) {
 	| "n":
 		error("Aborted")

src/jpu.jule

@@ -3,7 +3,7 @@
 // Use of this source code is governed by the BSD 3-Clause License.
 // See the LICENSE file for details.
 
-use cy "colorify"
+use cy "jpu/colorify"
 use "std/flag"
 use "std/os"
 use ss "std/strings"
@@ -12,20 +12,6 @@ use "std/sys"
 const protonGeURL = "https://api.github.com/repos/GloriousEggroll/proton-ge-custom/releases"
 const defaultInstallDir = "~/.steam/root/compatibilitytools.d/"
 
-static argMap: map[int][2]str = {}
-static successMessage = cy::Colorify("#", cy::Style{
-	Foreground: cy::Foreground.Green,
-	Background: cy::Background.Black,
-})
-static infoMessage = cy::Colorify("*", cy::Style{
-	Foreground: cy::Foreground.Blue,
-	Background: cy::Background.Black,
-})
-static errorMessage = cy::Colorify("!", cy::Style{
-	Foreground: cy::Foreground.Red,
-	Background: cy::Background.Black,
-})
-
 fn main() {
 	mut fs := flag::FlagSet.New()
 
@@ -45,29 +31,29 @@ fn main() {
 		ret
 	}
 
-	println(infoMessage + " No arguments provided. Assuming an update.")
+	printInfo("No arguments provided. Assuming an update.")
 	update(dir)
 }
 
 fn update(mut installDir: str) {
-	println(infoMessage + " Getting the latest Proton-GE release...")
+	printInfo("Getting the latest Proton-GE release...")
 	proton := GetProton("", protonGeURL, installDir) else {
 		handleErr(error)
 		ret
 	}
-	println(infoMessage + " Downloading...")
+	printInfo("Downloading...")
 	proton.Download() else {
 		handleErr(error)
 	}
-	println(infoMessage + " Installing...")
+	printInfo("Installing...")
 	proton.Install() else {
 		handleErr(error)
 	}
-	println(successMessage + " Done!")
+	printSuccess("Done!")
 }
 
 fn handleErr(err: any) {
-	print(errorMessage + " ")
+	printError()
 	println(err)
 	sys::Exit(1)
 }
@@ -86,4 +72,23 @@ fn autoHelp(mut flags: &flag::FlagSet): (res: str) {
 	}
 
 	ret res
+}
+
+fn printSuccess(msg: str) {
+	println(cy::Colorify("#", cy::Style{
+		Foreground: cy::Foreground.Green,
+		Background: cy::Background.Black,
+	}) + " " + msg)
+}
+fn printInfo(msg: str) {
+	println(cy::Colorify("*", cy::Style{
+		Foreground: cy::Foreground.Blue,
+		Background: cy::Background.Black,
+	}) + " " + msg)
+}
+fn printError() {
+	println(cy::Colorify("!", cy::Style{
+		Foreground: cy::Foreground.Red,
+		Background: cy::Background.Black,
+	}) + " ")
 }