rubypitaya 2.18.0 → 2.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38d15208a32190c01690735d3d8433bb0f8cc9b6f71a64f7897ba668c21e4e97
-  data.tar.gz: 7396c21b202d611ea5945fd9838b68323b4751777d3e154b20b31557ee470b7a
+  metadata.gz: 9505e2c4dbb300db345cff9e51d406c5f6b3c6f101c46105b8fa2e949b8c71bc
+  data.tar.gz: 9c1fb523cf378d6fa8bd7aa927611bfcd974b0583f22d8fdcbf3a3c71a438bec
 SHA512:
-  metadata.gz: 6b70755f160f42aa9a145bf55c0709bb82ec92f1f2105874127439bdc286ea124e7f2093cdae34a377d595bb54e21e75af244d34cbd9c30f8feac08849db7d9a
-  data.tar.gz: 50df16ee2575fd5840b0af30cfa3aedb9a7e4b35d27291a3a484ac2233b09b41700618ef9a1d8b2223cc1dba3e0cc0d8c7fc42a168971e548bd0301e34b77e7d
+  metadata.gz: 07c2486f386fef386ec1e002e57a2f723c6ff9f12e693d3c41abb322cf226cea49a9d5eab743f94ffb6d3b72627f48ef40716a03172d9ab58d53d0d53ca6f465
+  data.tar.gz: 6c2d3d381cb44074f9b4df501671c4a330e5c370b1b392e041a831d342615394dca786ed72d36de1673dbef45005c18aca0cb279d18f7f0011d0c833a2a8ca1a

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '2.18.0'
+gem 'rubypitaya', '2.21.0'
 
 group :development do
   gem 'pry', '0.14.0'

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

@@ -50,14 +50,14 @@ GEM
     etcdv3 (0.10.2)
       grpc (~> 1.17)
     eventmachine (1.2.7)
-    ffi (1.14.2)
-    google-protobuf (3.15.3-x86_64-linux)
+    ffi (1.15.0)
+    google-protobuf (3.15.8)
     googleapis-common-protos-types (1.0.6)
       google-protobuf (~> 3.14)
-    grpc (1.36.0-x86_64-linux)
-      google-protobuf (~> 3.14)
+    grpc (1.37.0)
+      google-protobuf (~> 3.15)
       googleapis-common-protos-types (~> 1.0)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     listen (3.4.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -108,10 +108,9 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
     ruby2_keywords (0.0.4)
-    rubypitaya (2.18.0)
+    rubypitaya (2.21.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)
@@ -149,7 +148,7 @@ DEPENDENCIES
   listen (= 3.4.1)
   pry (= 0.14.0)
   rspec (= 3.10.0)
-  rubypitaya (= 2.18.0)
+  rubypitaya (= 2.21.0)
 
 BUNDLED WITH
    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.7.2 bundle install
+	@docker run --rm -v "$(PWD)":/usr/src/app -w /usr/src/app ruby:2.7.2-slim bundle install
 
 ## + Improve metagame
 

data/lib/rubypitaya/app-template/Rakefile

@@ -8,8 +8,7 @@ namespace :db do
 
   desc 'Create the database'
   task :create do
-    environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
-    database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+    database_config = RubyPitaya::DatabaseConfig.new
     connection_data = database_config.connection_data_without_database
 
     ActiveRecord::Base.establish_connection(connection_data)
@@ -21,8 +20,7 @@ namespace :db do
 
   desc 'Migrate the database'
   task :migrate do
-    environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
-    database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+    database_config = RubyPitaya::DatabaseConfig.new
     connection_data = database_config.connection_data
     migrations_paths = [RubyPitaya::Path::Core::MIGRATIONS_FOLDER_PATH]
     migrations_paths += RubyPitaya::Path::Plugins::MIGRATIONS_FOLDER_PATHS
@@ -38,8 +36,7 @@ namespace :db do
 
   desc 'Rollback migrations'
   task :rollback do
-    environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
-    database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+    database_config = RubyPitaya::DatabaseConfig.new
     connection_data = database_config.connection_data
     migrations_paths = [RubyPitaya::Path::Core::MIGRATIONS_FOLDER_PATH]
     migrations_paths += RubyPitaya::Path::Plugins::MIGRATIONS_FOLDER_PATHS
@@ -64,8 +61,7 @@ namespace :db do
 
   desc 'Drop the database'
   task :drop do
-    environment_name = ENV.fetch("RUBYPITAYA_ENV") { 'development' }
-    database_config = RubyPitaya::DatabaseConfig.new(environment_name, RubyPitaya::Path::DATABASE_CONFIG_PATH)
+    database_config = RubyPitaya::DatabaseConfig.new
     connection_data = database_config.connection_data_without_database
 
     ActiveRecord::Base.establish_connection(connection_data)
@@ -78,8 +74,7 @@ namespace :db do
 
   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)
+    database_config = RubyPitaya::DatabaseConfig.new
     connection_data = database_config.connection_data
     migrations_paths = [RubyPitaya::Path::Core::MIGRATIONS_FOLDER_PATH]
     migrations_paths += RubyPitaya::Path::Plugins::MIGRATIONS_FOLDER_PATHS

data/lib/rubypitaya/app-template/app/bll/player_bll.rb

@@ -2,7 +2,7 @@ class PlayerBLL
 
   def create_new_player(setup, config)
     name = config['initial_player'][:name]
-    gold = setup['initial_player.wallet.gold']
+    gold = config['initial_player'][:wallet][:gold]
 
     player = Player.new(name: name, gold: gold, user: User.new)
     player.save!

data/lib/rubypitaya/app-template/app/config/initial_player.json

@@ -1,3 +1,6 @@
 {
-    "name": "Guest"
+    "name": "Guest",
+    "wallet": {
+        "gold": 10
+    }
 }

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

@@ -0,0 +1,27 @@
+server:
+  name: 'rubypitaya'
+  environment: development
+
+nats:
+  url: 'nats://nats:4222'
+
+etcd:
+  url: 'http://etcd:2379'
+  prefix: 'rubypitaya/'
+  leaseSeconds: '60'
+
+redis:
+  url: 'redis://redis:6379'
+
+database:
+  host: 'db'
+  port: 5432
+  user: 'postgres'
+  password: 'postgres'
+  name: 'ruby_pitaya'
+
+http:
+  auth:
+    user: 'user'
+    pass: 'pass'
+    enabled: 'false'

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

@@ -7,8 +7,7 @@ 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)
+database_config = RubyPitaya::DatabaseConfig.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/docker-compose.yml

@@ -60,18 +60,7 @@ services:
     ports:
       - '80:4567'
     environment:
-      SERVER_NAME: 'rubypitaya'
-      RUBYPITAYA_ENV: 'development'
       HISTFILE: '/app/rubypitaya/.bash-history'
-      NATS_URL: 'nats://nats:4222'
-      ETCD_URL: 'http://etcd:2379'
-      ETCD_PREFIX: 'rubypitaya/'
-      ETCD_LEASE_SECONDS: '60'
-      REDIS_URL: 'redis://redis:6379'
-      DATABASE_HOST: 'db'
-      DATABASE_USER: 'postgres'
-      DATABASE_PASSWORD: 'postgres'
-      DATABASE_NAME: 'ruby_pitaya'
 
   rubypitaya-console:
     <<: *rubypitaya

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

@@ -1,19 +1,24 @@
-FROM ruby:2.7.2
+FROM ruby:2.7.2-slim
 
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
 
 RUN apt update && \
     apt install -y --no-install-recommends \
-    docker.io \
-    postgresql-client \
+    git \
+    netcat \
+    libpq-dev \
+    build-essential \
     && rm -rf /var/lib/apt/lists/*
 
-COPY Gemfile Gemfile.lock ./
+WORKDIR /app/rubypitaya/
 
-RUN bundle install
+COPY Gemfile Gemfile.lock ./
 
-WORKDIR /app/rubypitaya/
+RUN bundle config --global jobs 4 && \
+    bundle config --global set clean 'true' \
+    bundle config --global git.allow_insecure true && \
+    bundle install
 
 COPY . .
 

data/lib/rubypitaya/app-template/docker/entrypoint.sh

@@ -3,10 +3,11 @@
 cmd="$@"
 
 echo "=> Waiting for postgres"
-until PGPASSWORD=$DATABASE_PASSWORD psql -h "$DATABASE_HOST" -U "$DATABASE_USER" -c '\q' > /dev/null 2>&1; do
-  echo "=> Waiting for Postgres..."
-  sleep 1
-done
+
+RUBYPITAYA_DATABASE_HOST=${RUBYPITAYA_DATABASE_HOST:-'db'}
+RUBYPITAYA_DATABASE_PORT=${RUBYPITAYA_DATABASE_PORT:-5432}
+
+./docker/wait_for.sh $RUBYPITAYA_DATABASE_HOST:$RUBYPITAYA_DATABASE_PORT
 
 echo "=> Postgres is ready"
 

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

@@ -1,16 +1,21 @@
-FROM ruby:2.7.2 as builder
+FROM ruby:2.7.2-slim as builder
 
 RUN apt update && \ 
     apt install -y --no-install-recommends \ 
     curl \
+    libpq-dev \
+    build-essential \
     && rm -rf /var/lib/apt/lists/*
 
 COPY Gemfile Gemfile.lock ./
 
-RUN bundle config --local without "development test" && \
+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" && \
     bundle install
 
-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
+# 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:2.7.2-slim
 
@@ -19,13 +24,17 @@ ENV LC_ALL=C.UTF-8
 
 RUN apt update && \ 
     apt install -y --no-install-recommends \ 
-    postgresql-client \
+    netcat \
+    libpq5 \
     && rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /usr/local/bundle /usr/local/bundle
-COPY --from=builder /kubectl /usr/local/bin/kubectl
- 
-RUN chmod +x /usr/local/bin/kubectl
+RUN rm -rf /usr/local/bundle/cache
+RUN rm -rf /usr/local/bundle/build_info
+RUN rm -rf /usr/local/bundle/doc
+
+# COPY --from=builder /kubectl /usr/local/bin/kubectl
+# RUN chmod +x /usr/local/bin/kubectl
 
 WORKDIR /app/rubypitaya/
 

data/lib/rubypitaya/app-template/docker/wait_for.sh

@@ -0,0 +1,184 @@
+#!/bin/sh
+
+# The MIT License (MIT)
+#
+# Copyright (c) 2017 Eficode Oy
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+set -- "$@" -- "$TIMEOUT" "$QUIET" "$PROTOCOL" "$HOST" "$PORT" "$result"
+TIMEOUT=15
+QUIET=0
+# The protocol to make the request with, either "tcp" or "http"
+PROTOCOL="tcp"
+
+echoerr() {
+  if [ "$QUIET" -ne 1 ]; then printf "%s\n" "$*" 1>&2; fi
+}
+
+usage() {
+  exitcode="$1"
+  cat << USAGE >&2
+Usage:
+  $cmdname host:port|url [-t timeout] [-- command args]
+  -q | --quiet                        Do not output any status messages
+  -t TIMEOUT | --timeout=timeout      Timeout in seconds, zero for no timeout
+  -- COMMAND ARGS                     Execute command with args after the test finishes
+USAGE
+  exit "$exitcode"
+}
+
+wait_for() {
+  case "$PROTOCOL" in
+    tcp)
+      if ! command -v nc >/dev/null; then
+        echoerr 'nc command is missing!'
+        exit 1
+      fi
+      ;;
+    wget)
+      if ! command -v wget >/dev/null; then
+        echoerr 'nc command is missing!'
+        exit 1
+      fi
+      ;;
+  esac
+
+  while :; do
+    case "$PROTOCOL" in
+      tcp) 
+        nc -z "$HOST" "$PORT" > /dev/null 2>&1
+        ;;
+      http)
+        wget --timeout=1 -q "$HOST" -O /dev/null > /dev/null 2>&1 
+        ;;
+      *)
+        echoerr "Unknown protocol '$PROTOCOL'"
+        exit 1
+        ;;
+    esac
+
+    result=$?
+        
+    if [ $result -eq 0 ] ; then
+      if [ $# -gt 7 ] ; then
+        for result in $(seq $(($# - 7))); do
+          result=$1
+          shift
+          set -- "$@" "$result"
+        done
+
+        TIMEOUT=$2 QUIET=$3 PROTOCOL=$4 HOST=$5 PORT=$6 result=$7
+        shift 7
+        exec "$@"
+      fi
+      exit 0
+    fi
+
+    if [ "$TIMEOUT" -le 0 ]; then
+      break
+    fi
+    TIMEOUT=$((TIMEOUT - 1))
+
+    sleep 1
+  done
+  echo "Operation timed out" >&2
+  exit 1
+}
+
+while :; do
+  case "$1" in
+    http://*|https://*)
+    HOST="$1"
+    PROTOCOL="http"
+    shift 1
+    ;;
+    *:* )
+    HOST=$(printf "%s\n" "$1"| cut -d : -f 1)
+    PORT=$(printf "%s\n" "$1"| cut -d : -f 2)
+    shift 1
+    ;;
+    -q | --quiet)
+    QUIET=1
+    shift 1
+    ;;
+    -q-*)
+    QUIET=0
+    echoerr "Unknown option: $1"
+    usage 1
+    ;;
+    -q*)
+    QUIET=1
+    result=$1
+    shift 1
+    set -- -"${result#-q}" "$@"
+    ;;
+    -t | --timeout)
+    TIMEOUT="$2"
+    shift 2
+    ;;
+    -t*)
+    TIMEOUT="${1#-t}"
+    shift 1
+    ;;
+    --timeout=*)
+    TIMEOUT="${1#*=}"
+    shift 1
+    ;;
+    --)
+    shift
+    break
+    ;;
+    --help)
+    usage 0
+    ;;
+    -*)
+    QUIET=0
+    echoerr "Unknown option: $1"
+    usage 1
+    ;;
+    *)
+    QUIET=0
+    echoerr "Unknown argument: $1"
+    usage 1
+    ;;
+  esac
+done
+
+if ! [ "$TIMEOUT" -ge 0 ] 2>/dev/null; then
+  echoerr "Error: invalid timeout '$TIMEOUT'"
+  usage 3
+fi
+
+case "$PROTOCOL" in
+  tcp)
+    if [ "$HOST" = "" -o "$PORT" = "" ]; then
+      echoerr "Error: you need to provide a host and port to test."
+      usage 2
+    fi
+  ;;
+  http)
+    if [ "$HOST" = "" ]; then
+      echoerr "Error: you need to provide a host to test."
+      usage 2
+    fi
+  ;;
+esac
+
+wait_for "$@"