rubypitaya 2.13.0 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cad906ad9159e4045b1ab90fd56ecb0985b6cc9e2478e8bfe63437967b223e4
-  data.tar.gz: a6d0684ac9693ad3336c7f45cac5acf6fdb79928abb0109d45538a168b004c21
+  metadata.gz: e4512ea6e0a637413e97896041d88fced36d78df993f3cce20dec3f666948588
+  data.tar.gz: f670294a5072062f87f575ae499c53e196437a6b8fae5025b2b6adfbceba59b1
 SHA512:
-  metadata.gz: 4e5278e4d406a0a2fcfe6e5d29be2808c3f27a054d87e0b4fd5c3f6220ce3b454089b887954075f7f9109f24a3bdd127b90f8507e3851a0004767b84362cb0cf
-  data.tar.gz: da4c6fd074fa1c9a9e696bb192cb4c14a05649e107cfc652ce21c3e9205087017ac8d0ffbef8c119c6388ed89c9b290ac11b161e5c9d9992953025b10da589e7
+  metadata.gz: 2caa669656cc57910c9cd09d992c802863a86c14ecfc3490a7b0944dd45bfb75b006eadf67bc407eef08fde8166c655d9252ff1743aca4587120efe0eb247ff6
+  data.tar.gz: 148854a900d3aeeed771b31de1e8edbf294a70880836ad6fa18e8d7282a04ac1074f0c9e1962ff97958195aaf2895679ebbbff2dfd32f46c35496e0fe25e6d5d

data/bin/rubypitaya

@@ -94,7 +94,7 @@ def show_help_create_migration
 end
 
 def show_help_add_plugin
-  puts 'Usage: $ rubypitaya create-migration [migration_name]'
+  puts 'Usage: $ rubypitaya add-plugin [plugin_git_link]'
   puts ''
 end
 

data/lib/rubypitaya/app-template/Gemfile

@@ -1,11 +1,11 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '2.13.0'
+gem 'rubypitaya', '2.16.0'
 
 group :development do
-  gem 'pry', '0.12.2'
-  gem 'bundler', '1.17.2'
-  gem 'rspec', '3.8.0'
-  gem 'listen', '3.2.1'
-  gem 'cucumber', '2.4.0'
+  gem 'pry', '0.14.0'
+  gem 'bundler', '2.1.4'
+  gem 'rspec', '3.10.0'
+  gem 'listen', '3.4.1'
+  gem 'cucumber', '5.3.0'
 end

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

@@ -1,101 +1,131 @@
+GIT
+  remote: https://gitlab.com/LucianoPC/ruby-pitaya
+  revision: 9c28f2a16f3140d24f019164a254155f524f2593
+  branch: ruby2.7.2
+  specs:
+    rubypitaya (2.16.0)
+      activerecord (= 6.1.3)
+      etcdv3 (= 0.10.2)
+      eventmachine (= 1.2.7)
+      nats (= 0.11.0)
+      ostruct (= 0.3.3)
+      pg (= 1.2.3)
+      protobuf (= 3.10.0)
+      rake (= 13.0.3)
+      redis (= 4.2.5)
+      sinatra (= 2.1.0)
+      sinatra-contrib (= 2.1.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.2)
-      activesupport (= 6.0.2)
-    activerecord (6.0.2)
-      activemodel (= 6.0.2)
-      activesupport (= 6.0.2)
-    activesupport (6.0.2)
+    activemodel (6.1.3)
+      activesupport (= 6.1.3)
+    activerecord (6.1.3)
+      activemodel (= 6.1.3)
+      activesupport (= 6.1.3)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
-    cucumber (2.4.0)
-      builder (>= 2.1.2)
-      cucumber-core (~> 1.5.0)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 4.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    cucumber-core (1.5.0)
-      gherkin (~> 4.0)
-    cucumber-wire (0.0.1)
+    concurrent-ruby (1.1.8)
+    cucumber (5.3.0)
+      builder (~> 3.2, >= 3.2.4)
+      cucumber-core (~> 8.0, >= 8.0.1)
+      cucumber-create-meta (~> 2.0, >= 2.0.2)
+      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
+      cucumber-gherkin (~> 15.0, >= 15.0.2)
+      cucumber-html-formatter (~> 9.0, >= 9.0.0)
+      cucumber-messages (~> 13.1, >= 13.1.0)
+      cucumber-wire (~> 4.0, >= 4.0.1)
+      diff-lcs (~> 1.4, >= 1.4.4)
+      multi_test (~> 0.1, >= 0.1.2)
+      sys-uname (~> 1.2, >= 1.2.1)
+    cucumber-core (8.0.1)
+      cucumber-gherkin (~> 15.0, >= 15.0.2)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+      cucumber-tag-expressions (~> 2.0, >= 2.0.4)
+    cucumber-create-meta (2.0.4)
+      cucumber-messages (~> 13.1, >= 13.1.0)
+      sys-uname (~> 1.2, >= 1.2.1)
+    cucumber-cucumber-expressions (10.3.0)
+    cucumber-gherkin (15.0.2)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+    cucumber-html-formatter (9.0.0)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+    cucumber-messages (13.2.1)
+      protobuf-cucumber (~> 3.10, >= 3.10.8)
+    cucumber-tag-expressions (2.0.4)
+    cucumber-wire (4.0.1)
+      cucumber-core (~> 8.0, >= 8.0.1)
+      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
+      cucumber-messages (~> 13.0, >= 13.0.1)
     diff-lcs (1.4.4)
     etcdv3 (0.10.2)
       grpc (~> 1.17)
     eventmachine (1.2.7)
     ffi (1.14.2)
-    gherkin (4.1.3)
-    google-protobuf (3.14.0)
-    googleapis-common-protos-types (1.0.5)
-      google-protobuf (~> 3.11)
-    grpc (1.34.0)
-      google-protobuf (~> 3.13)
+    google-protobuf (3.15.3)
+    googleapis-common-protos-types (1.0.6)
+      google-protobuf (~> 3.14)
+    grpc (1.36.0)
+      google-protobuf (~> 3.14)
       googleapis-common-protos-types (~> 1.0)
-    i18n (1.8.6)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    listen (3.2.1)
+    listen (3.4.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    method_source (0.9.2)
+    method_source (1.0.0)
     middleware (0.1.0)
-    minitest (5.14.2)
+    minitest (5.14.4)
     multi_json (1.15.0)
     multi_test (0.1.2)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     nats (0.11.0)
       eventmachine (~> 1.2, >= 1.2)
-    ostruct (0.1.0)
-    pg (0.21.0)
+    ostruct (0.3.3)
+    pg (1.2.3)
     protobuf (3.10.0)
       activesupport (>= 3.2)
       middleware
       thor
       thread_safe
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    protobuf-cucumber (3.10.8)
+      activesupport (>= 3.2)
+      middleware
+      thor
+      thread_safe
+    pry (0.14.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rack (2.2.3)
     rack-protection (2.1.0)
       rack
-    rake (10.0.0)
+    rake (13.0.3)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redis (4.1.3)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.6)
+    redis (4.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.2)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.3)
-    ruby2_keywords (0.0.2)
-    rubypitaya (2.13.0)
-      activerecord (= 6.0.2)
-      etcdv3 (= 0.10.2)
-      eventmachine (= 1.2.7)
-      nats (= 0.11.0)
-      ostruct (= 0.1.0)
-      pg (= 0.21.0)
-      protobuf (= 3.10.0)
-      rake (= 10.0)
-      redis (= 4.1.3)
-      sinatra (= 2.1.0)
-      sinatra-contrib (= 2.1.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    ruby2_keywords (0.0.4)
     sinatra (2.1.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
@@ -107,23 +137,25 @@ GEM
       rack-protection (= 2.1.0)
       sinatra (= 2.1.0)
       tilt (~> 2.0)
-    thor (1.0.1)
+    sys-uname (1.2.2)
+      ffi (~> 1.1)
+    thor (1.1.0)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (= 1.17.2)
-  cucumber (= 2.4.0)
-  listen (= 3.2.1)
-  pry (= 0.12.2)
-  rspec (= 3.8.0)
-  rubypitaya (= 2.13.0)
+  bundler (= 2.1.4)
+  cucumber (= 5.3.0)
+  listen (= 3.4.1)
+  pry (= 0.14.0)
+  rspec (= 3.10.0)
+  rubypitaya!
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

data/lib/rubypitaya/app-template/Makefile

@@ -41,7 +41,7 @@ test-cucumber:
 ## Update gems dependencies on Gemfile.lock
 update-dependencies:
 	@rm -f Gemfile.lock
-	@docker run --rm -v "$(PWD)":/usr/src/app -w /usr/src/app ruby:2.6.6 bundle install
+	@docker run --rm -v "$(PWD)":/usr/src/app -w /usr/src/app ruby:2.7.2 bundle install
 
 ## + Improve metagame
 

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

@@ -1,4 +1,4 @@
-FROM ruby:2.6.6
+FROM ruby:2.7.2
 
 RUN apt update
 RUN apt install -y git vim postgresql-client docker.io --no-install-recommends

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

@@ -1,14 +1,15 @@
-FROM ruby:2.6.6 as builder
+FROM ruby:2.7.2 as builder
 
 WORKDIR /app/rubypitaya/
 
 COPY Gemfile Gemfile.lock ./
 
-RUN bundle install --without development
+ENV BUNDLER_WITHOUT development test
+RUN bundle install
 
 COPY . .
 
-FROM ruby:2.6.6-slim
+FROM ruby:2.7.2-slim
 
 RUN apt update && apt install -y postgresql-client curl python3 bash vim --no-install-recommends
 RUN rm -rf /var/lib/apt/lists/*
@@ -20,7 +21,7 @@ RUN mv ./kubectl /usr/local/bin
 COPY --from=builder /usr/local/etc /usr/local/etc
 COPY --from=builder /usr/local/bundle /usr/local/bundle
 COPY --from=builder /usr/local/bin/ruby /usr/local/bin/ruby
-COPY --from=builder /usr/local/lib/ruby/gems/2.6.0 /usr/local/lib/ruby/gems/2.6.0
+COPY --from=builder /usr/local/lib/ruby/gems/2.7.0 /usr/local/lib/ruby/gems/2.7.0
 
 COPY --from=builder /app/rubypitaya /app/rubypitaya
 

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

@@ -19,11 +19,11 @@ Feature: Player
     Then  server should response the following json:
       """
       {
-        'code': 'RP-200',
-        'data': {
-          'name': 'Someone',
-          'gold': 15,
-          'userId': '00000000-0000-0000-0000-000000000001'
+        "code": "RP-200",
+        "data": {
+          "name": "Someone",
+          "gold": 15,
+          "userId": "00000000-0000-0000-0000-000000000001"
         }
       }
       """

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

@@ -9,8 +9,8 @@ Given(/^[Ss]erver should response ["'](.+)["'] as ["'](.+)["']$/) do |response_k
 end
 
 Given(/^[Ss]erver should response the following json[:]*$/) do |expected_json|
-  expected_json = expected_json.delete("\n").delete(' ')
-  response_json = @handler_helper.response.to_json.gsub("\"", "'")
+  expected_json = JSON.generate(JSON.parse(expected_json.strip))
+  response_json = JSON.generate(@handler_helper.response)
 
   expect(response_json).to eq(expected_json)
 end
@@ -38,6 +38,16 @@ Given(/^(?:[Nn]ow\s)?[Tt]oday is ["'](.+)["']$/) do |date_text|
   Time.stub(:now).and_return(time_now)
 end
 
+Given(/^[Tt]he [Uu]ser ["'](.+)["'] is authenticated$/) do |user_id|
+  @handler_helper.authenticate(user_id)
+end
+
+Given(/^[Tt]he following [Uu]ser[s]*[:]*$/) do |table|
+  table.hashes.each do |table_hash|
+    User.create(id: table_hash[:user_id])
+  end
+end
+
 Before do
   ActiveRecord::Base.descendants.each { |c| c.delete_all unless c == ActiveRecord::SchemaMigration }
   @handler_helper = RubyPitaya::HandlerSpecHelperClass.new('cucumber')

data/lib/rubypitaya/core/config.rb

@@ -9,11 +9,19 @@ module RubyPitaya
     def initialize
       @config_core = ConfigCore.new
       @config_core_override = nil
+
+      @result_cache = {}
     end
 
     def [](key)
+      result = @result_cache[key]
+      return result unless result.nil?
+
       result = @config_core_override[key] unless @config_core_override.nil?
       result = @config_core[key] if result.nil?
+
+      @result_cache[key] = result
+
       result
     end
 
@@ -21,5 +29,9 @@ module RubyPitaya
       @config_core.auto_reload
       @config_core_override.auto_reload unless @config_core_override.nil?
     end
+
+    def clear_cache
+      @result_cache.clear
+    end
   end
 end

data/lib/rubypitaya/core/db/migration/0000000001_create_user_migration.rb

@@ -1,6 +1,6 @@
 require 'active_record'
 
-class CreateUserMigration < ActiveRecord::Migration[5.1]
+class CreateUserMigration < ActiveRecord::Migration[6.0]
 
   enable_extension 'pgcrypto'
 

data/lib/rubypitaya/core/main.rb

@@ -165,6 +165,8 @@ module RubyPitaya
         @log.info "request  -> route: #{message_route}"
         @log.info "         -> data:  #{message_data}"
 
+        @config.clear_cache
+
         response = @handler_router.call(handler_name, action_name, @session,
                                         @postman, @redis_connector.redis,
                                         @setup, @config, @bll, @log, params)
@@ -177,7 +179,7 @@ module RubyPitaya
       end
       rescue Exception => error
         @log.info "ERROR: #{error}"
-        @log.info error.backtrace
+        @log.info error.backtrace.join("\n")
         run_nats_connection
     end
   end

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

@@ -70,6 +70,26 @@ module RubyPitaya
       @@setup.add(*keys, value)
     end
 
+    def get_bll
+      @@bll
+    end
+
+    def get_log
+      @@log
+    end
+
+    def get_session
+      @@session
+    end
+
+    def get_postman
+      @@postman
+    end
+
+    def get_redis
+      @@redis_connector.redis
+    end
+
     private
 
     def initialize_redis

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

@@ -1,6 +1,6 @@
 require 'active_record'
 
-class <%= class_name %> < ActiveRecord::Migration[5.1]
+class <%= class_name %> < ActiveRecord::Migration[6.0]
 
   enable_extension 'pgcrypto'
 

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '2.13.0'
+  VERSION = '2.16.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.16.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2021-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 1.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.3
 - !ruby/object:Gem::Dependency
   name: nats
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.3
+        version: 4.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.3
+        version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: etcdv3
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 6.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 6.1.3
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -170,70 +170,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.4.1
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 5.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 5.3.0
 description: RubyPitaya is an application to create servers using the pitaya protocol.
 email:
 - lucianopcbr@gmail.com
@@ -351,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Create servers with pitaya