rubypitaya 1.3.1 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47e0970be5b8e403375046ab301bf90738610d336c94942e29512c54d9100d36
-  data.tar.gz: 3d5ca8e24fc63223516723a6db06f85a3f0228bde29a58f88187675bdf82e78c
+  metadata.gz: ca8b3f228a70fa12fad3f4c813354ec41e924c78786044da97804c00c1766404
+  data.tar.gz: 48dde9ca6f70a0a161451173ab9014398ddde0f0eebd9982b0c2c4f35461e3c7
 SHA512:
-  metadata.gz: 39246abfef21adb49e4434f7500d7577998e061a7f735ea3d394b3d7ffded21a6a95394146dbd29abd7dce45300ea1c3c8db7ebe9bf7b9657bef1b75a2b40b3c
-  data.tar.gz: b1de3be06e60907f611e2dce20161f02a1aaf5cf98a97b4c3330859cbb8d8266d572bde3c16f459612a0ecc8f6b4414dbc9918ddcea3c5e2562d30e4f4471e8e
+  metadata.gz: 2ebec6b4e01a88a4c8ebda46aaaa850874425d7fdb577f1cfa4657f992fd2f182236e3548ab513bb4f8d27ae8e86940ae1cf38e77963d35188645cc717719578
+  data.tar.gz: dee2ad020e8b54d91b2713da3fd407236857c796ae1b02d0b77a3ff6c9f8b9883678764cfa84e0a30c9588fed619dfc9b1b72f2694f77f0ce2192cb50165a879

data/lib/rubypitaya/app-template/Gemfile

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

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

@@ -62,7 +62,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.3)
-    rubypitaya (1.3.1)
+    rubypitaya (1.6.1)
       activerecord (= 6.0.2)
       etcdv3 (= 0.10.2)
       eventmachine (= 1.2.7)
@@ -85,7 +85,7 @@ DEPENDENCIES
   pry (= 0.12.2)
   rake (= 10.0)
   rspec (= 3.8.0)
-  rubypitaya (= 1.3.1)
+  rubypitaya (= 1.6.1)
 
 BUNDLED WITH
    1.17.2

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

@@ -1,11 +1,13 @@
-class HelloWorldHandler < RubyPitaya::HandlerBase
+module MyApp
+  class HelloWorldHandler < RubyPitaya::HandlerBase
 
-  non_authenticated_actions :sayHello
+    non_authenticated_actions :sayHello
 
-  def sayHello
-    response = {
-      code: 'RP-200', 
-      msg: 'Hello!'
-    }
+    def sayHello
+      response = {
+        code: 'RP-200',
+        msg: 'Hello!'
+      }
+    end
   end
-end
+end

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

@@ -0,0 +1,11 @@
+class Routes < RubyPitaya::RoutesBase
+
+  # class:      RoutesBase
+  # methods:
+  #  - match('new_handler_name', to: 'ClassHandler')
+  #    - Defines a new name to handler
+
+  def setup
+    # match('helloHandler', to: 'MyApp::HelloWorldHandler')
+  end
+end

data/lib/rubypitaya/app-template/docker-compose.yml

@@ -63,6 +63,7 @@ services:
       NATS_URL: 'nats://nats:4222'
       ETCD_URL: 'http://etcd:2379'
       ETCD_PREFIX: 'rubypitaya/'
+      ETCD_LEASE_SECONDS: '60'
       REDIS_URL: 'redis://redis:6379'
       DATABASE_HOST: 'db'
       DATABASE_USER: 'postgres'

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

@@ -0,0 +1,60 @@
+Kubernetes Configuration
+========================
+
+Set namespace
+-------------
+
+Open files "deployment-*.yaml" and set the correct namespace on links
+
+
+Apply sequence
+--------------
+
+Run the following command on the listed files.
+But remember to put your namespace and your KUBECONFIG env var if you need.
+
+```sh
+$ kubectl apply -f [file-path]
+```
+
+persistent-volume.yaml
+
+statefulset-etcd.yaml
+statefulset-nats.yaml
+statefulset-postgres.yaml
+statefulset-redis.yaml
+
+service-etcd.yaml
+service-nats.yaml
+service-postgres.yaml
+service-redis.yaml
+
+deployment-connector.yaml
+service-connector.yaml
+
+
+Create gitlab-registry secret
+-----------------------------
+
+Run the following command.
+But remember to put your namespace and your KUBECONFIG env var if you need.
+
+```sh
+$ kubectl create secret docker-registry gitlab-registry --docker-server=[registry-server] --docker-username=[username] --docker-password=[password]
+```
+
+If you use a different registry name instead of "gitlab-registry" change the deployment-rubypitaya.yaml imagePullSecrets.name
+
+
+Apply sequence
+--------------
+
+Run the following command on the listed files.
+But remember to put your namespace and your KUBECONFIG env var if you need.
+
+```sh
+$ kubectl apply -f [file-path]
+```
+
+deployment-rubypitaya.yaml
+service-rubypitaya.yaml

data/lib/rubypitaya/app-template/kubernetes/deployment-connector.yaml

@@ -0,0 +1,35 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: connector
+  labels:
+    app: connector
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: connector
+  template:
+    metadata:
+      labels:
+        app: connector
+    spec:
+      containers:
+      - name: connector
+        image: registry.gitlab.com/lucianopc/pitaya-connector:0.2.0
+        ports:
+        - containerPort: 3250
+          name: connector
+        env:
+          - name: PITAYA_CLUSTER_RPC_SERVER_NATS_CONNECT
+            value: "nats://nats.default.svc.cluster.local:4222"
+          - name: PITAYA_CLUSTER_RPC_CLIENT_NATS_CONNECT
+            value: "nats://nats.default.svc.cluster.local:4222"
+          - name: PITAYA_CLUSTER_RPC_CLIENT_NATS_REQUESTTIMEOUT
+            value: "10s"
+          - name: PITAYA_CLUSTER_SD_ETCD_ENDPOINTS
+            value: "etcd.default.svc.cluster.local:2379"
+          - name: PITAYA_CLUSTER_SD_ETCD_PREFIX
+            value: "rubypitaya/"
+          - name: SERVER_ROUTES
+            value: "rubypitaya"

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

@@ -0,0 +1,48 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: rubypitaya
+  labels:
+    app: rubypitaya
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: rubypitaya
+  template:
+    metadata:
+      labels:
+        app: rubypitaya
+    spec:
+      containers:
+      - name: rubypitaya
+        image: git.topfreegames.com:4567/prestes/tech-prototype/rubypitaya:latest
+        command: ["bundle", "exec", "rubypitaya", "run"]
+        ports:
+        - containerPort: 4567
+          name: rubypitaya
+        env:
+          - name: SERVER_NAME
+            value: "rubypitaya"
+          - name: RUBYPITAYA_ENV
+            value: "production"
+          - name: NATS_URL
+            value: "nats://nats.default.svc.cluster.local:4222"
+          - name: ETCD_URL
+            value: "http://etcd.default.svc.cluster.local:2379"
+          - name: ETCD_PREFIX
+            value: "rubypitaya/"
+          - name: ETCD_LEASE_SECONDS
+            value: "60"
+          - name: REDIS_URL
+            value: "redis://redis.default.svc.cluster.local:6379"
+          - name: DATABASE_HOST
+            value: "postgres.default.svc.cluster.local"
+          - name: DATABASE_USER
+            value: "postgres"
+          - name: DATABASE_PASSWORD
+            value: ""
+          - name: DATABASE_NAME
+            value: "ruby_pitaya"
+      imagePullSecrets:
+      - name: gitlab-registry

data/lib/rubypitaya/app-template/kubernetes/persistent-volume.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: postgres-pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi
+  storageClassName: standard

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

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: connector
+spec:
+  selector:
+    app: connector
+  ports:
+    - protocol: TCP
+      port: 3250
+      targetPort: 3250
+  type: LoadBalancer

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

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: etcd
+spec:
+  selector:
+    app: etcd
+  ports:
+    - protocol: TCP
+      port: 2379
+      targetPort: 2379
+      name: etcd-2379
+    - protocol: TCP
+      port: 2380
+      targetPort: 2380
+      name: etcd-2380
+  type: LoadBalancer

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

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: nats
+spec:
+  selector:
+    app: nats
+  ports:
+    - protocol: TCP
+      port: 4222
+      targetPort: 4222
+  type: LoadBalancer

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

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: postgres
+spec:
+  selector:
+    app: postgres
+  ports:
+    - protocol: TCP
+      port: 5432
+      targetPort: 5432
+  type: LoadBalancer

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

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis
+spec:
+  selector:
+    app: redis
+  ports:
+    - protocol: TCP
+      port: 6379
+      targetPort: 6379
+      name: redis
+  type: LoadBalancer

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

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: rubypitaya
+spec:
+  selector:
+    app: rubypitaya
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 4567
+  type: LoadBalancer

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

@@ -0,0 +1,25 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: etcd
+  labels:
+    app: etcd
+spec:
+  serviceName: "etcd"
+  replicas: 1
+  selector:
+    matchLabels:
+      app: etcd
+  template:
+    metadata:
+      labels:
+        app: etcd
+    spec:
+      containers:
+      - name: etcd
+        image: appcelerator/etcd:3.0.15
+        ports:
+        - containerPort: 2379
+          name: etcd-2379
+        - containerPort: 2380
+          name: etcd-2380

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

@@ -0,0 +1,23 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: nats
+  labels:
+    app: nats
+spec:
+  serviceName: "nats"
+  replicas: 1
+  selector:
+    matchLabels:
+      app: nats
+  template:
+    metadata:
+      labels:
+        app: nats
+    spec:
+      containers:
+      - name: nats
+        image: nats:2.1.4
+        ports:
+        - containerPort: 4222
+          name: nats

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

@@ -0,0 +1,35 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: postgres
+  labels:
+    app: postgres
+spec:
+  serviceName: "postgres"
+  replicas: 1
+  selector:
+    matchLabels:
+      app: postgres
+  template:
+    metadata:
+      labels:
+        app: postgres
+    spec:
+      containers:
+      - name: postgres
+        image: postgres:9.6.17
+        env:
+          - name: POSTGRES_HOST_AUTH_METHOD
+            value: "trust"
+          - name: PGDATA
+            value: "/var/lib/postgresql/data/pgdata"
+        ports:
+        - containerPort: 5432
+          name: postgres
+        volumeMounts:
+        - name: postgres
+          mountPath: /var/lib/postgresql/data
+      volumes:
+      - name: postgres
+        persistentVolumeClaim:
+          claimName: postgres-pvc

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

@@ -0,0 +1,23 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: redis
+  labels:
+    app: redis
+spec:
+  serviceName: "redis"
+  replicas: 1
+  selector:
+    matchLabels:
+      app: redis
+  template:
+    metadata:
+      labels:
+        app: redis
+    spec:
+      containers:
+      - name: redis
+        image: redis:3.2.5-alpine
+        ports:
+        - containerPort: 6379
+          name: redis

data/lib/rubypitaya/core/etcd_connector.rb

@@ -6,35 +6,71 @@ module RubyPitaya
   class EtcdConnector
 
     def initialize(server_uuid, desktop_name, server_name, etcd_prefix,
-                  etcd_address, allow_reconnect)
+                   etcd_address, allow_reconnect, lease_seconds)
       @server_uuid = server_uuid
       @server_name = server_name
       @desktop_name = desktop_name
       @etcd_prefix = etcd_prefix
       @etcd_address = etcd_address
       @allow_reconnect = allow_reconnect
+      @lease_seconds = lease_seconds
+
+      @renew_connection_seconds = lease_seconds / 2.0
+
+      @renew_connection_key = nil
+      @renew_connection_value = nil
+      @renew_connection_thread = nil
     end
 
     def connect
+      connection_key = get_connection_key
+      connection_value = get_connection_value
+
       @connection = Etcdv3.new(endpoints: @etcd_address,
                               allow_reconnect: @allow_reconnect)
-      @connection.put(connection_key, connection_value)
+
+      @lease = @connection.lease_grant(@lease_seconds)
+
+      @connection.put(connection_key, connection_value, lease: @lease.ID)
+
+      @renew_connection_key = connection_key
+      @renew_connection_value = connection_value
+
+      renew_connection
     end
 
     def disconnect
-      @connection.del(connection_key)
+      @connection.del(get_connection_key)
     end
 
     private
 
-    def connection_key
+    def get_connection_key
       "#{@etcd_prefix}servers/#{@server_name}/#{@server_uuid}"
     end
 
-    def connection_value
+    def get_connection_value
       JSON.generate(get_server_data)
     end
 
+    def renew_connection
+      stop_renew_connection
+
+      @renew_connection_thread = Thread.new do
+        loop do
+          sleep(@renew_connection_seconds)
+
+          @lease = @connection.lease_grant(@lease_seconds)
+          @connection.put(@renew_connection_key, @renew_connection_value,
+                          lease: @lease.ID)
+        end
+      end
+    end
+
+    def stop_renew_connection
+      @renew_connection_thread.exit unless @renew_connection_thread.nil?
+    end
+
     def get_server_data
       {
         id: @server_uuid,

data/lib/rubypitaya/core/handler_router.rb

@@ -4,11 +4,26 @@ module RubyPitaya
 
   class HandlerRouter
 
-    def initialize(handler_folder_path)
+    def initialize(handler_folder_path, routes_path)
+      import_routes_file(routes_path)
       import_handler_files(handler_folder_path)
+
+      import_routes_class
       import_handler_classes
     end
 
+    def import_routes_file(routes_path)
+      require routes_path
+    end
+
+    def import_routes_class
+      routes_classes = ObjectSpace.each_object(RoutesBase.singleton_class).select do |klass|
+        klass != RoutesBase
+      end
+
+      @routes = routes_classes.first.new
+    end
+
     def import_handler_files(handler_folder_path)
       Gem.find_files("#{handler_folder_path}/*.rb").each { |path| require path }
     end
@@ -22,6 +37,8 @@ module RubyPitaya
 
       @handler_name_map = @handlers.map do |handler|
         handler_name = handler.class.to_s
+        handler_name = @routes.get_new_handler_name(handler_name)
+        handler_name = handler_name.split('::').last
         handler_name = handler_name[0].downcase + handler_name[1..-1]
 
         [handler_name, handler]

data/lib/rubypitaya/core/main.rb

@@ -7,6 +7,7 @@ require 'rubypitaya/core/config'
 require 'rubypitaya/core/session'
 require 'rubypitaya/core/postman'
 require 'rubypitaya/core/parameters'
+require 'rubypitaya/core/routes_base'
 require 'rubypitaya/core/handler_router'
 require 'rubypitaya/core/etcd_connector'
 require 'rubypitaya/core/nats_connector'
@@ -38,10 +39,12 @@ module RubyPitaya
 
       @etcd_prefix = ENV['ETCD_PREFIX']
       @etcd_address = ENV['ETCD_URL']
+      @etcd_lease_seconds = ENV['ETCD_LEASE_SECONDS'].to_i
       @allow_reconnect = false
       @etcd_connector = EtcdConnector.new(@service_uuid, @desktop_name,
                                           @server_name, @etcd_prefix,
-                                          @etcd_address, @allow_reconnect)
+                                          @etcd_address, @allow_reconnect,
+                                          @etcd_lease_seconds)
       @etcd_connector.connect
 
       @nats_address = ENV['NATS_URL']
@@ -67,7 +70,8 @@ module RubyPitaya
       @initializer_broadcast = InitializerBroadcast.new
       @initializer_broadcast.run(@initializer_content)
 
-      @handler_router = HandlerRouter.new(Path::HANDLERS_FOLDER_PATH)
+      @handler_router = HandlerRouter.new(Path::HANDLERS_FOLDER_PATH,
+                                          Path::ROUTES_FILE_PATH)
 
       run_server
     end

data/lib/rubypitaya/core/path.rb

@@ -9,5 +9,7 @@ module RubyPitaya
     HANDLERS_FOLDER_PATH = File.join(Dir.pwd, 'app/handlers/')
     APP_CONFIG_FOLDER_PATH = File.join(Dir.pwd, 'app/config/')
     MIGRATIONS_FOLDER_PATH = File.join(Dir.pwd, 'db/migrate/')
+
+    ROUTES_FILE_PATH = File.join(Dir.pwd, 'config/routes.rb')
   end
 end

data/lib/rubypitaya/core/routes_base.rb

@@ -0,0 +1,36 @@
+
+module RubyPitaya
+
+  class RoutesBase
+
+    def initialize
+      @handler_name_map = {}
+
+      setup
+    end
+
+    def setup
+    end
+
+    def match(route_name, to:)
+      handler_name, action_name = to.split('#')
+      new_handler_name, new_action_name = route_name.split('.')
+
+      if new_action_name.nil?
+        set_handler_name(handler_name, new_handler_name)
+      end
+    end
+
+    def get_new_handler_name(handler_name)
+      return handler_name unless @handler_name_map.include?(handler_name)
+
+      @handler_name_map[handler_name]
+    end
+
+    private
+
+    def set_handler_name(handler_name, new_handler_name)
+      @handler_name_map[handler_name] = new_handler_name
+    end
+  end
+end

data/lib/rubypitaya/version.rb

@@ -1,4 +1,3 @@
 module RubyPitaya
-  VERSION = "1.3.1"
+  VERSION = "1.6.1"
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.6.1
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -201,8 +201,10 @@ files:
 - "./lib/rubypitaya/app-template/app/handlers/player_handler.rb"
 - "./lib/rubypitaya/app-template/app/models/player.rb"
 - "./lib/rubypitaya/app-template/app/models/user.rb"
+- "./lib/rubypitaya/app-template/apptemplate-0.1.0.gem"
 - "./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/migrate/001_create_user_migration.rb"
 - "./lib/rubypitaya/app-template/db/migrate/002_create_player_migration.rb"
 - "./lib/rubypitaya/app-template/docker-compose.yml"
@@ -210,6 +212,20 @@ files:
 - "./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/persistent-volume.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"
+- "./lib/rubypitaya/app-template/kubernetes/service-postgres.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/service-redis.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/service-rubypitaya.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/statefulset-etcd.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/statefulset-nats.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/statefulset-postgres.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/statefulset-redis.yaml"
 - "./lib/rubypitaya/core/application_files_importer.rb"
 - "./lib/rubypitaya/core/config.rb"
 - "./lib/rubypitaya/core/database_config.rb"
@@ -227,6 +243,7 @@ files:
 - "./lib/rubypitaya/core/path.rb"
 - "./lib/rubypitaya/core/postman.rb"
 - "./lib/rubypitaya/core/redis_connector.rb"
+- "./lib/rubypitaya/core/routes_base.rb"
 - "./lib/rubypitaya/core/session.rb"
 - "./lib/rubypitaya/version.rb"
 - bin/rubypitaya