Drop 'twenty-' prefix from toplevel directories

The directories twenty-{server,client,cli} have been renamed to
not include 'twenty-'. The gems are still published with the twenty-
prefix, otherwise a collision is impossible to avoid. This commit makes
it slightly easier to generalize twenty.

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "twenty-client/src/css/vendor/tail.css"]
-	path = twenty-client/src/css/vendor/tail.css
+	path = client/src/css/vendor/tail.css
 	url = https://github.com/0x1eef/tail.css

Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 gemspec
-gem "twenty-cli", path: "./twenty-cli"
+gem "twenty-cli", path: "./cli"
-gem "twenty-server", path: "./twenty-server"
+gem "twenty-server", path: "./server"
-gem "twenty-client", path: "./twenty-client"
+gem "twenty-client", path: "./client"
 gem "listen"

bin/setup

@@ -4,7 +4,7 @@
 # sub-directory / sub-package (cli, client, server).
 set -e
 wrkdir=$(pwd)
-subdir=". twenty-cli twenty-client twenty-server"
+subdir=". cli client server"
 for dir in ${subdir}; do
     cd ${dir}
     bundle install

cli/bin/twenty

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 libdir = File.join(__dir__, "..", "lib")
-require File.join(libdir, "twenty-cli", "libexec")
+require File.join(libdir, "twenty", "cli", "libexec")
 
 case ARGV[0]
 when "up"

cli/cli.gemspec

@@ -9,12 +9,13 @@ Gem::Specification.new do |gem|
   gem.licenses = ["0BSD"]
   gem.files = [
     *Dir.glob(File.join(__dir__, "lib", "*.rb")),
-    *Dir.glob(File.join(__dir__, "lib", "twenty-cli", "**", "*.rb")),
+    *Dir.glob(File.join(__dir__, "lib", "twenty", "*.rb")),
+    *Dir.glob(File.join(__dir__, "lib", "twenty", "cli", "**", "*.rb")),
     *Dir.glob(File.join(__dir__, "libexec", "**", "*")),
     *Dir.glob(File.join(__dir__, "bin", "*"))
   ].select { File.file?(_1) }
   gem.require_paths = ["lib"]
-  gem.summary = "twenty: CLI component"
+  gem.summary = "Command-line interface"
   gem.description = gem.summary
   gem.executables = ["twenty"]
   gem.add_runtime_dependency "cmd.rb", "~> 0.5"

cli/cli.gemspec.erb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Gem::Specification.new do |gem|
-  gem.name = "twenty-cli"
+  gem.name = "<%= parent %>-cli"
   gem.authors = ["0x1eef"]
   gem.email = ["0x1eef@protonmail.com"]
   gem.homepage = "https://github.com/0x1eef/twenty#readme"
@@ -9,14 +9,15 @@ Gem::Specification.new do |gem|
   gem.licenses = ["0BSD"]
   gem.files = [
     *Dir.glob(File.join(__dir__, "lib", "*.rb")),
-    *Dir.glob(File.join(__dir__, "lib", "twenty-cli", "**", "*.rb")),
+    *Dir.glob(File.join(__dir__, "lib", "twenty", "*.rb")),
+    *Dir.glob(File.join(__dir__, "lib", "twenty", "cli", "**", "*.rb")),
     *Dir.glob(File.join(__dir__, "libexec", "**", "*")),
     *Dir.glob(File.join(__dir__, "bin", "*"))
   ].select { File.file?(_1) }
   gem.require_paths = ["lib"]
-  gem.summary = "twenty: CLI component"
+  gem.summary = "Command-line interface"
   gem.description = gem.summary
-  gem.executables = ["twenty"]
+  gem.executables = ["<%= parent %>"]
   gem.add_runtime_dependency "cmd.rb", "~> 0.5"
   gem.add_runtime_dependency "paint", "~> 2.3"
   gem.add_development_dependency "test-unit", "~> 3.5.7"

cli/lib/twenty/cli.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Twenty
+  require "json"
+  require "twenty/server"
+  require "twenty/client"
+  require_relative "cli/command"
+end

cli/lib/twenty/cli/command/mixin/sqlite_mixin.rb

@@ -4,8 +4,8 @@ module Twenty::Command::SQLiteMixin
   def run_command(options)
     path = options.database || Twenty.default_database
     Twenty.establish_connection(path:)
-    require "twenty-server/migration"
+    require "twenty/server/migration"
-    require "twenty-server/model"
+    require "twenty/server/model"
     super(options)
   end
 end

cli/lib/twenty/cli/libexec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 def spawn(exec, *)
-  libexec_dir = File.realpath(File.join(__dir__, "..", "..", "libexec", "twenty"))
+  libexec_dir = File.realpath(File.join(__dir__, "..", "..", "..", "libexec", "twenty"))
   Process.spawn(File.join(libexec_dir, exec), *)
 end
 

cli/libexec/twenty/up

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 libdir = File.expand_path File.join(__dir__, "..", "..", "lib")
-require File.join(libdir, "twenty-cli")
+require File.join(libdir, "twenty", "cli")
 
 ##
 # main

client/client.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
                   .flat_map { Dir.glob(_1.chomp) }
                   .select { File.file?(_1) }
   gem.require_paths = ["lib"]
-  gem.summary = "twenty: client-side component"
+  gem.summary = "HTTP client"
   gem.description = gem.summary
   gem.add_development_dependency "nanoc", "~> 4.12"
   gem.add_development_dependency "sass", "~> 3.7"

client/client.gemspec.erb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Gem::Specification.new do |gem|
-  gem.name = "twenty-client"
+  gem.name = "<%= parent %>-client"
   gem.authors = ["0x1eef"]
   gem.email = ["0x1eef@protonmail.com"]
   gem.homepage = "https://github.com/0x1eef/twenty#readme"
@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
                   .flat_map { Dir.glob(_1.chomp) }
                   .select { File.file?(_1) }
   gem.require_paths = ["lib"]
-  gem.summary = "twenty: client-side component"
+  gem.summary = "HTTP client"
   gem.description = gem.summary
   gem.add_development_dependency "nanoc", "~> 4.12"
   gem.add_development_dependency "sass", "~> 3.7"

client/lib/twenty/client.rb

@@ -2,6 +2,6 @@
 
 module Twenty
   def self.build
-    File.expand_path File.join(__dir__, "..", "build")
+    File.expand_path File.join(__dir__, "..", "..", "build")
   end
 end

rake/lib/builders.rb

@@ -2,8 +2,8 @@ class Builder
   ROOTDIR  = Dir.getwd
   STAGEDIR = File.join(ROOTDIR, "stage")
   PKGDIR   = File.join(ROOTDIR, "pkgs")
-  PARENT   = "twenty.rb"
+  PARENT   = File.basename File.realpath(File.join(__dir__, "..", ".."))
-  CHILDREN = %w[twenty-cli twenty-server twenty-client]
+  CHILDREN = %w[cli server client]
   include FileUtils
 
   def self.call(...)
@@ -16,7 +16,7 @@ class GemSpec < Builder
   def call(version)
     [PARENT, *CHILDREN].each do |node|
       path = find_path(node)
-      spec = ERB.new(File.binread(path)).result_with_hash({version:})
+      spec = ERB.new(File.binread(path)).result_with_hash({parent: PARENT, version:})
       File.binwrite File.join(File.dirname(path), "#{node}.gemspec"), spec
     end
   end

rake/tasks/nanoc.rake

@@ -1,6 +1,6 @@
 namespace :nanoc do
   require "bundler/setup"
-  workdir = File.realpath File.join(__dir__, "..", "..", "twenty-client")
+  workdir = File.realpath File.join(__dir__, "..", "..", "client")
 
   desc "Clean the build/ directory"
   task :clean do

rake/tasks/rubocop.rake

@@ -3,9 +3,9 @@
 namespace :rubocop do
   root = File.realpath File.join(__dir__, "..", "..")
   gems = [
-    File.join(root, "twenty-cli"),
+    File.join(root, "cli"),
-    File.join(root, "twenty-server"),
+    File.join(root, "server"),
-    File.join(root, "twenty-client")
+    File.join(root, "client")
   ]
 
   desc "Copy '.rubocop.yml' into place"

rake/tasks/schema.rake

@@ -5,15 +5,15 @@ namespace :schema do
 
   task :'regen:server' do
     Dir.chdir(workdir) do
-      require "twenty-server"
+      require "server"
-      schema = File.join(Dir.getwd, "share", "twenty-server", "schema.graphql")
+      schema = File.join(Dir.getwd, "share", "server", "schema.graphql")
       mkdir_p File.dirname(schema)
       File.binwrite schema, Twenty::GraphQL::Schema.to_definition
     end
   end
 
   task :'regen:client' do
-    Dir.chdir(File.join(workdir, "twenty-client")) do
+    Dir.chdir(File.join(workdir, "client")) do
       sh "npm exec graphql-codegen"
     end
   end

rake/tasks/server.rake

@@ -1,7 +1,7 @@
 desc "Run server"
 task :server, [:protocol] do |_, args|
   require 'rbconfig'
-  cli = [RbConfig.ruby, "-rbundler/setup", "twenty-cli/bin/twenty", "up"]
+  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")

server/lib/twenty/server.rb

@@ -3,7 +3,7 @@
 module Twenty
   require "fileutils"
   require "sequel"
-  require_relative "twenty-server/path"
+  require_relative "server/path"
 
   ##
   # @return [String]
@@ -32,6 +32,6 @@ module Twenty
   end
 
   FileUtils.touch(default_database)
-  require_relative "twenty-server/graphql"
+  require_relative "server/graphql"
-  require_relative "twenty-server/rack"
+  require_relative "server/rack"
 end