rubypitaya 2.15.0 → 2.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86eb826473766e568cdeec334cb978b65d8b36188a129c8f5aa8b31d837afbf1
-  data.tar.gz: cf96a7e6c0ed0f0abc69e797d00ba59b6d9fdef5524761928bbda431593b582d
+  metadata.gz: 63a4b9efb72dc065c543c844c34f18109ecd16c6a037595dcaee92269600294a
+  data.tar.gz: 825ffcf632ca4152c92f859cc73075b7b25d47bdc0b82dcc047833cc8f2f5744
 SHA512:
-  metadata.gz: 0416f1d8c5c8e31231bb7cb8800aa3bb4e68aa5415db605f5db79b8b83590c453ade21ea46644a38a02b7827f760dd45b9b186b0efb9b12471f9d1f86961c0ff
-  data.tar.gz: efb6d17b6f86544a3381d579b1625159f6ab0a4c11427ff69a466720ac755d576b21a760bfbda7e233d34701470231e18792b35f27879ede51a7da2f4d399816
+  metadata.gz: 88f7e8a0224d7e119a1f1660a82a57fa71a419a8d33ad190136f2b3796b03176ee6eb198d2528985fe30461dfde33f28e47f049f6df4ade56740c6bbf881cb9b
+  data.tar.gz: 5cc1afdaf5c20cb7ebcf809a833b6243cc3d064bfb47443ec8ba116678fb19bb385698bbb567f94e76d22d3b4185d2707593ef6df8cd4dffce1dd538bcf4a97a

data/lib/rubypitaya/app-template/Gemfile

@@ -1,11 +1,11 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '2.15.0'
+gem 'rubypitaya', '2.19.1'
 
 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,99 +1,123 @@
 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)
+    ffi (1.15.0)
+    google-protobuf (3.15.5)
+    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.15.0)
-      activerecord (= 6.0.2)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    ruby2_keywords (0.0.4)
+    rubypitaya (2.19.1)
+      activerecord (= 6.1.3)
       etcdv3 (= 0.10.2)
       eventmachine (= 1.2.7)
       nats (= 0.11.0)
-      ostruct (= 0.1.0)
-      pg (= 0.21.0)
+      ostruct (= 0.3.3)
+      pg (= 1.2.3)
       protobuf (= 3.10.0)
-      rake (= 10.0)
-      redis (= 4.1.3)
+      rake (= 13.0.3)
+      redis (= 4.2.5)
       sinatra (= 2.1.0)
       sinatra-contrib (= 2.1.0)
     sinatra (2.1.0)
@@ -107,23 +131,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.15.0)
+  bundler (= 2.1.4)
+  cucumber (= 5.3.0)
+  listen (= 3.4.1)
+  pry (= 0.14.0)
+  rspec (= 3.10.0)
+  rubypitaya (= 2.19.1)
 
 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-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,26 @@
-FROM ruby:2.6.6
+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 \
+    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,35 +1,44 @@
-FROM ruby:2.6.6 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 ./
 
-RUN bundle install --without development
+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.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/*
+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.6.0 /usr/local/lib/ruby/gems/2.6.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 "$@"