rubypitaya 2.24.0 → 2.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42695632f5f5199cbce5586b5600ef0297b4dad059397c523a5bf975cb192896
-  data.tar.gz: 37a55fabac4729035ef2d5129734e178745dcc3cb3056ab1b6c290cc68c2db93
+  metadata.gz: de24f57328bc18e37aac0d0b1df99ab5aaa053f3f8ea83dadc72747945b39296
+  data.tar.gz: 4c667ba7ada7fcc913c82b6edeb19a2484cad8205ca2f1456454dc231d1a2b75
 SHA512:
-  metadata.gz: 296d521e0de245fbaa1895de1fa1298bbac7653e4419d36fec27166737e595a434b96e64020d203e0a6375ff445753cfd989d8242f11b11cb75644aea5952c0a
-  data.tar.gz: 11d0cbe5dbc539fa914fc6faae7ced4f13a908c7ecd6decef96168b9dbe7109a78b02ff34eb644514fb1015a84aca77f2e27361b00897ab5253e4fc467ec08fe
+  metadata.gz: 61620b909468b5ad84669f5dce38e0b5627d22a61fe6590b328b5a644e4ea2b563874ef57b0c6c6554f945a1c3560e56c6934e256cb0e9bece5f355a7a5483da
+  data.tar.gz: 2f6ef8849e38c48cf4bdc10c66bc76e41a2edc214c67c4f1a6dd865f8842e0e0d6c34262e59e08159a9604b061af3684ea86d79ea4ff5f93ebd75dd84a11028d

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '2.24.0'
+gem 'rubypitaya', '2.26.1'
 
 group :development do
   gem 'pry', '0.14.0'

data/lib/rubypitaya/app-template/Gemfile.lock

@@ -1,12 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3)
-      activesupport (= 6.1.3)
-    activerecord (6.1.3)
-      activemodel (= 6.1.3)
-      activesupport (= 6.1.3)
-    activesupport (6.1.3)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -48,7 +48,7 @@ GEM
       cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
       cucumber-messages (~> 13.0, >= 13.0.1)
     diff-lcs (1.4.4)
-    etcdv3 (0.10.2)
+    etcdv3 (0.11.3)
       grpc (~> 1.17)
     eventmachine (1.2.7)
     ffi (1.15.3)
@@ -74,9 +74,9 @@ GEM
       ruby2_keywords (~> 0.0.1)
     nats (0.11.0)
       eventmachine (~> 1.2, >= 1.2)
-    ostruct (0.3.3)
+    ostruct (0.4.0)
     pg (1.2.3)
-    protobuf (3.10.0)
+    protobuf (3.10.4)
       activesupport (>= 3.2)
       middleware
       thor
@@ -92,11 +92,11 @@ GEM
     rack (2.2.3)
     rack-protection (2.1.0)
       rack
-    rake (13.0.3)
+    rake (13.0.6)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redis (4.2.5)
+    redis (4.4.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -111,23 +111,27 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
     ruby2_keywords (0.0.5)
-    rubypitaya (2.24.0)
-      activerecord (= 6.1.3)
-      etcdv3 (= 0.10.2)
+    rubypitaya (2.26.1)
+      activerecord (= 6.1.4.1)
+      etcdv3 (= 0.11.3)
       mongo (= 2.15.0)
       nats (= 0.11.0)
-      ostruct (= 0.3.3)
+      ostruct (= 0.4.0)
       pg (= 1.2.3)
-      protobuf (= 3.10.0)
-      rake (= 13.0.3)
-      redis (= 4.2.5)
+      protobuf (= 3.10.4)
+      rake (= 13.0.6)
+      redis (= 4.4.0)
       sinatra (= 2.1.0)
+      sinatra-activerecord (= 2.0.23)
       sinatra-contrib (= 2.1.0)
     sinatra (2.1.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
       rack-protection (= 2.1.0)
       tilt (~> 2.0)
+    sinatra-activerecord (2.0.23)
+      activerecord (>= 4.1)
+      sinatra (>= 1.0)
     sinatra-contrib (2.1.0)
       multi_json
       mustermann (~> 1.0)
@@ -152,7 +156,7 @@ DEPENDENCIES
   listen (= 3.4.1)
   pry (= 0.14.0)
   rspec (= 3.10.0)
-  rubypitaya (= 2.24.0)
+  rubypitaya (= 2.26.1)
 
 BUNDLED WITH
    2.1.4

data/lib/rubypitaya/app-template/Makefile

@@ -51,7 +51,7 @@ create-migration:
 
 ## Add or update a plugin. GIT=[plugin-http-git-link] BRANCH=[branch-name:optional]
 add-plugin:
-	@docker-compose run --service-ports --rm rubypitaya-commands bundle exec ruby ../../../bin/rubypitaya add-plugin $(GIT) $(BRANCH)
+	@docker-compose run --service-ports --rm rubypitaya-commands bundle exec rubypitaya add-plugin $(GIT) $(BRANCH)
 
 ## + Database Commands
 

data/lib/rubypitaya/app-template/helm/templates/config-maps/nginx-config.yaml

@@ -4,6 +4,6 @@ metadata:
   name: nginx-config
 data:
   nginx.conf: "events {\n    worker_connections  1024;\n}\n\nstream {\n    server
-    {\n        listen  {{ .Values.gameserver.port.first }}-{{ .Values.gameserver.port.last }};\n        \n        resolver kube-dns.kube-system.svc.cluster.local
-    valid=5s;\n\n        proxy_pass  gameserver-$server_port.{{ .Values.namespace }}.svc.cluster.local:$server_port;\n
+    {\n        listen  {{ .Values.gameserver.externalport.first }}-{{ .Values.gameserver.externalport.last }};\n        \n        resolver kube-dns.kube-system.svc.cluster.local
+    valid=5s;\n\n        proxy_pass  gameserver-$server_port.gameserver.{{ .Values.namespace }}.svc.cluster.local:{{ .Values.gameserver.gameport }};\n
     \   }\n}\n"

data/lib/rubypitaya/app-template/helm/templates/deployments/gameserver-nginx.yaml

@@ -21,8 +21,8 @@ spec:
       - name: gameserver-nginx
         image: nginx:1.18.0
         ports:
-        {{- $initialValue := int .Values.gameserver.port.first }}
-        {{- $finalValue := add .Values.gameserver.port.last 1 }}
+        {{- $initialValue := int .Values.gameserver.externalport.first }}
+        {{- $finalValue := add .Values.gameserver.externalport.last 1 }}
         {{- $finalValue = int $finalValue }}
         {{- range untilStep $initialValue $finalValue 1 }}
           {{- $port := . }}

data/lib/rubypitaya/app-template/helm/templates/deployments/rubypitaya.yaml

@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
       - name: rubypitaya
-        image: {{ .Values.rubypitaya.image.repository }}:{{ .Values.rubypitaya.image.tag }}
+        image: "{{ .Values.rubypitaya.image.repository }}:{{ .Values.rubypitaya.image.tag }}"
         command: ["bundle", "exec", "rubypitaya", "run"]
         ports:
         - containerPort: 4567
@@ -48,19 +48,19 @@ spec:
           - name: RUBYPITAYA_HTTP_AUTH_USER
             value: {{ .Values.http.auth.user | quote }}
           - name: RUBYPITAYA_HTTP_AUTH_PASS
-            value: {{ .Values.http.auth.password | quote }}
+            value: {{ .Values.http.auth.pass | quote }}
           - name: MATCHMAKING_CURRENTROOMBLL
             value: kubernetes
           - name: MATCHMAKING_ROOMBLL_KUBERNETES_NAMESPACE
             value: {{ .Values.namespace }}
           - name: MATCHMAKING_ROOMBLL_KUBERNETES_CONTAINERIMAGE
-            value: {{ .Values.gameserver.image.repository }}:{{ .Values.gameserver.image.tag }}
+            value: "{{ .Values.gameserver.image.repository }}:{{ .Values.gameserver.image.tag }}"
           - name: MATCHMAKING_ROOMBLL_KUBERNETES_INITIALPORT
-            value: {{ .Values.gameserver.port.first | quote }}
+            value: {{ .Values.gameserver.externalport.first | quote }}
           - name: MATCHMAKING_ROOMBLL_KUBERNETES_FINALPORT
-            value: {{ .Values.gameserver.port.last | quote }}
+            value: {{ .Values.gameserver.externalport.last | quote }}
           - name: MATCHMAKING_ROOMBLL_KUBERNETES_SERVICEHOST
-            value: {{ .Values.gameserver.servicehost }}
+            value: {{ .Values.gameserver.servicehost | quote }}
       imagePullSecrets:
       - name: gitlab-registry
       serviceAccount: rubypitaya

data/lib/rubypitaya/app-template/helm/templates/pods/gameserver.yaml

@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: gameserver-{{ .Values.gameserver.port }}
+  labels:
+    app: rubypitaya
+    component: gameserver
+spec:
+  hostname: gameserver-{{ .Values.gameserver.port }}
+  subdomain: gameserver
+  containers:
+  - name: gameserver-{{ .Values.gameserver.port }}
+    image: {{ .Values.gameserver.image.repository }}:{{ .Values.connector.image.tag }}
+    ports:
+    - containerPort: {{ .Values.gameserver.gameport }}
+      name: gameserver
+    env:
+      - name: ROOM_ID
+        value: {{ .Values.gameserver.roomid }}
+      - name: PORT
+        value: {{ .Values.gameserver.gameport }}

data/lib/rubypitaya/app-template/helm/templates/services/gameserver-nginx.yaml

@@ -7,8 +7,8 @@ spec:
     app: gameserver
     component: gameserver-nginx
   ports:
-    {{- $initialValue := int .Values.gameserver.port.first }}
-    {{- $finalValue := add .Values.gameserver.port.last 1 }}
+    {{- $initialValue := int .Values.gameserver.externalport.first }}
+    {{- $finalValue := add .Values.gameserver.externalport.last 1 }}
     {{- $finalValue = int $finalValue }}
     {{- range untilStep $initialValue $finalValue 1 }}
       {{- $port := . }}

data/lib/rubypitaya/app-template/helm/templates/services/gameserver.yaml

@@ -1,20 +1,13 @@
-{{- $initialValue := int .Values.gameserver.port.first }}
-{{- $finalValue := add .Values.gameserver.port.last 1 }}
-{{- $finalValue = int $finalValue }}
-{{- range untilStep $initialValue $finalValue 1 }}
-  {{- $port := . }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: gameserver-{{ $port }}
+  name: gameserver
 spec:
   selector:
-    app: gameserver
-    component: gameserver-{{ $port }}
+    app: rubypitaya
+    component: gameserver
   ports:
     - protocol: TCP
-      port: {{ $port }}
-      targetPort: {{ $port }}
-  type: ClusterIP
----
-{{- end }}
+      port: {{ .Values.gameserver.gameport }}
+      targetPort: {{ .Values.gameserver.gameport }}
+  type: ClusterIP

data/lib/rubypitaya/app-template/helm/values.yaml

@@ -30,7 +30,8 @@ gameserver:
   image:
     repository: [gameserver-repository-link]
     tag: latest
-  port:
+  externalport:
     first: 5000
     last: 5099
+  gameport: 3250
   servicehost: [gameserver-service-url]

data/lib/rubypitaya/core/app/migrations/0000000001_create_user_migration.rb

@@ -1,6 +1,6 @@
 require 'active_record'
 
-class CreateUserMigration < ActiveRecord::Migration[6.0]
+class CreateUserMigration < ActiveRecord::Migration[6.1]
 
   enable_extension 'pgcrypto'
 

data/lib/rubypitaya/core/handler_router.rb

@@ -6,6 +6,8 @@ module RubyPitaya
 
   class HandlerRouter
 
+    INVALID_ACTION_NAMES = ['initialize', 'set_attributes']
+
     def initialize()
       routes_path = Path::ROUTES_FILE_PATH
       handler_folder_paths = Path::Plugins::HANDLERS_FOLDER_PATHS + [Path::HANDLERS_FOLDER_PATH]
@@ -59,13 +61,14 @@ module RubyPitaya
       unless @handler_name_map.include?(handler_name)
         return {
           code: StatusCodes::CODE_HANDLER_NOT_FOUND,
-          msg: "Handler #{handler_name} not founded"
+          message: "Handler #{handler_name} not found"
         }
       end
-      unless @handler_name_map[handler_name].public_methods(false).include?(action_name.to_sym)
+      if INVALID_ACTION_NAMES.include?(action_name) ||
+         !@handler_name_map[handler_name].public_methods(false).include?(action_name.to_sym)
         return {
           code: StatusCodes::CODE_ACTION_NOT_FOUND,
-          msg: "Handler #{handler_name} action #{action_name} not founded"
+          message: "Handler #{handler_name} action #{action_name} not found"
         }
       end
 
@@ -81,7 +84,7 @@ module RubyPitaya
         else
           return {
             code: StatusCodes::CODE_NOT_AUTHENTICATED,
-            msg: 'Not authenticated',
+            message: 'Not authenticated',
           }
         end
       end

data/lib/rubypitaya/core/http_routes.rb

@@ -1,15 +1,21 @@
 require 'sinatra/base'
+require 'sinatra/activerecord'
 require 'rubypitaya/core/parameters'
 
 module RubyPitaya
 
   class HttpRoutes < Sinatra::Base
+    register Sinatra::ActiveRecordExtension
 
     def self.auto_reload
       require 'sinatra/reloader'
       register ::Sinatra::Reloader
     end
 
+    configure do
+      set :show_exceptions, false
+    end
+
     helpers do
       def find_template(views, name, engine, &block)
         views.each { |v| super(v, name, engine, &block) }
@@ -20,9 +26,13 @@ module RubyPitaya
       content_type :json
 
       @bll = settings.bll
+      @log = settings.log
       @mongo = settings.mongo
       @setup = settings.setup
+      @redis = settings.redis
       @config = settings.config
+      @session = nil
+      @postman = nil
 
       return error_unauthorized unless authorized?(request)
 
@@ -34,6 +44,11 @@ module RubyPitaya
       end
 
       @params = Parameters.new(@params)
+      @params.permit!
+    end
+
+    after do
+      ActiveRecord::Base.clear_active_connections!
     end
 
     private

data/lib/rubypitaya/core/spec-helpers/handler_spec_helper.rb

@@ -74,23 +74,23 @@ module RubyPitaya
       @@setup.add(*keys, value)
     end
 
-    def get_bll
+    def bll
       @@bll
     end
 
-    def get_log
+    def log
       @@log
     end
 
-    def get_session
+    def session
       @@session
     end
 
-    def get_postman
+    def postman
       @@postman
     end
 
-    def get_redis
+    def redis
       @@redis_connector.redis
     end
 

data/lib/rubypitaya/core/templates/template_migration.rb.erb

@@ -1,6 +1,6 @@
 require 'active_record'
 
-class <%= class_name %> < ActiveRecord::Migration[6.0]
+class <%= class_name %> < ActiveRecord::Migration[6.1]
 
   enable_extension 'pgcrypto'
 

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '2.24.0'
+  VERSION = '2.26.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.24.0
+  version: 2.26.1
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-25 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: 13.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: nats
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: etcdv3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.3
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -114,70 +114,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: sinatra-contrib
+  name: protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.10.4
 - !ruby/object:Gem::Dependency
-  name: protobuf
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 6.1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 6.1.4.1
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: sinatra-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: sinatra-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 2.0.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 2.0.23
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -212,28 +226,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: 7.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: 7.0.0
 description: RubyPitaya is an application to create servers using the pitaya protocol.
 email:
 - lucianopcbr@gmail.com
@@ -279,6 +293,7 @@ files:
 - "./lib/rubypitaya/app-template/helm/templates/deployments/connector.yaml"
 - "./lib/rubypitaya/app-template/helm/templates/deployments/gameserver-nginx.yaml"
 - "./lib/rubypitaya/app-template/helm/templates/deployments/rubypitaya.yaml"
+- "./lib/rubypitaya/app-template/helm/templates/pods/gameserver.yaml"
 - "./lib/rubypitaya/app-template/helm/templates/role-bindings/rubypitaya.yaml"
 - "./lib/rubypitaya/app-template/helm/templates/roles/rubypitaya.yaml"
 - "./lib/rubypitaya/app-template/helm/templates/service-accounts/rubypitaya.yaml"