rubypitaya 2.23.0 → 2.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3622a8779af46681d3a25d677021ef477a968e2a538d3dc7712c54a3bb5cd01d
-  data.tar.gz: d3357dc303db00fc1d29c208557547d60def38e432558a8286313dce4a9776df
+  metadata.gz: 8c289b7e66999cba7c278e77dd8658527cd101218009709e533fe853b5f43250
+  data.tar.gz: 4dd6b6fe78b6c22b30b1a7564a9972da484753c8d8716e4fd5dabd0e0f5ae001
 SHA512:
-  metadata.gz: 7f253dd21e9999acbe8ca3e6f64795f5c434a392cc7ad58749d5d0ac964fd1261e1440ef28a676489ce545bc406f39d5e1547242cee04575b666acfbe9dac4cb
-  data.tar.gz: 8ea11f029554fbb21abecb2f12dd69f6a40f6bff2dcb326e1bb28812be9261318bb650f8ff783b010fd68f5ac430de311263338d725b44e9715da914cc4ed2d6
+  metadata.gz: 3faa2a8b0cda879621cb823ae920271477596c556c9938881fcd829e185a7563d6da3492bb7a387c5a58766ce5d8f990dbc1c73bf997a19c3e0eaf5db6153ccc
+  data.tar.gz: ee519fc3028078226cc0e5e01e0b706bd96962481b10ca263e60c28f371b354bd0480b0fa3452e4fc9007ea4f786bbf0ba2ca75c330a6ad72b901cbf9defae9c

data/bin/rubypitaya

@@ -67,9 +67,10 @@ def command_add_plugin(argv)
     exit(-1)
   end
 
-  plugin_git_link = argv[1]
+  plugin_git_url = argv[1]
+  branch_name = argv[2] || ""
 
-  plugin_name = RubyPitaya::RubyPitaya.add_plugin(plugin_git_link)
+  plugin_name = RubyPitaya::RubyPitaya.add_plugin(plugin_git_url, branch_name)
 
   puts "Plugin #{plugin_name} added!"
 end
@@ -94,7 +95,7 @@ def show_help_create_migration
 end
 
 def show_help_add_plugin
-  puts 'Usage: $ rubypitaya add-plugin [plugin_git_link]'
+  puts 'Usage: $ rubypitaya add-plugin [plugin_git_link] [branch_name:optional]'
   puts ''
 end
 

data/lib/rubypitaya/app-template/Gemfile

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

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

@@ -111,7 +111,7 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
     ruby2_keywords (0.0.5)
-    rubypitaya (2.23.0)
+    rubypitaya (2.26.0)
       activerecord (= 6.1.3)
       etcdv3 (= 0.10.2)
       mongo (= 2.15.0)
@@ -152,7 +152,7 @@ DEPENDENCIES
   listen (= 3.4.1)
   pry (= 0.14.0)
   rspec (= 3.10.0)
-  rubypitaya (= 2.23.0)
+  rubypitaya (= 2.26.0)
 
 BUNDLED WITH
    2.1.4

data/lib/rubypitaya/app-template/Makefile

@@ -49,9 +49,9 @@ update-dependencies:
 create-migration:
 	@docker-compose run --service-ports --rm rubypitaya-commands bundle exec rubypitaya create-migration $(NAME)
 
-## Add or update a plugin. GIT=[plugin-http-git-link]
+## 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 rubypitaya add-plugin $(GIT)
+	@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.23.0'
+  VERSION = '2.26.0'
 end

data/lib/rubypitaya.rb

@@ -38,15 +38,19 @@ module RubyPitaya
       migration_file_name
     end
 
-    def self.add_plugin(plugin_git_link)
+    def self.add_plugin(plugin_git_url, branch_name)
       Dir.mkdir(Path::PLUGINS_FOLDER_PATH) unless File.exists?(Path::PLUGINS_FOLDER_PATH)
 
-      plugin_name = plugin_git_link.scan(/.+\/(.+)\.git/).flatten.first
+      plugin_name = plugin_git_url.scan(/.+\/(.+)\.git/).flatten.first
       plugin_folder_path = File.join(Path::PLUGINS_FOLDER_PATH, plugin_name)
       plugin_git_path = File.join(plugin_folder_path, '.git/')
 
+      branch_command = ""
+      branch_command = "--branch #{branch_name}" unless branch_name.blank?
+
       FileUtils.rm_rf(plugin_folder_path) if File.exists?(plugin_folder_path)
-      `git -C #{Path::PLUGINS_FOLDER_PATH} clone #{plugin_git_link}`
+      puts "git -C #{Path::PLUGINS_FOLDER_PATH} clone  --depth 1 #{branch_command} #{plugin_git_url}"
+      `git -C #{Path::PLUGINS_FOLDER_PATH} clone --depth 1 #{branch_command} #{plugin_git_url}`
       FileUtils.rm_rf(plugin_git_path)
 
       Dir.entries(plugin_folder_path).each do |entry|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.23.0
+  version: 2.26.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-19 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"