rubypitaya 3.1.1 → 3.3.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/rubypitaya/app-template/Gemfile +1 -1
- data/lib/rubypitaya/app-template/Gemfile.lock +2 -2
- data/lib/rubypitaya/app-template/app/constants/status_codes.rb +1 -0
- data/lib/rubypitaya/app-template/plugins.yaml +2 -0
- data/lib/rubypitaya/core/main.rb +8 -3
- data/lib/rubypitaya/core/path.rb +3 -3
- data/lib/rubypitaya/core/route_error.rb +11 -0
- data/lib/rubypitaya/core/spec-helpers/handler_spec_helper.rb +8 -0
- data/lib/rubypitaya/version.rb +1 -1
- data/lib/rubypitaya.rb +12 -1
- metadata +4 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b218ecc854aaf6e7cb2cf7bbf1ad80d910967c73b3ccf0ba06f81b039b5838b5
|
4
|
+
data.tar.gz: 30acb028ff6a65f8b7697be1ca1d533efb5383b3e68d180cdc92bdcf37d762f1
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 610d327bbf85407e5880b4593bd804c55ffff8022783582340e48f962da345f91d569b24f8b7e477027c8edbd61f8d8e9bb7827acb14e8070c63687e64799049
|
7
|
+
data.tar.gz: 1c5c9d3256b9d81d539f6b47c0181d15656e4a75185c3634d951984bc532762c5b6f3a390a94e8ae7c4486da20c0cde79885e69391875590f27c843963fdae33
|
@@ -103,7 +103,7 @@ GEM
|
|
103
103
|
rspec-support (~> 3.10.0)
|
104
104
|
rspec-support (3.10.3)
|
105
105
|
ruby2_keywords (0.0.5)
|
106
|
-
rubypitaya (3.
|
106
|
+
rubypitaya (3.3.2)
|
107
107
|
activerecord (= 6.1.4.1)
|
108
108
|
etcdv3 (= 0.11.4)
|
109
109
|
google-protobuf (= 3.18.1)
|
@@ -143,7 +143,7 @@ DEPENDENCIES
|
|
143
143
|
listen (= 3.7.0)
|
144
144
|
pry (= 0.14.1)
|
145
145
|
rspec (= 3.10.0)
|
146
|
-
rubypitaya (= 3.
|
146
|
+
rubypitaya (= 3.3.2)
|
147
147
|
sinatra-contrib (= 2.1.0)
|
148
148
|
|
149
149
|
BUNDLED WITH
|
@@ -11,6 +11,7 @@ class StatusCodes
|
|
11
11
|
#
|
12
12
|
#
|
13
13
|
## Error codes
|
14
|
+
# RubyPitaya::StatusCodes::CODE_ERROR = 'RP-201'
|
14
15
|
# RubyPitaya::StatusCodes::CODE_UNKNOWN = 'RP-000'
|
15
16
|
# RubyPitaya::StatusCodes::CODE_HANDLER_NOT_FOUND = 'RP-001'
|
16
17
|
# RubyPitaya::StatusCodes::CODE_ACTION_NOT_FOUND = 'RP-002'
|
data/lib/rubypitaya/core/main.rb
CHANGED
@@ -109,7 +109,7 @@ module RubyPitaya
|
|
109
109
|
HttpRoutes.set :setup, @setup
|
110
110
|
HttpRoutes.set :config, @config
|
111
111
|
HttpRoutes.set :objects, @objects
|
112
|
-
HttpRoutes.set :views, [Path::
|
112
|
+
HttpRoutes.set :views, [Path::HTTP_VIEWS_FOLDER_PATH] + Path::Plugins::HTTP_VIEWS_FOLDER_PATHS
|
113
113
|
|
114
114
|
HttpRoutes.auto_reload if @is_development_environment
|
115
115
|
|
@@ -190,9 +190,14 @@ module RubyPitaya
|
|
190
190
|
|
191
191
|
response
|
192
192
|
end
|
193
|
+
rescue RouteError => error
|
194
|
+
@log.error "ROUTE ERROR: #{error.class} | #{error.message}} \n #{error.backtrace.join("\n")}"
|
195
|
+
response = {
|
196
|
+
code: error.code,
|
197
|
+
message: error.message
|
198
|
+
}
|
193
199
|
rescue Exception => error
|
194
|
-
@log.
|
195
|
-
@log.info error.backtrace.join("\n")
|
200
|
+
@log.error "INTERNAL ERROR: #{error.class} | #{error.message}} \n #{error.backtrace.join("\n")}"
|
196
201
|
run_nats_connection
|
197
202
|
end
|
198
203
|
end
|
data/lib/rubypitaya/core/path.rb
CHANGED
@@ -10,10 +10,10 @@ module RubyPitaya
|
|
10
10
|
APP_SETUP_FOLDER_PATH = File.join(Dir.pwd, 'app/setup/')
|
11
11
|
MIGRATIONS_FOLDER_PATH = File.join(Dir.pwd, 'app/migrations/')
|
12
12
|
PLUGINS_FOLDER_PATH = File.join(Dir.pwd, 'plugins/')
|
13
|
+
HTTP_VIEWS_FOLDER_PATH = File.join(Dir.pwd, 'app/http/views/')
|
13
14
|
|
14
15
|
ROUTES_FILE_PATH = File.join(Dir.pwd, 'config/routes.rb')
|
15
|
-
|
16
|
-
HTTP_VIEWS_PATH = File.join(Dir.pwd, 'app/http/views')
|
16
|
+
PLUGIN_CONFIG_FILE_PATH = File.join(Dir.pwd, 'plugins.yaml')
|
17
17
|
|
18
18
|
|
19
19
|
class Core
|
@@ -27,7 +27,7 @@ module RubyPitaya
|
|
27
27
|
APP_CONFIG_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/config/'))
|
28
28
|
APP_SETUP_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/setup/'))
|
29
29
|
MIGRATIONS_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/migrations/'))
|
30
|
-
|
30
|
+
HTTP_VIEWS_FOLDER_PATHS = Dir.glob(File.join(Dir.pwd, 'plugins/*/app/http/views/'))
|
31
31
|
end
|
32
32
|
end
|
33
33
|
end
|
data/lib/rubypitaya/version.rb
CHANGED
data/lib/rubypitaya.rb
CHANGED
@@ -45,12 +45,14 @@ module RubyPitaya
|
|
45
45
|
plugin_folder_path = File.join(Path::PLUGINS_FOLDER_PATH, plugin_name)
|
46
46
|
plugin_git_path = File.join(plugin_folder_path, '.git/')
|
47
47
|
|
48
|
-
|
48
|
+
commit_hash = ''
|
49
|
+
branch_command = ''
|
49
50
|
branch_command = "--branch #{branch_name}" unless branch_name.blank?
|
50
51
|
|
51
52
|
FileUtils.rm_rf(plugin_folder_path) if File.exists?(plugin_folder_path)
|
52
53
|
puts "git -C #{Path::PLUGINS_FOLDER_PATH} clone --depth 1 #{branch_command} #{plugin_git_url}"
|
53
54
|
`git -C #{Path::PLUGINS_FOLDER_PATH} clone --depth 1 #{branch_command} #{plugin_git_url}`
|
55
|
+
commit_hash = `git rev-parse --short HEAD`.strip
|
54
56
|
FileUtils.rm_rf(plugin_git_path)
|
55
57
|
|
56
58
|
Dir.entries(plugin_folder_path).each do |entry|
|
@@ -71,6 +73,15 @@ module RubyPitaya
|
|
71
73
|
File.rename(migration_file, new_file)
|
72
74
|
end
|
73
75
|
|
76
|
+
plugins_config = YAML.load(File.open(Path::PLUGIN_CONFIG_FILE_PATH, &:read))
|
77
|
+
plugins_config['plugins'][plugin_name] = {
|
78
|
+
'git' => plugin_git_url,
|
79
|
+
'branch' => branch_name || '',
|
80
|
+
'commit' => commit_hash,
|
81
|
+
}
|
82
|
+
|
83
|
+
File.open(Path::PLUGIN_CONFIG_FILE_PATH, 'w') { |f| f.write(plugins_config.to_yaml) }
|
84
|
+
|
74
85
|
plugin_name
|
75
86
|
end
|
76
87
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rubypitaya
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.
|
4
|
+
version: 3.3.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Luciano Prestes Cavalcanti
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-11-
|
11
|
+
date: 2021-11-27 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: pg
|
@@ -328,6 +328,7 @@ files:
|
|
328
328
|
- "./lib/rubypitaya/app-template/kubernetes/statefulset-nats.yaml"
|
329
329
|
- "./lib/rubypitaya/app-template/kubernetes/statefulset-postgres.yaml"
|
330
330
|
- "./lib/rubypitaya/app-template/kubernetes/statefulset-redis.yaml"
|
331
|
+
- "./lib/rubypitaya/app-template/plugins.yaml"
|
331
332
|
- "./lib/rubypitaya/app-template/spec/hello_world_handler_spec.rb"
|
332
333
|
- "./lib/rubypitaya/app-template/spec/player_handler_spec.rb"
|
333
334
|
- "./lib/rubypitaya/app-template/spec/spec_helper.rb"
|
@@ -357,6 +358,7 @@ files:
|
|
357
358
|
- "./lib/rubypitaya/core/protos/nats_connector.proto"
|
358
359
|
- "./lib/rubypitaya/core/protos/nats_connector_pb.rb"
|
359
360
|
- "./lib/rubypitaya/core/redis_connector.rb"
|
361
|
+
- "./lib/rubypitaya/core/route_error.rb"
|
360
362
|
- "./lib/rubypitaya/core/routes_base.rb"
|
361
363
|
- "./lib/rubypitaya/core/session.rb"
|
362
364
|
- "./lib/rubypitaya/core/setup.rb"
|