rhino_project_core 0.21.0.beta.16 → 0.21.0.beta.19

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 41bbfde19d65b4ced4584216b4dfc36c9426daea8667d2938362fab853220bb6
4
- data.tar.gz: 813bad7ec99334fd6bcadb1bb34176f7c1a660294b54c9ab3e33f572adc8e64f
3
+ metadata.gz: 6055c4b7e29034a3f30b36bf4e2c7632ece77e188de4252a299b292411d536e6
4
+ data.tar.gz: 95760b34f9c74cab215b0ea5cfd6b4a629d4b3ddbe808e5b7d1099e12fd00787
5
5
  SHA512:
6
- metadata.gz: 2806095d60863665083452e6343bf6bfa986d1138e3414cb72116e64e6bccf3f1466f99d851f177d310dffefa39a834cfb206bd5e7eda2d60d5c607887cff44d
7
- data.tar.gz: 47360364e5082c4c4525a377bf735a4fe2e8d679242b292a22ae51bd7a629d93107334f5fae284789ad5d13354ce9104bf2256e5e2272db06e10c6f009e46be0
6
+ metadata.gz: 6fbc5ec187e852358ca5c6bac21bd4106715dc2dc56b29108cfa51e2401c4d1a9061f1c90be8659af4bd5506c1771c06846d683a5ea8265a3bb1c5f6a4e7ee5b
7
+ data.tar.gz: f96304e3b429d601902398a58149ef46c73a5c0f2309d21ed249fcfb0c5030dba4bb0e137cbe5f02767b8f0e3aa87beadeaaad9f6292344ba4ba2340227980df
@@ -6,13 +6,11 @@ module Rhino
6
6
  # rubocop:disable Metrics/ClassLength
7
7
  class SetupGenerator < ::Rails::Generators::Base
8
8
  DEFAULT_SERVER_PORT = 3000
9
- DEFAULT_CLIENT_PORT = DEFAULT_SERVER_PORT + 1
10
9
 
11
10
  class_option :prompt, type: :boolean, default: true, desc: "Prompt user for configuration options"
12
11
  class_option :defaults, type: :string, enum: %w[local docker], default: "local", desc: "Use configuration defaults of type DEFAULTS"
13
12
  class_option :skip_existing, type: :boolean, default: false, desc: "Skip existing env files"
14
13
  class_option :server_port, type: :numeric, default: DEFAULT_SERVER_PORT, group: :server, desc: "Server port"
15
- class_option :client_port, type: :numeric, default: DEFAULT_CLIENT_PORT, group: :client, desc: "Client port"
16
14
  class_option :db_host, type: :string, group: :database
17
15
  class_option :db_name, type: :string, group: :database
18
16
  class_option :db_port, type: :numeric, default: 5432, group: :database
@@ -22,7 +20,6 @@ module Rhino
22
20
  class_option :redis_database, type: :numeric, default: 0, group: :redis
23
21
 
24
22
  attr_reader :server_port,
25
- :client_port,
26
23
  :db_name,
27
24
  :db_host,
28
25
  :db_port,
@@ -47,9 +44,7 @@ module Rhino
47
44
 
48
45
  collect_env_info
49
46
 
50
- template "env.root", project_file(".env")
51
- template "env.server", server_file(".env")
52
- template "env.client", client_file(".env")
47
+ template "env", project_file(".env")
53
48
  end
54
49
 
55
50
  def install_hooks
@@ -63,21 +58,13 @@ module Rhino
63
58
  private
64
59
  def project_dir
65
60
  # Up one level from the server directory
66
- Rails.root.parent
67
- end
68
-
69
- def server_extension
70
- Rails.root.basename.to_s.match(/[-_]?server/)[0]
61
+ Rails.root
71
62
  end
72
63
 
73
64
  def server_port_default
74
65
  options[:server_port] || ENV["PORT"]
75
66
  end
76
67
 
77
- def client_port_default
78
- @server_port.to_i + 1
79
- end
80
-
81
68
  def project_name
82
69
  @project_name ||= File.basename(project_dir).sub(/[-_]?mono/, "")
83
70
  end
@@ -87,7 +74,7 @@ module Rhino
87
74
 
88
75
  return db_name if db_name.present?
89
76
 
90
- File.basename(Rails.root.parent)
77
+ File.basename(Rails.root)
91
78
  end
92
79
 
93
80
  def db_host_default
@@ -99,7 +86,7 @@ module Rhino
99
86
  end
100
87
 
101
88
  def db_user_default
102
- options[:db_user] || ENV["DB_USERNAME"] || `whoami`
89
+ options[:db_user] || ENV["DB_USERNAME"] || `whoami`.strip
103
90
  end
104
91
 
105
92
  def db_password_default
@@ -125,8 +112,7 @@ module Rhino
125
112
  def collect_env_info
126
113
  collect_docker_info
127
114
 
128
- @server_port = ask_prompt("Server Port?", server_port_default)
129
- @client_port = ask_prompt("Client Port?", client_port_default)
115
+ @server_port = ask_prompt("Port?", server_port_default)
130
116
 
131
117
  collect_database_info
132
118
  collect_redis_info
@@ -1,7 +1,8 @@
1
1
  PORT=<%= server_port %>
2
2
 
3
- ROOT_URL=http://localhost:<%= server_port %>
4
- FRONT_END_URL=http://localhost:<%= client_port %>
3
+ # Server
4
+ ROOT_URL=http://localhost:$PORT
5
+ FRONT_END_URL=http://localhost:$PORT
5
6
 
6
7
  DB_NAME=<%= db_name %>
7
8
  DB_HOST=<%= db_host %>
@@ -12,7 +13,10 @@ REDIS_HOST=<%= redis_host %>
12
13
  REDIS_PORT=<%= redis_port %>
13
14
  REDIS_DATABASE=<%= redis_database %>
14
15
 
15
- # Production only:
16
+ # Client
17
+ VITE_API_ROOT_PATH=$ROOT_URL
18
+
19
+ # Production server:
16
20
  SENDGRID_API_KEY=<api-key>
17
21
 
18
22
  #AWS_ACCESS_KEY=
@@ -31,3 +35,6 @@ SENDGRID_API_KEY=<api-key>
31
35
  #AUTH_GOOGLE_OAUTH2_SECRET_KEY=
32
36
 
33
37
  ROLLBAR_ACCESS_TOKEN=
38
+
39
+ # Production client:
40
+ VITE_ROLLBAR_ACCESS_TOKEN=
data/lib/rhino/version.rb CHANGED
@@ -10,7 +10,7 @@ module Rhino
10
10
  MAJOR = 0
11
11
  MINOR = 21
12
12
  TINY = 0
13
- PRE = "beta.16"
13
+ PRE = "beta.19"
14
14
 
15
15
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
16
16
  end
data/lib/tasks/rhino.rake CHANGED
@@ -9,7 +9,7 @@ namespace :rhino do
9
9
 
10
10
  desc "Export Rhino Open API information for client"
11
11
  task open_api_export: :environment do
12
- static_file = Rails.root.parent.join("app", "frontend", "models", "static.js")
12
+ static_file = Rails.root.join("app", "frontend", "models", "static.js")
13
13
  File.open(static_file, "w") do |f|
14
14
  f.write "const api = #{Rhino::OpenApiInfo.index};\n\n"
15
15
  f.write("export default api;\n")
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rhino_project_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.21.0.beta.16
4
+ version: 0.21.0.beta.19
5
5
  platform: ruby
6
6
  authors:
7
7
  - JP Rosevear
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-09-09 00:00:00.000000000 Z
11
+ date: 2024-09-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -428,9 +428,7 @@ files:
428
428
  - lib/commands/rhino/module/rails_command.rb
429
429
  - lib/commands/rhino/module/test_command.rb
430
430
  - lib/generators/rhino/dev/setup/setup_generator.rb
431
- - lib/generators/rhino/dev/setup/templates/env.client.tt
432
- - lib/generators/rhino/dev/setup/templates/env.root.tt
433
- - lib/generators/rhino/dev/setup/templates/env.server.tt
431
+ - lib/generators/rhino/dev/setup/templates/env.tt
434
432
  - lib/generators/rhino/dev/setup/templates/prepare-commit-msg
435
433
  - lib/generators/rhino/install/install_generator.rb
436
434
  - lib/generators/rhino/install/templates/account.rb
@@ -1,4 +0,0 @@
1
- PORT=<%= client_port %>
2
-
3
- VITE_API_ROOT_PATH=http://localhost:<%= server_port %>
4
- VITE_ROLLBAR_ACCESS_TOKEN=
@@ -1 +0,0 @@
1
- COMPOSE_PROJECT_NAME=<%= project_name %>