rubypitaya 2.7.1 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eb7880dd4445994c53e6f44214153fd926df154bc585c200ae007760d542b6b
-  data.tar.gz: 93d912fb1d953df4ea7f077887c88e832bf52d9515e93583b7dacd0b860486cd
+  metadata.gz: 4a6575a4e72c2225e88a02e48a02265797958d1ba5aba36d017bd576fd071c09
+  data.tar.gz: b502c84808a5372a6f354f860d5fd673a790851bcff700964b4da24a96c0f50f
 SHA512:
-  metadata.gz: 835e30a86c9cdbdc6fe473af6c065b11f8e85cc8cbc9beeaf9a2657b498ab13ac744c9d854ce2421ff13d4339540031763a02ace172785676b53da0e23244566
-  data.tar.gz: 3b6ac0801420229d445742dc5cb121687c2b60bf960378ea2c741bc4b1cd15ae9eb7f434f886f1b025c568440d4dc879da81b84e55b8f912db857d71236a6775
+  metadata.gz: 89b94ffafd69e7216559fcbbd6f55f81a431d4f357771d5ca595ad25a32fcb4e5f0427d5ec21db982ca97f65a19bd3a08b5293ec933e52bd5ac3bcd4c8f26a7e
+  data.tar.gz: 6701e279dc7173a1dde84870d2b3728554649a748f36eb2583d0f45b6d5d25432f19de88dc742351f85f8cd81c415fdea414170acbfabd245bcf3a6bbb26c727

data/bin/rubypitaya

@@ -2,7 +2,7 @@
 
 require 'rubypitaya'
 
-COMMANDS = ['run', 'create']
+COMMANDS = ['run', 'create', 'create-migration']
 
 def main
   if ARGV.size == 0 || !COMMANDS.include?(ARGV[0])
@@ -19,6 +19,10 @@ def main
   if command == 'create'
     command_create(ARGV)
   end
+
+  if command == 'create-migration'
+    command_create_migration(ARGV)
+  end
 end
 
 def command_run(argv)
@@ -40,11 +44,25 @@ def command_create(argv)
   puts "Project #{project_name} created!"
 end
 
+def command_create_migration(argv)
+  if argv.size <= 1
+    show_help_create_migration()
+    exit(-1)
+  end
+
+  migration_name = argv[1]
+
+  migration_file_name = RubyPitaya::RubyPitaya.create_migration(migration_name)
+
+  puts "Migration #{migration_file_name} created!"
+end
+
 def show_help
   puts 'Usage: $ rubypitaya [COMMAND]'
   puts 'COMMAND:'
-  puts '  run:    - Run server'
-  puts '  create: - Create project'
+  puts '  run:              - Run server'
+  puts '  create:           - Create project'
+  puts '  create-migration: - Create migration'
   puts ''
 end
 
@@ -53,4 +71,9 @@ def show_help_create
   puts ''
 end
 
+def show_help_create_migration
+  puts 'Usage: $ rubypitaya create-migration [migration_name]'
+  puts ''
+end
+
 main

data/lib/rubypitaya.rb

@@ -1,3 +1,5 @@
+require 'erb'
+require 'ostruct'
 require 'fileutils'
 
 require 'rubypitaya/core/main'
@@ -16,5 +18,24 @@ module RubyPitaya
 
       FileUtils.cp_r app_template_path, project_path
     end
+
+    def self.create_migration(migration_name)
+      migration_name = "#{migration_name}_migration" unless migration_name.underscore.end_with?('migration')
+      migration_timestamp = Time.now.utc.to_i
+      migration_file_name = "#{migration_timestamp}_#{migration_name.underscore}.rb"
+      migration_class_name = migration_name.camelcase
+
+      template_struct = OpenStruct.new(
+        class_name: migration_class_name,
+      )
+
+      template = File.open(Path::MIGRATION_TEMPLATE_PATH, &:read)
+      template_result = ERB.new(template).result(template_struct.instance_eval { binding })
+
+      migration_file_path = File.join(Path::MIGRATIONS_FOLDER_PATH, migration_file_name)
+      File.open(migration_file_path, 'w') { |f| f.write(template_result) }
+
+      migration_file_name
+    end
   end
 end

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '2.7.1'
+gem 'rubypitaya', '2.9.0'
 
 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.7.1)
+    rubypitaya (2.9.0)
       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.7.1)
+  rubypitaya (= 2.9.0)
 
 BUNDLED WITH
    1.17.2

data/lib/rubypitaya/app-template/Makefile

@@ -1,3 +1,9 @@
+IMAGE_TAG ?= latest
+IMAGE_REGISTRY ?= [put-your-registry-here]
+KUBE_NAMESPACE ?= [put-your-namespace-here]
+KUBE_DEPLOYMENT_SERVER ?= rubypitaya
+KUBECONTEXT ?= ''
+
 ## Run ruby pitaya metagame project
 run:
 	@docker-compose run --service-ports --rm rubypitaya bundle exec rubypitaya run
@@ -22,6 +28,10 @@ console:
 bash:
 	@docker-compose run --service-ports --rm rubypitaya bash
 
+## Create new migrgation. NAME=[migration-name]
+create-migration:
+	@docker-compose run --service-ports --rm rubypitaya-console bundle exec rubypitaya create-migration $(NAME)
+
 ## Create database
 db-create:
 	@docker-compose run --service-ports --rm rubypitaya bundle exec rake db:create
@@ -30,6 +40,10 @@ db-create:
 db-migrate:
 	@docker-compose run --service-ports --rm rubypitaya bundle exec rake db:migrate
 
+## Show migrations status on database
+db-migrate-status:
+	@docker-compose run --service-ports --rm rubypitaya bundle exec rake db:status
+
 ## Rollback migrations STEP=1
 db-rollback:
 	@docker-compose run --service-ports --rm -e STEP="$(STEP)" rubypitaya bundle exec rake db:rollback
@@ -48,15 +62,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 +112,3 @@ show-help:
 		} \
 		printf "\n"; \
 	}'
-
-
-

data/lib/rubypitaya/app-template/Rakefile

@@ -75,6 +75,25 @@ namespace :db do
     puts 'Database deleted.'
   end
 
+  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)
+    connection_data = database_config.connection_data
+    migrations_paths = [RubyPitaya::Path::Core::MIGRATIONS_FOLDER_PATH]
+    migrations_paths += RubyPitaya::Path::Plugins::MIGRATIONS_FOLDER_PATHS
+    migrations_paths += [RubyPitaya::Path::MIGRATIONS_FOLDER_PATH]
+
+    ActiveRecord::Base.establish_connection(connection_data)
+    ActiveRecord::Migrator.migrations_paths = migrations_paths
+    ActiveRecord::Base.connection.migration_context.migrations_status.each do |status, version, name|
+      puts "#{status.center(8)}  #{version.ljust(14)}  #{name}"
+    end
+    ActiveRecord::Base.connection.close
+
+    puts 'Rollback done.'
+  end
+
   desc 'Reset the database'
   task :reset do
     Rake::Task['db:drop'].invoke

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

@@ -27,6 +27,12 @@ module MyApp
     #    - methods:
     #      - [](key)
     #        - get config file by config path
+    #  - log
+    #    - class: Logger
+    #    - link: https://ruby-doc.org/stdlib-2.6.4/libdoc/logger/rdoc/Logger.html
+    #    - methods:
+    #      - info
+    #        - log information
 
     def run(initializer_content)
       bll = initializer_content.bll
@@ -35,5 +41,9 @@ module MyApp
 
       bll.add_instance(:player, playerBll)
     end
+
+    def self.path
+      __FILE__
+    end
   end
 end

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

@@ -1,3 +1,5 @@
+require 'rubypitaya/core/app/models/user'
+
 User.class_eval do
   # has_one :player
 end

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

@@ -6,25 +6,35 @@ require 'active_record'
 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)
 ActiveRecord::Base.establish_connection(database_config.connection_data)
 ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
 ActiveSupport::LogSubscriber.colorize_logging = true
 
+# Loading core files
 Gem.find_files('rubypitaya/**/*.rb').each do |path|
   require path unless path.end_with?('spec.rb') ||
                       path.include?('db/migration') ||
+                      path.include?('core/templates') ||
                       path.include?('app-template')
 end
 
-app_files_path = File.join(RubyPitaya::Path::APP_FOLDER_PATH, '**/*.rb')
-Dir[app_files_path].each do |path|
-  require path unless path.end_with?('spec.rb') ||
-                      path.include?('db/migration')
+# Loading application files
+app_folder_paths = RubyPitaya::Path::Plugins::APP_FOLDER_PATHS + [RubyPitaya::Path::APP_FOLDER_PATH]
+app_folder_paths.each do |app_folder_path|
+  app_files_path = File.join(app_folder_path, '**/*.rb')
+
+  Dir[app_files_path].each do |path|
+    require path unless path.end_with?('spec.rb') ||
+                        path.include?('db/migration')
+  end
 end
 
+# Starting irb
 require 'irb'
 IRB.start(__FILE__)
 
+# Closing database connection
 ActiveRecord::Base.connection.close

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

@@ -56,6 +56,7 @@ services:
     working_dir: '/app/rubypitaya'
     volumes:
       - '.:/app/rubypitaya'
+      - '/var/run/docker.sock:/var/run/docker.sock'
     ports:
       - '80:4567'
     environment:

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

@@ -1,7 +1,7 @@
 FROM ruby:2.6.6
 
 RUN apt update
-RUN apt install -y git vim postgresql-client --no-install-recommends
+RUN apt install -y git vim postgresql-client docker.io --no-install-recommends
 
 WORKDIR /app/rubypitaya/
 

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

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: rubypitaya
-        image: git.topfreegames.com:4567/prestes/tech-prototype/rubypitaya:latest
+        image: registry.gitlab.com/lucianopc/ruby-pitaya:latest
         command: ["bundle", "exec", "rubypitaya", "run"]
         ports:
         - containerPort: 4567
@@ -45,4 +45,4 @@ spec:
           - name: DATABASE_NAME
             value: "ruby_pitaya"
       imagePullSecrets:
-      - name: gitlab-registry
+      - name: gitlab-registry

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

@@ -2,7 +2,7 @@ kind: Role
 apiVersion: apps/v1
 metadata:
   namespace: default
-  name: namespace
+  name: rubypitaya
 rules:
 - apiGroups:
   - ""

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/initializer_base.rb

@@ -2,6 +2,10 @@ module RubyPitaya
 
   class InitializerBase
 
+    def self.path
+      __FILE__
+    end
+
     def run(main)
     end
   end

data/lib/rubypitaya/core/initializer_broadcast.rb

@@ -6,7 +6,25 @@ module RubyPitaya
   class InitializerBroadcast
 
     def run(initializer_content)
+      app_classes = []
+      plugin_classes = []
+
       ObjectSpace.each_object(InitializerBase.singleton_class) do |klass|
+        is_plugin_class = klass.path.include?('plugins')
+
+        if is_plugin_class
+          plugin_classes << klass
+        else
+          app_classes << klass
+        end
+      end
+
+      plugin_classes.each do |klass|
+        instance = klass.new
+        instance.run(initializer_content)
+      end
+
+      app_classes.each do |klass|
         instance = klass.new
         instance.run(initializer_content)
       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/core/path.rb

@@ -2,6 +2,7 @@ module RubyPitaya
 
   class Path
     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')
 
@@ -15,6 +16,7 @@ module RubyPitaya
 
     HTTP_VIEWS_PATH = File.join(Dir.pwd, 'app/http/views')
 
+
     class Core
       APP_FOLDER_PATH = File.join(__dir__, 'app/')
       MIGRATIONS_FOLDER_PATH = File.join(__dir__, 'db/migration/')

data/lib/rubypitaya/core/templates/template_migration.rb.erb

@@ -0,0 +1,13 @@
+require 'active_record'
+
+class <%= class_name %> < ActiveRecord::Migration[5.1]
+
+  enable_extension 'pgcrypto'
+
+  def change
+    create_table :[table-name-here-in-plural], id: :uuid do |t|
+      # t.belongs_to :user, type: :uuid
+      t.timestamps null: false
+    end
+  end
+end

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '2.7.1'
+  VERSION = '2.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.9.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -94,6 +94,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -285,6 +299,7 @@ files:
 - "./lib/rubypitaya/core/session.rb"
 - "./lib/rubypitaya/core/setup.rb"
 - "./lib/rubypitaya/core/status_codes.rb"
+- "./lib/rubypitaya/core/templates/template_migration.rb.erb"
 - "./lib/rubypitaya/version.rb"
 - bin/rubypitaya
 homepage: https://gitlab.com/LucianoPC/ruby-pitaya