rubypitaya 2.6.2 → 2.7.3

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

@@ -0,0 +1,31 @@
+kind: Role
+apiVersion: apps/v1
+metadata:
+  namespace: default
+  name: namespace
+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/http_routes.rb

@@ -10,6 +10,12 @@ module RubyPitaya
       register Sinatra::Reloader
     end
 
+    helpers do
+      def find_template(views, name, engine, &block)
+        views.each { |v| super(v, name, engine, &block) }
+      end
+    end
+
     before do
       content_type :json
 
@@ -17,8 +23,10 @@ module RubyPitaya
       @setup = settings.setup
       @config = settings.config
 
-      request_body = request.body.read
-      @params.merge!(JSON.parse(request_body)) if !request_body.blank?
+      if request.content_type == 'application/json'
+        request_body = request.body.read
+        @params.merge!(JSON.parse(request_body)) if !request_body.blank?
+      end
 
       @params = Parameters.new(@params)
     end

data/lib/rubypitaya/core/main.rb

@@ -8,6 +8,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'
@@ -89,7 +90,7 @@ module RubyPitaya
       HttpRoutes.set :bll, @bll
       HttpRoutes.set :setup, @setup
       HttpRoutes.set :config, @config
-      HttpRoutes.set :views, [Path::HTTP_VIEWS_PATH] + Path::Plugins::APP_CONFIG_FOLDER_PATHS;
+      HttpRoutes.set :views, [Path::HTTP_VIEWS_PATH] + Path::Plugins::HTTP_VIEWS_PATHS
 
       Thread.new do
         HttpRoutes.bind = '0.0.0.0'

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '2.6.2'
+  VERSION = '2.7.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-28 00:00:00.000000000 Z
+date: 2020-11-30 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"; \
-	}'
-
-
-