rhino_project_core 0.21.0.beta.16 → 0.21.0.beta.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41bbfde19d65b4ced4584216b4dfc36c9426daea8667d2938362fab853220bb6
-  data.tar.gz: 813bad7ec99334fd6bcadb1bb34176f7c1a660294b54c9ab3e33f572adc8e64f
+  metadata.gz: bc5c199628c33141e7e566807b3bc0df83aa7494660330e66586b51885756b1a
+  data.tar.gz: 91bebe3bfaadbfb349a44fa5f6d32260439313f9156d9a09ea61f60282b078a7
 SHA512:
-  metadata.gz: 2806095d60863665083452e6343bf6bfa986d1138e3414cb72116e64e6bccf3f1466f99d851f177d310dffefa39a834cfb206bd5e7eda2d60d5c607887cff44d
-  data.tar.gz: 47360364e5082c4c4525a377bf735a4fe2e8d679242b292a22ae51bd7a629d93107334f5fae284789ad5d13354ce9104bf2256e5e2272db06e10c6f009e46be0
+  metadata.gz: 7fd1e29c9d4fe443341e14a843569c9d83e51fc4e84e69154c1e4008069d62ce52e5e0b9473571432130757c19f9e3552d27370a6317078e6935f17e5e73a48f
+  data.tar.gz: e7d931ec9a4a8b3063011583ad0dba6bcceb50b20fad041afb390ee30c44d2815f71f6429aebee1920aa01bf5099b73eebf32108a84e91526a30538bac5cc935

data/lib/generators/rhino/dev/setup/setup_generator.rb

@@ -6,13 +6,11 @@ module Rhino
       # rubocop:disable Metrics/ClassLength
       class SetupGenerator < ::Rails::Generators::Base
         DEFAULT_SERVER_PORT = 3000
-        DEFAULT_CLIENT_PORT = DEFAULT_SERVER_PORT + 1
 
         class_option :prompt, type: :boolean, default: true, desc: "Prompt user for configuration options"
         class_option :defaults, type: :string, enum: %w[local docker], default: "local", desc: "Use configuration defaults of type DEFAULTS"
         class_option :skip_existing, type: :boolean, default: false, desc: "Skip existing env files"
         class_option :server_port, type: :numeric, default: DEFAULT_SERVER_PORT, group: :server, desc: "Server port"
-        class_option :client_port, type: :numeric, default: DEFAULT_CLIENT_PORT, group: :client, desc: "Client port"
         class_option :db_host, type: :string, group: :database
         class_option :db_name, type: :string, group: :database
         class_option :db_port, type: :numeric, default: 5432, group: :database
@@ -22,7 +20,6 @@ module Rhino
         class_option :redis_database, type: :numeric, default: 0, group: :redis
 
         attr_reader :server_port,
-                    :client_port,
                     :db_name,
                     :db_host,
                     :db_port,
@@ -47,9 +44,7 @@ module Rhino
 
           collect_env_info
 
-          template "env.root", project_file(".env")
-          template "env.server", server_file(".env")
-          template "env.client", client_file(".env")
+          template "env", project_file(".env")
         end
 
         def install_hooks
@@ -63,21 +58,13 @@ module Rhino
         private
           def project_dir
             # Up one level from the server directory
-            Rails.root.parent
-          end
-
-          def server_extension
-            Rails.root.basename.to_s.match(/[-_]?server/)[0]
+            Rails.root
           end
 
           def server_port_default
             options[:server_port] || ENV["PORT"]
           end
 
-          def client_port_default
-            @server_port.to_i + 1
-          end
-
           def project_name
             @project_name ||= File.basename(project_dir).sub(/[-_]?mono/, "")
           end
@@ -87,7 +74,7 @@ module Rhino
 
             return db_name if db_name.present?
 
-            File.basename(Rails.root.parent)
+            File.basename(Rails.root)
           end
 
           def db_host_default
@@ -99,7 +86,7 @@ module Rhino
           end
 
           def db_user_default
-            options[:db_user] || ENV["DB_USERNAME"] || `whoami`
+            options[:db_user] || ENV["DB_USERNAME"] || `whoami`.strip
           end
 
           def db_password_default
@@ -125,8 +112,7 @@ module Rhino
           def collect_env_info
             collect_docker_info
 
-            @server_port = ask_prompt("Server Port?", server_port_default)
-            @client_port = ask_prompt("Client Port?", client_port_default)
+            @server_port = ask_prompt("Port?", server_port_default)
 
             collect_database_info
             collect_redis_info

data/lib/generators/rhino/dev/setup/templates/{env.server.tt → env.tt}

@@ -1,7 +1,8 @@
 PORT=<%= server_port %>
 
-ROOT_URL=http://localhost:<%= server_port %>
-FRONT_END_URL=http://localhost:<%= client_port %>
+# Server
+ROOT_URL=http://localhost:$PORT
+FRONT_END_URL=http://localhost:$PORT
 
 DB_NAME=<%= db_name %>
 DB_HOST=<%= db_host %>
@@ -12,7 +13,10 @@ REDIS_HOST=<%= redis_host %>
 REDIS_PORT=<%= redis_port %>
 REDIS_DATABASE=<%= redis_database %>
 
-# Production only:
+# Client
+VITE_API_ROOT_PATH=$ROOT_URL
+
+# Production server:
 SENDGRID_API_KEY=<api-key>
 
 #AWS_ACCESS_KEY=
@@ -31,3 +35,6 @@ SENDGRID_API_KEY=<api-key>
 #AUTH_GOOGLE_OAUTH2_SECRET_KEY=
 
 ROLLBAR_ACCESS_TOKEN=
+
+# Production client:
+VITE_ROLLBAR_ACCESS_TOKEN=

data/lib/rhino/version.rb

@@ -10,7 +10,7 @@ module Rhino
     MAJOR = 0
     MINOR = 21
     TINY  = 0
-    PRE   = "beta.16"
+    PRE   = "beta.17"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/tasks/rhino.rake

@@ -9,7 +9,7 @@ namespace :rhino do
 
   desc "Export Rhino Open API information for client"
   task open_api_export: :environment do
-    static_file = Rails.root.parent.join("app", "frontend", "models", "static.js")
+    static_file = Rails.root.join("app", "frontend", "models", "static.js")
     File.open(static_file, "w") do |f|
       f.write "const api = #{Rhino::OpenApiInfo.index};\n\n"
       f.write("export default api;\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhino_project_core
 version: !ruby/object:Gem::Version
-  version: 0.21.0.beta.16
+  version: 0.21.0.beta.17
 platform: ruby
 authors:
 - JP Rosevear
@@ -428,9 +428,7 @@ files:
 - lib/commands/rhino/module/rails_command.rb
 - lib/commands/rhino/module/test_command.rb
 - lib/generators/rhino/dev/setup/setup_generator.rb
-- lib/generators/rhino/dev/setup/templates/env.client.tt
-- lib/generators/rhino/dev/setup/templates/env.root.tt
-- lib/generators/rhino/dev/setup/templates/env.server.tt
+- lib/generators/rhino/dev/setup/templates/env.tt
 - lib/generators/rhino/dev/setup/templates/prepare-commit-msg
 - lib/generators/rhino/install/install_generator.rb
 - lib/generators/rhino/install/templates/account.rb

data/lib/generators/rhino/dev/setup/templates/env.client.tt

@@ -1,4 +0,0 @@
-PORT=<%= client_port %>
-
-VITE_API_ROOT_PATH=http://localhost:<%= server_port %>
-VITE_ROLLBAR_ACCESS_TOKEN=

data/lib/generators/rhino/dev/setup/templates/env.root.tt

@@ -1 +0,0 @@
-COMPOSE_PROJECT_NAME=<%= project_name %>