syntropy 0.33.0 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a39afb5d39d1a1c9b95e2e242b9ce55144ba6923ad4b0addee3c6c005d314ead
-  data.tar.gz: 0b067b50a4f27381ba495a32d8c8e471e4a64374d6eee3c62d25fb30aaa10a24
+  metadata.gz: 29b7fe87a7350db0c154f0ee25b1c6992c81aead3938cec537e383dc5e3f6a62
+  data.tar.gz: 7dcf8de792102d368aefed72ced1ac3c2e5afd1fe0aea3ac106150fa59862a6b
 SHA512:
-  metadata.gz: 9768274a2d09c8f4068625006660403e98655cfa7d7d742ed75f3ce0e31abfc0410f301d16d8d8910fcc94d7947008238a730b19b514342cbb67dac8669a4e76
-  data.tar.gz: 76a2d90674f7ebc34f8162e3435d81edb1ca56022ef7d490bcc6fcfa0041529f1ace321233451dd7df40867b05eb83327984634461f0986dd650db3e0913af6c
+  metadata.gz: 904b3740de777c83a631b4b0b37f72ee22b698b2f1618110a906c6ca5adf979f0c46c84af08d1ae228f8b9aa90bcb54093e88de9c18dcf3961d72ea7e0d94d2c
+  data.tar.gz: '0081303c531b38423d94f43423efcdcd80852201b0826f0078b276618b03dc7cde09e24dd599e8cee58ddf4ae8ce1f226d4684b4aa8592407728b9f911e30cc5'

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.34.0 2026-06-03
+
+- Streamline options for CLI commands
+- Remove `App#setup_db`
+- Add support for config modules (e.g. `config/development.rb`)
+- Add support for running modes: production, development, test
+
 # 0.33.0 2026-06-02
 
 - Fix `ModuleLoader` to load a module only once

data/cmd/console.rb

@@ -2,16 +2,28 @@
 
 require_relative '../lib/syntropy'
 require 'optparse'
+require 'fileutils'
 
 env = {
+  app_root:             File.join(FileUtils.pwd, 'app'),
+  config_root:          File.join(FileUtils.pwd, 'config'),
+  mode:                 ENV['SYNTROPY_MODE'] || 'development',
   mount_path:           '/',
-  logger:               true,
   builtin_applet_path:  '/.syntropy',
+  logger:               true,
   watch_files:          true
 }
 
 parser = OptionParser.new do |o|
-  o.banner = 'Usage: syntropy serve [options] DIR'
+  o.banner = 'Usage: syntropy serve [options]'
+
+  o.on('-a', '--app PATH', 'Set app directory (default: ./app') do |path|
+    env[:app_root] = path
+  end
+
+  o.on('-c', '--config PATH', 'Set config directory (default: ./config') do |path|
+    env[:config_root] = path
+  end
 
   o.on('-h', '--help', 'Show this help message') do
     puts o
@@ -19,7 +31,6 @@ parser = OptionParser.new do |o|
   end
 
   o.on('-m', '--mount PATH', 'Set mount path (default: /)') do |path|
-    p mount: path
     env[:mount_path] = path
     env[:builtin_applet_path] = File.join(path, '.syntropy')
   end
@@ -43,11 +54,11 @@ rescue StandardError => e
   exit
 end
 
-$syntropy_dev_mode = env[:dev_mode]
-env[:root_dir] = (ARGV.shift || '.').gsub(/\/$/, '')
+Syntropy.dev_mode = env[:mode] == 'development'
+Syntropy.load_config(env)
 
-if !File.directory?(env[:root_dir])
-  puts "#{File.expand_path(env[:root_dir])} Not a directory"
+if !File.directory?(env[:app_root])
+  puts "#{File.expand_path(env[:app_root])} Not a directory"
   exit
 end
 

data/cmd/serve.rb

@@ -2,19 +2,27 @@
 
 require_relative '../lib/syntropy'
 require 'optparse'
+require 'fileutils'
 
 env = {
-  mount_path: '/',
-  logger: true,
-  builtin_applet_path: '/.syntropy',
-  server_extensions: {
+  app_root:             File.join(FileUtils.pwd, 'app'),
+  config_root:          File.join(FileUtils.pwd, 'config'),
+  mode:                 ENV['SYNTROPY_MODE'] || 'development',
+  mount_path:           '/',
+  builtin_applet_path:  '/.syntropy',
+  logger:               true,
+  server_extensions:    {
     date: true,
     name: 'Syntropy'
   }
 }
 
 parser = OptionParser.new do |o|
-  o.banner = 'Usage: syntropy serve [options] DIR'
+  o.banner = 'Usage: syntropy serve [options]'
+
+  o.on('-a', '--app PATH', 'Set app directory (default: ./app') do |path|
+    env[:app_root] = path
+  end
 
   o.on('-b', '--bind BIND', String,
        'Bind address (default: http://0.0.0.0:1234). You can specify this flag multiple times to bind to multiple addresses.') do
@@ -22,14 +30,8 @@ parser = OptionParser.new do |o|
     env[:bind] << it
   end
 
-  o.on('-s', '--silent', 'Silent mode') do
-    env[:banner] = nil
-    env[:logger] = nil
-  end
-
-  o.on('-d', '--dev', 'Development mode') do
-    env[:dev_mode] = true
-    env[:watch_files] = true
+  o.on('-c', '--config PATH', 'Set config directory (default: ./config') do |path|
+    env[:config_root] = path
   end
 
   o.on('-h', '--help', 'Show this help message') do
@@ -50,6 +52,11 @@ parser = OptionParser.new do |o|
     env[:server_extensions] = nil
   end
 
+  o.on('-s', '--silent', 'Silent mode') do
+    env[:banner] = nil
+    env[:logger] = nil
+  end
+
   o.on('-v', '--version', 'Show version') do
     require 'syntropy/version'
     puts "Syntropy version #{Syntropy::VERSION}"
@@ -71,11 +78,12 @@ rescue StandardError => e
   exit
 end
 
-$syntropy_dev_mode = env[:dev_mode]
-env[:root_dir] = (ARGV.shift || '.').gsub(/\/$/, '')
+Syntropy.dev_mode = env[:mode] == 'development'
+Syntropy.load_config(env)
+env[:watch_files] = Syntropy.dev_mode
 
-if !File.directory?(env[:root_dir])
-  puts "#{File.expand_path(env[:root_dir])} Not a directory"
+if !File.directory?(env[:app_root])
+  puts "#{File.expand_path(env[:app_root])} Not a directory"
   exit
 end
 
@@ -87,7 +95,7 @@ env[:machine] = Syntropy.machine = UM.new
 env[:logger] = env[:logger] && Syntropy::Logger.new(env[:machine], **env)
 
 require 'syntropy/version'
-require 'syntropy/dev_mode' if env[:dev_mode]
+require 'syntropy/dev_mode' if Syntropy.dev_mode
 
 app = Syntropy::App.load(env)
 Syntropy.run(env) { app.call(it) }

data/cmd/test.rb

@@ -5,15 +5,25 @@ require 'optparse'
 
 pwd = FileUtils.pwd
 env = {
-  root_dir: File.join(pwd, 'app'),
-  test_dir: File.join(pwd, 'test'),
-  mount_path: '/'
+  app_root:             File.join(FileUtils.pwd, 'app'),
+  config_root:          File.join(FileUtils.pwd, 'config'),
+  test_root:             File.join(pwd, 'test'),
+  mode:                 'test',
+  mount_path:           '/'
 }
 MINITEST_ARGV = []
 
 parser = OptionParser.new do |o|
   o.banner = 'Usage: syntropy test [options]'
 
+  o.on('-a', '--app PATH', 'Set app directory (default: ./app') do |path|
+    env[:app_root] = path
+  end
+
+  o.on('-c', '--config PATH', 'Set config directory (default: ./config') do |path|
+    env[:config_root] = path
+  end
+
   o.on('-h', '--help', 'Show this help message') do
     puts o
     exit
@@ -24,35 +34,31 @@ parser = OptionParser.new do |o|
     env[:builtin_applet_path] = File.join(path, '.syntropy')
   end
 
-  o.on('-w', '--watch', 'Watch for file changes') do
-    env[:watch_mode] = true
+  o.on('-n', '--name NAME', 'Specify test to run') do |name|
+    MINITEST_ARGV << '--name' << name
   end
 
-  o.on('-a', '--app PATH', 'Set app root (default: ./app)') do |path|
-    env[:root_dir] = path
+  o.on('-s', '--seed SEED', 'Specify random seed') do |seed|
+    MINITEST_ARGV << '--seed' << seed
   end
 
-  o.on('-t', '--test PATH', 'Set test root (default: ./test)') do |path|
-    env[:test_dir] = path
-  end
-
-  o.on('-n', '--name NAME', 'Specify test to run') do |name|
-    MINITEST_ARGV << '--name' << name
+  o.on('-t', '--test PATH', 'Set test directory (default: ./test)') do |path|
+    env[:test_root] = path
   end
 
   o.on('-V', '--verbose', 'Verbose test output') do
     MINITEST_ARGV << '--verbose'
   end
 
-  o.on('-s', '--seed SEED', 'Specify random seed') do |seed|
-    MINITEST_ARGV << '--seed' << seed
-  end
-
   o.on('-v', '--version', 'Show version') do
     require 'syntropy/version'
     puts "Syntropy version #{Syntropy::VERSION}"
     exit
   end
+
+  o.on('-w', '--watch', 'Watch for file changes') do
+    env[:watch_mode] = true
+  end
 end
 
 argv_copy = ARGV.dup
@@ -71,26 +77,33 @@ end
 require_relative '../lib/syntropy'
 require_relative '../lib/syntropy/test'
 
+Syntropy.load_config(env)
+
 $stdout.sync = true
 $stderr.sync = true
 
-Dir.glob("#{env[:test_dir]}/test_*.rb").each { require(it) }
+Dir.glob("#{File.expand_path(env[:test_root])}/test_*.rb").each { require(it) }
+
+def restart_on_file_change(machine, dir, restart_argv)
 
-def watch_for_file_changes(machine)
-  machine.write(UM::STDOUT_FILENO, "Waiting for file changes in #{FileUtils.pwd}\n")
-  machine.file_watch(FileUtils.pwd, UM::IN_CREATE | UM::IN_DELETE | UM::IN_CLOSE_WRITE) {
+  machine.file_watch(dir, UM::IN_CREATE | UM::IN_DELETE | UM::IN_CLOSE_WRITE) {
     machine.write(UM::STDOUT_FILENO, "File changed: #{it[:fn]}\n")
     break
   }
+  exec('ruby', __FILE__, *restart_argv)
 end
 
-Syntropy::Test.env=(env)
+Syntropy::Test.env = (env)
 Minitest.run MINITEST_ARGV
 
 if env[:watch_mode]
   m = UM.new(size: 4)
   m.write(UM::STDOUT_FILENO, "\n")
   trap('SIGINT') { m.write(UM::STDOUT_FILENO, "\n"); exit! }
-  watch_for_file_changes(m)
-  exec("ruby", __FILE__, *argv_copy)
+
+  machine.write(UM::STDOUT_FILENO, "Waiting for file changes...\n")
+  m.join(
+    m.spin { restart_on_file_change(m, env[:app_root], argv_copy) },
+    m.spin { restart_on_file_change(m, env[:test_root], argv_copy) }
+  )
 end

data/examples/blog/.gitignore

@@ -0,0 +1 @@
+storage/*

data/examples/blog/app/_lib/database.rb

@@ -0,0 +1,13 @@
+export self
+
+def connection_pool
+  @connection_pool ||= DB::ConnectionPool.new(@machine, @env[:config][:storage][:path], 4)
+end
+
+def schema
+  DB::Schema.new(module_loader: @module_loader, schema_root: '_schema')
+end
+
+def migrate!
+  schema.apply(connection_pool)
+end

data/examples/blog/app/_lib/{post_store.rb → posts.rb}

@@ -1,3 +1,5 @@
+DB = import '/_lib/database'
+
 class PostStore < Syntropy::DB::Store
   # @return [Integer] post id
   def create(title, body)
@@ -44,4 +46,4 @@ class PostStore < Syntropy::DB::Store
   end
 end
 
-export PostStore.new(@app.connection_pool)
+export PostStore.new(DB.connection_pool)

data/examples/blog/app/posts/[id]/edit.rb

@@ -1,11 +1,11 @@
-@post_store = import '/_lib/post_store'
+@posts = import '/_lib/posts'
 @layout = import '/_layout/default'
 
 export http_methods
 
 def get(req)
   id = req.route_params['id'].to_i
-  post = @post_store.get(id)
+  post = @posts.get(id)
   raise Syntropy::Error.not_found if !post
 
   req.respond_html(

data/examples/blog/app/posts/[id]/index.rb

@@ -1,11 +1,11 @@
-@post_store = import '/_lib/post_store'
+@posts = import '/_lib/posts'
 @layout = import '/_layout/default'
 
 export http_methods
 
 def get(req)
   id = req.route_params['id'].to_i
-  post = @post_store.get(id)
+  post = @posts.get(id)
   raise Syntropy::Error.not_found if !post
 
   req.respond_html(
@@ -21,7 +21,7 @@ def post(req)
   title = req.validate(data['title'], String, /.+/)
   body = req.validate(data['body'], String, /.+/)
 
-  updated = @post_store.update(id, title, body)
+  updated = @posts.update(id, title, body)
   raise BadRequestError, "Failed to update post" if updated != 1
 
   req.flash[:notice] = 'Post was successfully updated.'
@@ -31,7 +31,7 @@ end
 def delete(req)
   id = req.route_params['id'].to_i
 
-  deleted = @post_store.delete(id)
+  deleted = @posts.delete(id)
   raise BadRequestError, "Failed to delete post" if deleted != 1
 
   req.flash[:notice] = 'Post was successfully destroyed.'

data/examples/blog/app/posts/index.rb

@@ -1,10 +1,10 @@
-@post_store = import '_lib/post_store'
+@posts = import '_lib/posts'
 @layout = import '_layout/default'
 
 export http_methods
 
 def get(req)
-  posts = @post_store.get_all
+  posts = @posts.get_all
   req.respond_html(
     @template.render(posts:, req:)
   )
@@ -14,14 +14,14 @@ def post(req)
   data = req.get_form_data
   title = req.validate(data['title'], String, /.+/)
   body = req.validate(data['body'], String, /.+/)
-  id = @post_store.create(title, body)
+  id = @posts.create(title, body)
 
   req.flash[:notice] = 'Post was successfully created.'
   req.redirect("posts/#{id}")
 end
 
 @template = @layout.apply { |**props|
-  h1 "My blog"
+  h1 "My awesome blog"
   p props[:req]&.flash[:notice], style: 'color: green'
   props[:posts].each { |post|
     div {

data/examples/blog/app/posts/new.rb

@@ -1,4 +1,4 @@
-@post_store = import '/_lib/post_store'
+@posts = import '/_lib/posts'
 @layout = import '/_layout/default'
 
 export http_methods

data/examples/blog/config/development.rb

@@ -0,0 +1,5 @@
+export(
+  storage: {
+    path: ENV['DATABASE_PATH'] || 'storage/development.db'
+  }
+)

data/examples/blog/config/production.rb

@@ -0,0 +1,4 @@
+export(
+  storage:
+    path: ENV['DATABASE_PATH'] || 'storage/production.db'
+)

data/examples/blog/config/test.rb

@@ -0,0 +1,5 @@
+export({
+  storage: {
+    path: ENV['DATABASE_PATH'] || Syntropy.tmp_path('test-db')
+  }
+})

data/examples/blog/test/test_posts.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+class PostsTest < Syntropy::Test
+  def setup
+    super
+    @posts = load_module('/_lib/posts')
+  end
+
+  def test_get_all
+    assert_equal [], @posts.get_all
+
+    @posts.create('foo', 'bar')
+
+    assert_equal [
+      { id: 1, title: 'foo', body: 'bar' }
+    ], @posts.get_all
+  end
+
+  def test_get
+    assert_nil @posts.get(1)
+    assert_nil @posts.get(2)
+
+    @posts.create('foo', 'bar')
+
+    assert_equal(
+      { id: 1, title: 'foo', body: 'bar' },
+      @posts.get(1)
+    )
+    assert_nil @posts.get(2)
+
+    @posts.create('bar', 'baz')
+
+    assert_equal(
+      { id: 1, title: 'foo', body: 'bar' },
+      @posts.get(1)
+    )
+    assert_equal(
+      { id: 2, title: 'bar', body: 'baz' },
+      @posts.get(2)
+    )
+  end
+
+  def test_update
+    assert_equal 0, @posts.update(1, 'qqq', 'ttt')
+
+    @posts.create('foo', 'bar')
+    assert_equal 1, @posts.update(1, 'qqq', 'ttt')
+
+    assert_equal [
+      { id: 1, title: 'qqq', body: 'ttt' }
+    ], @posts.get_all
+  end
+
+  def test_delete
+    assert_equal 0, @posts.delete(1)
+
+    @posts.create('foo', 'bar')
+    @posts.create('bar', 'baz')
+
+    assert_equal 1, @posts.delete(1)
+    assert_equal [
+      { id: 2, title: 'bar', body: 'baz' }
+    ], @posts.get_all
+  end
+end

data/examples/mcp-oauth/app/oauth/token.rb

@@ -65,7 +65,7 @@ rescue ValidationError => e
     },
     ':status' => Syntropy::HTTP::BAD_REQUEST
   )
-rescue => e
+rescue StandardError => e
   status = Syntropy::Error.http_status(e)
   raise if status == HTTP::INTERNAL_SERVER_ERROR