radd 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1b144c324d733fdabbee7eada3e800e3e9c1cba8aee8e2de1a02c67fd6e5a34
-  data.tar.gz: 27a536a5b377f7762a6c8bf26c9978e27ac08218745cca493af8f45680fc9f10
+  metadata.gz: 3839d4afb39cef8bced2dd146aff7ef7a08dd7e130f2bd534cd820856e6f9c90
+  data.tar.gz: d3ff659868d45d89068ab1628090c7f40370407cd2a162d17ddca5c5bf1c8a21
 SHA512:
-  metadata.gz: f46802e9687b2cd65da92e5866dce85e14a2a8de8fb04b1b1bf29431b485c4979c50f71292d850af787d7e7163a13c5b3282e5ac45548482d66f70ea8d1be5cf
-  data.tar.gz: d2a5de1d3da7ad395f77eda95bd72f39796bdb7b64c072ca1df336207c064ca405624f0f09142bac1c44ee937436696d0afbfbbb094000f24d4444e5b3d5b825
+  metadata.gz: 5d79c2896c91af7aee9d4d4c4d86f250f03f1f5fcf8233379c47be57eab5d6d519b0dc2008db930326a6420f0afcc91c7aedbe57c0563919b7acb647bc3d259c
+  data.tar.gz: ad478c2fea9f293b3164d3ab7e73b059b87ce84a2493063962261c0c0b82922d39b0e3a1ac88185b61ccde9738cfb52db997971495900c7aabc6766682a8974c

data/lib/radd/cli.rb

@@ -4,25 +4,21 @@ module Radd::Cli
 
   class << self
 
-    def start
+    def load_config
       config = {}
       parser = OptionParser.new
-      parser.banner = 'Usage: radd -i IP -d DOMAIN [options]'
-      parser.on('--ip IP', 'Public IP address') do |ip|
-        config['ip'] = ip
-      end
-      parser.on('--domain DOMAIN', 'Root FQDN') do |domain|
-        config['domain'] = domain
-      end
-      parser.on('--http-port [PORT]', 'HTTP port') do |port|
-        config['http_port'] = port
-      end
-      parser.on('--dns-port [PORT]', 'DNS port') do |port|
-        config['dns_port'] = port
+      parser.banner = 'Usage: radd --config [FILE]'
+      parser.on('--config FILE', 'Config file') do |file|
+        config['file'] = file
       end
+
       parser.parse!
 
-      Radd.configure!(config)
+      Radd.configure!(config['file'])
+    end
+
+    def start
+      load_config
       puts "Starting Radd server for #{Radd.domain}"
 
       dns, http = Radd::Nameserver.new, Radd::Webserver.new

data/lib/radd/config.rb

@@ -0,0 +1,50 @@
+module Radd
+
+  class << self
+    def configure!(file)
+      file_path = Pathname.new(file || 'radd.yml')
+      file_path = Radd.root + file_path unless file_path.absolute?
+      raise Radd::ConfigurationError, "could not open config file #{file_path}" unless file_path.file?
+      @config = YAML.load(file_path.read).slice(*%w[domain ip host dns_port http_port db])
+      raise Radd::ConfigurationError, 'domain missing' unless Radd.domain
+      raise Radd::ConfigurationError, 'invalid IP' unless Radd.valid_ip?(Radd.ip)
+      db_path = Pathname.new(@config.delete('db') || 'db/radd.sqlite3')
+      db_path = Radd.root + db_path unless db_path.absolute?
+      @config['db'] = db_path
+      raise Radd::ConfigurationError, 'invalid database' unless Radd.db.file?
+      # Late loading required by Sequel architecture
+      require_relative 'db'
+      require_relative 'record'
+    end
+    
+    def domain
+      @config['domain']
+    end
+
+    def ip
+      @config['ip']
+    end
+    
+    def db
+      @config['db']
+    end
+    
+    def host
+      @config['host'] || '127.0.0.1'
+    end
+
+    def dns_port
+      @config['dns_port'] || 5300
+    end
+    
+    def http_port
+      @config['http_port'] || 3000
+    end
+
+    # Check whether +ip+ is a valid IP address string
+    def valid_ip?(ip)
+      !!(ip && ip.match(Resolv::IPv4::Regex))
+    end
+  end
+  
+end

data/lib/radd/db.rb

@@ -1,3 +1,3 @@
 require 'sequel'
 
-DB = Sequel.connect("sqlite://#{Pathname.new(__FILE__).dirname.join('..', '..', 'db', 'radd.sqlite3')}")
+DB = Sequel.connect("sqlite://#{Radd.db}")

data/lib/radd/errors.rb

@@ -0,0 +1,7 @@
+module Radd
+  class RaddError < StandardError; end
+  class ConfigurationError < StandardError; end
+  class Forbidden < RaddError; end
+  class InvalidRequest < RaddError; end
+  class UpdateError < RaddError; end
+end

data/lib/radd/version.rb

@@ -1,3 +1,3 @@
 module Radd
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/lib/radd.rb

@@ -10,53 +10,25 @@ require 'async/http/endpoint'
 require 'protocol/rack/adapter'
 
 require_relative 'radd/version'
+require_relative 'radd/errors'
+require_relative 'radd/config'
 require_relative 'radd/ip'
-require_relative 'radd/db'
-require_relative 'radd/record'
 require_relative 'radd/update'
 require_relative 'radd/nameserver'
 require_relative 'radd/webserver'
 require_relative 'radd/app'
+require_relative 'radd/cli'
 
 module Radd
-  class RaddError < StandardError; end
-  class ConfigurationError < StandardError; end
-  class Forbidden < RaddError; end
-  class InvalidRequest < RaddError; end
-  class UpdateError < RaddError; end
-
   class << self
-    def configure!(config)
-      @config = config.slice(*%w[domain ip host dns_port http_port])
-      raise Radd::ConfigurationError, 'domain missing' unless Radd.domain
-      raise Radd::ConfigurationError, 'invalid IP' unless Radd.valid_ip?(Radd.ip)
+    def root=(path)
+      @root = Pathname.new(path)
     end
     
-    def domain
-      config['domain']
-    end
-
-    def ip
-      config['ip']
-    end
-    
-    def host
-      config['host'] || '127.0.0.1'
-    end
-
-    def dns_port
-      config['dns_port'] || 5300
+    def root
+      @root ||= Pathname.new(Dir.pwd)
     end
     
-    def http_port
-      config['http_port'] || 3000
-    end
-
-    # Check whether +ip+ is a valid IP address string
-    def valid_ip?(ip)
-      !!(ip && ip.match(Resolv::IPv4::Regex))
-    end
-
     # Check whether +name+ is authorized with +password+
     def authorized?(name, password)
       return false unless record = Record.where(name: name).first
@@ -71,10 +43,6 @@ module Radd
       record.ip
     end
     
-    def run
-      
-    end
-
     private
 
     def config

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: radd
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Matthias Grosser
 bindir: bin
 cert_chain: []
-date: 2026-02-23 00:00:00.000000000 Z
+date: 2026-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -23,6 +23,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: optparse
   requirement: !ruby/object:Gem::Requirement
@@ -159,14 +173,15 @@ files:
 - CHANGELOG
 - LICENSE
 - README.md
-- bin/console
 - bin/radd
 - lib/radd.rb
 - lib/radd/app.rb
 - lib/radd/cli.rb
+- lib/radd/config.rb
 - lib/radd/db.rb
 - lib/radd/dns.rb
 - lib/radd/dns_service.rb
+- lib/radd/errors.rb
 - lib/radd/http.rb
 - lib/radd/http_service.rb
 - lib/radd/ip.rb

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'radd'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start