rubypitaya 2.6.3 → 2.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b367c2b1b6a1bbd272c216dc53b07444bc76ee014126735d2e815299910dfea
-  data.tar.gz: 626cbd30f338f766de59000a1a7b659d6086e7b64b80c9c6090c05c9e493f908
+  metadata.gz: 623c57d88899a89b5ff791d083b7f6025922f2b3a2c69d4d11ba2b7d328fb1c5
+  data.tar.gz: fae9b7a11220d84d71f3775d6daeabf24628dd2db9eb48a2cf0b235643c864f3
 SHA512:
-  metadata.gz: e17f34d833d731125d1a1940b235f5966dba02b82a9b8688cd825bae0902816296bc39c0a8dc0c9be7a13368ca145cbc339b16634ae758b8475ce0c8392eed82
-  data.tar.gz: cead4eea29f929c9cde46fa007967052bb735f83088359b59360fbd15402b9ae87c9ca84ded405ed3e4d1653ae11ee8a505a6f8ec5c3052beb7a0f9328658b60
+  metadata.gz: e3dd0f6775614ab1462fc2651582f9ad25850d52de90889b756879dd02bc0446f20564656b8d90bbb98d79a25a5da6bcb0c7dbcf220afd571a5643a6fa61d5b5
+  data.tar.gz: 7316e7f5846839f4c59ebf2607da8f032b10560c03ba80e19b4a551f528ef96587516b9d516c340b128ef443791642ad23299d3c4e7886a8a28b2d943825a840

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '2.6.3'
+gem 'rubypitaya', '2.7.4'
 
 group :development do
   gem 'pry', '0.12.2'

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

@@ -69,7 +69,7 @@ GEM
       rspec-support (~> 3.8.0)
     rspec-support (3.8.3)
     ruby2_keywords (0.0.2)
-    rubypitaya (2.6.3)
+    rubypitaya (2.7.4)
       activerecord (= 6.0.2)
       etcdv3 (= 0.10.2)
       eventmachine (= 1.2.7)
@@ -106,7 +106,7 @@ DEPENDENCIES
   listen (= 3.2.1)
   pry (= 0.12.2)
   rspec (= 3.8.0)
-  rubypitaya (= 2.6.3)
+  rubypitaya (= 2.7.4)
 
 BUNDLED WITH
    1.17.2

data/lib/rubypitaya/app-template/Makefile

@@ -1,3 +1,8 @@
+IMAGE_TAG ?= latest
+IMAGE_REGISTRY ?= [put-your-registry-here]
+KUBE_NAMESPACE ?= [put-your-namespace-here]
+KUBE_DEPLOYMENT_SERVER ?= rubypitaya
+
 ## Run ruby pitaya metagame project
 run:
 	@docker-compose run --service-ports --rm rubypitaya bundle exec rubypitaya run
@@ -48,15 +53,15 @@ generate-gemfilelock:
 
 ## Build image to production environment
 prod-build-image:
-	@docker build . -f docker/prod/Dockerfile -t [registry-address]:$(IMAGE_TAG)
+	@docker build . -f docker/prod/Dockerfile -t $(IMAGE_REGISTRY):$(IMAGE_TAG)
 
 ## Push prod image to gitlab
 prod-push-image:
-	@docker push [registry-address]:$(IMAGE_TAG)
+	@docker push $(IMAGE_REGISTRY):$(IMAGE_TAG)
 
 ## Deploy prod image to kubernetes cluster
 prod-deploy-image:
-	kubectl -n $(PROD_NAMESPACE) set image deployment rubypitaya rubypitaya=[registry-address]:$(IMAGE_TAG)
+	kubectl --context='$(KUBECONTEXT)' -n $(KUBE_NAMESPACE) set image deployment $(KUBE_DEPLOYMENT_SERVER) $(KUBE_DEPLOYMENT_SERVER)=$(IMAGE_REGISTRY):$(IMAGE_TAG)
 
 .DEFAULT_GOAL := show-help
 
@@ -98,6 +103,3 @@ show-help:
 		} \
 		printf "\n"; \
 	}'
-
-
-

data/lib/rubypitaya/app-template/app/app_initializer.rb

@@ -1,36 +1,39 @@
-class AppInitializer < RubyPitaya::InitializerBase
+module MyApp
 
-  # method:     run
-  # parameter:  initializer_content
-  # attributes:
-  #  - bll
-  #    - class: RubyPitaya::InstanceHolder
-  #    - link: https://gitlab.com/LucianoPC/ruby-pitaya/-/blob/master/lib/rubypitaya/core/instance_holder.rb
-  #    - methods:
-  #      - add_instance(key, instance)
-  #        - add any instance to any key
-  #      - [](key)
-  #        - get instance by key
-  #  - redis
-  #    - link: https://github.com/redis/redis-rb/
-  #  - config
-  #    - class: RubyPitaya::Config
-  #    - link: https://gitlab.com/LucianoPC/ruby-pitaya/-/blob/master/lib/rubypitaya/core/config.rb
-  #    - methods:
-  #      - [](key)
-  #        - get config file by config path
-  #  - setup
-  #    - class: RubyPitaya::Setup
-  #    - link: https://gitlab.com/LucianoPC/ruby-pitaya/-/blob/master/lib/rubypitaya/core/setup.rb
-  #    - methods:
-  #      - [](key)
-  #        - get config file by config path
+  class AppInitializer < RubyPitaya::InitializerBase
 
-  def run(initializer_content)
-    bll = initializer_content.bll
+    # method:     run
+    # parameter:  initializer_content
+    # attributes:
+    #  - bll
+    #    - class: RubyPitaya::InstanceHolder
+    #    - link: https://gitlab.com/LucianoPC/ruby-pitaya/-/blob/master/lib/rubypitaya/core/instance_holder.rb
+    #    - methods:
+    #      - add_instance(key, instance)
+    #        - add any instance to any key
+    #      - [](key)
+    #        - get instance by key
+    #  - redis
+    #    - link: https://github.com/redis/redis-rb/
+    #  - config
+    #    - class: RubyPitaya::Config
+    #    - link: https://gitlab.com/LucianoPC/ruby-pitaya/-/blob/master/lib/rubypitaya/core/config.rb
+    #    - methods:
+    #      - [](key)
+    #        - get config file by config path
+    #  - setup
+    #    - class: RubyPitaya::Setup
+    #    - link: https://gitlab.com/LucianoPC/ruby-pitaya/-/blob/master/lib/rubypitaya/core/setup.rb
+    #    - methods:
+    #      - [](key)
+    #        - get config file by config path
 
-    playerBll = PlayerBLL.new
+    def run(initializer_content)
+      bll = initializer_content.bll
 
-    bll.add_instance(:player, playerBll)
+      playerBll = PlayerBLL.new
+
+      bll.add_instance(:player, playerBll)
+    end
   end
-end
+end

data/lib/rubypitaya/app-template/app/bll/player_bll.rb

@@ -1,11 +1,14 @@
-class PlayerBLL
+module MyApp
+  
+  class PlayerBLL
 
-  def create_new_player(setup, config)
-    name = config['initial_player']['name']
-    gold = setup['initial_player.wallet.gold']
+    def create_new_player(setup, config)
+      name = config['initial_player']['name']
+      gold = setup['initial_player.wallet.gold']
 
-    player = Player.new(name: name, gold: gold, user: User.new)
-    player.save
-    player
+      player = Player.new(name: name, gold: gold, user: User.new)
+      player.save
+      player
+    end
   end
 end

data/lib/rubypitaya/app-template/app/constants/status_codes.rb

@@ -1,22 +1,25 @@
-class StatusCodes
+module MyApp
+  
+  class StatusCodes
 
-  CODE_OK = RubyPitaya::StatusCodes::CODE_OK
+    CODE_OK = RubyPitaya::StatusCodes::CODE_OK
 
-  ################
-  ## Existent Codes
-  ################
-  ## Success codes
-  #
-  # RubyPitaya::StatusCodes::CODE_OK                   = 'RP-200'
-  #
-  #
-  ## Error codes
-  # RubyPitaya::StatusCodes::CODE_UNKNOWN              = 'RP-000'
-  # RubyPitaya::StatusCodes::CODE_HANDLER_NOT_FOUND    = 'RP-001'
-  # RubyPitaya::StatusCodes::CODE_ACTION_NOT_FOUND     = 'RP-002'
-  # RubyPitaya::StatusCodes::CODE_NOT_AUTHENTICATED    = 'RP-003'
-  # RubyPitaya::StatusCodes::CODE_AUTHENTICATION_ERROR = 'RP-004'
-  #
-  # RubyPitaya::StatusCodes::Connector::CODE_UNKNOWN   = 'PIT-000'
-  ################
+    ################
+    ## Existent Codes
+    ################
+    ## Success codes
+    #
+    # RubyPitaya::StatusCodes::CODE_OK                   = 'RP-200'
+    #
+    #
+    ## Error codes
+    # RubyPitaya::StatusCodes::CODE_UNKNOWN              = 'RP-000'
+    # RubyPitaya::StatusCodes::CODE_HANDLER_NOT_FOUND    = 'RP-001'
+    # RubyPitaya::StatusCodes::CODE_ACTION_NOT_FOUND     = 'RP-002'
+    # RubyPitaya::StatusCodes::CODE_NOT_AUTHENTICATED    = 'RP-003'
+    # RubyPitaya::StatusCodes::CODE_AUTHENTICATION_ERROR = 'RP-004'
+    #
+    # RubyPitaya::StatusCodes::Connector::CODE_UNKNOWN   = 'PIT-000'
+    ################
+  end
 end

data/lib/rubypitaya/app-template/app/handlers/hello_world_handler.rb

@@ -1,4 +1,5 @@
 module MyApp
+
   class HelloWorldHandler < RubyPitaya::HandlerBase
 
     non_authenticated_actions :sayHello

data/lib/rubypitaya/app-template/app/handlers/player_handler.rb

@@ -1,79 +1,82 @@
-class PlayerHandler < RubyPitaya::HandlerBase
+module MyApp
+  
+  class PlayerHandler < RubyPitaya::HandlerBase
 
-  # class:      HandlerBase
-  # attributes:
-  #  - @bll
-  #    - class: InstanceHolder
-  #    - methods:
-  #      - [](key)
-  #        - info: get bll by key
-  #
-  #  - @redis
-  #    - link: https://github.com/redis/redis-rb/
-  #
-  #  - @config
-  #    - info: Hash with config json files inside of 'app/config'
-  #    - example:
-  #               Given you have the following file "app/config/initial_player.json"
-  #               And this json content is {'name': 'Guest'}
-  #               And you can get the initial player name
-  #               Then you can run the following code: @config['initial_player']['name']
-  #
-  #  - @params
-  #    - info: Special hash with the request parameters
-  #    - link: https://api.rubyonrails.org/classes/ActionController/Parameters.html
-  #
-  #  - @session
-  #    - attributes:
-  #      - id          :: session id
-  #      - uid         :: user id
-  #      - data        :: session data
-  #      - metadata    :: session data
-  #      - frontend_id :: connector server id
-  #
-  #  - @postman
-  #    - info: Send messages to server and clients
-  #    - methods:
-  #      - bind_session(session)
-  #        - info:
-  #                Send a session to connector, you can use to set the userId
-  #                of the session, for example you can set an userId on
-  #                @session, like `@session.uid = '123'`, and then you can
-  #                bind this session with `@postman.bind_session(@session)`
+    # class:      HandlerBase
+    # attributes:
+    #  - @bll
+    #    - class: InstanceHolder
+    #    - methods:
+    #      - [](key)
+    #        - info: get bll by key
+    #
+    #  - @redis
+    #    - link: https://github.com/redis/redis-rb/
+    #
+    #  - @config
+    #    - info: Hash with config json files inside of 'app/config'
+    #    - example:
+    #               Given you have the following file "app/config/initial_player.json"
+    #               And this json content is {'name': 'Guest'}
+    #               And you can get the initial player name
+    #               Then you can run the following code: @config['initial_player']['name']
+    #
+    #  - @params
+    #    - info: Special hash with the request parameters
+    #    - link: https://api.rubyonrails.org/classes/ActionController/Parameters.html
+    #
+    #  - @session
+    #    - attributes:
+    #      - id          :: session id
+    #      - uid         :: user id
+    #      - data        :: session data
+    #      - metadata    :: session data
+    #      - frontend_id :: connector server id
+    #
+    #  - @postman
+    #    - info: Send messages to server and clients
+    #    - methods:
+    #      - bind_session(session)
+    #        - info:
+    #                Send a session to connector, you can use to set the userId
+    #                of the session, for example you can set an userId on
+    #                @session, like `@session.uid = '123'`, and then you can
+    #                bind this session with `@postman.bind_session(@session)`
 
-  non_authenticated_actions :authenticate
+    non_authenticated_actions :authenticate
 
-  def authenticate
-    user_id = @params[:userId]
+    def authenticate
+      user_id = @params[:userId]
 
-    player = Player.find_by_user_id(user_id)
-    player = @bll[:player].create_new_player(@setup, @config) if player.nil?
+      player = Player.find_by_user_id(user_id)
+      player = @bll[:player].create_new_player(@setup, @config) if player.nil?
 
-    @session.uid = player.user_id
+      @session.uid = player.user_id
 
-    bind_session_response = @postman.bind_session(@session)
+      bind_session_response = @postman.bind_session(@session)
 
-    unless bind_session_response.dig(:error, :code).nil?
-      return response = {
-        code: RubyPitaya::StatusCodes::CODE_AUTHENTICATION_ERROR,
-        msg: 'Error to authenticate',
+      unless bind_session_response.dig(:error, :code).nil?
+        return response = {
+          code: RubyPitaya::StatusCodes::CODE_AUTHENTICATION_ERROR,
+          msg: 'Error to authenticate',
+        }
+      end
+
+      response = {
+        code: StatusCodes::CODE_OK,
+        data: player.to_hash,
       }
     end
 
-    response = {
-       code: StatusCodes::CODE_OK,
-       data: player.to_hash,
-    }
-  end
-
-  def getInfo
-    user_id = @session.uid
+    def getInfo
+      user_id = @session.uid
 
-    player = Player.find_by_user_id(user_id)
+      player = Player.find_by_user_id(user_id)
 
-    response = {
-       code: StatusCodes::CODE_OK,
-       data: player.to_hash,
-    }
+      response = {
+        code: StatusCodes::CODE_OK,
+        data: player.to_hash,
+      }
+    end
   end
-end
+end

data/lib/rubypitaya/app-template/app/models/player.rb

@@ -1,16 +1,19 @@
 require 'active_record'
 
-class Player < ActiveRecord::Base
+module MyApp
 
-  belongs_to :user
+  class Player < ActiveRecord::Base
 
-  validates_presence_of :name, :gold, :user
+    belongs_to :user
 
-  def to_hash
-    {
-      name: name,
-      gold: gold,
-      userId: user_id,
-    }
+    validates_presence_of :name, :gold, :user
+
+    def to_hash
+      {
+        name: name,
+        gold: gold,
+        userId: user_id,
+      }
+    end
   end
-end
+end

data/lib/rubypitaya/app-template/config/routes.rb

@@ -1,6 +1,6 @@
 class Routes < RubyPitaya::RoutesBase
 
-  # class:      RoutesBase
+  # class:   RoutesBase
   # methods:
   #  - match('new_handler_name', to: 'ClassHandler')
   #    - Defines a new name to handler

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

@@ -10,9 +10,13 @@ COPY . .
 
 FROM ruby:2.6.6-slim
 
-RUN apt update && apt install -y postgresql-client --no-install-recommends
+RUN apt update && apt install -y postgresql-client curl python3 bash vim --no-install-recommends
 RUN rm -rf /var/lib/apt/lists/*
 
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
+RUN chmod +x ./kubectl
+RUN mv ./kubectl /usr/local/bin
+
 COPY --from=builder /usr/local/etc /usr/local/etc
 COPY --from=builder /usr/local/bundle /usr/local/bundle
 COPY --from=builder /usr/local/bin/ruby /usr/local/bin/ruby

data/lib/rubypitaya/app-template/kubernetes/README.md

@@ -4,12 +4,14 @@ Kubernetes Configuration
 Set namespace
 -------------
 
-Open files "deployment-*.yaml" and set the correct namespace on links
+Open files "deployment-*.yaml", "role-rubypitaya.yaml" and "rolebinding-rubypitaya.yaml" and set the correct namespace on fields and links
 
 
 Apply sequence
 --------------
 
+If you already has a postgres don't apply the postgres files and change the
+deployment-rubypitaya.yaml postgres env vars.
 Run the following command on the listed files.
 But remember to put your namespace and your KUBECONFIG env var if you need.
 
@@ -57,4 +59,22 @@ $ kubectl apply -f [file-path]
 ```
 
 deployment-rubypitaya.yaml
-service-rubypitaya.yaml
+service-rubypitaya.yaml
+
+
+Setup nginx for gameserver
+--------------------------
+
+Run the following command to create configmap with nginx.conf file.
+But remember to put your namespace and your KUBECONFIG env var if you need.
+
+```sh
+$ kubectl create configmap nginx-config --from-file=./gameplay/nginx.conf
+```
+
+Create the deployments and services for nginx:
+
+```sh
+$ kubectl apply -f ./gameplay/deployment-nginx.yaml
+$ kubectl apply -f ./gameplay/service-nginx.yaml
+```