diff --git a/Rakefile.rb b/Rakefile.rb index 7e559a6..50aa889 100644 --- a/Rakefile.rb +++ b/Rakefile.rb @@ -1,7 +1,7 @@ require "bundler/setup" -load "rake/tasks/schema.rake" -load "rake/tasks/nanoc.rake" -load "rake/tasks/gem.rake" -load "rake/tasks/rubocop.rake" -load "rake/tasks/server.rake" +load "host/rake/tasks/schema.rake" +load "host/rake/tasks/nanoc.rake" +load "host/rake/tasks/gem.rake" +load "host/rake/tasks/rubocop.rake" +load "host/rake/tasks/server.rake" diff --git a/bin/setup b/host/bin/setup similarity index 100% rename from bin/setup rename to host/bin/setup diff --git a/lib/twenty.rb b/host/lib/twenty.rb similarity index 100% rename from lib/twenty.rb rename to host/lib/twenty.rb diff --git a/rake/lib/builders.rb b/host/rake/lib/builders.rb similarity index 99% rename from rake/lib/builders.rb rename to host/rake/lib/builders.rb index a1aa66c..690092e 100644 --- a/rake/lib/builders.rb +++ b/host/rake/lib/builders.rb @@ -2,7 +2,7 @@ class Builder ROOTDIR = Dir.getwd STAGEDIR = File.join(ROOTDIR, "stage") PKGDIR = File.join(ROOTDIR, "pkgs") - PARENT = File.basename File.realpath(File.join(__dir__, "..", "..")) + PARENT = File.basename File.realpath(File.join(__dir__, "..", "..", "..")) CHILDREN = %w[cli server client] include FileUtils diff --git a/rake/tasks/gem.rake b/host/rake/tasks/gem.rake similarity index 93% rename from rake/tasks/gem.rake rename to host/rake/tasks/gem.rake index a2ca9ef..c0a8a7e 100644 --- a/rake/tasks/gem.rake +++ b/host/rake/tasks/gem.rake @@ -2,7 +2,7 @@ namespace :gem do require_relative "../lib/builders" - root = File.realpath File.join(__dir__, "..", "..") + root = File.realpath File.join(__dir__, "..", "..", "..") version = File.binread(File.join(root, "VERSION")).chomp desc "Build gemspec" diff --git a/rake/tasks/nanoc.rake b/host/rake/tasks/nanoc.rake similarity index 93% rename from rake/tasks/nanoc.rake rename to host/rake/tasks/nanoc.rake index dd7136a..3e45abf 100644 --- a/rake/tasks/nanoc.rake +++ b/host/rake/tasks/nanoc.rake @@ -1,6 +1,6 @@ namespace :nanoc do require "bundler/setup" - workdir = File.realpath File.join(__dir__, "..", "..", "client") + workdir = File.realpath File.join(__dir__, "..", "..", "..", "client") desc "Clean the build/ directory" task :clean do diff --git a/rake/tasks/rubocop.rake b/host/rake/tasks/rubocop.rake similarity index 92% rename from rake/tasks/rubocop.rake rename to host/rake/tasks/rubocop.rake index 9b256c8..b15c07c 100644 --- a/rake/tasks/rubocop.rake +++ b/host/rake/tasks/rubocop.rake @@ -1,7 +1,7 @@ #!/usr/bin/env ruby namespace :rubocop do - root = File.realpath File.join(__dir__, "..", "..") + root = File.realpath File.join(__dir__, "..", "..", "..") gems = [ File.join(root, "cli"), File.join(root, "server"), diff --git a/rake/tasks/schema.rake b/host/rake/tasks/schema.rake similarity index 91% rename from rake/tasks/schema.rake rename to host/rake/tasks/schema.rake index 74b911f..eb36556 100644 --- a/rake/tasks/schema.rake +++ b/host/rake/tasks/schema.rake @@ -1,5 +1,5 @@ namespace :schema do - workdir = File.join(__dir__, "..", "..") + workdir = File.join(__dir__, "..", "..", "..") desc "Regenerate the GraphQL schema (server-side and client-side)" task regen: %i[regen:server regen:client] diff --git a/rake/tasks/server.rake b/host/rake/tasks/server.rake similarity index 100% rename from rake/tasks/server.rake rename to host/rake/tasks/server.rake diff --git a/twenty.gemspec b/twenty.gemspec index 124ea39..36f2405 100644 --- a/twenty.gemspec +++ b/twenty.gemspec @@ -8,7 +8,7 @@ Gem::Specification.new do |gem| gem.version = "0.3.5" gem.licenses = ["0BSD"] gem.files = [ - *Dir.glob(File.join(__dir__, "lib", "*.rb")), + *Dir.glob(File.join(__dir__, "host", "lib", "*.rb")), ].select { File.file?(_1) } gem.summary = "Minimal project management that runs on your computer" gem.description = gem.summary diff --git a/twenty.gemspec.erb b/twenty.gemspec.erb index 028d43e..ae84d9c 100644 --- a/twenty.gemspec.erb +++ b/twenty.gemspec.erb @@ -8,7 +8,7 @@ Gem::Specification.new do |gem| gem.version = "<%= version %>" gem.licenses = ["0BSD"] gem.files = [ - *Dir.glob(File.join(__dir__, "lib", "*.rb")), + *Dir.glob(File.join(__dir__, "host", "lib", "*.rb")), ].select { File.file?(_1) } gem.summary = "Minimal project management that runs on your computer" gem.description = gem.summary