rubypitaya 3.8.0 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12a31604406460247ee5d2596f52358a59f6b60f3b2765f4262b78525004cbd5
-  data.tar.gz: 74b634075206caaddae86a7726e2f7fb0c5e6e7e5e1ce0c4a4c7e1f615d7a2e7
+  metadata.gz: c504da4f358b8b73e07c17883c293bf185c6ca2328d4a13bba0a88523b85e9cf
+  data.tar.gz: f850e834117933afd8db27dc771dc3326c8953083db06facdec0a839872c7a00
 SHA512:
-  metadata.gz: 673c27cb2dfea753dc3d81e95b04424d838c533dafbd262730a7c82a278ad35c9355aaf17a72e2156e9919de1987d47dadfb6728e31958f6ff6d3343acf9f175
-  data.tar.gz: d5e2813b687030005f55ef15acdca2f06c2f22075be9fb0db54f05d50333a7fc92e8ef478fa350a6bdab4bc78c7e830e3d55896c3c821ba9e3f6283f3e71075f
+  metadata.gz: d5f8c32268f3e0a943b65601483f30f560f3e2ae0bac19efcd65705215e84d6f61b10355096d606a804c0f9967654806b105ea195dc05dc4878e534d2e0245b0
+  data.tar.gz: f9ee5fcefa9e332e015ac228e5dcdaa09b1ad66b20222942660df14f72d6cd09cbc2c1b1c8c6c4a749b143331b68c3bf50d8513aecfd86ac7c611265cd472794

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '3.8.0'
+gem 'rubypitaya', '3.10.0'
 
 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.8.0)
+    rubypitaya (3.10.0)
       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.8.0)
+  rubypitaya (= 3.10.0)
   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/bin/console

@@ -7,7 +7,7 @@ require 'rubypitaya'
 require 'rubypitaya/core/database_config'
 
 # Database connection
-database_config = RubyPitaya::DatabaseConfig.new
+database_config = RubyPitaya::DatabaseConfig.new(RubyPitaya::Setup.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/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/core/service_holder.rb

@@ -15,6 +15,10 @@ module RubyPitaya
       @services[key].client
     end
 
+    def has?(key)
+      @services.has_key?(key)
+    end
+
     def all_services
       @services.values
     end

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.8.0'
+  VERSION = '3.10.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.10.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
@@ -370,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