rubypitaya 3.15.3 → 3.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f093bde26abc5e9b0894d992cf050046d7e4d429b8c4e46fdbc7617930a9af8
-  data.tar.gz: f2666269c4003901ece36e33e7b90971c2f07e00594e119c5f52cb6b1c331ab3
+  metadata.gz: 87d08d5ced6ba4a1e729c5f4a2a2e5640d70cee6abee913e929cb90158bbb700
+  data.tar.gz: e5bdccc6bc61e9013ee0ddcee53fd896405639d14061439d23be6dc4b241a43c
 SHA512:
-  metadata.gz: b71e9815ffb0e9e776618ec626ba747ba42bc2e2c138dcf101087bfc48894d44a0da6fee32751dade600454706b0ca29c95416f648b523bc08b02597335ea16d
-  data.tar.gz: 0f0c2db6a01632e1bc3fbfc93acee3108ac41e107beb5d532a79fb2d2255055bf5e08fc214777c82fae63d4aad314f6635d066c7d4926dfb28b769cf165a4bd0
+  metadata.gz: 59f7d14c1993cf80675c915b3ee4b9a3cf8da65b0f22f89eefb4e95b813cda162e3ca1e34799c686c685c4a308b5dfce0a68e6ef41781843244ba29eb542ecd2
+  data.tar.gz: ec3e2972772fa5eada008ec9e997de986a8531c99bdb1278636d1838bfabc0756bb37cb535b60d48d025af9b50ae915a43fc36b36b3fd5e0890ea6382eb38228

data/lib/rubypitaya/app-template/Gemfile

@@ -1,12 +1,12 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '3.15.3'
+gem 'rubypitaya', '3.17.0'
 
 group :development do
   gem 'pry', '0.14.2'
   gem 'rspec', '3.12.0'
   gem 'listen', '3.8.0'
-  gem 'bundler', '2.3.26'
-  gem 'cucumber', '8.0.0'
-  gem 'sinatra-contrib', '3.0.5'
+  gem 'bundler', '2.4.10'
+  gem 'cucumber', '9.1.1'
+  gem 'sinatra-contrib', '3.2.0'
 end

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

@@ -1,139 +1,151 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.4)
-      activesupport (= 7.0.4)
-    activerecord (7.0.4)
-      activemodel (= 7.0.4)
-      activesupport (= 7.0.4)
-    activesupport (7.0.4)
+    activemodel (7.1.2)
+      activesupport (= 7.1.2)
+    activerecord (7.1.2)
+      activemodel (= 7.1.2)
+      activesupport (= 7.1.2)
+      timeout (>= 0.4.0)
+    activesupport (7.1.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.5)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    connection_pool (2.3.0)
-    cucumber (8.0.0)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    cucumber (9.1.1)
       builder (~> 3.2, >= 3.2.4)
-      cucumber-ci-environment (~> 9.0, >= 9.0.4)
-      cucumber-core (~> 11.0, >= 11.0.0)
-      cucumber-cucumber-expressions (~> 15.1, >= 15.1.1)
-      cucumber-gherkin (~> 23.0, >= 23.0.1)
-      cucumber-html-formatter (~> 19.1, >= 19.1.0)
-      cucumber-messages (~> 18.0, >= 18.0.0)
-      diff-lcs (~> 1.5, >= 1.5.0)
-      mime-types (~> 3.4, >= 3.4.1)
+      cucumber-ci-environment (~> 9.2, >= 9.2.0)
+      cucumber-core (~> 12.0)
+      cucumber-cucumber-expressions (~> 17.0)
+      cucumber-gherkin (> 24, < 27)
+      cucumber-html-formatter (> 20.3, < 22)
+      cucumber-messages (> 19, < 25)
+      diff-lcs (~> 1.5)
+      mini_mime (~> 1.1, >= 1.1.5)
       multi_test (~> 1.1, >= 1.1.0)
-      sys-uname (~> 1.2, >= 1.2.2)
-    cucumber-ci-environment (9.1.0)
-    cucumber-core (11.0.0)
-      cucumber-gherkin (~> 23.0, >= 23.0.1)
-      cucumber-messages (~> 18.0, >= 18.0.0)
-      cucumber-tag-expressions (~> 4.1, >= 4.1.0)
-    cucumber-cucumber-expressions (15.2.0)
-    cucumber-gherkin (23.0.1)
-      cucumber-messages (~> 18.0, >= 18.0.0)
-    cucumber-html-formatter (19.2.0)
-      cucumber-messages (~> 18.0, >= 18.0.0)
-    cucumber-messages (18.0.0)
-    cucumber-tag-expressions (4.1.0)
+      sys-uname (~> 1.2, >= 1.2.3)
+    cucumber-ci-environment (9.2.0)
+    cucumber-core (12.0.0)
+      cucumber-gherkin (>= 25, < 27)
+      cucumber-messages (>= 20, < 23)
+      cucumber-tag-expressions (~> 5.0, >= 5.0.4)
+    cucumber-cucumber-expressions (17.0.1)
+    cucumber-gherkin (26.2.0)
+      cucumber-messages (>= 19.1.4, < 22.1)
+    cucumber-html-formatter (21.2.0)
+      cucumber-messages (> 19, < 25)
+    cucumber-messages (22.0.0)
+    cucumber-tag-expressions (5.0.6)
     diff-lcs (1.5.0)
-    etcdv3 (0.11.5)
+    drb (2.2.0)
+      ruby2_keywords
+    etcdv3 (0.11.6)
       grpc (~> 1.17)
-    ffi (1.15.5)
-    google-protobuf (3.21.12-x86_64-linux)
-    googleapis-common-protos-types (1.5.0)
-      google-protobuf (~> 3.14)
-    grpc (1.50.0-x86_64-linux)
-      google-protobuf (~> 3.21)
+    ffi (1.16.3)
+    google-protobuf (3.25.2-x86_64-linux)
+    googleapis-common-protos-types (1.11.0)
+      google-protobuf (~> 3.18)
+    grpc (1.60.0-x86_64-linux)
+      google-protobuf (~> 3.25)
       googleapis-common-protos-types (~> 1.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     method_source (1.0.0)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    minitest (5.17.0)
+    mini_mime (1.1.5)
+    minitest (5.21.1)
     multi_json (1.15.0)
     multi_test (1.1.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
-    nats-pure (2.2.1)
-    ostruct (0.5.5)
-    pg (1.4.5)
+    mutex_m (0.2.0)
+    nats-pure (2.4.0)
+      concurrent-ruby (~> 1.0)
+    ostruct (0.6.0)
+    pg (1.5.4)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (2.2.5)
-    rack-protection (3.0.5)
-      rack
-    rake (13.0.6)
+    rack (2.2.8)
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
+      rack (~> 2.2, >= 2.2.4)
+    rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redis (5.0.5)
-      redis-client (>= 0.9.0)
-    redis-client (0.12.0)
+    redis (5.0.8)
+      redis-client (>= 0.17.0)
+    redis-client (0.19.1)
       connection_pool
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.2)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     ruby2_keywords (0.0.5)
-    rubypitaya (3.15.3)
-      activerecord (= 7.0.4)
-      etcdv3 (= 0.11.5)
-      google-protobuf (= 3.21.12)
-      nats-pure (= 2.2.1)
-      ostruct (= 0.5.5)
-      pg (= 1.4.5)
-      rake (= 13.0.6)
-      redis (= 5.0.5)
-      sinatra (= 3.0.5)
-      webrick (= 1.7.0)
-    sinatra (3.0.5)
+    rubypitaya (3.17.0)
+      activerecord (= 7.1.2)
+      etcdv3 (= 0.11.6)
+      google-protobuf (= 3.25.2)
+      nats-pure (= 2.4.0)
+      ostruct (= 0.6.0)
+      pg (= 1.5.4)
+      rake (= 13.1.0)
+      redis (= 5.0.8)
+      sinatra (= 3.2.0)
+      webrick (= 1.8.1)
+    sinatra (3.2.0)
       mustermann (~> 3.0)
       rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.0.5)
+      rack-protection (= 3.2.0)
       tilt (~> 2.0)
-    sinatra-contrib (3.0.5)
-      multi_json
+    sinatra-contrib (3.2.0)
+      multi_json (>= 0.0.2)
       mustermann (~> 3.0)
-      rack-protection (= 3.0.5)
-      sinatra (= 3.0.5)
+      rack-protection (= 3.2.0)
+      sinatra (= 3.2.0)
       tilt (~> 2.0)
-    sys-uname (1.2.2)
+    sys-uname (1.2.3)
       ffi (~> 1.1)
-    tilt (2.0.11)
-    tzinfo (2.0.5)
+    tilt (2.3.0)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    webrick (1.7.0)
+    webrick (1.8.1)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  bundler (= 2.3.26)
-  cucumber (= 8.0.0)
+  bundler (= 2.4.10)
+  cucumber (= 9.1.1)
   listen (= 3.8.0)
   pry (= 0.14.2)
   rspec (= 3.12.0)
-  rubypitaya (= 3.15.3)
-  sinatra-contrib (= 3.0.5)
+  rubypitaya (= 3.17.0)
+  sinatra-contrib (= 3.2.0)
 
 BUNDLED WITH
-   2.3.26
+   2.4.10

data/lib/rubypitaya/app-template/Makefile

@@ -14,10 +14,10 @@ run:
 build:
 	@docker-compose build
 	@docker-compose pull
-	# @echo "Copying vendor folder ..."
-	# @rm -rf ./vendor
-	# @sh -c "FOLDER=$(notdir $(shell pwd)); docker-compose run --no-deps --detach --name=rubypitaya rubypitaya; docker cp rubypitaya:/app/rubypitaya/vendor ."
-	# @docker rm -f rubypitaya
+#	@echo "Copying vendor folder ..."
+#	@rm -rf ./vendor
+#	@sh -c "FOLDER=$(notdir $(shell pwd)); docker-compose run --no-deps --detach --name=rubypitaya rubypitaya; docker cp rubypitaya:/app/rubypitaya/vendor ."
+#	@docker rm -f rubypitaya
 
 ## Setup project dependencies
 setup: clear

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

@@ -27,6 +27,9 @@ class AppInitializer < RubyPitaya::InitializerBase
   #      - info
   #        - log information
   #
+  #  - handlers
+  #    - List of all handlers
+  #
   # services:
   #  - redis
   #    - link:

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

@@ -9,7 +9,7 @@ nats:
 etcd:
   url: 'http://etcd:2379'
   prefix: 'rubypitaya/'
-  leaseSeconds: '60'
+  leaseSeconds: 60
 
 redis:
   url: 'redis://redis:6379'

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

@@ -1,4 +1,4 @@
-FROM ruby:3.1.3-slim
+FROM ruby:3.2.2-slim
 
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
@@ -6,7 +6,7 @@ ENV LC_ALL=C.UTF-8
 RUN apt update && \
     apt install -y --no-install-recommends \
     git \
-    netcat \
+    netcat-traditional \
     libpq-dev \
     build-essential \
     && rm -rf /var/lib/apt/lists/*
@@ -15,11 +15,8 @@ WORKDIR /app/rubypitaya/
 
 COPY Gemfile Gemfile.lock ./
 
-RUN bundle config --global jobs 4 && \
-    bundle config --global set clean 'true' \
-    bundle config --global git.allow_insecure true && \
-    bundle config set path './vendor/bundle' && \
-    bundle install
+# RUN bundle config set path './vendor/bundle' && \
+RUN bundle install
 
 COPY . .
 

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

@@ -1,4 +1,4 @@
-FROM ruby:3.1.3-slim as builder
+FROM ruby:3.2.2-slim as builder
 
 RUN apt update && \
     apt install -y --no-install-recommends \
@@ -9,33 +9,31 @@ RUN apt update && \
 
 COPY Gemfile Gemfile.lock ./
 
-RUN bundle config --global jobs 4 && \
-    bundle config --global set clean 'true' \
-    bundle config --global git.allow_insecure true && \
-    bundle config --global without "development test" && \
+RUN bundle config set --global without "development" \
     bundle install
 
 RUN rm -rf /usr/local/bundle/cache && \
     rm -rf /usr/local/bundle/build_info && \
     rm -rf /usr/local/bundle/doc && \
     rm -rf /usr/local/bundle/doc && \
-    find /usr/local/bundle/gems/grpc-*/src/ruby/lib/grpc/2.5/ -name "*.so" -delete && \
     find /usr/local/bundle/gems/grpc-*/src/ruby/lib/grpc/2.6/ -name "*.so" -delete && \
     find /usr/local/bundle/gems/grpc-*/src/ruby/lib/grpc/2.7/ -name "*.so" -delete && \
+    find /usr/local/bundle/gems/grpc-*/src/ruby/lib/grpc/3.0/ -name "*.so" -delete && \
+    find /usr/local/bundle/gems/grpc-*/src/ruby/lib/grpc/3.2/ -name "*.so" -delete && \
     find /usr/local/bundle/gems/ -name "*.c" -delete && \
     find /usr/local/bundle/gems/ -name "*.o" -delete && \
     find /usr/local/bundle/gems/ -name "spec" -exec rm -rv {} +
 
 # RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
 
-FROM ruby:3.1.3-slim
+FROM ruby:3.2.2-slim
 
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
 
 RUN apt update && \
     apt install -y --no-install-recommends \
-    netcat \
+    netcat-traditional \
     libpq5 \
     && rm -rf /var/lib/apt/lists/*
 
@@ -46,6 +44,8 @@ COPY --from=builder /usr/local/bundle /usr/local/bundle
 
 WORKDIR /app/rubypitaya/
 
+RUN bundle config set --global without "development"
+
 COPY . .
 
 ENTRYPOINT ["./docker/entrypoint.sh"]

data/lib/rubypitaya/app-template/docker/stag/docker-compose.stag.yaml

@@ -0,0 +1,67 @@
+version: '3'
+services:
+  nats:
+    image: 'nats:2.6.2-alpine'
+    restart: always
+    ports:
+      - '4222:4222'
+
+  etcd:
+    image: 'quay.io/coreos/etcd:v3.5.5'
+    restart: always
+    environment:
+       ETCD_ADVERTISE_CLIENT_URLS: 'http://localhost:2379'
+       ETCD_LISTEN_CLIENT_URLS: 'http://0.0.0.0:2379'
+    ports:
+      - '2379:2379'
+
+  redis:
+    image: 'redis:6.0.5-alpine'
+    restart: always
+    ports:
+      - '9001:6379'
+
+  db:
+    image: 'postgres:14.0-alpine'
+    restart: always
+    volumes:
+      - 'postgres:/var/lib/postgresql/data'
+    environment:
+      POSTGRES_USER: 'postgres'
+      POSTGRES_PASSWORD: 'postgres'
+    ports:
+      - '9100:5432'
+
+  connector:
+    image: 'registry.gitlab.com/lucianopc/pitaya-connector:0.1.0'
+    restart: always
+    depends_on:
+      - 'db'
+      - 'nats'
+      - 'etcd'
+      - 'redis'
+    ports:
+      - '3250:3250'
+    environment:
+      PITAYA_CLUSTER_RPC_SERVER_NATS_CONNECT: 'nats://nats:4222'
+      PITAYA_CLUSTER_RPC_CLIENT_NATS_CONNECT: 'nats://nats:4222'
+      PITAYA_CLUSTER_RPC_CLIENT_NATS_REQUESTTIMEOUT: '10s'
+      PITAYA_CLUSTER_SD_ETCD_ENDPOINTS: 'etcd:2379'
+      PITAYA_CLUSTER_SD_ETCD_PREFIX: 'rubypitaya/'
+      SERVER_ROUTES: 'rubypitaya'
+
+  rubypitaya:
+    image: 'registry.gitlab.com/dungeonrpg/dungeonrpg/backend:${RUBYPITAYA_IMAGE_TAG}'
+    restart: always
+    depends_on:
+      - 'db'
+      - 'nats'
+      - 'etcd'
+      - 'redis'
+      - 'connector'
+    working_dir: '/app/rubypitaya'
+    environment:
+      RUBYPITAYA_SERVER_ENVIRONMENT: 'production'
+
+volumes:
+  postgres:

data/lib/rubypitaya/app-template/docker/stag/update_image

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+IMAGE_ENV=$1
+IMAGE_TAG=$2
+
+sed -i "s/$IMAGE_ENV=.*/$IMAGE_ENV=$IMAGE_TAG/" .env

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

@@ -6,12 +6,12 @@ services:
       - '4222:4222'
 
   etcd:
-    image: quay.io/coreos/etcd:v3.5.5
+    image: 'quay.io/coreos/etcd:v3.5.5'
     environment:
-       - ETCD_ADVERTISE_CLIENT_URLS=http://localhost:2379
-       - ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379
+       ETCD_ADVERTISE_CLIENT_URLS: 'http://localhost:2379'
+       ETCD_LISTEN_CLIENT_URLS: 'http://0.0.0.0:2379'
     ports:
-      - 2379:2379
+      - '2379:2379'
 
   redis:
     image: 'redis:6.0.5-alpine'
@@ -58,7 +58,8 @@ services:
     working_dir: '/app/rubypitaya'
     volumes:
       - .:/app/rubypitaya
-      - /app/rubypitaya/vendor
+      # - /app/rubypitaya/vendor
+      # - ./vendor/bundle/ruby/3.1.0/gems/rubypitaya-3.13.0/lib/rubypitaya/core:/app/rubypitaya/vendor/bundle/ruby/3.1.0/gems/rubypitaya-3.13.0/lib/rubypitaya/core
     ports:
       - '80:4567'
     environment:
@@ -67,12 +68,14 @@ services:
   rubypitaya-console:
     <<: *rubypitaya
     ports: []
+    command: 'exit'
 
   rubypitaya-commands:
     <<: *rubypitaya
     depends_on:
       - 'db'
     ports: []
+    command: 'exit'
 
 volumes:
   postgres: