remove variables from puff.yml, add get_branch method, bug fix

Author: smokingplaya

.gitignore

@@ -1 +1,2 @@
-/target
+/target
+.env

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "atomic-git"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2024"
 
 [lib]

Cargo.toml

@@ -21,8 +21,8 @@ pub fn derive_userdata(input: TokenStream) -> TokenStream {
   let lua_wrappers = methods.iter().map(|m| {
     let fname = format_ident!("{}", m);
     quote! {
-      use atomicframework::userdata::IntoLuaValue;
       extern "C" fn #fname(lua: rglua::lua::LuaState) -> i32 {
+        use atomicframework::userdata::IntoLuaValue;
         unsafe {
           let ud = rglua::prelude::lua_touserdata(lua, 1) as *mut #struct_name;
           let obj = &*ud;

crates/atomicframework-macro/src/lib.rs

@@ -1,6 +1,3 @@
-variables:
-  SRCDS: "D:/Projects/Roleplay/steamapps/common/GarrysModDS"
-
 configuration:
   shell: powershell
   default: cicd
@@ -12,19 +9,17 @@ tasks:
   move:
     commands:
       - if (Test-Path "${SRCDS}/garrysmod/lua/bin/gmsv_atomic_git_win32.dll") { Remove-Item -Force "${SRCDS}/garrysmod/lua/bin/gmsv_atomic_git_win32.dll" }
-      - Move-Item -Force "./target/i686-pc-windows-msvc/release/atomic_git.dll" "${SRCDS}/garrysmod/lua/bin/gmsv_atomic_git_win32.dll"
+      - 'Move-Item -Force "./target/i686-pc-windows-msvc/release/atomic_git.dll" "${SRCDS}/garrysmod/lua/bin/gmsv_atomic_git_win32.dll"'
   killsrcds:
     commands:
       - |
         if (Get-Process "srcds" -ErrorAction SilentlyContinue) {
           taskkill /F /IM srcds.exe
-        } else {
-          Write-Host "srcds.exe не найден — скипаю"
-        }
+        } else { }
 
   startsrcds:
     commands:
-      - cd ${SRCDS}; ${SRCDS}/start.bat
+      - cd ${SRCDS}; Start-Process "${SRCDS}/start.bat" -WindowStyle Hidden -RedirectStandardOutput "$env:TEMP\out.txt" -RedirectStandardError "$env:TEMP\err.txt"
   cicd:
     commands:
       - puff build

puff.yml

@@ -1,9 +1,9 @@
 use atomicframework::macros::Userdata;
-use anyhow::{anyhow, Result};
+use anyhow::{anyhow, bail, Result};
 use git2::Repository;
 
 #[derive(Userdata)]
-#[userdata("get_commit_id")]
+#[userdata("get_commit_id", "get_branch")]
 pub struct GitRepo {
   repo: Repository,
 }
@@ -23,4 +23,16 @@ impl GitRepo {
 
     Ok(id)
   }
+
+  fn get_branch(&self) -> anyhow::Result<String> {
+    let head = self.repo.head()?;
+
+    if head.is_branch() {
+      if let Some(name) = head.shorthand() {
+        return Ok(name.to_string());
+      }
+    }
+
+    bail!("Detached ~HEAD")
+  }
 }