rubypitaya 2.6.4 → 2.7.5

data/lib/rubypitaya/app-template/kubernetes/role-rubypitaya.yaml

@@ -0,0 +1,31 @@
+kind: Role
+apiVersion: apps/v1
+metadata:
+  namespace: default
+  name: rubypitaya
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - services
+  - pods
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - apps
+  resources:
+  - deployments
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete

data/lib/rubypitaya/app-template/kubernetes/rolebinding-rubypitaya.yaml

@@ -0,0 +1,13 @@
+kind: RoleBinding
+apiVersion: apps/v1
+metadata:
+  name: rubypitaya
+  namespace: default
+subjects:
+- kind: ServiceAccount
+  name: rubypitaya
+  namespace: default
+roleRef:
+  apiGroup: apps
+  kind: Role
+  name: rubypitaya

data/lib/rubypitaya/app-template/kubernetes/service-etcd.yaml

@@ -14,4 +14,4 @@ spec:
       port: 2380
       targetPort: 2380
       name: etcd-2380
-  type: LoadBalancer
+  type: ClusterIP

data/lib/rubypitaya/app-template/kubernetes/service-nats.yaml

@@ -9,4 +9,4 @@ spec:
     - protocol: TCP
       port: 4222
       targetPort: 4222
-  type: LoadBalancer
+  type: ClusterIP

data/lib/rubypitaya/app-template/kubernetes/service-postgres.yaml

@@ -9,4 +9,4 @@ spec:
     - protocol: TCP
       port: 5432
       targetPort: 5432
-  type: LoadBalancer
+  type: ClusterIP

data/lib/rubypitaya/app-template/kubernetes/service-redis.yaml

@@ -10,4 +10,4 @@ spec:
       port: 6379
       targetPort: 6379
       name: redis
-  type: LoadBalancer
+  type: ClusterIP

data/lib/rubypitaya/core/handler_base.rb

@@ -4,10 +4,11 @@ module RubyPitaya
 
     class_attribute :non_authenticated_routes, default: []
 
-    attr_accessor :bll, :redis, :setup, :config, :params, :session, :postman
+    attr_accessor :bll, :log, :redis, :setup, :config, :params, :session, :postman
 
     def initialize
       @bll = nil
+      @log = nil
       @redis = nil
       @setup = nil
       @config = nil

data/lib/rubypitaya/core/handler_router.rb

@@ -53,7 +53,7 @@ module RubyPitaya
     end
 
     def call(handler_name, action_name, session, postman, redis, setup, config,
-             bll, params)
+             bll, log, params)
       unless @handler_name_map.include?(handler_name)
         return {
           code: StatusCodes::CODE_HANDLER_NOT_FOUND,
@@ -71,6 +71,7 @@ module RubyPitaya
       handler = @handler_name_map[handler_name]
 
       handler.bll = bll
+      handler.log = log
       handler.redis = redis
       handler.setup = setup
       handler.config = config

data/lib/rubypitaya/core/http_routes.rb

@@ -23,7 +23,7 @@ module RubyPitaya
       @setup = settings.setup
       @config = settings.config
 
-      if request.content_type == 'aplication/json'
+      if request.content_type == 'application/json'
         request_body = request.body.read
         @params.merge!(JSON.parse(request_body)) if !request_body.blank?
       end

data/lib/rubypitaya/core/initializer_content.rb

@@ -2,10 +2,11 @@ module RubyPitaya
 
   class InitializerContent
 
-    attr_reader :bll, :redis, :config
+    attr_reader :bll, :log, :redis, :setup, :config
 
-    def initialize(bll, redis, setup, config)
+    def initialize(bll, log, redis, setup, config)
       @bll = bll
+      @log = log
       @redis = redis
       @setup = setup
       @config = config

data/lib/rubypitaya/core/main.rb

@@ -1,4 +1,5 @@
 require 'socket'
+require 'logger'
 require 'securerandom'
 require 'active_model'
 
@@ -8,6 +9,7 @@ require 'rubypitaya/core/config'
 require 'rubypitaya/core/session'
 require 'rubypitaya/core/postman'
 require 'rubypitaya/core/parameters'
+require 'rubypitaya/core/http_routes'
 require 'rubypitaya/core/routes_base'
 require 'rubypitaya/core/status_codes'
 require 'rubypitaya/core/handler_router'
@@ -31,6 +33,12 @@ module RubyPitaya
       @environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
       @is_development_environment = @environment_name == 'development'
 
+      @log = Logger.new('/proc/self/fd/1')
+      @log.level = Logger::INFO
+      @log.formatter = proc do |severity, datetime, progname, msg|
+        "#{msg}\n"
+      end
+
       @application_files_importer = ApplicationFilesImporter.new
       @application_files_importer.import
       @application_files_importer.auto_reload if @is_development_environment
@@ -71,6 +79,7 @@ module RubyPitaya
       @bll = InstanceHolder.new
 
       @initializer_content = InitializerContent.new(@bll,
+                                                    @log,
                                                     @redis_connector.redis,
                                                     @setup,
                                                     @config)
@@ -87,6 +96,7 @@ module RubyPitaya
 
     def run_http
       HttpRoutes.set :bll, @bll
+      HttpRoutes.set :log, @log
       HttpRoutes.set :setup, @setup
       HttpRoutes.set :config, @config
       HttpRoutes.set :views, [Path::HTTP_VIEWS_PATH] + Path::Plugins::HTTP_VIEWS_PATHS
@@ -106,7 +116,7 @@ module RubyPitaya
         Signal.trap("SIGQUIT") { throw :sig_shutdown }
         Signal.trap("SIGTERM") { throw :sig_shutdown }
 
-        puts "Server started!"
+        @log.info "Server started!"
         run_nats_connection
       end
 
@@ -121,7 +131,7 @@ module RubyPitaya
       return if @is_shutting_down
       @is_shutting_down = true
 
-      puts "Server shutting down..."
+      @log.info "Server shutting down..."
 
       @etcd_connector.disconnect
       @database_connector.disconnect
@@ -152,22 +162,22 @@ module RubyPitaya
 
         handler_name, action_name = message_route.split('.')[1..-1]
 
-        puts "request  -> route: #{message_route}"
-        puts "         -> data:  #{message_data}"
+        @log.info "request  -> route: #{message_route}"
+        @log.info "         -> data:  #{message_data}"
 
         response = @handler_router.call(handler_name, action_name, @session,
                                         @postman, @redis_connector.redis,
-                                        @setup, @config, @bll, params)
+                                        @setup, @config, @bll, @log, params)
 
         delta_time_seconds = Time.now.to_i - start_time_seconds
 
-        puts "response [#{delta_time_seconds}s] -> #{response.to_json}"
+        @log.info "response [#{delta_time_seconds}s] -> #{response.to_json}"
 
         response
       end
       rescue Exception => error
-        puts "ERROR: #{error}"
-        puts error.backtrace
+        @log.info "ERROR: #{error}"
+        @log.info error.backtrace
         run_nats_connection
     end
   end

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '2.6.4'
+  VERSION = '2.7.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.7.5
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-28 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -235,16 +235,21 @@ files:
 - "./lib/rubypitaya/app-template/bin/console"
 - "./lib/rubypitaya/app-template/config/database.yml"
 - "./lib/rubypitaya/app-template/config/routes.rb"
-- "./lib/rubypitaya/app-template/db/migration/0000000002_create_player_migration.rb"
+- "./lib/rubypitaya/app-template/db/migration/1606736477_create_player_migration.rb"
 - "./lib/rubypitaya/app-template/docker-compose.yml"
 - "./lib/rubypitaya/app-template/docker/dev/Dockerfile"
 - "./lib/rubypitaya/app-template/docker/entrypoint.sh"
 - "./lib/rubypitaya/app-template/docker/prod/Dockerfile"
-- "./lib/rubypitaya/app-template/docker/prod/Makefile"
 - "./lib/rubypitaya/app-template/kubernetes/README.md"
 - "./lib/rubypitaya/app-template/kubernetes/deployment-connector.yaml"
 - "./lib/rubypitaya/app-template/kubernetes/deployment-rubypitaya.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/gameplay/deployment-nginx.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/gameplay/gameplay-template.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/gameplay/nginx.conf"
+- "./lib/rubypitaya/app-template/kubernetes/gameplay/service-nginx.yaml"
 - "./lib/rubypitaya/app-template/kubernetes/persistent-volume.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/role-rubypitaya.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/rolebinding-rubypitaya.yaml"
 - "./lib/rubypitaya/app-template/kubernetes/service-connector.yaml"
 - "./lib/rubypitaya/app-template/kubernetes/service-etcd.yaml"
 - "./lib/rubypitaya/app-template/kubernetes/service-nats.yaml"

data/lib/rubypitaya/app-template/docker/prod/Makefile

@@ -1,67 +0,0 @@
-## Run ruby pitaya metagame project
-run:
-	@docker-compose run --service-ports --rm rubypitaya bundle exec rubypitaya
-
-## Update docker images
-update:
-	@docker-compose pull
-
-## Create database
-db-create:
-	@docker-compose run --service-ports --rm rubypitaya bundle exec rake db:create
-
-## Run migrations to database
-db-migrate:
-	@docker-compose run --service-ports --rm rubypitaya bundle exec rake db:migrate
-
-## Drop database
-db-drop:
-	@docker-compose run --service-ports --rm rubypitaya bundle exec rake db:drop
-
-## Reset database
-db-reset:
-	@docker-compose run --service-ports --rm rubypitaya bundle exec rake db:reset
-
-.DEFAULT_GOAL := show-help
-
-.PHONY: show-help
-show-help:
-	@echo "$$(tput bold)Commands:$$(tput sgr0)"
-	@echo
-	@sed -n -e "/^## / { \
-		h; \
-		s/.*//; \
-		:doc" \
-		-e "H; \
-		n; \
-		s/^## //; \
-		t doc" \
-		-e "s/:.*//; \
-		G; \
-		s/\\n## /---/; \
-		s/\\n/ /g; \
-		p; \
-	}" ${MAKEFILE_LIST} \
-	| LC_ALL='C' sort --ignore-case \
-	| awk -F '---' \
-		-v ncol=$$(tput cols) \
-		-v indent=19 \
-		-v col_on="$$(tput setaf 6)" \
-		-v col_off="$$(tput sgr0)" \
-	'{ \
-		printf "%s%*s%s ", col_on, -indent, $$1, col_off; \
-		n = split($$2, words, " "); \
-		line_length = ncol - indent; \
-		for (i = 1; i <= n; i++) { \
-			line_length -= length(words[i]) + 1; \
-			if (line_length <= 0) { \
-				line_length = ncol - indent - length(words[i]) - 1; \
-				printf "\n%*s ", -indent, " "; \
-			} \
-			printf "%s ", words[i]; \
-		} \
-		printf "\n"; \
-	}'
-
-
-