roda-project 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 481798dedf638baf4a37f1a8f1c554086eaa1fe9ba9ad409b6301a6693d5ab32
-  data.tar.gz: fa9bb1b2f1f6d7d465ebda947b1e62a3d5c4a0cb9e3837db4abd59c2df3304b5
+  metadata.gz: a0848c0ffefb79c9a29e0f914ade9409ed3da6f94523afa9fd686647eb49c401
+  data.tar.gz: 9a100a0a6781bdd0c9d0a005f473db621f4f28749e95523186bddf338b0acd10
 SHA512:
-  metadata.gz: 63e2755468f18b312a2de6f09117564ea91d073bcb55422f1963737ed04268087cdb7555ae2fd60e6742f7e64ac465decfde11dac17886dd52c81a42baa5a979
-  data.tar.gz: e2755bb05abdd00d0fc285b2975aa07ace46b8d885a53af09f3b08be1bcd636e56877c44f7dd8daf99ce4dd2b0c3954405bf9de3f4728d1b02c03d3ae2ae0532
+  metadata.gz: 883ecbdc87121a984469a003ab1f2350ef3aa998bdda14efb6443d151b9378adf56f0704b66eb40c8e9765d193a2b3fdce521fc3cae4b3faf0de0039a8822136
+  data.tar.gz: 06b3aeba438bb755926afff42b68a66303f42332c97fcb9bca23f96e47399a16cda090e42d6835837ee091bcefb135d6f5f2a6ba54d2070164616be113e4e3be

data/lib/roda/project/cli.rb

@@ -37,10 +37,10 @@ module Roda
           puts "$ rake db:migrate"
         end
         puts "\nrun and watch the project in dev mode:\n"
-        puts "\n$ rake dev:watch"
+        puts "\n$ rake dev"
         if @context.fullstack?
           puts "\ncompile and watch assets:\n"
-          puts "\n$ rake assets:watch"
+          puts "\n$ rake dev:assets"
         end
         puts "\nrun 'rake' inside #{@context.project_name} to see all available tasks\n\n"
       rescue TTY::Reader::InputInterrupt
@@ -106,18 +106,21 @@ module Roda
       def add_front_end
         if @context.fullstack?
           puts "* adding front-end"
-          tty_cp_r("front-end", "app/assets")
-          tty_cp("front-end", "esbuild.js")
-          tty_cp("front-end", "package.json")
-          cp_r("front-end", "app/views")
+          erb_cp_dir("front-end", "app/assets")
+          erb_cp_file("front-end", "esbuild.js")
+          erb_cp_file("front-end", "package.json")
+          cp_dir("front-end", "app/views")
+          cp_dir("front-end", "app/views")
+          cp_dir("front-end", "public/assets")
+          cp_dir("front-end", "public/images")
         end
       end
 
       def add_database
         if @context.database?
           puts "* adding database"
-          tty_cp_r("database", "db")
-          tty_cp("database", "app/config/providers/db/conn.rb")
+          erb_cp_dir("database", "db")
+          erb_cp_file("database", "app/config/providers/db/conn.rb")
           add_rodauth
         end
       end
@@ -125,10 +128,10 @@ module Roda
       def add_rodauth
         if @context.rodauth?
           puts "* adding rodauth"
-          tty_cp_r("rodauth", "app/models")
-          tty_cp("rodauth", "db/migrations/001_add_rodauth.rb")
+          erb_cp_dir("rodauth", "app/models")
+          erb_cp_file("rodauth", "db/migrations/001_add_rodauth.rb")
           if @context.fullstack?
-            cp("rodauth", "app/views/create-account.erb")
+            cp_file("rodauth", "app/views/create-account.erb")
           end
         end
       end
@@ -138,9 +141,9 @@ module Roda
         minimal_dir = @context.minimal? ? "minimal/" : ""
 
         if @context.rspec?
-          tty_cp_r("tests/#{minimal_dir}rspec", "spec")
+          erb_cp_dir("tests/#{minimal_dir}rspec", "spec")
         else
-          tty_cp_r("tests/#{minimal_dir}minitest", "spec")
+          erb_cp_dir("tests/#{minimal_dir}minitest", "spec")
         end
       end
     end

data/lib/roda/project/helpers/template.rb

@@ -2,7 +2,7 @@ module Roda
   module Project
     module Helpers
       module Template
-        def tty_cp_r(type, path)
+        def erb_cp_dir(type, path)
           TTY::File.copy_directory(
             File.expand_path("../../templates/#{type}/#{path}", __dir__),
             "#{@dir}#{@context.project_name}/#{path}",
@@ -10,7 +10,7 @@ module Roda
           )
         end
 
-        def tty_cp(type, path)
+        def erb_cp_file(type, path)
           TTY::File.copy_file(
             File.expand_path("../../templates/#{type}/#{path}", __dir__),
             "#{@dir}#{@context.project_name}/#{path}",
@@ -19,7 +19,7 @@ module Roda
         end
 
         # For copy without parse ERB files
-        def cp_r(type, path)
+        def cp_dir(type, path)
           FileUtils.cp_r(
             File.expand_path("../../templates/#{type}/#{path}", __dir__),
             "#{@dir}#{@context.project_name}/#{path}"
@@ -27,7 +27,7 @@ module Roda
         end
 
         # For copy without parse ERB files
-        def cp(type, path)
+        def cp_file(type, path)
           File.write(
             "#{@dir}#{@context.project_name}/#{path}",
             File.read(File.expand_path("../../templates/#{type}/#{path}", __dir__))

data/lib/roda/project/version.rb

@@ -2,6 +2,6 @@
 
 module Roda
   module Project
-    VERSION = "0.1.4"
+    VERSION = "0.1.6"
   end
 end

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

@@ -16,9 +16,6 @@ gem "puma"
 gem "oj"
 # gem 'async'
 
-# CLI
-gem "rake"
-
 # Security
 # gem "rack-attack"
 
@@ -33,6 +30,7 @@ group :development do
   gem "standard"<% if context.minitest? %>
   gem "minitest"
   gem "minitest-hooks"
+  gem "rake"
 <% else %>
   gem "rspec"<% end %>
 end

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

@@ -2,59 +2,50 @@
 
 require "fileutils"
 
-# List rake tasks
 task :default do
   system("rake -T")
 end
 
-# Console Task
 desc "Open a console with application context (alias: rake c)"
 task :console do
   system("irb -r ./boot.rb")
 end
 task c: :console
 
-# Lint Task
 desc "Run lint"
 task :lint do
   system("bundle exec standardrb")
 end
 
-# Lint Fix Task
 desc "Auto fix lint warnings"
 task "lint:fix" do
   system("bundle exec standardrb --fix")
 end
 
-# Test Task
 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
 
-# Development Server Task
 desc "Exec development server"
-task :dev do
-  system("RACK_ENV=development bundle exec puma --port 4000")
+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
 
-# Development Watch Task
 desc "Exec development server watching for changes"
-task "dev:watch" do
+task "dev" do
   system("RACK_ENV=development bundle exec guard")
 end
-
-# Production Server Task
-desc "Exec production server"
-task :prod do
-  if ENV["DATABASE_URL"].nil?
-    puts("DATABASE_URL is empty")
-    exit 1
-  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")
-end

data/lib/roda/templates/base/scaffold/Gemfile.erb

@@ -25,9 +25,6 @@ gem "puma"
 gem "oj"
 # gem 'async'
 
-# CLI
-gem "rake"
-
 # Security
 # gem "rack-attack"
 
@@ -47,6 +44,7 @@ group :development do
   gem "standard"<% if context.minitest? %>
   gem "minitest"
   gem "minitest-hooks"
+  gem "rake"
 <% else %>
   gem "rspec"<% end %>
 end

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

@@ -2,12 +2,10 @@
 
 require "fileutils"
 
-# List rake tasks
 task :default do
   system("rake -T")
 end
 <% if context.database? %>
-# DB Migrate Task
 namespace :db do
   desc "Migrate the database. Optional: provide target version, e.g., 'rake db:migrate[123]'"
   task :migrate, [:target] do |t, args|
@@ -26,57 +24,61 @@ namespace :db do
   end
 end
 <% end %>
-# Console Task
 desc "Open a console with application context (alias: rake c)"
 task :console do
   system("irb -r ./boot.rb")
 end
 task c: :console
 
-# Lint Task
 desc "Run lint"
 task :lint do
   system("bundle exec standardrb")
 end
 
-# Lint Fix Task
 desc "Auto fix lint warnings"
 task "lint:fix" do
   system("bundle exec standardrb --fix")
 end
 
-# Test Task
 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
 
-# Development Server Task
 desc "Exec development server"
-task :dev do
-  system("RACK_ENV=development bundle exec puma --port 4000")
+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
 
-# Development Watch Task
 desc "Exec development server watching for changes"
-task "dev:watch" do
+task "dev" do
   system("RACK_ENV=development bundle exec guard")
 end
-
-# Development Assets Task
-desc "Watch and compile assets"
+<% if context.fullstack? %>
+desc "Compile assets"
 task :assets do
   system("npm i && npm run build")
 end
 
-# Development Assets Task
 desc "Watch and compile assets"
-task "assets:watch" do
+task "dev:assets" do
   system("npm i && npm run build:watch")
 end
+<% end %>
 
-# Production Server Task
 desc "Exec production server"
 task :prod do
   if ENV["DATABASE_URL"].nil?
@@ -90,7 +92,6 @@ task :prod do
   system("RUBYOPT=--yjit RUBY_YJIT_ENABLE=1 RACK_ENV=production bundle exec puma --port 4000")
 end
 
-# Generate Tasks
 namespace :g do<% if context.database? %>
   desc "Generate an empty Sequel migration. Usage: 'rake generate:migration[migration_name]'"
   task :migration, [:migration_name] do |t, args|
@@ -137,7 +138,7 @@ namespace :g do<% if context.database? %>
       exit 1
     end
 
-    must_generate_views = Dir.exist?(File.expand_path("../../app/views", __dir__))
+    must_generate_views = Dir.exist?(File.expand_path("./app/views", __dir__))
     ensure_and_get_path = proc do |path|
       base_path = File.expand_path(path, __dir__)
       full_path_dir = File.join(base_path, File.dirname(branch_name))
@@ -145,14 +146,14 @@ namespace :g do<% if context.database? %>
 
       base_path
     end
-    parse_route_string = proc do
+    parse_route_string = proc do |route_str|
       name, method = route_str.split(":", 2)
       method ||= "get"
       [method, name]
     end
 
     # Generate routes
-    filename = File.join(ensure_and_get_path.call("../../app/routes"), "#{branch_name}.rb")
+    filename = File.join(ensure_and_get_path.call("./app/routes"), "#{branch_name}.rb")
     route_definitions = routes_list.map do |route_str|
       method, name = parse_route_string.call(route_str)
       view_line = (method == "get" && must_generate_views) ? "\n      view('#{name}')" : ""
@@ -171,7 +172,7 @@ namespace :g do<% if context.database? %>
 
     # Generate views
     if must_generate_views
-      branch_views_dir = File.join(File.expand_path("../../app/views", __dir__), branch_name)
+      branch_views_dir = File.join(File.expand_path("./app/views", __dir__), branch_name)
       FileUtils.mkdir_p(branch_views_dir)
       routes_list.each do |route_str|
         method, name = parse_route_string.call(route_str)
@@ -184,7 +185,7 @@ namespace :g do<% if context.database? %>
     end
 
     # Generate tests
-    test_filename = File.join(ensure_and_get_path.call("../../spec/app/routes"), "#{branch_name}_spec.rb")
+    test_filename = File.join(ensure_and_get_path.call("./spec/app/routes"), "#{branch_name}_spec.rb")
     nesting_level = branch_name.count("/")
     relative_spec_helper_path = "../" * (2 + nesting_level) + "spec_helper"
 

data/lib/roda/templates/base/scaffold/app/config/config.rb.erb

@@ -3,13 +3,13 @@ module Config
     def get
       @config ||= {
         secret: ENV["SESSION_SECRET"] || 'DEV-ONLY-8<FQF8HiF)>l0hbPk£vBQ#IrYsoO}14k\l+-/gIU[j}l0hbPk£vBQ#IrY',
-        environment:,
+        environment:,<% if context.rodauth? %>
         hmac_secret: ENV["RODAUTH_HMAC_SECRET"] || 'DEV-ONLY',
-        jwt_secret: ENV["JWT_SECRET"] || 'DEV-ONLY',
+        jwt_secret: ENV["JWT_SECRET"] || 'DEV-ONLY',<% end %><% if context.fullstack? %>
         i18n: {
           translations: ["app/config/locales", "app/config/locales/foo"],
           locale: ["en", "pt-br"]
-        }<% if context.database? %>,
+        }<% end %><% if context.database? %>,
         db: {
           url: not_production? ? <%= context.dev_db_url %> : ENV["DATABASE_URL"]
         }<% end %><% if context.fullstack? %>,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda-project
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Henrique F. Teixeira
@@ -95,10 +95,7 @@ files:
 - 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/assets/app.css
-- lib/roda/templates/base/scaffold/public/assets/app.js
 - lib/roda/templates/base/scaffold/public/exception_page.css
-- lib/roda/templates/base/scaffold/public/images/roda-project.png
 - 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
@@ -111,6 +108,9 @@ files:
 - 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
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.17
 specification_version: 4
 summary: A command-line interface (CLI) tool that helps you quickly scaffold new Roda
   web applications