Merge pull request #9 from golemcloud/ci

CI

Author: vigoo

.github/workflows/ci.yaml

@@ -0,0 +1,74 @@
+name: CI
+on:
+  push:
+    tags:
+      - "v*.*.*"
+    branches:
+      - main
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Setup Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+      - name: Check formatting
+        run: cargo fmt -- --check
+      - name: Clippy
+        run: cargo clippy -- -Dwarnings
+      - name: Tests
+        run: cargo test
+  publish:
+    needs: [build]
+    if: "startsWith(github.ref, 'refs/tags/v')"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Setup Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - id: get_version
+        uses: battila7/get-version-action@v2
+      - name: Publish crate
+        env:
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+        run: |
+          export VERSION="${{ steps.get_version.outputs.version-without-v }}"
+          sed -i "s/0.0.0/$VERSION/g" Cargo.toml
+          cargo publish -p golem-openapi-client-generator --all-features --allow-dirty

.rustfmt.toml

@@ -1,5 +1,2 @@
-normalize_comments = true 
-reorder_imports = true 
-group_imports = "StdExternalCrate"
+reorder_imports = true
 newline_style = "Unix"
-imports_granularity = "Module"

README.md

@@ -1,5 +1,5 @@
 # Client generator for golem projects
 
-Rust client renerator for OpenAPI of [Golem](https://golem.cloud) projects.
+Rust client generator for OpenAPI of [Golem](https://golem.cloud) projects.
 
 This is not a general purpose client generator - it might be able to generate Rust clients for other OpenAPI specs produced by [Poem OpenAPI](https://crates.io/crates/poem-openapi), but this is not the goal of this project.

src/printer.rs

@@ -227,8 +227,7 @@ impl<C: PrintContext> Add<NewLine> for TreePrinter<C> {
 
 #[cfg(test)]
 mod tests {
-
-    use crate::printer::{PrintContext, Printer, TreePrinter};
+    use crate::printer::{PrintContext, TreePrinter};
 
     struct StringContext {
         ctx: String,
@@ -252,7 +251,7 @@ mod tests {
 
         let mut ctx = StringContext { ctx: String::new() };
 
-        p.printer().print(&mut ctx);
+        p.print(&mut ctx);
 
         assert_eq!(ctx.ctx, "abc")
     }
@@ -265,7 +264,7 @@ mod tests {
 
         let mut ctx = StringContext { ctx: String::new() };
 
-        p.printer().print(&mut ctx);
+        p.print(&mut ctx);
 
         assert_eq!(ctx.ctx, "abcdef")
     }

src/rust/printer.rs

@@ -123,8 +123,13 @@ pub fn line<T: IntoRustTree>(code: T) -> TreePrinter<RustContext> {
 }
 
 pub fn rust_name(import: &str, name: &str) -> TreePrinter<RustContext> {
+    let import_name = if name.ends_with('!') {
+        &name[0..name.len() - 1]
+    } else {
+        name
+    };
     TreePrinter::leaf(RustCode {
-        imports: HashSet::from([RustUse(format!("{import}::{name}"))]),
+        imports: HashSet::from([RustUse(format!("{import}::{import_name}"))]),
         code: name.to_string(),
     })
 }
@@ -155,10 +160,10 @@ mod tests {
         let error = rust_name("trace", "error!");
 
         #[rustfmt::skip]
-        let p = unit()
+            let p = unit()
             + line("pub fn m() {")
             + indented(
-                line(info + "(\"abc\");")
+            line(info + "(\"abc\");")
                 + line(error + "(\"def\")"))
             + line("}");