rustfava 0.1.1__tar.gz → 0.1.3__tar.gz

{rustfava-0.1.1 → rustfava-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rustfava
-Version: 0.1.1
+Version: 0.1.3
 Summary: Web interface for the accounting tool rustledger.
 Author-email: Dominik Aumayr <dominik@aumayr.name>
 Maintainer-email: Jakob Schnitzer <mail@jakobschnitzer.de>
@@ -57,7 +57,7 @@ Dynamic: license-file
 
 Manage your finances with plain text accounting.
 
-[![CI](https://github.com/rustledger/rustfava/actions/workflows/ci.yml/badge.svg)](https://github.com/rustledger/rustfava/actions/workflows/ci.yml)
+[![CI](https://github.com/rustledger/rustfava/actions/workflows/test.yml/badge.svg)](https://github.com/rustledger/rustfava/actions/workflows/test.yml)
 [![GitHub Release](https://img.shields.io/github/v/release/rustledger/rustfava)](https://github.com/rustledger/rustfava/releases)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
 [![PyPI](https://img.shields.io/pypi/v/rustfava)](https://pypi.org/project/rustfava/)
@@ -81,13 +81,23 @@ Manage your finances with plain text accounting.
 
 ## Install
 
-| Platform | Download |
-|----------|----------|
-| **macOS** | [`rustfava_0.1.0_aarch64.dmg`](https://github.com/rustledger/rustfava/releases/download/v0.1.0/rustfava_0.1.0_aarch64.dmg) |
-| **Windows** | [`rustfava_0.1.0_x64-setup.exe`](https://github.com/rustledger/rustfava/releases/download/v0.1.0/rustfava_0.1.0_x64-setup.exe) |
-| **Linux** | [`rustfava_0.1.0_amd64.AppImage`](https://github.com/rustledger/rustfava/releases/download/v0.1.0/rustfava_0.1.0_amd64.AppImage) |
+### Desktop App
+
+Download the latest release for your platform from the [Releases page](https://github.com/rustledger/rustfava/releases/latest).
+
+| Platform | Format |
+|----------|--------|
+| **macOS** | `.dmg` (Intel & Apple Silicon) |
+| **Windows** | `.exe` installer or `.msi` |
+| **Linux** | `.AppImage`, `.deb`, `.rpm`, or `.tar.gz` |
+
+### Other Installation Methods
+
+| Method | Command |
+|--------|---------|
 | **Docker** | `docker run -p 5000:5000 -v /path/to/ledger:/data ghcr.io/rustledger/rustfava /data/main.beancount` |
 | **PyPI** | `uv tool install rustfava` (requires Python 3.13+ and [wasmtime](https://wasmtime.dev/)) |
+| **Nix** | `nix run github:rustledger/rustfava#desktop` |
 
 <sub>Missing your platform? [Open an issue](https://github.com/rustledger/rustfava/issues/new) to request it.</sub>
 

{rustfava-0.1.1 → rustfava-0.1.3}/README.md

@@ -6,7 +6,7 @@
 
 Manage your finances with plain text accounting.
 
-[![CI](https://github.com/rustledger/rustfava/actions/workflows/ci.yml/badge.svg)](https://github.com/rustledger/rustfava/actions/workflows/ci.yml)
+[![CI](https://github.com/rustledger/rustfava/actions/workflows/test.yml/badge.svg)](https://github.com/rustledger/rustfava/actions/workflows/test.yml)
 [![GitHub Release](https://img.shields.io/github/v/release/rustledger/rustfava)](https://github.com/rustledger/rustfava/releases)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
 [![PyPI](https://img.shields.io/pypi/v/rustfava)](https://pypi.org/project/rustfava/)
@@ -30,13 +30,23 @@ Manage your finances with plain text accounting.
 
 ## Install
 
-| Platform | Download |
-|----------|----------|
-| **macOS** | [`rustfava_0.1.0_aarch64.dmg`](https://github.com/rustledger/rustfava/releases/download/v0.1.0/rustfava_0.1.0_aarch64.dmg) |
-| **Windows** | [`rustfava_0.1.0_x64-setup.exe`](https://github.com/rustledger/rustfava/releases/download/v0.1.0/rustfava_0.1.0_x64-setup.exe) |
-| **Linux** | [`rustfava_0.1.0_amd64.AppImage`](https://github.com/rustledger/rustfava/releases/download/v0.1.0/rustfava_0.1.0_amd64.AppImage) |
+### Desktop App
+
+Download the latest release for your platform from the [Releases page](https://github.com/rustledger/rustfava/releases/latest).
+
+| Platform | Format |
+|----------|--------|
+| **macOS** | `.dmg` (Intel & Apple Silicon) |
+| **Windows** | `.exe` installer or `.msi` |
+| **Linux** | `.AppImage`, `.deb`, `.rpm`, or `.tar.gz` |
+
+### Other Installation Methods
+
+| Method | Command |
+|--------|---------|
 | **Docker** | `docker run -p 5000:5000 -v /path/to/ledger:/data ghcr.io/rustledger/rustfava /data/main.beancount` |
 | **PyPI** | `uv tool install rustfava` (requires Python 3.13+ and [wasmtime](https://wasmtime.dev/)) |
+| **Nix** | `nix run github:rustledger/rustfava#desktop` |
 
 <sub>Missing your platform? [Open an issue](https://github.com/rustledger/rustfava/issues/new) to request it.</sub>
 

{rustfava-0.1.1 → rustfava-0.1.3}/_build_backend.py

@@ -9,8 +9,6 @@ from os import walk
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from babel.messages.mofile import write_mo
-from babel.messages.pofile import read_po
 from setuptools import build_meta
 from setuptools.build_meta import get_requires_for_build_editable
 from setuptools.build_meta import get_requires_for_build_sdist
@@ -69,6 +67,10 @@ def _compile_frontend() -> None:
 
 def _compile_translations() -> None:
     """Compile the translations from .po to .mo (if changed or missing)."""
+    # Lazy import to avoid requiring Babel for metadata preparation
+    from babel.messages.mofile import write_mo
+    from babel.messages.pofile import read_po
+
     for source in Path().glob("src/rustfava/translations/**/messages.po"):
         target = source.parent / "messages.mo"
         if (

rustfava-0.1.3/contrib/pyinstaller_spec.spec

@@ -0,0 +1,102 @@
+# vim: set ft=python:
+"""Pyinstaller spec file for building a binary from rustfava's cli.py
+
+This spec works without pip installing rustfava - it uses the source directly.
+"""
+
+from __future__ import annotations
+
+import os
+import sys
+from pathlib import Path
+
+from PyInstaller.utils.hooks import collect_data_files
+from PyInstaller.utils.hooks import collect_submodules
+
+# Get the project root (parent of contrib/)
+spec_dir = Path(SPECPATH)
+project_root = spec_dir.parent
+src_dir = project_root / "src"
+rustfava_dir = src_dir / "rustfava"
+
+# Add src/ to path so PyInstaller can find rustfava
+sys.path.insert(0, str(src_dir))
+
+# Collect data files from source directory
+datas = []
+
+# Static files (CSS, JS, etc.)
+static_dir = rustfava_dir / "static"
+if static_dir.exists():
+    for f in static_dir.rglob("*"):
+        if f.is_file():
+            rel_path = f.relative_to(rustfava_dir)
+            datas.append((str(f), f"rustfava/{rel_path.parent}"))
+
+# Templates
+templates_dir = rustfava_dir / "templates"
+if templates_dir.exists():
+    for f in templates_dir.rglob("*"):
+        if f.is_file():
+            rel_path = f.relative_to(rustfava_dir)
+            datas.append((str(f), f"rustfava/{rel_path.parent}"))
+
+# Translations (.mo files)
+translations_dir = rustfava_dir / "translations"
+if translations_dir.exists():
+    for f in translations_dir.rglob("*.mo"):
+        rel_path = f.relative_to(rustfava_dir)
+        datas.append((str(f), f"rustfava/{rel_path.parent}"))
+
+# WASM file for rustledger
+wasm_file = rustfava_dir / "rustledger" / "rustledger-wasi.wasm"
+if wasm_file.exists():
+    datas.append((str(wasm_file), "rustfava/rustledger"))
+
+# Help files
+help_dir = rustfava_dir / "help"
+if help_dir.exists():
+    for f in help_dir.rglob("*"):
+        if f.is_file():
+            rel_path = f.relative_to(rustfava_dir)
+            datas.append((str(f), f"rustfava/{rel_path.parent}"))
+
+# Hidden imports
+hiddenimports = [
+    "rustfava",
+    "rustfava.application",
+    "rustfava.cli",
+    "rustfava.core",
+    "rustfava.rustledger",
+    "rustfava.serialisation",
+]
+
+# Optionally add beancount for legacy plugin support
+try:
+    hiddenimports += collect_submodules("beancount")
+    datas += collect_data_files("beancount")
+except Exception:
+    pass
+
+a = Analysis(
+    [str(rustfava_dir / "cli.py")],
+    pathex=[str(src_dir)],
+    datas=datas,
+    hiddenimports=hiddenimports,
+)
+
+pyz = PYZ(
+    a.pure,
+    a.zipped_data,
+)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    a.binaries,
+    a.zipfiles,
+    a.datas,
+    [],
+    name="rustfava",
+    upx=True,
+)

{rustfava-0.1.1 → rustfava-0.1.3}/desktop/src-tauri/src/main.rs

@@ -148,16 +148,16 @@ fn spawn_rustfava_server(app: &AppHandle, path: &str, port: u16) -> Result<Comma
         }
     }
 
-    // Fall back to rustfava from PATH (for NixOS/system installs)
-    // This allows the desktop app to work when rustfava CLI is installed separately
+    // Fall back to rustfava-server from PATH (for NixOS flake installs)
+    // The flake creates symlinks without the target triple suffix
     let command = app
         .shell()
-        .command("rustfava")
+        .command("rustfava-server")
         .args([path, "-p", &port.to_string()]);
 
     let (_, child) = command
         .spawn()
-        .map_err(|e| format!("Failed to spawn rustfava: {}. Make sure rustfava is installed and in PATH.", e))?;
+        .map_err(|e| format!("Failed to spawn rustfava-server: {}. Make sure the desktop app is properly installed.", e))?;
 
     Ok(child)
 }

rustfava-0.1.3/desktop-sources.json

@@ -0,0 +1,7 @@
+{
+  "version": "0.1.2",
+  "x86_64-linux": {
+    "url": "https://github.com/rustledger/rustfava/releases/download/v0.1.2/rustfava-desktop-x86_64-unknown-linux-gnu.tar.gz",
+    "hash": "sha256-+ZWYhww1/XGlEh9ym+XG4nOiLP0qnZo5220zxtTTjp8="
+  }
+}

{rustfava-0.1.1 → rustfava-0.1.3}/flake.lock

@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1769018530,
-        "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
+        "lastModified": 1769170682,
+        "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
+        "rev": "c5296fdd05cfa2c187990dd909864da9658df755",
         "type": "github"
       },
       "original": {

{rustfava-0.1.1 → rustfava-0.1.3}/flake.nix

@@ -11,10 +11,19 @@
       let
         pkgs = import nixpkgs { inherit system; };
 
-        # Version to download from releases
-        version = "0.1.0";
-
-        # Target triple for the current platform
+        # Read sources from JSON file (updated by CI)
+        desktopSources = builtins.fromJSON (builtins.readFile ./desktop-sources.json);
+        version = desktopSources.version;
+
+        # Map Nix system to sources key
+        systemKey =
+          if system == "x86_64-linux" then "x86_64-linux"
+          else if system == "aarch64-linux" then "aarch64-linux"
+          else if system == "x86_64-darwin" then "x86_64-darwin"
+          else if system == "aarch64-darwin" then "aarch64-darwin"
+          else throw "Unsupported system: ${system}";
+
+        # Target triple for the current platform (used in tarball name)
         targetTriple =
           if pkgs.stdenv.isLinux then
             if pkgs.stdenv.hostPlatform.isx86_64 then "x86_64-unknown-linux-gnu"
@@ -25,15 +34,18 @@
             else "x86_64-apple-darwin"
           else throw "Unsupported platform";
 
+        # Get source for this system (if available)
+        hasDesktopSource = desktopSources ? ${systemKey};
+        desktopSource = if hasDesktopSource then desktopSources.${systemKey} else null;
+
         # Download desktop tarball from GitHub releases
-        desktopTarball = pkgs.fetchurl {
-          url = "https://github.com/rustledger/rustfava/releases/download/v${version}/rustfava-desktop-${targetTriple}.tar.gz";
-          # TODO: Update hash after first release with tarball
-          hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
-        };
+        desktopTarball = if hasDesktopSource then pkgs.fetchurl {
+          url = desktopSource.url;
+          hash = desktopSource.hash;
+        } else null;
 
         # Desktop app from release tarball
-        rustfava-desktop = pkgs.stdenv.mkDerivation {
+        rustfava-desktop = if desktopTarball != null then pkgs.stdenv.mkDerivation {
           pname = "rustfava-desktop";
           inherit version;
 
@@ -64,6 +76,19 @@
             mkdir -p $out
             cp -r bin lib $out/
 
+            # Create symlinks without target triple suffix for PATH lookup
+            # The desktop app falls back to these when sidecar lookup fails
+            for bin in $out/bin/*-${targetTriple}*; do
+              if [ -f "$bin" ]; then
+                base=$(basename "$bin" | sed "s/-${targetTriple}//")
+                ln -sf "$(basename "$bin")" "$out/bin/$base"
+              fi
+            done
+
+            # Create rustfava -> rustfava-server symlink for backwards compatibility
+            # Old releases look for 'rustfava' in PATH as fallback
+            ln -sf "rustfava-server-${targetTriple}" "$out/bin/rustfava"
+
             # Wrap all binaries with wasmtime in PATH and GTK settings
             for bin in $out/bin/*; do
               if [ -f "$bin" ] && [ -x "$bin" ]; then
@@ -82,7 +107,7 @@
             platforms = platforms.linux;
             mainProgram = "rustfava-desktop";
           };
-        };
+        } else null;
 
         # Python with Rustfava dependencies for dev shell
         pythonEnv = pkgs.python313.withPackages (ps: with ps; [
@@ -111,6 +136,7 @@
       in {
         packages = {
           default = rustfava;
+        } // pkgs.lib.optionalAttrs (rustfava-desktop != null) {
           desktop = rustfava-desktop;
         };
 
@@ -119,6 +145,7 @@
             type = "app";
             program = "${rustfava}/bin/rustfava";
           };
+        } // pkgs.lib.optionalAttrs (rustfava-desktop != null) {
           desktop = {
             type = "app";
             program = "${rustfava-desktop}/bin/rustfava-desktop";

{rustfava-0.1.1 → rustfava-0.1.3}/src/rustfava.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rustfava
-Version: 0.1.1
+Version: 0.1.3
 Summary: Web interface for the accounting tool rustledger.
 Author-email: Dominik Aumayr <dominik@aumayr.name>
 Maintainer-email: Jakob Schnitzer <mail@jakobschnitzer.de>
@@ -57,7 +57,7 @@ Dynamic: license-file
 
 Manage your finances with plain text accounting.
 
-[![CI](https://github.com/rustledger/rustfava/actions/workflows/ci.yml/badge.svg)](https://github.com/rustledger/rustfava/actions/workflows/ci.yml)
+[![CI](https://github.com/rustledger/rustfava/actions/workflows/test.yml/badge.svg)](https://github.com/rustledger/rustfava/actions/workflows/test.yml)
 [![GitHub Release](https://img.shields.io/github/v/release/rustledger/rustfava)](https://github.com/rustledger/rustfava/releases)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
 [![PyPI](https://img.shields.io/pypi/v/rustfava)](https://pypi.org/project/rustfava/)
@@ -81,13 +81,23 @@ Manage your finances with plain text accounting.
 
 ## Install
 
-| Platform | Download |
-|----------|----------|
-| **macOS** | [`rustfava_0.1.0_aarch64.dmg`](https://github.com/rustledger/rustfava/releases/download/v0.1.0/rustfava_0.1.0_aarch64.dmg) |
-| **Windows** | [`rustfava_0.1.0_x64-setup.exe`](https://github.com/rustledger/rustfava/releases/download/v0.1.0/rustfava_0.1.0_x64-setup.exe) |
-| **Linux** | [`rustfava_0.1.0_amd64.AppImage`](https://github.com/rustledger/rustfava/releases/download/v0.1.0/rustfava_0.1.0_amd64.AppImage) |
+### Desktop App
+
+Download the latest release for your platform from the [Releases page](https://github.com/rustledger/rustfava/releases/latest).
+
+| Platform | Format |
+|----------|--------|
+| **macOS** | `.dmg` (Intel & Apple Silicon) |
+| **Windows** | `.exe` installer or `.msi` |
+| **Linux** | `.AppImage`, `.deb`, `.rpm`, or `.tar.gz` |
+
+### Other Installation Methods
+
+| Method | Command |
+|--------|---------|
 | **Docker** | `docker run -p 5000:5000 -v /path/to/ledger:/data ghcr.io/rustledger/rustfava /data/main.beancount` |
 | **PyPI** | `uv tool install rustfava` (requires Python 3.13+ and [wasmtime](https://wasmtime.dev/)) |
+| **Nix** | `nix run github:rustledger/rustfava#desktop` |
 
 <sub>Missing your platform? [Open an issue](https://github.com/rustledger/rustfava/issues/new) to request it.</sub>
 

{rustfava-0.1.1 → rustfava-0.1.3}/src/rustfava.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ README.md
 SECURITY.md
 _build_backend.py
 biome.json
+desktop-sources.json
 flake.lock
 flake.nix
 justfile

rustfava-0.1.1/contrib/pyinstaller_spec.spec

@@ -1,54 +0,0 @@
-# vim: set ft=python:
-"""Pyinstaller spec file for building a binary from rustfava's cli.py"""
-
-from __future__ import annotations
-
-import os
-
-from PyInstaller.utils.hooks import collect_data_files
-from PyInstaller.utils.hooks import collect_submodules
-from PyInstaller.utils.hooks import copy_metadata
-
-# Data files and version info for rustfava:
-datas = collect_data_files("rustfava") + copy_metadata("rustfava")
-
-# Explicitly include the rustledger WASM file
-# This ensures it's bundled even if collect_data_files misses it
-import rustfava
-rustfava_dir = os.path.dirname(rustfava.__file__)
-wasm_file = os.path.join(rustfava_dir, "rustledger", "rustledger-wasi.wasm")
-if os.path.exists(wasm_file):
-    datas.append((wasm_file, "rustfava/rustledger"))
-
-# Hidden imports for rustledger
-hiddenimports = []
-
-# Optionally add beancount for legacy plugin support
-try:
-    hiddenimports += collect_submodules("beancount")
-    datas += collect_data_files("beancount")
-except Exception:
-    pass
-
-a = Analysis(
-    ["../src/rustfava/cli.py"],
-    pathex=["."],
-    datas=datas,
-    hiddenimports=hiddenimports,
-)
-
-pyz = PYZ(
-    a.pure,
-    a.zipped_data,
-)
-
-exe = EXE(
-    pyz,
-    a.scripts,
-    a.binaries,
-    a.zipfiles,
-    a.datas,
-    [],
-    name="rustfava",
-    upx=True,
-)