From f9e7bb6469367db4cce203d0642da56adb0e8d15 Mon Sep 17 00:00:00 2001
From: 0x1eef <0x1eef@protonmail.com>
Date: Fri, 21 Jun 2024 04:37:44 -0300
Subject: [PATCH] Update server.rake

---
 Gemfile.lock                |  2 +-
 Rakefile.rb                 |  5 +++++
 client/nanoc.yaml           |  7 +++++++
 host/rake/tasks/server.rake | 25 +++++++++++++++++--------
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1794a50..40ec97e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -51,7 +51,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    ryo.rb (0.5.1)
+    ryo.rb (0.5.5)
     sequel (5.80.0)
       bigdecimal
     server.rb (0.2.2)
diff --git a/Rakefile.rb b/Rakefile.rb
index 50aa889..06018df 100644
--- a/Rakefile.rb
+++ b/Rakefile.rb
@@ -1,4 +1,9 @@
 require "bundler/setup"
+require "twenty/cli"
+require "twenty/client"
+require "twenty/server"
+require "ryo"
+require "ryo/yaml"
 
 load "host/rake/tasks/schema.rake"
 load "host/rake/tasks/nanoc.rake"
diff --git a/client/nanoc.yaml b/client/nanoc.yaml
index 2dd3dd3..848e324 100644
--- a/client/nanoc.yaml
+++ b/client/nanoc.yaml
@@ -14,3 +14,10 @@ data_sources:
     encoding: utf-8
     content_dir: src/
     layouts_dir: src/layouts
+
+server:
+  unix:
+    path: /tmp/github.com.0x1eef.twenty
+  tcp:
+    host: 127.0.0.1
+    port: 7777
diff --git a/host/rake/tasks/server.rake b/host/rake/tasks/server.rake
index febfd3c..694f4d3 100644
--- a/host/rake/tasks/server.rake
+++ b/host/rake/tasks/server.rake
@@ -1,11 +1,20 @@
-desc "Run server"
-task :server, [:protocol] do |_, args|
-  require 'rbconfig'
-  cli = [RbConfig.ruby, "-rbundler/setup", "cli/bin/twenty", "up"]
-  h   = args.to_h
-  if h[:protocol] == "unix"
-    Process.wait spawn(*cli, "--unix", "/tmp/twenty.freebsd.local")
+# frozen_string_literal: true
+
+cwd = File.realpath File.join(__dir__, "..", "..", "..", "client")
+desc "Start web server"
+task :server, [:protocol] do |_t, args|
+  nanoc = Ryo.from_yaml(path: File.join(cwd, "nanoc.yaml"))
+  h = args.to_h
+  p = h[:protocol] || "tcp"
+  n = File.basename File.dirname(cwd)
+  Process.setproctitle "rake server[#{p}] [#{n}]"
+  if p == "unix"
+    Twenty::Command::Up
+      .new(["-u", nanoc.server.unix.path])
+      .run
   else
-    Process.wait spawn(*cli)
+    Twenty::Command::Up
+      .new(["-b", nanoc.server.tcp.host, "-p", nanoc.server.tcp.port])
+      .run
   end
 end