rubypitaya 3.7.0 → 3.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d18288d711a487bc0b84dcd073c63ed0192ca0412fb99fcbc1e0305c587df97
-  data.tar.gz: 1c5b6be9550df23b8d625806ae0b2a0f3a6b454e01a9ba32f27d890b5f169272
+  metadata.gz: ab294041796e0582cbaf00b126cd94640367f9efa9936951bb4d15e62189bc9d
+  data.tar.gz: 35717958fa3945457d8cf7cc1dd948d77c49fdbae65c1bef8b3ab314ae00e3f8
 SHA512:
-  metadata.gz: 0326e18138b4eeae46b59d4d43df908446072b95838e724dcf9fd46125c937519bdf3781e177ba97c7e7db5d3aeabbc5a25675f0602d2aeaa4a640637bc1fc2e
-  data.tar.gz: cfe3acbd44442ea99606bb6ba4e51b7103febecdad79551228a1bf2a2aaf5fda80b219d168fed4e8055eed6efc006aea0c0d582df6d0a15d6f7ab5e83769ee6c
+  metadata.gz: 575b508d8dee1160823a8694dfb4efa9ffc3f26a8d989e46519f6e26a14ed2a4ec7e75dbea0c13be84c33819f37a86beff67c28e48b6f302a1f80e2e1a9f91d2
+  data.tar.gz: df30b0b4f45cfbee21afca815a0c9b066324810475971e89022fe95a898f68b84a4dae8b868764ecc97986e88305bb0cb772324ff326c760229b5482d1ca4810

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '3.7.0'
+gem 'rubypitaya', '3.9.1'
 
 group :development do
   gem 'pry', '0.14.1'

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

@@ -99,7 +99,7 @@ GEM
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
     ruby2_keywords (0.0.5)
-    rubypitaya (3.7.0)
+    rubypitaya (3.9.1)
       activerecord (= 7.0.2)
       etcdv3 (= 0.11.5)
       google-protobuf (= 3.19.4)
@@ -138,7 +138,7 @@ DEPENDENCIES
   listen (= 3.7.1)
   pry (= 0.14.1)
   rspec (= 3.11.0)
-  rubypitaya (= 3.7.0)
+  rubypitaya (= 3.9.1)
   sinatra-contrib (= 2.1.0)
 
 BUNDLED WITH

data/lib/rubypitaya/app-template/Makefile

@@ -10,12 +10,17 @@ KUBECONTEXT ?= ''
 run:
 	@docker-compose run --service-ports --rm rubypitaya bundle exec rubypitaya run
 
-## Build project
+## Build project docker containers
 build:
 	@docker-compose build
+	@docker-compose pull
 	@echo "Copying vendor folder ..."
 	@sh -c "FOLDER=$(notdir $(shell pwd)); CONTAINER="\$${FOLDER}_rubypitaya"; docker cp \$$(docker create \$${CONTAINER}):/app/rubypitaya/vendor ."
 
+## Setup project dependencies
+setup: clear
+	@docker-compose run --service-ports --rm rubypitaya ./setup/development/main
+
 ## Run ruby irb console
 console:
 	@docker-compose run --service-ports --rm rubypitaya-console bundle exec ruby ./bin/console
@@ -34,11 +39,15 @@ test: test-rspec test-cucumber
 
 ## Run rspec tests. FILE=spec.rb:10
 test-rspec:
-	@docker-compose run --service-ports --rm rubypitaya bundle exec rspec $(FILE)
+	@docker-compose run --service-ports --rm -e RUBYPITAYA_SERVER_ENVIRONMENT="test" rubypitaya bundle exec rspec $(FILE)
 
 ## Run cucumber tests. FILE=something.feature
 test-cucumber:
-	@docker-compose run --service-ports --rm rubypitaya bundle exec cucumber --publish-quiet $(FILE)
+	@docker-compose run --service-ports --rm -e RUBYPITAYA_SERVER_ENVIRONMENT="test" rubypitaya bundle exec cucumber --publish-quiet $(FILE)
+
+## Setup project dependencies for tests
+setup-test: clear
+	@docker-compose run --service-ports --rm -e RUBYPITAYA_SERVER_ENVIRONMENT="test" rubypitaya ./setup/test/main
 
 ## Update gems dependencies on Gemfile.lock
 update-dependencies:
@@ -83,7 +92,7 @@ db-reset:
 
 ## Setup test database
 db-test-setup:
-	@docker-compose run --service-ports --rm rubypitaya-commands bundle exec rake db:test:setup
+	@docker-compose run --service-ports --rm -e RUBYPITAYA_SERVER_ENVIRONMENT="test" rubypitaya-commands bundle exec rake db:test:setup
 
 ## + Deployment commands
 

data/lib/rubypitaya/app-template/features/step_definitions/application_steps.rb

@@ -1,6 +1,6 @@
 Given(/^[Tt]he [Pp]layer ["'](.+)["'] is authenticated$/) do |player_name|
   player = Player.find_by_name(player_name)
-  @handler_helper.authenticate(player.user_id)
+  @app_helper.authenticate(player.user_id)
 end
 
 Given(/^[Tt]he following [Pp]layer[s]*[:]*$/) do |table|

data/lib/rubypitaya/app-template/features/step_definitions/rubypitaya_steps.rb

@@ -1,47 +1,47 @@
 Given(/^[Cc]lient call route ["'](.+)["']$/) do |route|
-  @handler_helper.request(route)
+  @app_helper.request(route)
 end
 
 Given(/^[Cc]lient call route ["'](.+)["'] with param[s]*[:]*$/) do |route, table|
   params = table.hashes.first.symbolize_keys
-  @handler_helper.request(route, params)
+  @app_helper.request(route, params)
 end
 
 Given(/^[Cc]lient call route ["'](.+)["'] with json param[s]*[:]*$/) do |route, json|
   params = JSON.parse(json, symbolize_names: true)
-  @handler_helper.request(route, params)
+  @app_helper.request(route, params)
 end
 
 Given(/^[Ss]erver should response ["'](.+)["'] as ["'](.+)["']$/) do |response_key, expected_value|
-  response_value = @handler_helper.response.dig(*response_key.split('.').map(&:to_sym))
+  response_value = @app_helper.response.dig(*response_key.split('.').map(&:to_sym))
 
   expect(response_value.to_s).to eq(expected_value)
 end
 
 Given(/^[Ss]erver should response the following json[:]*$/) do |expected_json|
   expected_json = JSON.generate(JSON.parse(expected_json.strip))
-  response_json = JSON.generate(@handler_helper.response)
+  response_json = JSON.generate(@app_helper.response)
 
-  puts JSON.pretty_generate(@handler_helper.response) if expected_json != response_json
+  puts JSON.pretty_generate(@app_helper.response) if expected_json != response_json
 
   expect(response_json).to eq(expected_json)
 end
 
 Given(/^[Ss]etup key ["'](.+)["'] is ["'](.+)["']$/) do |key, value|
-  @handler_helper.add_setup(key, value)
+  @app_helper.add_setup(key, value)
 end
 
 Given(/^[Cc]onfig key ["'](.+)["'] is ["'](.+)["']$/) do |key, value|
-  @handler_helper.add_config(key, value)
+  @app_helper.add_config(key, value)
 end
 
 Given(/^[Cc]onfig is the following json[:]*$/) do |config_json|
   config = JSON.parse(config_json)
-  @handler_helper.set_config(config)
+  @app_helper.set_config(config)
 end
 
 Given(/^[Pp]rint server response$/) do 
-  puts "response: #{@handler_helper.response}"
+  puts "response: #{@app_helper.response}"
 end
 
 Given(/^(?:[Nn]ow\s)?[Tt]oday is ["'](.+)["']$/) do |date_text|
@@ -51,7 +51,7 @@ Given(/^(?:[Nn]ow\s)?[Tt]oday is ["'](.+)["']$/) do |date_text|
 end
 
 Given(/^[Tt]he [Uu]ser ["'](.+)["'] is authenticated$/) do |user_id|
-  @handler_helper.authenticate(user_id)
+  @app_helper.authenticate(user_id)
 end
 
 Given(/^[Tt]he following [Uu]ser[s]*[:]*$/) do |table|
@@ -62,8 +62,8 @@ end
 
 Before do
   ActiveRecord::Base.descendants.each { |c| c.delete_all unless c == ActiveRecord::SchemaMigration }
-  RubyPitaya::HandlerSpecHelper.update_before_each
-  @handler_helper = RubyPitaya::HandlerSpecHelperClass.new('cucumber')
+  RubyPitaya::AppSpecHelper.update_before_each
+  @app_helper = RubyPitaya::AppSpecHelperClass.new('cucumber')
 end
 
 # After do

data/lib/rubypitaya/app-template/features/support/env.rb

@@ -2,12 +2,12 @@ require 'rspec'
 require 'cucumber/rspec/doubles'
 
 require 'rubypitaya/core/helpers/setup_helper'
-require 'rubypitaya/core/spec-helpers/handler_spec_helper_class'
+require 'rubypitaya/core/spec-helpers/app_spec_helper_class'
 
 ENV['RUBYPITAYA_ENV'] = 'test'
 
-RubyPitaya::HandlerSpecHelper.initialize_before_suite
+RubyPitaya::AppSpecHelper.initialize_before_suite
 
 at_exit do
-  RubyPitaya::HandlerSpecHelper.finalize_after_suite
+  RubyPitaya::AppSpecHelper.finalize_after_suite
 end

data/lib/rubypitaya/app-template/setup/development/database

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+bundle exec rake db:reset

data/lib/rubypitaya/app-template/setup/development/main

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "Setup database"
+./setup/development/database

data/lib/rubypitaya/app-template/setup/test/database

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+bundle exec rake db:test:setup

data/lib/rubypitaya/app-template/setup/test/main

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "Setup database"
+./setup/test/database

data/lib/rubypitaya/core/spec-helpers/{handler_spec_helper.rb → app_spec_helper.rb}

@@ -7,7 +7,7 @@ require 'rubypitaya/core/spec-helpers/postman_spec_helper'
 
 module RubyPitaya
 
-  module HandlerSpecHelper
+  module AppSpecHelper
 
     def self.initialize_before_suite
       default_setup = Setup.new.get_config
@@ -36,6 +36,7 @@ module RubyPitaya
     end
 
     def self.finalize_after_suite
+      clear_all_services_data
       disconnect_services
     end
 

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

@@ -0,0 +1,8 @@
+require 'rubypitaya/core/spec-helpers/app_spec_helper'
+
+module RubyPitaya
+
+  class AppSpecHelperClass
+    include AppSpecHelper
+  end
+end

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

@@ -3,21 +3,21 @@ require 'rspec'
 ENV['RUBYPITAYA_ENV'] = 'test'
 
 require 'rubypitaya/core/helpers/setup_helper'
-require 'rubypitaya/core/spec-helpers/handler_spec_helper'
+require 'rubypitaya/core/spec-helpers/app_spec_helper'
 
 RSpec.configure do |config|
-  config.include RubyPitaya::HandlerSpecHelper
+  config.include RubyPitaya::AppSpecHelper
 
   config.before(:suite) do
-    RubyPitaya::HandlerSpecHelper.initialize_before_suite
+    RubyPitaya::AppSpecHelper.initialize_before_suite
   end
 
   config.after(:suite) do
-    RubyPitaya::HandlerSpecHelper.finalize_after_suite
+    RubyPitaya::AppSpecHelper.finalize_after_suite
   end
 
   config.before(:each) do
-    RubyPitaya::HandlerSpecHelper.update_before_each
+    RubyPitaya::AppSpecHelper.update_before_each
     ActiveRecord::Base.descendants.each { |c| c.delete_all unless c == ActiveRecord::SchemaMigration }
   end
 

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '3.7.0'
+  VERSION = '3.9.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.9.1
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
@@ -330,6 +330,10 @@ files:
 - "./lib/rubypitaya/app-template/kubernetes/statefulset-postgres.yaml"
 - "./lib/rubypitaya/app-template/kubernetes/statefulset-redis.yaml"
 - "./lib/rubypitaya/app-template/plugins.yaml"
+- "./lib/rubypitaya/app-template/setup/development/database"
+- "./lib/rubypitaya/app-template/setup/development/main"
+- "./lib/rubypitaya/app-template/setup/test/database"
+- "./lib/rubypitaya/app-template/setup/test/main"
 - "./lib/rubypitaya/app-template/spec/hello_world_handler_spec.rb"
 - "./lib/rubypitaya/app-template/spec/player_handler_spec.rb"
 - "./lib/rubypitaya/app-template/spec/redis_service_spec.rb"
@@ -366,9 +370,9 @@ files:
 - "./lib/rubypitaya/core/service_holder.rb"
 - "./lib/rubypitaya/core/session.rb"
 - "./lib/rubypitaya/core/setup.rb"
+- "./lib/rubypitaya/core/spec-helpers/app_spec_helper.rb"
+- "./lib/rubypitaya/core/spec-helpers/app_spec_helper_class.rb"
 - "./lib/rubypitaya/core/spec-helpers/config_spec_helper.rb"
-- "./lib/rubypitaya/core/spec-helpers/handler_spec_helper.rb"
-- "./lib/rubypitaya/core/spec-helpers/handler_spec_helper_class.rb"
 - "./lib/rubypitaya/core/spec-helpers/postman_spec_helper.rb"
 - "./lib/rubypitaya/core/spec-helpers/rubypitaya_spec_helper.rb"
 - "./lib/rubypitaya/core/spec-helpers/setup_spec_helper.rb"

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

@@ -1,8 +0,0 @@
-require 'rubypitaya/core/spec-helpers/handler_spec_helper'
-
-module RubyPitaya
-
-  class HandlerSpecHelperClass
-    include HandlerSpecHelper
-  end
-end