resolved all problems originating in the merge

.github/workflows/rust.yml

@@ -0,0 +1,48 @@
+name: Rust
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.cargo/registry
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-
+      - name: Build
+        run: cargo build --verbose
+      - name: Run tests
+        run: cargo test --verbose
+
+  publish:
+    needs: build
+    if: ${{ needs.build.result == 'success' }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+      - run: cargo publish --token ${CRATES_TOKEN}
+        env:
+          CRATES_TOKEN: ${{ secrets.CRATES_TOKEN }}

.gitignore

@@ -4,4 +4,6 @@
 /vscode_extension/node_modules
 /vscode_extension/fmt_core
 /vscode_extension/dist
-/vscode_extension/*.vsix
+/package
+
+token.txt

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### v0.2.0
+ - complete restructure to combine vscode extension branch
+ - seperated cli binary and the core library to make integration with library easier 
+
 ### v0.1.8
  - organisation
 

Cargo.toml

@@ -1,19 +1,10 @@
 [package]
 name = "glyphrs"
-<<<<<<< HEAD
-version = "0.1.8"
-=======
-version = "1.0.4"
->>>>>>> extension
+version = "0.2.0"
 edition = "2021"
 description = "A text art generator written in Rust"
 license = "MIT"
 
-[lib]
-name = "glyphrs_core"
-path = "./core/core.rs"
-crate-type = ["cdylib", "rlib"]
-
 [[bin]]
 name = "glyphrs"
 path = "./cli/main.rs"
@@ -24,10 +15,9 @@ path = "./core/core.rs"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-regex = "1.9.3"
-sqlparser = "0.45.0"
-itertools = "0.11.0"
+clap = "4.5.4"
+serde = { version = "1.0.203", features = ["derive"] }
+toml = "0.8.13"
 wasm-bindgen = "0.2.87"
-glyphrs = "0.1.7"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Makefile

@@ -1,3 +1,6 @@
+build-binary:
+	cargo build --release
+
 gen-wasm-for-extension:
 	rm -rf ./vscode_extension/core
 	wasm-pack build --target bundler --out-dir ./vscode_extension/core --release

README.md

@@ -0,0 +1,5 @@
+# Glyph.rs
+![Glyphrs](assets/title.png)
+## A text art generator written in Rust
+
+glyph.rs is a tool for generating text art from the terminal

cli/lib.rs

@@ -0,0 +1 @@
+pub mod clap;