rubypitaya 2.16.0 → 2.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4512ea6e0a637413e97896041d88fced36d78df993f3cce20dec3f666948588
-  data.tar.gz: f670294a5072062f87f575ae499c53e196437a6b8fae5025b2b6adfbceba59b1
+  metadata.gz: a6dfc8681449f1ffcae12145b9fb3533f04d82aa42ed663ddac513d16eb57c79
+  data.tar.gz: 3176f5f30664abbd2f9464eedec8c7f004412d6d4c5391528f17ae35932cecb7
 SHA512:
-  metadata.gz: 2caa669656cc57910c9cd09d992c802863a86c14ecfc3490a7b0944dd45bfb75b006eadf67bc407eef08fde8166c655d9252ff1743aca4587120efe0eb247ff6
-  data.tar.gz: 148854a900d3aeeed771b31de1e8edbf294a70880836ad6fa18e8d7282a04ac1074f0c9e1962ff97958195aaf2895679ebbbff2dfd32f46c35496e0fe25e6d5d
+  metadata.gz: c2c31cbe23ea840ba2fb5c0dd59c29a3bdf204bd017d06aa772a3213bf0ce7b99536bafaa60494edb2e462176f3b001125a2c707ee7e387ad5d3cd0fc6aa64bc
+  data.tar.gz: 59cf7321c84bd05e5727a38236cbec7e6ee4d32f9b02c3ef7349a65e09a327885294de37eeb04e6f2740dbbf5d4c14d9cc93aeb593c2c4ae5cbbe53f0c4bde9a

data/lib/rubypitaya/app-template/Gemfile

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

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

@@ -1,21 +1,3 @@
-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:
@@ -68,14 +50,14 @@ GEM
     etcdv3 (0.10.2)
       grpc (~> 1.17)
     eventmachine (1.2.7)
-    ffi (1.14.2)
-    google-protobuf (3.15.3)
+    ffi (1.15.0)
+    google-protobuf (3.15.8)
     googleapis-common-protos-types (1.0.6)
       google-protobuf (~> 3.14)
-    grpc (1.36.0)
-      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)
@@ -126,6 +108,17 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
     ruby2_keywords (0.0.4)
+    rubypitaya (2.20.0)
+      activerecord (= 6.1.3)
+      etcdv3 (= 0.10.2)
+      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)
     sinatra (2.1.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
@@ -155,7 +148,7 @@ DEPENDENCIES
   listen (= 3.4.1)
   pry (= 0.14.0)
   rspec (= 3.10.0)
-  rubypitaya!
+  rubypitaya (= 2.19.1)
 
 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/app/bll/player_bll.rb

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

data/lib/rubypitaya/app-template/app/handlers/player_handler.rb

@@ -17,7 +17,7 @@ class PlayerHandler < RubyPitaya::HandlerBase
   #               Given you have the following file "app/config/initial_player.json"
   #               And this json content is {'name': 'Guest'}
   #               And you can get the initial player name
-  #               Then you can run the following code: @config['initial_player']['name']
+  #               Then you can run the following code: @config['initial_player'][:name]
   #
   #  - @params
   #    - info: Special hash with the request parameters

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

@@ -69,9 +69,13 @@ services:
       ETCD_LEASE_SECONDS: '60'
       REDIS_URL: 'redis://redis:6379'
       DATABASE_HOST: 'db'
+      DATABASE_PORT: 5432
       DATABASE_USER: 'postgres'
       DATABASE_PASSWORD: 'postgres'
       DATABASE_NAME: 'ruby_pitaya'
+      HTTP_AUTH_ENABLED: 'false'
+      HTTP_AUTH_USER: 'user'
+      HTTP_AUTH_PASS: 'pass'
 
   rubypitaya-console:
     <<: *rubypitaya

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

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

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

@@ -3,10 +3,8 @@
 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
+
+./docker/wait_for.sh $DATABASE_HOST:$DATABASE_PORT
 
 echo "=> Postgres is ready"
 

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

@@ -1,36 +1,44 @@
-FROM ruby:2.7.2 as builder
+FROM ruby:2.7.2-slim as builder
 
-WORKDIR /app/rubypitaya/
+RUN apt update && \ 
+    apt install -y --no-install-recommends \ 
+    curl \
+    libpq-dev \
+    build-essential \
+    && rm -rf /var/lib/apt/lists/*
 
 COPY Gemfile Gemfile.lock ./
 
-ENV BUNDLER_WITHOUT development test
-RUN bundle install
+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
 
-COPY . .
+# 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
 
-RUN apt update && apt install -y postgresql-client curl python3 bash vim --no-install-recommends
-RUN rm -rf /var/lib/apt/lists/*
+ENV LANG=C.UTF-8
+ENV LC_ALL=C.UTF-8
 
-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 chmod +x ./kubectl
-RUN mv ./kubectl /usr/local/bin
+RUN apt update && \ 
+    apt install -y --no-install-recommends \ 
+    netcat \
+    libpq5 \
+    && rm -rf /var/lib/apt/lists/*
 
-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.7.0 /usr/local/lib/ruby/gems/2.7.0
+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 /app/rubypitaya /app/rubypitaya
+# COPY --from=builder /kubectl /usr/local/bin/kubectl
+# RUN chmod +x /usr/local/bin/kubectl
 
 WORKDIR /app/rubypitaya/
 
-RUN rm -rf vendor/
-
-ENV LANG=C.UTF-8
-ENV LC_ALL=C.UTF-8
+COPY . .
 
 ENTRYPOINT ["./docker/entrypoint.sh"]
 

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 "$@"

data/lib/rubypitaya/app-template/helm/Chart.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+description: [Game Name]
+name: [game-name]
+version: 0.0.1

data/lib/rubypitaya/app-template/helm/templates/config-maps/nginx-config.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: nginx-config
+data:
+  nginx.conf: "events {\n    worker_connections  1024;\n}\n\nstream {\n    server
+    {\n        listen  {{ .Values.gameserver.port.first }}-{{ .Values.gameserver.port.last }};\n        \n        resolver kube-dns.kube-system.svc.cluster.local
+    valid=5s;\n\n        proxy_pass  gameserver-$server_port.{{ .Values.namespace }}.svc.cluster.local:$server_port;\n
+    \   }\n}\n"