rubypitaya 2.20.0 → 2.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6dfc8681449f1ffcae12145b9fb3533f04d82aa42ed663ddac513d16eb57c79
-  data.tar.gz: 3176f5f30664abbd2f9464eedec8c7f004412d6d4c5391528f17ae35932cecb7
+  metadata.gz: 9505e2c4dbb300db345cff9e51d406c5f6b3c6f101c46105b8fa2e949b8c71bc
+  data.tar.gz: 9c1fb523cf378d6fa8bd7aa927611bfcd974b0583f22d8fdcbf3a3c71a438bec
 SHA512:
-  metadata.gz: c2c31cbe23ea840ba2fb5c0dd59c29a3bdf204bd017d06aa772a3213bf0ce7b99536bafaa60494edb2e462176f3b001125a2c707ee7e387ad5d3cd0fc6aa64bc
-  data.tar.gz: 59cf7321c84bd05e5727a38236cbec7e6ee4d32f9b02c3ef7349a65e09a327885294de37eeb04e6f2740dbbf5d4c14d9cc93aeb593c2c4ae5cbbe53f0c4bde9a
+  metadata.gz: 07c2486f386fef386ec1e002e57a2f723c6ff9f12e693d3c41abb322cf226cea49a9d5eab743f94ffb6d3b72627f48ef40716a03172d9ab58d53d0d53ca6f465
+  data.tar.gz: 6c2d3d381cb44074f9b4df501671c4a330e5c370b1b392e041a831d342615394dca786ed72d36de1673dbef45005c18aca0cb279d18f7f0011d0c833a2a8ca1a

data/lib/rubypitaya/app-template/Gemfile

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

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

@@ -108,7 +108,7 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
     ruby2_keywords (0.0.4)
-    rubypitaya (2.20.0)
+    rubypitaya (2.21.0)
       activerecord (= 6.1.3)
       etcdv3 (= 0.10.2)
       nats (= 0.11.0)
@@ -148,7 +148,7 @@ DEPENDENCIES
   listen (= 3.4.1)
   pry (= 0.14.0)
   rspec (= 3.10.0)
-  rubypitaya (= 2.19.1)
+  rubypitaya (= 2.21.0)
 
 BUNDLED WITH
    2.1.4

data/lib/rubypitaya/app-template/Rakefile

@@ -8,8 +8,7 @@ namespace :db do
 
   desc 'Create the database'
   task :create do
-    environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
-    database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+    database_config = RubyPitaya::DatabaseConfig.new
     connection_data = database_config.connection_data_without_database
 
     ActiveRecord::Base.establish_connection(connection_data)
@@ -21,8 +20,7 @@ namespace :db do
 
   desc 'Migrate the database'
   task :migrate do
-    environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
-    database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+    database_config = RubyPitaya::DatabaseConfig.new
     connection_data = database_config.connection_data
     migrations_paths = [RubyPitaya::Path::Core::MIGRATIONS_FOLDER_PATH]
     migrations_paths += RubyPitaya::Path::Plugins::MIGRATIONS_FOLDER_PATHS
@@ -38,8 +36,7 @@ namespace :db do
 
   desc 'Rollback migrations'
   task :rollback do
-    environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
-    database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+    database_config = RubyPitaya::DatabaseConfig.new
     connection_data = database_config.connection_data
     migrations_paths = [RubyPitaya::Path::Core::MIGRATIONS_FOLDER_PATH]
     migrations_paths += RubyPitaya::Path::Plugins::MIGRATIONS_FOLDER_PATHS
@@ -64,8 +61,7 @@ namespace :db do
 
   desc 'Drop the database'
   task :drop do
-    environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
-    database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+    database_config = RubyPitaya::DatabaseConfig.new
     connection_data = database_config.connection_data_without_database
 
     ActiveRecord::Base.establish_connection(connection_data)
@@ -78,8 +74,7 @@ namespace :db do
 
   desc 'migration status'
   task :status do
-    environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
-    database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+    database_config = RubyPitaya::DatabaseConfig.new
     connection_data = database_config.connection_data
     migrations_paths = [RubyPitaya::Path::Core::MIGRATIONS_FOLDER_PATH]
     migrations_paths += RubyPitaya::Path::Plugins::MIGRATIONS_FOLDER_PATHS

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

@@ -2,7 +2,7 @@ class PlayerBLL
 
   def create_new_player(setup, config)
     name = config['initial_player'][:name]
-    gold = setup['initial_player.wallet.gold']
+    gold = config['initial_player'][:wallet][:gold]
 
     player = Player.new(name: name, gold: gold, user: User.new)
     player.save!

data/lib/rubypitaya/app-template/app/config/initial_player.json

@@ -1,3 +1,6 @@
 {
-    "name": "Guest"
+    "name": "Guest",
+    "wallet": {
+        "gold": 10
+    }
 }

data/lib/rubypitaya/app-template/app/setup/rubypitaya.yml

@@ -0,0 +1,27 @@
+server:
+  name: 'rubypitaya'
+  environment: development
+
+nats:
+  url: 'nats://nats:4222'
+
+etcd:
+  url: 'http://etcd:2379'
+  prefix: 'rubypitaya/'
+  leaseSeconds: '60'
+
+redis:
+  url: 'redis://redis:6379'
+
+database:
+  host: 'db'
+  port: 5432
+  user: 'postgres'
+  password: 'postgres'
+  name: 'ruby_pitaya'
+
+http:
+  auth:
+    user: 'user'
+    pass: 'pass'
+    enabled: 'false'

data/lib/rubypitaya/app-template/bin/console

@@ -7,8 +7,7 @@ require 'rubypitaya'
 require 'rubypitaya/core/database_config'
 
 # Database connection
-environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
-database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+database_config = RubyPitaya::DatabaseConfig.new
 ActiveRecord::Base.establish_connection(database_config.connection_data)
 ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
 ActiveSupport::LogSubscriber.colorize_logging = true

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

@@ -60,22 +60,7 @@ services:
     ports:
       - '80:4567'
     environment:
-      SERVER_NAME: 'rubypitaya'
-      RUBYPITAYA_ENV: 'development'
       HISTFILE: '/app/rubypitaya/.bash-history'
-      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_PORT: 5432
-      DATABASE_USER: 'postgres'
-      DATABASE_PASSWORD: 'postgres'
-      DATABASE_NAME: 'ruby_pitaya'
-      HTTP_AUTH_ENABLED: 'false'
-      HTTP_AUTH_USER: 'user'
-      HTTP_AUTH_PASS: 'pass'
 
   rubypitaya-console:
     <<: *rubypitaya

data/lib/rubypitaya/app-template/docker/entrypoint.sh

@@ -4,7 +4,10 @@ cmd="$@"
 
 echo "=> Waiting for postgres"
 
-./docker/wait_for.sh $DATABASE_HOST:$DATABASE_PORT
+RUBYPITAYA_DATABASE_HOST=${RUBYPITAYA_DATABASE_HOST:-'db'}
+RUBYPITAYA_DATABASE_PORT=${RUBYPITAYA_DATABASE_PORT:-5432}
+
+./docker/wait_for.sh $RUBYPITAYA_DATABASE_HOST:$RUBYPITAYA_DATABASE_PORT
 
 echo "=> Postgres is ready"
 

data/lib/rubypitaya/app-template/features/player.feature

@@ -3,7 +3,7 @@ Feature: Player
   As a game player I want to have a player on database
 
   Scenario: Create new player
-    Given setup key 'initial_player.wallet.gold' is '10'
+    Given config key 'initial_player.wallet.gold' is '10'
     And   config key 'initial_player.name' is 'Guest'
     When  client call route 'rubypitaya.playerHandler.authenticate'
     Then  server should response 'code' as 'RP-200'

data/lib/rubypitaya/app-template/helm/templates/deployments/rubypitaya.yaml

@@ -25,34 +25,30 @@ spec:
         - containerPort: 4567
           name: rubypitaya
         env:
-          - name: SERVER_NAME
-            value: "rubypitaya"
-          - name: RUBYPITAYA_ENV
-            value: "production"
-          - name: NATS_URL
+          - name: RUBYPITAYA_SERVER_ENVIRONMENT
+            value: {{ .Values.rubypitaya.server.environment | quote }}
+          - name: RUBYPITAYA_NATS_URL
             value: "nats://nats.{{ .Values.namespace }}.svc.cluster.local:4222"
-          - name: ETCD_URL
+          - name: RUBYPITAYA_ETCD_URL
             value: "http://etcd.{{ .Values.namespace }}.svc.cluster.local:2379"
-          - name: ETCD_PREFIX
-            value: "rubypitaya/"
-          - name: ETCD_LEASE_SECONDS
-            value: "60"
-          - name: REDIS_URL
+          - name: RUBYPITAYA_REDIS_URL
             value: "redis://redis.{{ .Values.namespace }}.svc.cluster.local:6379"
-          - name: DATABASE_NAME
+          - name: RUBYPITAYA_DATABASE_NAME
             value: {{ .Values.database.name | quote }}
-          - name: DATABASE_HOST
+          - name: RUBYPITAYA_DATABASE_HOST
             value: {{ .Values.database.host | quote }}
-          - name: DATABASE_USER
+          - name: RUBYPITAYA_DATABASE_USER
             value: {{ .Values.database.user | quote }}
-          - name: DATABASE_PASSWORD
+          - name: RUBYPITAYA_DATABASE_PORT
+            value: {{ .Values.database.port | quote }}
+          - name: RUBYPITAYA_DATABASE_PASSWORD
             value: {{ .Values.database.password | quote }}
-          - name: HTTP_AUTH_ENABLED
-            value: {{ .Values.http.enabled | quote }}
-          - name: HTTP_AUTH_USER
-            value: {{ .Values.http.user | quote }}
-          - name: HTTP_AUTH_PASS
-            value: {{ .Values.http.password | quote }}
+          - name: RUBYPITAYA_HTTP_AUTH_ENABLED
+            value: {{ .Values.http.auth.enabled | quote }}
+          - name: RUBYPITAYA_HTTP_AUTH_USER
+            value: {{ .Values.http.auth.user | quote }}
+          - name: RUBYPITAYA_HTTP_AUTH_PASS
+            value: {{ .Values.http.auth.password | quote }}
           - name: MATCHMAKING_CURRENTROOMBLL
             value: kubernetes
           - name: MATCHMAKING_ROOMBLL_KUBERNETES_NAMESPACE

data/lib/rubypitaya/app-template/helm/values.yaml

@@ -7,6 +7,8 @@ connector:
     tag: 0.2.0
 
 rubypitaya:
+  server:
+    environment: production
   image:
     repository: [metagame-repository-link]
     tag: latest
@@ -15,12 +17,14 @@ database:
   name: [database-name]
   host: [database-host]
   user: [database-user]
+  port: [database-port]
   password: [database-password]
 
 http:
-  enabled: false
-  user: user
-  password: pass
+  auth:
+    user: 'user'
+    pass: 'pass'
+    enabled: 'false'
 
 gameserver:
   image:

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

@@ -22,27 +22,23 @@ spec:
         - containerPort: 4567
           name: rubypitaya
         env:
-          - name: SERVER_NAME
-            value: "rubypitaya"
-          - name: RUBYPITAYA_ENV
+          - name: RUBYPITAYA_SERVER_ENVIRONMENT
             value: "production"
-          - name: NATS_URL
+          - name: RUBYPITAYA_NATS_URL
             value: "nats://nats.default.svc.cluster.local:4222"
-          - name: ETCD_URL
+          - name: RUBYPITAYA_ETCD_URL
             value: "http://etcd.default.svc.cluster.local:2379"
-          - name: ETCD_PREFIX
-            value: "rubypitaya/"
-          - name: ETCD_LEASE_SECONDS
-            value: "60"
-          - name: REDIS_URL
+          - name: RUBYPITAYA_REDIS_URL
             value: "redis://redis.default.svc.cluster.local:6379"
-          - name: DATABASE_HOST
+          - name: RUBYPITAYA_DATABASE_HOST
             value: "postgres.default.svc.cluster.local"
-          - name: DATABASE_USER
+          - name: RUBYPITAYA_DATABASE_USER
             value: "postgres"
-          - name: DATABASE_PASSWORD
+          - name: RUBYPITAYA_DATABASE_PORT
+            value: "5432"
+          - name: RUBYPITAYA_DATABASE_PASSWORD
             value: "postgres"
-          - name: DATABASE_NAME
+          - name: RUBYPITAYA_DATABASE_NAME
             value: "ruby_pitaya"
       imagePullSecrets:
       - name: gitlab-registry

data/lib/rubypitaya/app-template/spec/player_handler_spec.rb

@@ -3,10 +3,11 @@ require 'spec_helper'
 RSpec.describe 'PlayerHandler', type: :request do
   context 'authenticate' do
     it 'create_new_user' do
-      setup = {'initial_player' => {'wallet' => {'gold' => 10}}}
-      config = {'initial_player' => {'name' => 'Guest'}}
+      config = {'initial_player' => {
+        'name' => 'Guest',
+        'wallet' => {'gold' => 10},
+      }}
 
-      set_setup(setup)
       set_config(config)
 
       params = {}

data/lib/rubypitaya/core/config.rb

@@ -9,6 +9,7 @@ module RubyPitaya
       @config_core_override = nil
       @has_config_core_override = false
 
+      @empty_hash = {}
       @result_cache = {}
     end
 
@@ -28,6 +29,13 @@ module RubyPitaya
       result
     end
 
+    def fetch(*args)
+      result = self[args[0]]
+      return result unless result.nil?
+
+      @empty_hash.fetch(*args)
+    end
+
     def auto_reload
       @config_core.auto_reload
       @config_core_override.auto_reload unless @config_core_override.nil?

data/lib/rubypitaya/core/database_config.rb

@@ -1,21 +1,30 @@
 require 'erb'
 require 'yaml'
 
-require 'rubypitaya/core/path'
+require 'rubypitaya/core/setup'
 
 module RubyPitaya
 
   class DatabaseConfig
 
-    def initialize(environment_name, database_config_path)
-      @environment_name = environment_name
+    def initialize()
+      @setup = Setup.new
+
+      @config = {
+        'adapter' => 'postgresql',
+        'encoding' => 'unicode',
+        'pool' => @setup.fetch('rubypitaya.database.pool', 5),
+        'host' => @setup['rubypitaya.database.host'],
+        'user' => @setup['rubypitaya.database.user'],
+        'password' => @setup['rubypitaya.database.password'],
+        'database' => @setup['rubypitaya.database.name'],
+      }
 
-      yaml_contents = File.open(database_config_path).read
-      @config = YAML.load( ERB.new(yaml_contents).result )
+      @config['database'] = "#{@config['database']}_test" if @environment_name == 'test'
     end
 
     def config
-      @config[@environment_name]
+      @config
     end
 
     def connection_data
@@ -44,9 +53,5 @@ module RubyPitaya
     def database_name
       config['database']
     end
-
-    def migrations_path
-      @migrations_path
-    end
   end
 end

data/lib/rubypitaya/core/helpers/setup_helper.rb

@@ -3,8 +3,7 @@ require 'active_record'
 require 'rubypitaya/core/database_config'
 
 # Database connection
-environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
-database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+database_config = RubyPitaya::DatabaseConfig.new
 ActiveRecord::Base.establish_connection(database_config.connection_data)
 # ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
 # ActiveSupport::LogSubscriber.colorize_logging = true

data/lib/rubypitaya/core/http_routes.rb

@@ -1,13 +1,13 @@
 require 'sinatra/base'
-require 'sinatra/reloader' if ENV['RUBYPITAYA_ENV'] == 'development'
 require 'rubypitaya/core/parameters'
 
 module RubyPitaya
 
   class HttpRoutes < Sinatra::Base
 
-    if ENV['RUBYPITAYA_ENV'] == 'development'
-      register Sinatra::Reloader
+    def self.auto_reload
+      require 'sinatra/reloader'
+      register ::Sinatra::Reloader
     end
 
     helpers do
@@ -19,12 +19,12 @@ module RubyPitaya
     before do
       content_type :json
 
-      return error_unauthorized unless authorized?(request)
-
       @bll = settings.bll
       @setup = settings.setup
       @config = settings.config
 
+      return error_unauthorized unless authorized?(request)
+
       @config.clear_cache
 
       if request.content_type == 'application/json'
@@ -49,12 +49,12 @@ module RubyPitaya
     end
 
     def http_auth_enabled?
-      return ENV.fetch("HTTP_AUTH_ENABLED") { 'false' } == 'true'
+      return @setup.fetch('rubypitaya.http.auth.enabled') { 'false' } == 'true'
     end
 
     def get_http_auth
-      user = ENV.fetch("HTTP_AUTH_USER") { '' }
-      pass = ENV.fetch("HTTP_AUTH_PASS") { '' }
+      user = @setup.fetch('rubypitaya.http.auth.user') { '' }
+      pass = @setup.fetch('rubypitaya.http.auth.pass') { '' }
 
       auth_token = ::Base64.strict_encode64("#{user}:#{pass}")
 

data/lib/rubypitaya/core/main.rb

@@ -30,8 +30,10 @@ module RubyPitaya
     attr_reader :redis_connector, :config, :bll
 
     def initialize
-      @environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
+      @setup = Setup.new
+      @environment_name = @setup.fetch('rubypitaya.server.environment', 'development')
       @is_development_environment = @environment_name == 'development'
+      @setup.auto_reload if @is_development_environment
 
       @log = Logger.new('/proc/self/fd/1')
       @log.level = Logger::INFO
@@ -43,13 +45,13 @@ module RubyPitaya
       @application_files_importer.import
       @application_files_importer.auto_reload if @is_development_environment
 
-      @server_name = ENV['SERVER_NAME']
+      @server_name = @setup['rubypitaya.server.name']
       @service_uuid = SecureRandom.uuid
       @desktop_name = Socket.gethostname
 
-      @etcd_prefix = ENV['ETCD_PREFIX']
-      @etcd_address = ENV['ETCD_URL']
-      @etcd_lease_seconds = ENV['ETCD_LEASE_SECONDS'].to_i
+      @etcd_prefix = @setup['rubypitaya.etcd.prefix']
+      @etcd_address = @setup['rubypitaya.etcd.url']
+      @etcd_lease_seconds = @setup['rubypitaya.etcd.leaseSeconds'].to_i
       @allow_reconnect = false
       @etcd_connector = EtcdConnector.new(@service_uuid, @desktop_name,
                                           @server_name, @etcd_prefix,
@@ -57,15 +59,15 @@ module RubyPitaya
                                           @etcd_lease_seconds)
       @etcd_connector.connect
 
-      @nats_address = ENV['NATS_URL']
+      @nats_address = @setup['rubypitaya.nats.url']
       @nats_connector = NatsConnector.new(@nats_address, @service_uuid,
                                           @server_name)
 
-      @redis_address = ENV['REDIS_URL']
+      @redis_address = @setup['rubypitaya.redis.url']
       @redis_connector = RedisConnector.new(@redis_address)
       @redis_connector.connect
 
-      @database_config = DatabaseConfig.new(@environment_name, Path::DATABASE_CONFIG_PATH)
+      @database_config = DatabaseConfig.new
       @database_connector = DatabaseConnector.new(@database_config)
       @database_connector.connect
 
@@ -73,8 +75,6 @@ module RubyPitaya
       @postman = Postman.new(@nats_connector)
       @config = Config.new
       @config.auto_reload if @is_development_environment
-      @setup = Setup.new
-      @setup.auto_reload if @is_development_environment
 
       @bll = InstanceHolder.new
 
@@ -101,6 +101,8 @@ module RubyPitaya
       HttpRoutes.set :config, @config
       HttpRoutes.set :views, [Path::HTTP_VIEWS_PATH] + Path::Plugins::HTTP_VIEWS_PATHS
 
+      HttpRoutes.auto_reload if @is_development_environment
+
       Thread.new do
         HttpRoutes.bind = '0.0.0.0'
         HttpRoutes.port = '4567'

data/lib/rubypitaya/core/path.rb

@@ -4,8 +4,6 @@ module RubyPitaya
     APP_TEMPLATE_FOLDER_PATH = File.join(__dir__, '../app-template/')
     MIGRATION_TEMPLATE_PATH = File.join(__dir__, 'templates/template_migration.rb.erb')
 
-    DATABASE_CONFIG_PATH = File.join(Dir.pwd, 'config/database.yml')
-
     APP_FOLDER_PATH = File.join(Dir.pwd, 'app/')
     HANDLERS_FOLDER_PATH = File.join(Dir.pwd, 'app/handlers/')
     APP_CONFIG_FOLDER_PATH = File.join(Dir.pwd, 'app/config/')

data/lib/rubypitaya/core/setup.rb

@@ -1,9 +1,12 @@
+require 'rubypitaya/core/path'
+
 module RubyPitaya
 
   class Setup
 
     def initialize()
       @config = {}
+      @empty_hash = {}
       configs_folder_paths = Path::Plugins::APP_SETUP_FOLDER_PATHS + [Path::APP_SETUP_FOLDER_PATH]
 
       configs_folder_paths.each do |configs_folder_path|
@@ -24,6 +27,13 @@ module RubyPitaya
       @config.dig(*split_key)
     end
 
+    def fetch(*args)
+      result = self[args[0]]
+      return result unless result.nil?
+
+      @empty_hash.fetch(*args)
+    end
+
     def auto_reload
       require 'listen'
 

data/lib/rubypitaya/core/spec-helpers/handler_spec_helper.rb

@@ -1,3 +1,4 @@
+require 'rubypitaya/core/setup'
 require 'rubypitaya/core/handler_router'
 require 'rubypitaya/core/redis_connector'
 require 'rubypitaya/core/spec-helpers/setup_spec_helper'
@@ -96,7 +97,8 @@ module RubyPitaya
       @@redis_connector ||= nil
 
       if @@redis_connector.nil?
-        redis_address = ENV['REDIS_URL']
+        @@core_setup ||= Setup.new
+        redis_address = @@core_setup['rubypitaya.redis.url']
         @@redis_connector = RedisConnector.new(redis_address)
         @@redis_connector.connect
       end

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '2.20.0'
+  VERSION = '2.21.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.20.0
+  version: 2.21.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -52,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: mongo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.15.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.15.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -246,9 +260,8 @@ files:
 - "./lib/rubypitaya/app-template/app/http/views/hello_world.erb"
 - "./lib/rubypitaya/app-template/app/models/player.rb"
 - "./lib/rubypitaya/app-template/app/models/user.rb"
-- "./lib/rubypitaya/app-template/app/setup/initial_player.yml"
+- "./lib/rubypitaya/app-template/app/setup/rubypitaya.yml"
 - "./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/1606736477_create_player_migration.rb"
 - "./lib/rubypitaya/app-template/docker-compose.yml"

data/lib/rubypitaya/app-template/app/setup/initial_player.yml

@@ -1,2 +0,0 @@
-wallet: 
-  gold: 10

data/lib/rubypitaya/app-template/config/database.yml

@@ -1,20 +0,0 @@
-default: &default
-  adapter: postgresql
-  encoding: unicode
-  pool: <%= ENV['RUBYPITAYA_MAX_THREADS'] { 5 } %>
-  host: <%= ENV['DATABASE_HOST'] %>
-  user: <%= ENV['DATABASE_USER'] %>
-  password: <%= ENV['DATABASE_PASSWORD'] %>
-
-development:
-  <<: *default
-  database: <%= "#{ENV['DATABASE_NAME']}" %>
-
-test:
-  <<: *default
-  database: <%= "#{ENV['DATABASE_NAME']}_test" %>
-
-production:
-  <<: *default
-  database: <%= "#{ENV['DATABASE_NAME']}" %>
-