Merge pull request #20 from gmcgibbon/more_linux

Add xournalpp, fzf, fd

Bootstrapfile

@@ -13,6 +13,7 @@ gui do
   install "qemu"
   install "localsend"
   install "pinta"
+  install "xournalpp"
 
   macos do
     install "iterm2"
@@ -35,6 +36,8 @@ unix do
   install "heroku"
   install "ripgrep"
   install "btop"
+  install "fzf"
+  install "fd"
 end
 
 install "ollama"

bootstrap/lib/bootstrap/package/sources.yml

@@ -153,3 +153,8 @@ ollama:
   ubuntu:
     <<: *linux
 
+xournalpp:
+  windows:
+    name: Xournal++.Xournal++
+  macos:
+    name: xournal++

test/bootstrap/fedora_test.rb

@@ -41,17 +41,25 @@ class FedoraTest < TestCase
     end
 
     test "installs ripgrep" do
-      assert_dnf_install("ripgrep")
+      assert_dnf_installed("ripgrep")
     end
 
     test "installs btop" do
-      assert_dnf_install("btop")
+      assert_dnf_installed("btop")
     end
 
     test "installs olama" do
       assert_installed_at("/usr/local/bin/ollama")
     end
 
+    test "installs fzf" do
+      assert_dnf_installed("fzf")
+    end
+
+    test "installs fd" do
+      assert_dnf_installed("fd")
+    end
+
     if gui?
       test "installs firefox" do
         assert_dnf_installed("firefox")
@@ -100,6 +108,10 @@ class FedoraTest < TestCase
       test "installs pinta" do
         assert_dnf_installed("pinta")
       end
+
+      test "installs xournalpp" do
+        assert_dnf_installed("xournalpp")
+      end
     else
       test "does not install flux" do
         assert_dnf_not_installed("fluxgui")
@@ -148,6 +160,10 @@ class FedoraTest < TestCase
       test "does not install pinta" do
         assert_dnf_not_installed("pinta")
       end
+
+      test "installs xournalpp" do
+        assert_dnf_not_installed("xournalpp")
+      end
     end
 
     private

test/bootstrap/macos_test.rb

@@ -52,6 +52,14 @@ class MacosTest < TestCase
       assert_brew_installed("ollama")
     end
 
+    test "installs fzf" do
+      assert_brew_installed("fzf")
+    end
+
+    test "installs fd" do
+      assert_brew_installed("fd")
+    end
+
     if gui?
       test "installs iterm2" do
         assert_brew_cask_installed("iterm2")
@@ -108,6 +116,10 @@ class MacosTest < TestCase
       test "installs pinta" do
         assert_brew_cask_installed("pinta")
       end
+
+      test "installs xournalpp" do
+        assert_brew_cask_installed("xournal++")
+      end
     else
       test "does not install iterm2" do
         assert_brew_cask_not_installed("iterm2")
@@ -160,6 +172,10 @@ class MacosTest < TestCase
       test "does not install pinta" do
         assert_brew_cask_not_installed("pinta")
       end
+
+      test "does not install xournalpp" do
+        assert_brew_cask_not_installed("xournal++")
+      end
     end
 
     private

test/bootstrap/ubuntu_test.rb

@@ -52,6 +52,14 @@ class UbuntuTest < TestCase
       assert_installed_at("/usr/local/bin/ollama")
     end
 
+    test "installs fzf" do
+      assert_apt_installed("fzf")
+    end
+
+    test "installs fd" do
+      assert_apt_installed("fd")
+    end
+
     if gui?
       test "installs firefox" do
         assert_apt_installed("firefox")
@@ -100,6 +108,10 @@ class UbuntuTest < TestCase
       test "installs pinta" do
         assert_apt_installed("pinta")
       end
+
+      test "installs xournalpp" do
+        assert_apt_installed("xournalpp")
+      end
     else
       test "does not install flux" do
         assert_apt_not_installed("fluxgui")
@@ -148,6 +160,10 @@ class UbuntuTest < TestCase
       test "does not install pinta" do
         assert_apt_not_installed("pinta")
       end
+
+      test "does not install xournalpp" do
+        assert_apt_not_installed("xournalpp")
+      end
     end
 
     private

test/bootstrap/windows_test.rb

@@ -72,6 +72,10 @@ class WindowsTest < TestCase
       assert_winget_installed("ollama")
     end
 
+    test "installs xournalpp" do
+      assert_winget_installed("Xournal++.Xournal++")
+    end
+
     private
 
     def assert_winget_installed(package_name)