Update server.rake

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)

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"

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

host/rake/tasks/server.rake

@@ -1,11 +1,20 @@
-desc "Run server"
+# frozen_string_literal: true
-task :server, [:protocol] do |_, args|
+
-  require 'rbconfig'
+cwd = File.realpath File.join(__dir__, "..", "..", "..", "client")
-  cli = [RbConfig.ruby, "-rbundler/setup", "cli/bin/twenty", "up"]
+desc "Start web server"
-  h   = args.to_h
+task :server, [:protocol] do |_t, args|
-  if h[:protocol] == "unix"
+  nanoc = Ryo.from_yaml(path: File.join(cwd, "nanoc.yaml"))
-    Process.wait spawn(*cli, "--unix", "/tmp/twenty.freebsd.local")
+  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