From 2e8cf6e333aba1b0d01f3e9ab2a32a0f7f83e956 Mon Sep 17 00:00:00 2001 From: 0x1eef <0x1eef@protonmail.com> Date: Sun, 21 Apr 2024 20:08:29 -0300 Subject: [PATCH] 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 | 2 +- Gemfile | 6 +++--- bin/setup | 2 +- {twenty-cli => cli}/.bundle/config | 0 {twenty-cli => cli}/.rubocop.yml | 0 {twenty-cli => cli}/Gemfile | 0 {twenty-cli => cli}/bin/twenty | 2 +- twenty-cli/twenty-cli.gemspec => cli/cli.gemspec | 5 +++-- .../twenty-cli.gemspec.erb => cli/cli.gemspec.erb | 9 +++++---- cli/lib/twenty/cli.rb | 8 ++++++++ .../twenty-cli => cli/lib/twenty/cli}/command.rb | 0 .../lib/twenty/cli}/command/connect.rb | 0 .../lib/twenty/cli}/command/console.rb | 0 .../lib/twenty/cli}/command/disconnect.rb | 0 .../lib/twenty/cli}/command/down.rb | 0 .../lib/twenty/cli}/command/migrate.rb | 0 .../cli}/command/mixin/common_option_mixin.rb | 0 .../twenty/cli}/command/mixin/migration_mixin.rb | 0 .../lib/twenty/cli}/command/mixin/rescue_mixin.rb | 0 .../lib/twenty/cli}/command/mixin/sqlite_mixin.rb | 4 ++-- .../twenty-cli => cli/lib/twenty/cli}/command/up.rb | 0 .../twenty-cli => cli/lib/twenty/cli}/libexec.rb | 2 +- {twenty-cli => cli}/libexec/twenty/connect | 0 {twenty-cli => cli}/libexec/twenty/console | 0 {twenty-cli => cli}/libexec/twenty/disconnect | 0 {twenty-cli => cli}/libexec/twenty/down | 0 {twenty-cli => cli}/libexec/twenty/migrate | 0 {twenty-cli => cli}/libexec/twenty/up | 2 +- {twenty-client => client}/.bundle/config | 0 {twenty-client => client}/.eslintrc.js | 0 {twenty-client => client}/.gitignore | 0 {twenty-client => client}/.prettierrc | 0 {twenty-client => client}/.rubocop.yml | 0 {twenty-client => client}/Gemfile | 0 {twenty-client => client}/Gemfile.lock | 0 {twenty-client => client}/MANIFEST | 0 {twenty-client => client}/Rules | 0 .../twenty-client.gemspec => client/client.gemspec | 2 +- .../client.gemspec.erb | 4 ++-- {twenty-client => client}/codegen.yml | 0 .../twenty-client.rb => client/lib/twenty/client.rb | 2 +- {twenty-client => client}/nanoc.yaml | 0 {twenty-client => client}/nanoc/rules/assets.rules | 0 .../nanoc/rules/projects.rules | 0 {twenty-client => client}/nanoc/rules/tasks.rules | 0 {twenty-client => client}/package-lock.json | 0 {twenty-client => client}/package.json | 0 {twenty-client => client}/src/css/_colors.scss | 0 {twenty-client => client}/src/css/_fonts.scss | 0 {twenty-client => client}/src/css/_global.scss | 0 {twenty-client => client}/src/css/_tables.scss | 0 {twenty-client => client}/src/css/main.scss | 0 {twenty-client => client}/src/css/vendor/tail.css | 0 {twenty-client => client}/src/favicon.svg | 0 .../src/fonts/noto-sans-mono-regular.ttf | Bin .../src/fonts/noto-sans-regular.ttf | Bin .../src/fonts/noto-serif-regular.ttf | Bin {twenty-client => client}/src/html/react.html.erb | 0 {twenty-client => client}/src/js/Context.ts | 0 {twenty-client => client}/src/js/components/App.tsx | 0 .../src/js/components/Group.tsx | 0 .../src/js/components/Icons.tsx | 0 .../src/js/components/NavBar.tsx | 0 .../src/js/components/ProjectSelect.tsx | 0 .../src/js/components/Projects.tsx | 0 .../src/js/components/Select.tsx | 0 .../src/js/components/Tabs.tsx | 0 .../src/js/components/Task.tsx | 0 .../src/js/components/TaskStatusSelect.tsx | 0 .../src/js/components/Tasks.tsx | 0 .../src/js/components/forms/Select.tsx | 0 .../src/js/hooks/mutations/useCompleteTask.ts | 0 .../src/js/hooks/mutations/useCreateTask.ts | 0 .../src/js/hooks/mutations/useDestroyTask.ts | 0 .../js/hooks/mutations/useSetRandomProjectColor.tsx | 0 .../src/js/hooks/mutations/useUpdateTask.ts | 0 .../src/js/hooks/queries/useFindTask.ts | 0 .../src/js/hooks/queries/useProjects.ts | 0 .../src/js/hooks/queries/useTasks.ts | 0 {twenty-client => client}/src/js/hooks/useParams.ts | 0 .../src/js/lib/markdown-utils.ts | 0 {twenty-client => client}/src/js/main/projects.tsx | 0 {twenty-client => client}/src/js/main/task/edit.tsx | 0 {twenty-client => client}/src/js/main/task/new.tsx | 0 {twenty-client => client}/src/js/main/tasks.tsx | 0 {twenty-client => client}/src/js/types/schema.ts | 0 {twenty-client => client}/tsconfig.json | 0 {twenty-client => client}/webpack.common.js | 0 {twenty-client => client}/webpack.development.js | 0 {twenty-client => client}/webpack.production.js | 0 rake/lib/builders.rb | 6 +++--- rake/tasks/nanoc.rake | 2 +- rake/tasks/rubocop.rake | 6 +++--- rake/tasks/schema.rake | 6 +++--- rake/tasks/server.rake | 2 +- {twenty-server => server}/.rubocop.yml | 0 {twenty-server => server}/Gemfile | 0 .../twenty-server.rb => server/lib/twenty/server.rb | 6 +++--- .../lib/twenty/server}/graphql.rb | 0 .../lib/twenty/server}/graphql/input.rb | 0 .../lib/twenty/server}/graphql/input/task_input.rb | 0 .../lib/twenty/server}/graphql/mutation.rb | 0 .../server}/graphql/mutation/complete_task.rb | 0 .../twenty/server}/graphql/mutation/create_task.rb | 0 .../twenty/server}/graphql/mutation/destroy_task.rb | 0 .../graphql/mutation/set_random_project_color.rb | 0 .../twenty/server}/graphql/mutation/update_task.rb | 0 .../lib/twenty/server}/graphql/schema.rb | 0 .../lib/twenty/server}/graphql/type.rb | 0 .../lib/twenty/server}/graphql/type/mutation.rb | 0 .../lib/twenty/server}/graphql/type/project.rb | 0 .../lib/twenty/server}/graphql/type/query.rb | 0 .../lib/twenty/server}/graphql/type/task.rb | 0 .../lib/twenty/server}/graphql/type/task_status.rb | 0 .../lib/twenty/server}/migration.rb | 0 .../twenty/server}/migration/1_create_projects.rb | 0 .../lib/twenty/server}/migration/2_create_tasks.rb | 0 .../server}/migration/3_add_color_to_projects.rb | 0 .../lib/twenty/server}/model.rb | 0 .../twenty/server}/model/mixin/colorable_mixin.rb | 0 .../lib/twenty/server}/model/project.rb | 0 .../lib/twenty/server}/model/task.rb | 0 .../lib/twenty/server}/path.rb | 0 .../lib/twenty/server}/rack.rb | 0 .../lib/twenty/server}/rack/graphql.rb | 0 .../twenty-server.gemspec => server/server.gemspec | 4 ++-- .../server.gemspec.erb | 6 +++--- .../share/twenty-server/schema.graphql | 0 twenty-cli/lib/twenty-cli.rb | 8 -------- twenty-server/.bundle/config | 3 --- twenty.rb.gemspec => twenty.gemspec | 5 ++--- twenty.rb.gemspec.erb => twenty.gemspec.erb | 11 +++++------ 132 files changed, 56 insertions(+), 59 deletions(-) rename {twenty-cli => cli}/.bundle/config (100%) rename {twenty-cli => cli}/.rubocop.yml (100%) rename {twenty-cli => cli}/Gemfile (100%) rename {twenty-cli => cli}/bin/twenty (94%) rename twenty-cli/twenty-cli.gemspec => cli/cli.gemspec (83%) rename twenty-cli/twenty-cli.gemspec.erb => cli/cli.gemspec.erb (77%) create mode 100644 cli/lib/twenty/cli.rb rename {twenty-cli/lib/twenty-cli => cli/lib/twenty/cli}/command.rb (100%) rename {twenty-cli/lib/twenty-cli => cli/lib/twenty/cli}/command/connect.rb (100%) rename {twenty-cli/lib/twenty-cli => cli/lib/twenty/cli}/command/console.rb (100%) rename {twenty-cli/lib/twenty-cli => cli/lib/twenty/cli}/command/disconnect.rb (100%) rename {twenty-cli/lib/twenty-cli => cli/lib/twenty/cli}/command/down.rb (100%) rename {twenty-cli/lib/twenty-cli => cli/lib/twenty/cli}/command/migrate.rb (100%) rename {twenty-cli/lib/twenty-cli => cli/lib/twenty/cli}/command/mixin/common_option_mixin.rb (100%) rename {twenty-cli/lib/twenty-cli => cli/lib/twenty/cli}/command/mixin/migration_mixin.rb (100%) rename {twenty-cli/lib/twenty-cli => cli/lib/twenty/cli}/command/mixin/rescue_mixin.rb (100%) rename {twenty-cli/lib/twenty-cli => cli/lib/twenty/cli}/command/mixin/sqlite_mixin.rb (75%) rename {twenty-cli/lib/twenty-cli => cli/lib/twenty/cli}/command/up.rb (100%) rename {twenty-cli/lib/twenty-cli => cli/lib/twenty/cli}/libexec.rb (65%) rename {twenty-cli => cli}/libexec/twenty/connect (100%) rename {twenty-cli => cli}/libexec/twenty/console (100%) rename {twenty-cli => cli}/libexec/twenty/disconnect (100%) rename {twenty-cli => cli}/libexec/twenty/down (100%) rename {twenty-cli => cli}/libexec/twenty/migrate (100%) rename {twenty-cli => cli}/libexec/twenty/up (81%) rename {twenty-client => client}/.bundle/config (100%) rename {twenty-client => client}/.eslintrc.js (100%) rename {twenty-client => client}/.gitignore (100%) rename {twenty-client => client}/.prettierrc (100%) rename {twenty-client => client}/.rubocop.yml (100%) rename {twenty-client => client}/Gemfile (100%) rename {twenty-client => client}/Gemfile.lock (100%) rename {twenty-client => client}/MANIFEST (100%) rename {twenty-client => client}/Rules (100%) rename twenty-client/twenty-client.gemspec => client/client.gemspec (94%) rename twenty-client/twenty-client.gemspec.erb => client/client.gemspec.erb (91%) rename {twenty-client => client}/codegen.yml (100%) rename twenty-client/lib/twenty-client.rb => client/lib/twenty/client.rb (54%) rename {twenty-client => client}/nanoc.yaml (100%) rename {twenty-client => client}/nanoc/rules/assets.rules (100%) rename {twenty-client => client}/nanoc/rules/projects.rules (100%) rename {twenty-client => client}/nanoc/rules/tasks.rules (100%) rename {twenty-client => client}/package-lock.json (100%) rename {twenty-client => client}/package.json (100%) rename {twenty-client => client}/src/css/_colors.scss (100%) rename {twenty-client => client}/src/css/_fonts.scss (100%) rename {twenty-client => client}/src/css/_global.scss (100%) rename {twenty-client => client}/src/css/_tables.scss (100%) rename {twenty-client => client}/src/css/main.scss (100%) rename {twenty-client => client}/src/css/vendor/tail.css (100%) rename {twenty-client => client}/src/favicon.svg (100%) rename {twenty-client => client}/src/fonts/noto-sans-mono-regular.ttf (100%) rename {twenty-client => client}/src/fonts/noto-sans-regular.ttf (100%) rename {twenty-client => client}/src/fonts/noto-serif-regular.ttf (100%) rename {twenty-client => client}/src/html/react.html.erb (100%) rename {twenty-client => client}/src/js/Context.ts (100%) rename {twenty-client => client}/src/js/components/App.tsx (100%) rename {twenty-client => client}/src/js/components/Group.tsx (100%) rename {twenty-client => client}/src/js/components/Icons.tsx (100%) rename {twenty-client => client}/src/js/components/NavBar.tsx (100%) rename {twenty-client => client}/src/js/components/ProjectSelect.tsx (100%) rename {twenty-client => client}/src/js/components/Projects.tsx (100%) rename {twenty-client => client}/src/js/components/Select.tsx (100%) rename {twenty-client => client}/src/js/components/Tabs.tsx (100%) rename {twenty-client => client}/src/js/components/Task.tsx (100%) rename {twenty-client => client}/src/js/components/TaskStatusSelect.tsx (100%) rename {twenty-client => client}/src/js/components/Tasks.tsx (100%) rename {twenty-client => client}/src/js/components/forms/Select.tsx (100%) rename {twenty-client => client}/src/js/hooks/mutations/useCompleteTask.ts (100%) rename {twenty-client => client}/src/js/hooks/mutations/useCreateTask.ts (100%) rename {twenty-client => client}/src/js/hooks/mutations/useDestroyTask.ts (100%) rename {twenty-client => client}/src/js/hooks/mutations/useSetRandomProjectColor.tsx (100%) rename {twenty-client => client}/src/js/hooks/mutations/useUpdateTask.ts (100%) rename {twenty-client => client}/src/js/hooks/queries/useFindTask.ts (100%) rename {twenty-client => client}/src/js/hooks/queries/useProjects.ts (100%) rename {twenty-client => client}/src/js/hooks/queries/useTasks.ts (100%) rename {twenty-client => client}/src/js/hooks/useParams.ts (100%) rename {twenty-client => client}/src/js/lib/markdown-utils.ts (100%) rename {twenty-client => client}/src/js/main/projects.tsx (100%) rename {twenty-client => client}/src/js/main/task/edit.tsx (100%) rename {twenty-client => client}/src/js/main/task/new.tsx (100%) rename {twenty-client => client}/src/js/main/tasks.tsx (100%) rename {twenty-client => client}/src/js/types/schema.ts (100%) rename {twenty-client => client}/tsconfig.json (100%) rename {twenty-client => client}/webpack.common.js (100%) rename {twenty-client => client}/webpack.development.js (100%) rename {twenty-client => client}/webpack.production.js (100%) rename {twenty-server => server}/.rubocop.yml (100%) rename {twenty-server => server}/Gemfile (100%) rename twenty-server/lib/twenty-server.rb => server/lib/twenty/server.rb (84%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/graphql.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/graphql/input.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/graphql/input/task_input.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/graphql/mutation.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/graphql/mutation/complete_task.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/graphql/mutation/create_task.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/graphql/mutation/destroy_task.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/graphql/mutation/set_random_project_color.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/graphql/mutation/update_task.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/graphql/schema.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/graphql/type.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/graphql/type/mutation.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/graphql/type/project.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/graphql/type/query.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/graphql/type/task.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/graphql/type/task_status.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/migration.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/migration/1_create_projects.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/migration/2_create_tasks.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/migration/3_add_color_to_projects.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/model.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/model/mixin/colorable_mixin.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/model/project.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/model/task.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/path.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/rack.rb (100%) rename {twenty-server/lib/twenty-server => server/lib/twenty/server}/rack/graphql.rb (100%) rename twenty-server/twenty-server.gemspec => server/server.gemspec (86%) rename twenty-server/twenty-server.gemspec.erb => server/server.gemspec.erb (83%) rename {twenty-server => server}/share/twenty-server/schema.graphql (100%) delete mode 100644 twenty-cli/lib/twenty-cli.rb delete mode 100644 twenty-server/.bundle/config rename twenty.rb.gemspec => twenty.gemspec (79%) rename twenty.rb.gemspec.erb => twenty.gemspec.erb (55%) diff --git a/.gitmodules b/.gitmodules index cb73c57..88bd2c0 100644 --- a/.gitmodules +++ b/.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 diff --git a/Gemfile b/Gemfile index 6e66c50..4214497 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" gemspec -gem "twenty-cli", path: "./twenty-cli" -gem "twenty-server", path: "./twenty-server" -gem "twenty-client", path: "./twenty-client" +gem "twenty-cli", path: "./cli" +gem "twenty-server", path: "./server" +gem "twenty-client", path: "./client" gem "listen" diff --git a/bin/setup b/bin/setup index 3d853b3..442b8b8 100755 --- a/bin/setup +++ b/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 diff --git a/twenty-cli/.bundle/config b/cli/.bundle/config similarity index 100% rename from twenty-cli/.bundle/config rename to cli/.bundle/config diff --git a/twenty-cli/.rubocop.yml b/cli/.rubocop.yml similarity index 100% rename from twenty-cli/.rubocop.yml rename to cli/.rubocop.yml diff --git a/twenty-cli/Gemfile b/cli/Gemfile similarity index 100% rename from twenty-cli/Gemfile rename to cli/Gemfile diff --git a/twenty-cli/bin/twenty b/cli/bin/twenty similarity index 94% rename from twenty-cli/bin/twenty rename to cli/bin/twenty index fa51380..cbb1e01 100755 --- a/twenty-cli/bin/twenty +++ b/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" diff --git a/twenty-cli/twenty-cli.gemspec b/cli/cli.gemspec similarity index 83% rename from twenty-cli/twenty-cli.gemspec rename to cli/cli.gemspec index b142035..e07b1cd 100644 --- a/twenty-cli/twenty-cli.gemspec +++ b/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" diff --git a/twenty-cli/twenty-cli.gemspec.erb b/cli/cli.gemspec.erb similarity index 77% rename from twenty-cli/twenty-cli.gemspec.erb rename to cli/cli.gemspec.erb index 67d197a..f1805df 100644 --- a/twenty-cli/twenty-cli.gemspec.erb +++ b/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" diff --git a/cli/lib/twenty/cli.rb b/cli/lib/twenty/cli.rb new file mode 100644 index 0000000..5fcbb02 --- /dev/null +++ b/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 diff --git a/twenty-cli/lib/twenty-cli/command.rb b/cli/lib/twenty/cli/command.rb similarity index 100% rename from twenty-cli/lib/twenty-cli/command.rb rename to cli/lib/twenty/cli/command.rb diff --git a/twenty-cli/lib/twenty-cli/command/connect.rb b/cli/lib/twenty/cli/command/connect.rb similarity index 100% rename from twenty-cli/lib/twenty-cli/command/connect.rb rename to cli/lib/twenty/cli/command/connect.rb diff --git a/twenty-cli/lib/twenty-cli/command/console.rb b/cli/lib/twenty/cli/command/console.rb similarity index 100% rename from twenty-cli/lib/twenty-cli/command/console.rb rename to cli/lib/twenty/cli/command/console.rb diff --git a/twenty-cli/lib/twenty-cli/command/disconnect.rb b/cli/lib/twenty/cli/command/disconnect.rb similarity index 100% rename from twenty-cli/lib/twenty-cli/command/disconnect.rb rename to cli/lib/twenty/cli/command/disconnect.rb diff --git a/twenty-cli/lib/twenty-cli/command/down.rb b/cli/lib/twenty/cli/command/down.rb similarity index 100% rename from twenty-cli/lib/twenty-cli/command/down.rb rename to cli/lib/twenty/cli/command/down.rb diff --git a/twenty-cli/lib/twenty-cli/command/migrate.rb b/cli/lib/twenty/cli/command/migrate.rb similarity index 100% rename from twenty-cli/lib/twenty-cli/command/migrate.rb rename to cli/lib/twenty/cli/command/migrate.rb diff --git a/twenty-cli/lib/twenty-cli/command/mixin/common_option_mixin.rb b/cli/lib/twenty/cli/command/mixin/common_option_mixin.rb similarity index 100% rename from twenty-cli/lib/twenty-cli/command/mixin/common_option_mixin.rb rename to cli/lib/twenty/cli/command/mixin/common_option_mixin.rb diff --git a/twenty-cli/lib/twenty-cli/command/mixin/migration_mixin.rb b/cli/lib/twenty/cli/command/mixin/migration_mixin.rb similarity index 100% rename from twenty-cli/lib/twenty-cli/command/mixin/migration_mixin.rb rename to cli/lib/twenty/cli/command/mixin/migration_mixin.rb diff --git a/twenty-cli/lib/twenty-cli/command/mixin/rescue_mixin.rb b/cli/lib/twenty/cli/command/mixin/rescue_mixin.rb similarity index 100% rename from twenty-cli/lib/twenty-cli/command/mixin/rescue_mixin.rb rename to cli/lib/twenty/cli/command/mixin/rescue_mixin.rb diff --git a/twenty-cli/lib/twenty-cli/command/mixin/sqlite_mixin.rb b/cli/lib/twenty/cli/command/mixin/sqlite_mixin.rb similarity index 75% rename from twenty-cli/lib/twenty-cli/command/mixin/sqlite_mixin.rb rename to cli/lib/twenty/cli/command/mixin/sqlite_mixin.rb index e9b03cc..18c07cb 100644 --- a/twenty-cli/lib/twenty-cli/command/mixin/sqlite_mixin.rb +++ b/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/model" + require "twenty/server/migration" + require "twenty/server/model" super(options) end end diff --git a/twenty-cli/lib/twenty-cli/command/up.rb b/cli/lib/twenty/cli/command/up.rb similarity index 100% rename from twenty-cli/lib/twenty-cli/command/up.rb rename to cli/lib/twenty/cli/command/up.rb diff --git a/twenty-cli/lib/twenty-cli/libexec.rb b/cli/lib/twenty/cli/libexec.rb similarity index 65% rename from twenty-cli/lib/twenty-cli/libexec.rb rename to cli/lib/twenty/cli/libexec.rb index e1318aa..3d6452c 100644 --- a/twenty-cli/lib/twenty-cli/libexec.rb +++ b/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 diff --git a/twenty-cli/libexec/twenty/connect b/cli/libexec/twenty/connect similarity index 100% rename from twenty-cli/libexec/twenty/connect rename to cli/libexec/twenty/connect diff --git a/twenty-cli/libexec/twenty/console b/cli/libexec/twenty/console similarity index 100% rename from twenty-cli/libexec/twenty/console rename to cli/libexec/twenty/console diff --git a/twenty-cli/libexec/twenty/disconnect b/cli/libexec/twenty/disconnect similarity index 100% rename from twenty-cli/libexec/twenty/disconnect rename to cli/libexec/twenty/disconnect diff --git a/twenty-cli/libexec/twenty/down b/cli/libexec/twenty/down similarity index 100% rename from twenty-cli/libexec/twenty/down rename to cli/libexec/twenty/down diff --git a/twenty-cli/libexec/twenty/migrate b/cli/libexec/twenty/migrate similarity index 100% rename from twenty-cli/libexec/twenty/migrate rename to cli/libexec/twenty/migrate diff --git a/twenty-cli/libexec/twenty/up b/cli/libexec/twenty/up similarity index 81% rename from twenty-cli/libexec/twenty/up rename to cli/libexec/twenty/up index 342bcb7..2b747dc 100755 --- a/twenty-cli/libexec/twenty/up +++ b/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 diff --git a/twenty-client/.bundle/config b/client/.bundle/config similarity index 100% rename from twenty-client/.bundle/config rename to client/.bundle/config diff --git a/twenty-client/.eslintrc.js b/client/.eslintrc.js similarity index 100% rename from twenty-client/.eslintrc.js rename to client/.eslintrc.js diff --git a/twenty-client/.gitignore b/client/.gitignore similarity index 100% rename from twenty-client/.gitignore rename to client/.gitignore diff --git a/twenty-client/.prettierrc b/client/.prettierrc similarity index 100% rename from twenty-client/.prettierrc rename to client/.prettierrc diff --git a/twenty-client/.rubocop.yml b/client/.rubocop.yml similarity index 100% rename from twenty-client/.rubocop.yml rename to client/.rubocop.yml diff --git a/twenty-client/Gemfile b/client/Gemfile similarity index 100% rename from twenty-client/Gemfile rename to client/Gemfile diff --git a/twenty-client/Gemfile.lock b/client/Gemfile.lock similarity index 100% rename from twenty-client/Gemfile.lock rename to client/Gemfile.lock diff --git a/twenty-client/MANIFEST b/client/MANIFEST similarity index 100% rename from twenty-client/MANIFEST rename to client/MANIFEST diff --git a/twenty-client/Rules b/client/Rules similarity index 100% rename from twenty-client/Rules rename to client/Rules diff --git a/twenty-client/twenty-client.gemspec b/client/client.gemspec similarity index 94% rename from twenty-client/twenty-client.gemspec rename to client/client.gemspec index 968df4a..c0bfe8d 100644 --- a/twenty-client/twenty-client.gemspec +++ b/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" diff --git a/twenty-client/twenty-client.gemspec.erb b/client/client.gemspec.erb similarity index 91% rename from twenty-client/twenty-client.gemspec.erb rename to client/client.gemspec.erb index 69889dd..190a75b 100644 --- a/twenty-client/twenty-client.gemspec.erb +++ b/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" diff --git a/twenty-client/codegen.yml b/client/codegen.yml similarity index 100% rename from twenty-client/codegen.yml rename to client/codegen.yml diff --git a/twenty-client/lib/twenty-client.rb b/client/lib/twenty/client.rb similarity index 54% rename from twenty-client/lib/twenty-client.rb rename to client/lib/twenty/client.rb index c72b5b5..433fe5f 100644 --- a/twenty-client/lib/twenty-client.rb +++ b/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 diff --git a/twenty-client/nanoc.yaml b/client/nanoc.yaml similarity index 100% rename from twenty-client/nanoc.yaml rename to client/nanoc.yaml diff --git a/twenty-client/nanoc/rules/assets.rules b/client/nanoc/rules/assets.rules similarity index 100% rename from twenty-client/nanoc/rules/assets.rules rename to client/nanoc/rules/assets.rules diff --git a/twenty-client/nanoc/rules/projects.rules b/client/nanoc/rules/projects.rules similarity index 100% rename from twenty-client/nanoc/rules/projects.rules rename to client/nanoc/rules/projects.rules diff --git a/twenty-client/nanoc/rules/tasks.rules b/client/nanoc/rules/tasks.rules similarity index 100% rename from twenty-client/nanoc/rules/tasks.rules rename to client/nanoc/rules/tasks.rules diff --git a/twenty-client/package-lock.json b/client/package-lock.json similarity index 100% rename from twenty-client/package-lock.json rename to client/package-lock.json diff --git a/twenty-client/package.json b/client/package.json similarity index 100% rename from twenty-client/package.json rename to client/package.json diff --git a/twenty-client/src/css/_colors.scss b/client/src/css/_colors.scss similarity index 100% rename from twenty-client/src/css/_colors.scss rename to client/src/css/_colors.scss diff --git a/twenty-client/src/css/_fonts.scss b/client/src/css/_fonts.scss similarity index 100% rename from twenty-client/src/css/_fonts.scss rename to client/src/css/_fonts.scss diff --git a/twenty-client/src/css/_global.scss b/client/src/css/_global.scss similarity index 100% rename from twenty-client/src/css/_global.scss rename to client/src/css/_global.scss diff --git a/twenty-client/src/css/_tables.scss b/client/src/css/_tables.scss similarity index 100% rename from twenty-client/src/css/_tables.scss rename to client/src/css/_tables.scss diff --git a/twenty-client/src/css/main.scss b/client/src/css/main.scss similarity index 100% rename from twenty-client/src/css/main.scss rename to client/src/css/main.scss diff --git a/twenty-client/src/css/vendor/tail.css b/client/src/css/vendor/tail.css similarity index 100% rename from twenty-client/src/css/vendor/tail.css rename to client/src/css/vendor/tail.css diff --git a/twenty-client/src/favicon.svg b/client/src/favicon.svg similarity index 100% rename from twenty-client/src/favicon.svg rename to client/src/favicon.svg diff --git a/twenty-client/src/fonts/noto-sans-mono-regular.ttf b/client/src/fonts/noto-sans-mono-regular.ttf similarity index 100% rename from twenty-client/src/fonts/noto-sans-mono-regular.ttf rename to client/src/fonts/noto-sans-mono-regular.ttf diff --git a/twenty-client/src/fonts/noto-sans-regular.ttf b/client/src/fonts/noto-sans-regular.ttf similarity index 100% rename from twenty-client/src/fonts/noto-sans-regular.ttf rename to client/src/fonts/noto-sans-regular.ttf diff --git a/twenty-client/src/fonts/noto-serif-regular.ttf b/client/src/fonts/noto-serif-regular.ttf similarity index 100% rename from twenty-client/src/fonts/noto-serif-regular.ttf rename to client/src/fonts/noto-serif-regular.ttf diff --git a/twenty-client/src/html/react.html.erb b/client/src/html/react.html.erb similarity index 100% rename from twenty-client/src/html/react.html.erb rename to client/src/html/react.html.erb diff --git a/twenty-client/src/js/Context.ts b/client/src/js/Context.ts similarity index 100% rename from twenty-client/src/js/Context.ts rename to client/src/js/Context.ts diff --git a/twenty-client/src/js/components/App.tsx b/client/src/js/components/App.tsx similarity index 100% rename from twenty-client/src/js/components/App.tsx rename to client/src/js/components/App.tsx diff --git a/twenty-client/src/js/components/Group.tsx b/client/src/js/components/Group.tsx similarity index 100% rename from twenty-client/src/js/components/Group.tsx rename to client/src/js/components/Group.tsx diff --git a/twenty-client/src/js/components/Icons.tsx b/client/src/js/components/Icons.tsx similarity index 100% rename from twenty-client/src/js/components/Icons.tsx rename to client/src/js/components/Icons.tsx diff --git a/twenty-client/src/js/components/NavBar.tsx b/client/src/js/components/NavBar.tsx similarity index 100% rename from twenty-client/src/js/components/NavBar.tsx rename to client/src/js/components/NavBar.tsx diff --git a/twenty-client/src/js/components/ProjectSelect.tsx b/client/src/js/components/ProjectSelect.tsx similarity index 100% rename from twenty-client/src/js/components/ProjectSelect.tsx rename to client/src/js/components/ProjectSelect.tsx diff --git a/twenty-client/src/js/components/Projects.tsx b/client/src/js/components/Projects.tsx similarity index 100% rename from twenty-client/src/js/components/Projects.tsx rename to client/src/js/components/Projects.tsx diff --git a/twenty-client/src/js/components/Select.tsx b/client/src/js/components/Select.tsx similarity index 100% rename from twenty-client/src/js/components/Select.tsx rename to client/src/js/components/Select.tsx diff --git a/twenty-client/src/js/components/Tabs.tsx b/client/src/js/components/Tabs.tsx similarity index 100% rename from twenty-client/src/js/components/Tabs.tsx rename to client/src/js/components/Tabs.tsx diff --git a/twenty-client/src/js/components/Task.tsx b/client/src/js/components/Task.tsx similarity index 100% rename from twenty-client/src/js/components/Task.tsx rename to client/src/js/components/Task.tsx diff --git a/twenty-client/src/js/components/TaskStatusSelect.tsx b/client/src/js/components/TaskStatusSelect.tsx similarity index 100% rename from twenty-client/src/js/components/TaskStatusSelect.tsx rename to client/src/js/components/TaskStatusSelect.tsx diff --git a/twenty-client/src/js/components/Tasks.tsx b/client/src/js/components/Tasks.tsx similarity index 100% rename from twenty-client/src/js/components/Tasks.tsx rename to client/src/js/components/Tasks.tsx diff --git a/twenty-client/src/js/components/forms/Select.tsx b/client/src/js/components/forms/Select.tsx similarity index 100% rename from twenty-client/src/js/components/forms/Select.tsx rename to client/src/js/components/forms/Select.tsx diff --git a/twenty-client/src/js/hooks/mutations/useCompleteTask.ts b/client/src/js/hooks/mutations/useCompleteTask.ts similarity index 100% rename from twenty-client/src/js/hooks/mutations/useCompleteTask.ts rename to client/src/js/hooks/mutations/useCompleteTask.ts diff --git a/twenty-client/src/js/hooks/mutations/useCreateTask.ts b/client/src/js/hooks/mutations/useCreateTask.ts similarity index 100% rename from twenty-client/src/js/hooks/mutations/useCreateTask.ts rename to client/src/js/hooks/mutations/useCreateTask.ts diff --git a/twenty-client/src/js/hooks/mutations/useDestroyTask.ts b/client/src/js/hooks/mutations/useDestroyTask.ts similarity index 100% rename from twenty-client/src/js/hooks/mutations/useDestroyTask.ts rename to client/src/js/hooks/mutations/useDestroyTask.ts diff --git a/twenty-client/src/js/hooks/mutations/useSetRandomProjectColor.tsx b/client/src/js/hooks/mutations/useSetRandomProjectColor.tsx similarity index 100% rename from twenty-client/src/js/hooks/mutations/useSetRandomProjectColor.tsx rename to client/src/js/hooks/mutations/useSetRandomProjectColor.tsx diff --git a/twenty-client/src/js/hooks/mutations/useUpdateTask.ts b/client/src/js/hooks/mutations/useUpdateTask.ts similarity index 100% rename from twenty-client/src/js/hooks/mutations/useUpdateTask.ts rename to client/src/js/hooks/mutations/useUpdateTask.ts diff --git a/twenty-client/src/js/hooks/queries/useFindTask.ts b/client/src/js/hooks/queries/useFindTask.ts similarity index 100% rename from twenty-client/src/js/hooks/queries/useFindTask.ts rename to client/src/js/hooks/queries/useFindTask.ts diff --git a/twenty-client/src/js/hooks/queries/useProjects.ts b/client/src/js/hooks/queries/useProjects.ts similarity index 100% rename from twenty-client/src/js/hooks/queries/useProjects.ts rename to client/src/js/hooks/queries/useProjects.ts diff --git a/twenty-client/src/js/hooks/queries/useTasks.ts b/client/src/js/hooks/queries/useTasks.ts similarity index 100% rename from twenty-client/src/js/hooks/queries/useTasks.ts rename to client/src/js/hooks/queries/useTasks.ts diff --git a/twenty-client/src/js/hooks/useParams.ts b/client/src/js/hooks/useParams.ts similarity index 100% rename from twenty-client/src/js/hooks/useParams.ts rename to client/src/js/hooks/useParams.ts diff --git a/twenty-client/src/js/lib/markdown-utils.ts b/client/src/js/lib/markdown-utils.ts similarity index 100% rename from twenty-client/src/js/lib/markdown-utils.ts rename to client/src/js/lib/markdown-utils.ts diff --git a/twenty-client/src/js/main/projects.tsx b/client/src/js/main/projects.tsx similarity index 100% rename from twenty-client/src/js/main/projects.tsx rename to client/src/js/main/projects.tsx diff --git a/twenty-client/src/js/main/task/edit.tsx b/client/src/js/main/task/edit.tsx similarity index 100% rename from twenty-client/src/js/main/task/edit.tsx rename to client/src/js/main/task/edit.tsx diff --git a/twenty-client/src/js/main/task/new.tsx b/client/src/js/main/task/new.tsx similarity index 100% rename from twenty-client/src/js/main/task/new.tsx rename to client/src/js/main/task/new.tsx diff --git a/twenty-client/src/js/main/tasks.tsx b/client/src/js/main/tasks.tsx similarity index 100% rename from twenty-client/src/js/main/tasks.tsx rename to client/src/js/main/tasks.tsx diff --git a/twenty-client/src/js/types/schema.ts b/client/src/js/types/schema.ts similarity index 100% rename from twenty-client/src/js/types/schema.ts rename to client/src/js/types/schema.ts diff --git a/twenty-client/tsconfig.json b/client/tsconfig.json similarity index 100% rename from twenty-client/tsconfig.json rename to client/tsconfig.json diff --git a/twenty-client/webpack.common.js b/client/webpack.common.js similarity index 100% rename from twenty-client/webpack.common.js rename to client/webpack.common.js diff --git a/twenty-client/webpack.development.js b/client/webpack.development.js similarity index 100% rename from twenty-client/webpack.development.js rename to client/webpack.development.js diff --git a/twenty-client/webpack.production.js b/client/webpack.production.js similarity index 100% rename from twenty-client/webpack.production.js rename to client/webpack.production.js diff --git a/rake/lib/builders.rb b/rake/lib/builders.rb index 6c24288..a1aa66c 100644 --- a/rake/lib/builders.rb +++ b/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" - CHILDREN = %w[twenty-cli twenty-server twenty-client] + PARENT = File.basename File.realpath(File.join(__dir__, "..", "..")) + 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 diff --git a/rake/tasks/nanoc.rake b/rake/tasks/nanoc.rake index 975240f..dd7136a 100644 --- a/rake/tasks/nanoc.rake +++ b/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 diff --git a/rake/tasks/rubocop.rake b/rake/tasks/rubocop.rake index f9dc3ff..9b256c8 100644 --- a/rake/tasks/rubocop.rake +++ b/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, "twenty-server"), - File.join(root, "twenty-client") + File.join(root, "cli"), + File.join(root, "server"), + File.join(root, "client") ] desc "Copy '.rubocop.yml' into place" diff --git a/rake/tasks/schema.rake b/rake/tasks/schema.rake index e60aa94..74b911f 100644 --- a/rake/tasks/schema.rake +++ b/rake/tasks/schema.rake @@ -5,15 +5,15 @@ namespace :schema do task :'regen:server' do Dir.chdir(workdir) do - require "twenty-server" - schema = File.join(Dir.getwd, "share", "twenty-server", "schema.graphql") + require "server" + 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 diff --git a/rake/tasks/server.rake b/rake/tasks/server.rake index ed209eb..febfd3c 100644 --- a/rake/tasks/server.rake +++ b/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") diff --git a/twenty-server/.rubocop.yml b/server/.rubocop.yml similarity index 100% rename from twenty-server/.rubocop.yml rename to server/.rubocop.yml diff --git a/twenty-server/Gemfile b/server/Gemfile similarity index 100% rename from twenty-server/Gemfile rename to server/Gemfile diff --git a/twenty-server/lib/twenty-server.rb b/server/lib/twenty/server.rb similarity index 84% rename from twenty-server/lib/twenty-server.rb rename to server/lib/twenty/server.rb index 96c2b3e..a023511 100644 --- a/twenty-server/lib/twenty-server.rb +++ b/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 "twenty-server/rack" + require_relative "server/graphql" + require_relative "server/rack" end diff --git a/twenty-server/lib/twenty-server/graphql.rb b/server/lib/twenty/server/graphql.rb similarity index 100% rename from twenty-server/lib/twenty-server/graphql.rb rename to server/lib/twenty/server/graphql.rb diff --git a/twenty-server/lib/twenty-server/graphql/input.rb b/server/lib/twenty/server/graphql/input.rb similarity index 100% rename from twenty-server/lib/twenty-server/graphql/input.rb rename to server/lib/twenty/server/graphql/input.rb diff --git a/twenty-server/lib/twenty-server/graphql/input/task_input.rb b/server/lib/twenty/server/graphql/input/task_input.rb similarity index 100% rename from twenty-server/lib/twenty-server/graphql/input/task_input.rb rename to server/lib/twenty/server/graphql/input/task_input.rb diff --git a/twenty-server/lib/twenty-server/graphql/mutation.rb b/server/lib/twenty/server/graphql/mutation.rb similarity index 100% rename from twenty-server/lib/twenty-server/graphql/mutation.rb rename to server/lib/twenty/server/graphql/mutation.rb diff --git a/twenty-server/lib/twenty-server/graphql/mutation/complete_task.rb b/server/lib/twenty/server/graphql/mutation/complete_task.rb similarity index 100% rename from twenty-server/lib/twenty-server/graphql/mutation/complete_task.rb rename to server/lib/twenty/server/graphql/mutation/complete_task.rb diff --git a/twenty-server/lib/twenty-server/graphql/mutation/create_task.rb b/server/lib/twenty/server/graphql/mutation/create_task.rb similarity index 100% rename from twenty-server/lib/twenty-server/graphql/mutation/create_task.rb rename to server/lib/twenty/server/graphql/mutation/create_task.rb diff --git a/twenty-server/lib/twenty-server/graphql/mutation/destroy_task.rb b/server/lib/twenty/server/graphql/mutation/destroy_task.rb similarity index 100% rename from twenty-server/lib/twenty-server/graphql/mutation/destroy_task.rb rename to server/lib/twenty/server/graphql/mutation/destroy_task.rb diff --git a/twenty-server/lib/twenty-server/graphql/mutation/set_random_project_color.rb b/server/lib/twenty/server/graphql/mutation/set_random_project_color.rb similarity index 100% rename from twenty-server/lib/twenty-server/graphql/mutation/set_random_project_color.rb rename to server/lib/twenty/server/graphql/mutation/set_random_project_color.rb diff --git a/twenty-server/lib/twenty-server/graphql/mutation/update_task.rb b/server/lib/twenty/server/graphql/mutation/update_task.rb similarity index 100% rename from twenty-server/lib/twenty-server/graphql/mutation/update_task.rb rename to server/lib/twenty/server/graphql/mutation/update_task.rb diff --git a/twenty-server/lib/twenty-server/graphql/schema.rb b/server/lib/twenty/server/graphql/schema.rb similarity index 100% rename from twenty-server/lib/twenty-server/graphql/schema.rb rename to server/lib/twenty/server/graphql/schema.rb diff --git a/twenty-server/lib/twenty-server/graphql/type.rb b/server/lib/twenty/server/graphql/type.rb similarity index 100% rename from twenty-server/lib/twenty-server/graphql/type.rb rename to server/lib/twenty/server/graphql/type.rb diff --git a/twenty-server/lib/twenty-server/graphql/type/mutation.rb b/server/lib/twenty/server/graphql/type/mutation.rb similarity index 100% rename from twenty-server/lib/twenty-server/graphql/type/mutation.rb rename to server/lib/twenty/server/graphql/type/mutation.rb diff --git a/twenty-server/lib/twenty-server/graphql/type/project.rb b/server/lib/twenty/server/graphql/type/project.rb similarity index 100% rename from twenty-server/lib/twenty-server/graphql/type/project.rb rename to server/lib/twenty/server/graphql/type/project.rb diff --git a/twenty-server/lib/twenty-server/graphql/type/query.rb b/server/lib/twenty/server/graphql/type/query.rb similarity index 100% rename from twenty-server/lib/twenty-server/graphql/type/query.rb rename to server/lib/twenty/server/graphql/type/query.rb diff --git a/twenty-server/lib/twenty-server/graphql/type/task.rb b/server/lib/twenty/server/graphql/type/task.rb similarity index 100% rename from twenty-server/lib/twenty-server/graphql/type/task.rb rename to server/lib/twenty/server/graphql/type/task.rb diff --git a/twenty-server/lib/twenty-server/graphql/type/task_status.rb b/server/lib/twenty/server/graphql/type/task_status.rb similarity index 100% rename from twenty-server/lib/twenty-server/graphql/type/task_status.rb rename to server/lib/twenty/server/graphql/type/task_status.rb diff --git a/twenty-server/lib/twenty-server/migration.rb b/server/lib/twenty/server/migration.rb similarity index 100% rename from twenty-server/lib/twenty-server/migration.rb rename to server/lib/twenty/server/migration.rb diff --git a/twenty-server/lib/twenty-server/migration/1_create_projects.rb b/server/lib/twenty/server/migration/1_create_projects.rb similarity index 100% rename from twenty-server/lib/twenty-server/migration/1_create_projects.rb rename to server/lib/twenty/server/migration/1_create_projects.rb diff --git a/twenty-server/lib/twenty-server/migration/2_create_tasks.rb b/server/lib/twenty/server/migration/2_create_tasks.rb similarity index 100% rename from twenty-server/lib/twenty-server/migration/2_create_tasks.rb rename to server/lib/twenty/server/migration/2_create_tasks.rb diff --git a/twenty-server/lib/twenty-server/migration/3_add_color_to_projects.rb b/server/lib/twenty/server/migration/3_add_color_to_projects.rb similarity index 100% rename from twenty-server/lib/twenty-server/migration/3_add_color_to_projects.rb rename to server/lib/twenty/server/migration/3_add_color_to_projects.rb diff --git a/twenty-server/lib/twenty-server/model.rb b/server/lib/twenty/server/model.rb similarity index 100% rename from twenty-server/lib/twenty-server/model.rb rename to server/lib/twenty/server/model.rb diff --git a/twenty-server/lib/twenty-server/model/mixin/colorable_mixin.rb b/server/lib/twenty/server/model/mixin/colorable_mixin.rb similarity index 100% rename from twenty-server/lib/twenty-server/model/mixin/colorable_mixin.rb rename to server/lib/twenty/server/model/mixin/colorable_mixin.rb diff --git a/twenty-server/lib/twenty-server/model/project.rb b/server/lib/twenty/server/model/project.rb similarity index 100% rename from twenty-server/lib/twenty-server/model/project.rb rename to server/lib/twenty/server/model/project.rb diff --git a/twenty-server/lib/twenty-server/model/task.rb b/server/lib/twenty/server/model/task.rb similarity index 100% rename from twenty-server/lib/twenty-server/model/task.rb rename to server/lib/twenty/server/model/task.rb diff --git a/twenty-server/lib/twenty-server/path.rb b/server/lib/twenty/server/path.rb similarity index 100% rename from twenty-server/lib/twenty-server/path.rb rename to server/lib/twenty/server/path.rb diff --git a/twenty-server/lib/twenty-server/rack.rb b/server/lib/twenty/server/rack.rb similarity index 100% rename from twenty-server/lib/twenty-server/rack.rb rename to server/lib/twenty/server/rack.rb diff --git a/twenty-server/lib/twenty-server/rack/graphql.rb b/server/lib/twenty/server/rack/graphql.rb similarity index 100% rename from twenty-server/lib/twenty-server/rack/graphql.rb rename to server/lib/twenty/server/rack/graphql.rb diff --git a/twenty-server/twenty-server.gemspec b/server/server.gemspec similarity index 86% rename from twenty-server/twenty-server.gemspec rename to server/server.gemspec index 6b09db0..0d78a9e 100644 --- a/twenty-server/twenty-server.gemspec +++ b/server/server.gemspec @@ -9,11 +9,11 @@ Gem::Specification.new do |gem| gem.licenses = ["0BSD"] gem.files = [ *Dir.glob(File.join(__dir__, "lib", "*.rb")), - *Dir.glob(File.join(__dir__, "lib", "twenty-server", "**", "*.rb")), + *Dir.glob(File.join(__dir__, "lib", "twenty", "server", "**", "*.rb")), *Dir.glob(File.join(__dir__, "share", "**", "*")), ].select { File.file?(_1) } gem.require_paths = ["lib"] - gem.summary = "twenty: server-side component" + gem.summary = "HTTP server" gem.description = gem.summary gem.add_runtime_dependency "sequel", "~> 5.78" gem.add_runtime_dependency "sqlite3", "~> 1.6" diff --git a/twenty-server/twenty-server.gemspec.erb b/server/server.gemspec.erb similarity index 83% rename from twenty-server/twenty-server.gemspec.erb rename to server/server.gemspec.erb index 62a3475..765eb86 100644 --- a/twenty-server/twenty-server.gemspec.erb +++ b/server/server.gemspec.erb @@ -1,7 +1,7 @@ # frozen_string_literal: true Gem::Specification.new do |gem| - gem.name = "twenty-server" + gem.name = "<%= parent %>-server" gem.authors = ["0x1eef"] gem.email = ["0x1eef@protonmail.com"] gem.homepage = "https://github.com/0x1eef/twenty#readme" @@ -9,11 +9,11 @@ Gem::Specification.new do |gem| gem.licenses = ["0BSD"] gem.files = [ *Dir.glob(File.join(__dir__, "lib", "*.rb")), - *Dir.glob(File.join(__dir__, "lib", "twenty-server", "**", "*.rb")), + *Dir.glob(File.join(__dir__, "lib", "twenty", "server", "**", "*.rb")), *Dir.glob(File.join(__dir__, "share", "**", "*")), ].select { File.file?(_1) } gem.require_paths = ["lib"] - gem.summary = "twenty: server-side component" + gem.summary = "HTTP server" gem.description = gem.summary gem.add_runtime_dependency "sequel", "~> 5.78" gem.add_runtime_dependency "sqlite3", "~> 1.6" diff --git a/twenty-server/share/twenty-server/schema.graphql b/server/share/twenty-server/schema.graphql similarity index 100% rename from twenty-server/share/twenty-server/schema.graphql rename to server/share/twenty-server/schema.graphql diff --git a/twenty-cli/lib/twenty-cli.rb b/twenty-cli/lib/twenty-cli.rb deleted file mode 100644 index 3d5739f..0000000 --- a/twenty-cli/lib/twenty-cli.rb +++ /dev/null @@ -1,8 +0,0 @@ -# frozen_string_literal: true - -module Twenty - require "json" - require "twenty-server" - require "twenty-client" - require_relative "twenty-cli/command" -end diff --git a/twenty-server/.bundle/config b/twenty-server/.bundle/config deleted file mode 100644 index e308ea4..0000000 --- a/twenty-server/.bundle/config +++ /dev/null @@ -1,3 +0,0 @@ ---- -BUNDLE_PATH: ".gems" -BUNDLE_BUILD__SQLITE3: "--enable-system-libraries" diff --git a/twenty.rb.gemspec b/twenty.gemspec similarity index 79% rename from twenty.rb.gemspec rename to twenty.gemspec index 728af3c..124ea39 100644 --- a/twenty.rb.gemspec +++ b/twenty.gemspec @@ -1,15 +1,14 @@ # frozen_string_literal: true Gem::Specification.new do |gem| - gem.name = "twenty.rb" + gem.name = "twenty" gem.authors = ["0x1eef"] gem.email = ["0x1eef@protonmail.com"] gem.homepage = "https://github.com/0x1eef/twenty#readme" gem.version = "0.3.5" gem.licenses = ["0BSD"] gem.files = [ - *Dir.glob(File.join(__dir__, "lib", "*.rb")), - *Dir.glob(File.join(__dir__, "lib", "twenty", "**","*.rb")) + *Dir.glob(File.join(__dir__, "lib", "*.rb")), ].select { File.file?(_1) } gem.summary = "Minimal project management that runs on your computer" gem.description = gem.summary diff --git a/twenty.rb.gemspec.erb b/twenty.gemspec.erb similarity index 55% rename from twenty.rb.gemspec.erb rename to twenty.gemspec.erb index bfb1053..028d43e 100644 --- a/twenty.rb.gemspec.erb +++ b/twenty.gemspec.erb @@ -1,19 +1,18 @@ # frozen_string_literal: true Gem::Specification.new do |gem| - gem.name = "twenty.rb" + gem.name = "<%= parent %>" gem.authors = ["0x1eef"] gem.email = ["0x1eef@protonmail.com"] gem.homepage = "https://github.com/0x1eef/twenty#readme" gem.version = "<%= version %>" gem.licenses = ["0BSD"] gem.files = [ - *Dir.glob(File.join(__dir__, "lib", "*.rb")), - *Dir.glob(File.join(__dir__, "lib", "twenty", "**","*.rb")) + *Dir.glob(File.join(__dir__, "lib", "*.rb")), ].select { File.file?(_1) } gem.summary = "Minimal project management that runs on your computer" gem.description = gem.summary - gem.add_runtime_dependency "twenty-server", "<%= version %>" - gem.add_runtime_dependency "twenty-client", "<%= version %>" - gem.add_runtime_dependency "twenty-cli", "<%= version %>" + gem.add_runtime_dependency "<%= parent %>-server", "<%= version %>" + gem.add_runtime_dependency "<%= parent %>-client", "<%= version %>" + gem.add_runtime_dependency "<%= parent %>-cli", "<%= version %>" end