roda-project 0.1.6 → 0.1.8

data/lib/roda/{templates → project/templates}/base/scaffold/Gemfile.erb

@@ -10,17 +10,20 @@ gem "zeitwerk"
 # Authentication
 gem "rodauth"
 gem "jwt"
-<% end %>
+<% end %><% if context.database? %>
 # Database
 gem "sequel"
-<%= "gem \"#{context.db_gem}\"" if context.database? %>
-
+<%= "gem \"#{context.db_gem}\"" %>
+<% end %>
 # Web Server
 gem "puma"
 # gem "falcon"
 # gem 'iodine'
-# gem 'thin'
+# gem 'thin'<% if context.fullstack? %>
 
+# Views
+gem 'roda-assets_manifest'
+<% end %>
 # Performance
 gem "oj"
 # gem 'async'
@@ -29,12 +32,11 @@ gem "oj"
 # gem "rack-attack"
 
 # Misc
-gem "html_slice"
 gem "mail"
 gem "bcrypt"
 gem "logger"
-
 group :development do
+  gem "thor"
   gem "guard-puma"
   gem "guard-livereload"
   gem "rack-livereload"
@@ -44,7 +46,6 @@ group :development do
   gem "standard"<% if context.minitest? %>
   gem "minitest"
   gem "minitest-hooks"
-  gem "rake"
 <% else %>
   gem "rspec"<% end %>
 end

data/lib/roda/{templates → project/templates}/base/scaffold/app/config/config.rb.erb

@@ -11,23 +11,12 @@ module Config
           locale: ["en", "pt-br"]
         }<% end %><% if context.database? %>,
         db: {
-          url: not_production? ? <%= context.dev_db_url %> : ENV["DATABASE_URL"]
-        }<% end %><% if context.fullstack? %>,
-        assets: {
-          host: '/public/assets',
-          manifest:
+          url: not_production? ? <%= context.default_db_url %> : ENV["DATABASE_URL"]
         }<% end %>
       }
     end
 
-    def not_production? = environment != "production"<% if context.fullstack? %>
-    def manifest
-      manifest_path = File.expand_path("../../public/assets/manifest.json", __dir__)
-      return JSON.parse(File.read(manifest_path)) if File.exist?(manifest_path)
-
-      {}
-    end
-    <% end %>
+    def not_production? = environment != "production"
     def environment
       ENV["RACK_ENV"] || "development"
     end

data/lib/roda/project/templates/base/scaffold/bin/roda.erb

@@ -0,0 +1,153 @@
+#!/usr/bin/env ruby
+require "thor"
+require "roda/project/bin/generators"
+<% if context.database? %>
+class Db < Thor
+  desc "migrate", "Migrate the database. Optional: provide target version, e.g., 'roda db:migrate 1'"
+  option :target, type: :numeric, aliases: "-t", desc: "provide target version"
+  def migrate
+    require_db_deps
+    require_relative "../boot"
+
+    Sequel.extension :migration
+    db = Providers::DB::Conn.get
+    if options[:target]
+      Sequel::Migrator.run(db, "db/migrations", target: options[:target].to_i)
+    else
+      Sequel::Migrator.run(db, "db/migrations")
+    end
+    puts "* database migration complete."
+  end
+  <% if context.sqlite? %>
+  desc "create", "Create the database"
+  def create
+    require_db_deps
+    path = parse_sqlite_path(Config.get[:db][:url])
+    FileUtils.mkdir_p(File.dirname(path))
+    Sequel.connect("sqlite://#{path}") rescue nil
+    puts "* create database #{path} ✓"
+  end
+
+  desc "drop", "Drop the database"
+  def drop
+    require_db_deps
+    path = parse_sqlite_path(Config.get[:db][:url])
+    File.delete(path) if File.exist?(path)
+    puts "* drop database #{path} ✓"
+  end
+  <% else %>
+  [:drop, :create].each do |action|
+    desc action.to_s, "#{action.capitalize} the database"
+    define_method(action) do
+      require_db_deps
+      require_relative "../app/config/config"<% if context.postgresql? %>
+      db_config =
+        PG::Connection
+        .conninfo_parse(Config.get[:db][:url])
+        .each_with_object({}) { |h, o|
+          o[h[:keyword].to_sym] = h[:val] if h[:val]
+        }
+      ok = system("PGPASSWORD='#{db_config[:password]}' #{action}db -h #{db_config[:host]} -p #{db_config[:port]} -U #{db_confi
+      g[:user]} #{db_config[:dbname]}")<% end %><% if context.mysql? %>
+      uri = URI.parse(Config.get[:db][:url])
+      db_config = {
+        host: uri.host,
+        port: uri.port,
+        user: uri.user,
+        password: uri.password,
+        dbname: uri.path.tr('/', '') # removes leading slash
+      }
+      sql = action == :create ?
+      "CREATE DATABASE IF NOT EXISTS `#{db_config[:dbname]}`;" :
+      "DROP DATABASE IF EXISTS `#{db_config[:dbname]}`;"
+      flags = []
+      flags << "-h#{db_config[:host]}" if db_config[:host]
+      flags << "-P#{db_config[:port]}" if db_config[:port]
+      flags << "-u#{db_config[:user]}" if db_config[:user]
+      env = { "MYSQL_PWD" => db_config[:password] }.compact
+      ok = system(env, "mysql", *flags, "-e", sql)<% end %>
+      puts "* #{action} database #{db_config[:dbname]} ✓" if ok
+    end
+  end
+  <% end %>
+  private
+  <% if context.sqlite? %>
+  def parse_sqlite_path(url)
+    uri = URI.parse(url)
+    File.expand_path(uri.host ? File.join(uri.host, uri.path) : uri.path, Dir.pwd)
+  end
+  <% end %>
+  def require_db_deps
+    require_relative "../boot"
+    require "sequel"
+    require "sequel/extensions/migration"
+    require "<%= context.db_gem %>"<% if context.mysql? %>
+    require "uri"<% end %>
+  end
+end
+<% end %>
+class CLI < Thor
+  desc "console", "Open a console with application context, alias: roda c"
+  def console
+    system("irb -r ./boot.rb")
+  end
+  map "c" => "console"
+
+  desc "lint", "Run lint"
+  option :fix, type: :boolean, aliases: "-w", desc: "Auto fix lint warnings"
+  def lint
+    if options[:fix]
+      system("bundle exec standardrb --fix")
+    else
+      system("bundle exec standardrb")
+    end
+  end
+
+  desc "test", "Run tests"
+  def test<% if context.rspec? %>
+    system("RACK_ENV=test bundle exec rspec")<% else %>
+    system("RACK_ENV=test bundle exec minitest spec/")<% end %>
+  end
+
+  desc "dev", "Exec development server watching for changes"
+  def dev
+    system("RACK_ENV=development bundle exec guard")
+  end
+  <% if context.fullstack? %>
+  desc "assets", "Compile assets (use -w flag to watch for changes)"
+  option :watch, type: :boolean, aliases: "-w", desc: "Watch for changes"
+  def assets
+    if options[:watch]
+      system("npm i && npm run build:watch")
+    else
+      system("npm i && npm run build")
+    end
+  end
+<% end %>
+  desc "server", "Runs the project, alias roda s"
+  def server
+    if ENV["RACK_ENV"] == "production"<% if context.database? %>
+      if ENV["DATABASE_URL"].nil?
+        puts("DATABASE_URL is empty")
+        exit 1
+      end<% end %>
+      if ENV["SESSION_SECRET"].nil?
+        puts("SESSION_SECRET is empty")
+        exit 1
+      end
+      system("RUBYOPT=--yjit RUBY_YJIT_ENABLE=1 RACK_ENV=production bundle exec puma --port 4000")
+    else
+      system("RACK_ENV=development bundle exec puma --port 4000")
+    end
+  end
+  map "s" => "server"
+  <% if context.database? %>
+  desc "db", "Database functions"
+  subcommand "db", Db
+  <% end %>
+  desc "generate", "Commands to generate code"
+  <%= context.to_thor_option %>
+  subcommand "generate", Roda::Project::Bin::Generators
+end
+
+CLI.start(ARGV)

data/lib/roda/project/templates/front-end/app/views/layout.erb

@@ -0,0 +1,23 @@
+<html>
+  <head>
+    <meta charset='utf-8' />
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+    <title>Roda project</title>
+
+    <%= css_entrypoint_tag(:app) %>
+  </head>
+  <body>
+    <img src='/public/images/roda-project.png' />
+    <br>
+    <div class="navbar">
+      <a href="/">home</a>
+      <a href="/foo/bar">foo/bar</a>
+    </div>
+
+    <%= yield %>
+    <%= js_entrypoint_tag(:app) %>
+  </body>
+</html>

data/lib/roda/{templates → project/templates}/front-end/esbuild.js

@@ -6,13 +6,13 @@ const isProduction = process.env.RACK_ENV === 'production';
 const cssEntryPoints = ['app']
 const jsEntryPoints = ['app']
 
-function config() {
-  const assetsEntryPoints =
-    cssEntryPoints.map((e) => `css/${e}.css`)
-    .concat(
-      jsEntryPoints.map((e) => `js/${e}.js`)
-    )
+const assetsEntryPoints =
+  cssEntryPoints.map((e) => `css/${e}.css`)
+  .concat(
+    jsEntryPoints.map((e) => `js/${e}.js`)
+  )
 
+function config() {
   return {
     entryPoints: assetsEntryPoints.map((name) => `app/assets/${name}`),
     bundle: true,

data/lib/roda/project/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-module Roda
+class Roda
   module Project
-    VERSION = "0.1.6"
+    VERSION = "0.1.8"
   end
 end

data/lib/roda/project.rb

@@ -1,17 +1,6 @@
 # frozen_string_literal: true
 
-require "tty-file"
-require "fileutils"
-require "tty-reader"
-require "pastel"
-require_relative "project/version"
-require_relative "project/helpers/ids"
-require_relative "project/context"
-require_relative "project/helpers/input"
-require_relative "project/helpers/template"
-require_relative "project/cli"
-
-module Roda
+class Roda
   module Project
     class Error < StandardError; end
 
@@ -55,3 +44,25 @@ module Roda
     end
   end
 end
+
+# Dependences
+require "tty-file"
+require "fileutils"
+require "tty-reader"
+require "pastel"
+require "thor"
+# Helpers
+require_relative "project/helpers/ids"
+require_relative "project/helpers/interactive_input"
+require_relative "project/helpers/template"
+# Base
+require_relative "project/main_context"
+require_relative "project/generator"
+require_relative "project/cli"
+# Generators
+require_relative "project/bin/generator"
+require_relative "project/bin/generators/migration"
+require_relative "project/bin/generators/routes"
+require_relative "project/bin/generators"
+# Version
+require_relative "project/version"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda-project
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Henrique F. Teixeira
@@ -51,6 +51,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  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'
 email:
 - hriqueft@gmail.com
 executables:
@@ -63,71 +77,74 @@ files:
 - bin/roda-project.rb
 - bin/setup
 - lib/roda/project.rb
+- lib/roda/project/bin/generator.rb
+- lib/roda/project/bin/generators.rb
+- lib/roda/project/bin/generators/migration.rb
+- lib/roda/project/bin/generators/routes.rb
 - lib/roda/project/cli.rb
-- lib/roda/project/context.rb
+- lib/roda/project/generator.rb
 - lib/roda/project/helpers/ids.rb
-- lib/roda/project/helpers/input.rb
+- lib/roda/project/helpers/interactive_input.rb
 - lib/roda/project/helpers/template.rb
+- lib/roda/project/main_context.rb
+- lib/roda/project/templates/base/app/app.rb.erb
+- lib/roda/project/templates/base/minimal/AGENTS.md
+- lib/roda/project/templates/base/minimal/Gemfile.erb
+- lib/roda/project/templates/base/minimal/Gemfile.lock
+- lib/roda/project/templates/base/minimal/Guardfile
+- lib/roda/project/templates/base/minimal/README.md
+- lib/roda/project/templates/base/minimal/app.rb
+- lib/roda/project/templates/base/minimal/bin/roda.erb
+- lib/roda/project/templates/base/minimal/boot.rb
+- lib/roda/project/templates/base/minimal/config.ru
+- lib/roda/project/templates/base/minimal/public/exception_page.css
+- lib/roda/project/templates/base/scaffold/AGENTS.md
+- lib/roda/project/templates/base/scaffold/Gemfile.erb
+- lib/roda/project/templates/base/scaffold/Guardfile
+- lib/roda/project/templates/base/scaffold/README.md
+- lib/roda/project/templates/base/scaffold/app/config/config.rb.erb
+- lib/roda/project/templates/base/scaffold/app/config/locales/en.yml
+- lib/roda/project/templates/base/scaffold/app/config/locales/foo/en.yml
+- lib/roda/project/templates/base/scaffold/app/config/locales/foo/pt-br.yml
+- lib/roda/project/templates/base/scaffold/app/config/locales/pt-br.yml
+- lib/roda/project/templates/base/scaffold/app/config/providers/logger.rb
+- lib/roda/project/templates/base/scaffold/app/config/providers/mailer.rb
+- lib/roda/project/templates/base/scaffold/app/routes/foo.rb.erb
+- lib/roda/project/templates/base/scaffold/bin/roda.erb
+- lib/roda/project/templates/base/scaffold/boot.rb.erb
+- lib/roda/project/templates/base/scaffold/config.ru.erb
+- lib/roda/project/templates/base/scaffold/public/exception_page.css
+- lib/roda/project/templates/database/app/config/providers/db/conn.rb
+- lib/roda/project/templates/database/db/seeds.rb
+- lib/roda/project/templates/front-end/app/assets/css/app.css
+- lib/roda/project/templates/front-end/app/assets/js/app.js
+- lib/roda/project/templates/front-end/app/assets/js/some/foo.js
+- lib/roda/project/templates/front-end/app/views/foo/bar.erb
+- lib/roda/project/templates/front-end/app/views/index.erb
+- lib/roda/project/templates/front-end/app/views/layout.erb
+- lib/roda/project/templates/front-end/esbuild.js
+- lib/roda/project/templates/front-end/package.json
+- lib/roda/project/templates/front-end/public/assets/app.css
+- lib/roda/project/templates/front-end/public/assets/app.js
+- lib/roda/project/templates/front-end/public/images/roda-project.png
+- lib/roda/project/templates/rodauth/app/models/account.rb
+- lib/roda/project/templates/rodauth/app/views/create-account.erb
+- lib/roda/project/templates/rodauth/db/migrations/001_add_rodauth.rb
+- lib/roda/project/templates/tests/minimal/minitest/spec/app_spec.rb
+- lib/roda/project/templates/tests/minimal/minitest/spec/spec_helper.rb.erb
+- lib/roda/project/templates/tests/minimal/rspec/spec/app_spec.rb
+- lib/roda/project/templates/tests/minimal/rspec/spec/spec_helper.rb
+- lib/roda/project/templates/tests/minitest/spec/app/app_spec.rb.erb
+- lib/roda/project/templates/tests/minitest/spec/app/routes/foo_spec.rb
+- lib/roda/project/templates/tests/minitest/spec/app/routes/test_branch_spec.rb
+- lib/roda/project/templates/tests/minitest/spec/app/views/html_spec.rb
+- lib/roda/project/templates/tests/minitest/spec/spec_helper.rb.erb
+- lib/roda/project/templates/tests/rspec/spec/app/app_spec.rb.erb
+- lib/roda/project/templates/tests/rspec/spec/app/routes/foo_spec.rb
+- lib/roda/project/templates/tests/rspec/spec/app/routes/test_branch_spec.rb
+- lib/roda/project/templates/tests/rspec/spec/app/views/html_spec.rb
+- lib/roda/project/templates/tests/rspec/spec/spec_helper.rb.erb
 - lib/roda/project/version.rb
-- lib/roda/templates/base/app/app.rb.erb
-- lib/roda/templates/base/minimal/AGENTS.md
-- lib/roda/templates/base/minimal/Gemfile.erb
-- lib/roda/templates/base/minimal/Gemfile.lock
-- lib/roda/templates/base/minimal/Guardfile
-- lib/roda/templates/base/minimal/README.md
-- lib/roda/templates/base/minimal/Rakefile.erb
-- lib/roda/templates/base/minimal/app.rb
-- lib/roda/templates/base/minimal/boot.rb
-- lib/roda/templates/base/minimal/config.ru
-- lib/roda/templates/base/minimal/public/exception_page.css
-- lib/roda/templates/base/scaffold/AGENTS.md
-- lib/roda/templates/base/scaffold/Gemfile.erb
-- lib/roda/templates/base/scaffold/Guardfile
-- lib/roda/templates/base/scaffold/README.md
-- lib/roda/templates/base/scaffold/Rakefile.erb
-- lib/roda/templates/base/scaffold/app/config/config.rb.erb
-- lib/roda/templates/base/scaffold/app/config/locales/en.yml
-- lib/roda/templates/base/scaffold/app/config/locales/foo/en.yml
-- lib/roda/templates/base/scaffold/app/config/locales/foo/pt-br.yml
-- lib/roda/templates/base/scaffold/app/config/locales/pt-br.yml
-- lib/roda/templates/base/scaffold/app/config/providers/logger.rb
-- lib/roda/templates/base/scaffold/app/config/providers/mailer.rb
-- lib/roda/templates/base/scaffold/app/routes/foo.rb.erb
-- lib/roda/templates/base/scaffold/boot.rb.erb
-- lib/roda/templates/base/scaffold/config.ru.erb
-- lib/roda/templates/base/scaffold/public/exception_page.css
-- lib/roda/templates/database/app/config/providers/db/conn.rb
-- lib/roda/templates/database/db/seeds.rb
-- lib/roda/templates/front-end/app/assets/css/app.css
-- lib/roda/templates/front-end/app/assets/js/app.js
-- lib/roda/templates/front-end/app/assets/js/some/foo.js
-- lib/roda/templates/front-end/app/views/foo/bar.erb
-- lib/roda/templates/front-end/app/views/foo/html.rb
-- lib/roda/templates/front-end/app/views/html.rb
-- lib/roda/templates/front-end/app/views/index.erb
-- lib/roda/templates/front-end/app/views/layout.erb
-- lib/roda/templates/front-end/esbuild.js
-- lib/roda/templates/front-end/package.json
-- lib/roda/templates/front-end/public/assets/app.css
-- lib/roda/templates/front-end/public/assets/app.js
-- lib/roda/templates/front-end/public/images/roda-project.png
-- lib/roda/templates/rodauth/app/models/account.rb
-- lib/roda/templates/rodauth/app/views/create-account.erb
-- lib/roda/templates/rodauth/db/migrations/001_add_rodauth.rb
-- lib/roda/templates/tests/minimal/minitest/spec/app_spec.rb
-- lib/roda/templates/tests/minimal/minitest/spec/spec_helper.rb.erb
-- lib/roda/templates/tests/minimal/rspec/spec/app_spec.rb
-- lib/roda/templates/tests/minimal/rspec/spec/spec_helper.rb
-- lib/roda/templates/tests/minitest/spec/app/app_spec.rb.erb
-- lib/roda/templates/tests/minitest/spec/app/routes/foo_spec.rb
-- lib/roda/templates/tests/minitest/spec/app/routes/test_branch_spec.rb
-- lib/roda/templates/tests/minitest/spec/app/views/html_spec.rb
-- lib/roda/templates/tests/minitest/spec/spec_helper.rb.erb
-- lib/roda/templates/tests/rspec/spec/app/app_spec.rb.erb
-- lib/roda/templates/tests/rspec/spec/app/routes/foo_spec.rb
-- lib/roda/templates/tests/rspec/spec/app/routes/test_branch_spec.rb
-- lib/roda/templates/tests/rspec/spec/app/views/html_spec.rb
-- lib/roda/templates/tests/rspec/spec/spec_helper.rb.erb
 homepage: https://github.com/roda-project
 licenses:
 - MIT

data/lib/roda/templates/base/minimal/Rakefile.erb

@@ -1,51 +0,0 @@
-# Rakefile
-
-require "fileutils"
-
-task :default do
-  system("rake -T")
-end
-
-desc "Open a console with application context (alias: rake c)"
-task :console do
-  system("irb -r ./boot.rb")
-end
-task c: :console
-
-desc "Run lint"
-task :lint do
-  system("bundle exec standardrb")
-end
-
-desc "Auto fix lint warnings"
-task "lint:fix" do
-  system("bundle exec standardrb --fix")
-end
-
-desc "Run tests"
-task :test do<% if context.rspec? %>
-  system("RACK_ENV=test bundle exec rspec")<% else %>
-  system("RACK_ENV=test bundle exec minitest spec/")<% end %>
-end
-
-desc "Exec development server"
-task :server do
-  if ENV["RACK_ENV"] == "production"<% if context.database? %>
-    if ENV["DATABASE_URL"].nil?
-      puts("DATABASE_URL is empty")
-      exit 1
-    end<% end %>
-    if ENV["SESSION_SECRET"].nil?
-      puts("SESSION_SECRET is empty")
-      exit 1
-    end
-    system("RUBYOPT=--yjit RUBY_YJIT_ENABLE=1 RACK_ENV=production bundle exec puma --port 4000")
-  else
-    system("RACK_ENV=development bundle exec puma --port 4000")
-  end
-end
-
-desc "Exec development server watching for changes"
-task "dev" do
-  system("RACK_ENV=development bundle exec guard")
-end