vgs_api_client 0.0.35 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07adef47ba5ccc217d17fdfc5baa3dd09af553128ab3d35f06abfb54d77b41e8
-  data.tar.gz: a39c3a9a6f20f2e140c328c9a16c173fa773d61842a9ccb986a67fc8c1c7a990
+  metadata.gz: 6ac791716077474e6e10c682083c03d3a6bc74bab8dfe095db6b1175ce384292
+  data.tar.gz: 04c38e7663d97faa123607ed30e118cec6d0fece3996990a2543d9e2cc64268a
 SHA512:
-  metadata.gz: 45e98bc4413b5019bfe3470cce2e1903543c3fdc9cd10ee509dbf12cb6505eb6074e3c825d1ace1db3c954d0c449e6b46f339ed252e5334e05af074168d18a01
-  data.tar.gz: 90957e93a04e7d6f63d1a20966533a69c2f759a70deabf22bbed39002d571d78264b6ca9514161fb15a9d9d26b320a9684ee049c95ce58179d16201f247a77fc
+  metadata.gz: 945150111d39f3f5118a77311a0b5fb578263278d0d1b24592421547b7b607e0cae6ab8a04320849a7343f551bf49b93495a5e89a829dbb884cba81b023b2d49
+  data.tar.gz: 1f8980fb53018cd62404f565130a2acc8420e62a640f4d4d12cf263a4d1a95764443690f3bc56ccd24905f12a16d333fdd050723e3804e43a851c97749194311

data/docker-compose.yaml

@@ -28,5 +28,13 @@ services:
       VAULT_API_BASE_URI: https://api.sandbox.verygoodvault.com
       VAULT_API_VAULT_ID: tntkxfmsefj
       LIB_VERSION: ${LIB_VERSION}
-    volumes:
-      - ./:/vgs-api-client/
+  test-e2e:
+    build:
+      context: .
+      dockerfile: scripts/test-e2e/Dockerfile
+    environment:
+      VAULT_API_USERNAME: US7oyrzRGmaKqi3ET8eSsECS
+      VAULT_API_PASSWORD: c06cf6d1-a35e-439d-91d1-8bd04e5fd9e5
+      VAULT_API_BASE_URI: https://api.sandbox.verygoodvault.com
+      VAULT_API_VAULT_ID: tntkxfmsefj
+      LIB_VERSION: ${LIB_VERSION}

data/lib/vgs_api_client/api_client.rb

@@ -31,7 +31,7 @@ module VgsApiClient
     # @option config [Configuration] Configuration for initializing the object, default to Configuration.default
     def initialize(config = Configuration.default)
       @config = config
-      @user_agent = "vgs-api-client/0.0.35/ruby"
+      @user_agent = "vgs-api-client/0.0.36/ruby"
       @default_headers = {
         'Content-Type' => 'application/json',
         'User-Agent' => @user_agent

data/lib/vgs_api_client/version.rb

@@ -11,5 +11,5 @@ OpenAPI Generator version: 5.4.0
 =end
 
 module VgsApiClient
-  VERSION = '0.0.35'
+  VERSION = '0.0.36'
 end

data/scripts/assemble/run.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-LIB_VERSION=${LIB_VERSION:-0.0.1.dev$(date "+%Y%m%d%H%M")}
+LIB_VERSION=${LIB_VERSION:-0.0.1.alpha$(date "+%Y%m%d%H%M")}
 
 # fix version
-grep -rl 0.0.35 . | xargs sed -i "s/0.0.35/${LIB_VERSION}/g"
+grep -rl 0.0.36 . | xargs sed -i "s/0.0.36/${LIB_VERSION}/g"
 
 # build
 gem build vgs_api_client.gemspec

data/scripts/publish/run.sh

@@ -5,7 +5,8 @@ set -e
 usage() { echo "Required env var '$1' is missing"; exit 1; }
 
 [ -z "${ARTIFACT_REPOSITORY_TOKEN}" ] && usage "ARTIFACT_REPOSITORY_TOKEN" ;
-[ -z "${LIB_VERSION}" ] && usage "LIB_VERSION" ;
+
+LIB_VERSION=${LIB_VERSION:-0.0.1.alpha$(date "+%Y%m%d%H%M")}
 
 mkdir ~/.gem
 echo ":rubygems_api_key: ${ARTIFACT_REPOSITORY_TOKEN}" > ~/.gem/credentials

data/scripts/publish.sh

@@ -5,7 +5,8 @@ set -e
 usage() { echo "Required env var '$1' is missing"; exit 1; }
 
 [ -z "${ARTIFACT_REPOSITORY_TOKEN}" ] && usage "ARTIFACT_REPOSITORY_TOKEN" ;
-[ -z "${LIB_VERSION}" ] && usage "LIB_VERSION" ;
+
+export LIB_VERSION=${LIB_VERSION:-0.0.1.alpha$(date "+%Y%m%d%H%M")}
 
 docker-compose build && \
 docker-compose run assemble && \

data/scripts/run-tests-e2e.sh

@@ -2,9 +2,7 @@
 
 set -e
 
-usage() { echo "Required env var '$1' is missing"; exit 1; }
+export LIB_VERSION=${LIB_VERSION:-0.0.1.alpha$(date "+%Y%m%d%H%M")}
 
-[ -z "${LIB_VERSION}" ] && usage "LIB_VERSION" ;
-
-docker-compose build && \
-docker-compose run test
+docker-compose build test-e2e && \
+docker-compose run test-e2e

data/scripts/run-tests.sh

@@ -2,6 +2,5 @@
 
 set -e
 
-docker-compose build && \
-docker-compose run assemble && \
+docker-compose build test && \
 docker-compose run test

data/scripts/test/Dockerfile

@@ -7,6 +7,8 @@ RUN apk update && \
     gem install bundler && \
     gem install rspec-support
 
+ADD . /vgs-api-client
+
 WORKDIR /vgs-api-client/
 
 ENTRYPOINT ["bash", "./scripts/test/run.sh"]

data/scripts/test/run.sh

@@ -2,32 +2,12 @@
 
 set -e
 
-rm vgs_api_client-*.gem || true
+echo "Installing lib from local sources"
+# fix version
+VERSION=0.0.1.alpha$(date "+%Y%m%d%H%M")
+grep -rl 0.0.36 . | xargs sed -i "s/0.0.36/$VERSION/g"
 
-if [[ -n "${LIB_VERSION}" ]]; then
-  echo "Installing lib from rubygems.org ${LIB_VERSION} ..."
+bundle install
 
-  set +e
-  ATTEMPT=1
-  while [  $ATTEMPT -lt 60 ]; do
-    echo "Attempt ${ATTEMPT} ..."
-
-    bundle install --without production --binstubs
-    gem install vgs_api_client -v ${LIB_VERSION}
-
-    if [[ $? == 0 ]]; then
-      echo "Installed ${LIB_VERSION}"
-      break
-    fi
-
-    ATTEMPT=$((ATTEMPT+1))
-
-    sleep 5
-  done
-  set -e
-else
-  echo "Installing lib from local sources"
-  bundle install
-fi
-
-bundle exec rspec ./spec/test_api_spec.rb
+echo "Running tests"
+bundle exec rspec ./spec/*.rb

data/scripts/test-e2e/Dockerfile

@@ -0,0 +1,22 @@
+FROM ruby:3.1.2-alpine3.15
+
+RUN apk update && \
+    apk add bash && \
+    apk add build-base && \
+    apk add libcurl && \
+    gem install bundler && \
+    gem install rspec-support
+
+RUN mkdir -p /vgs-api-client/ && \
+    mkdir -p /vgs-api-client/tmp
+
+ADD ./scripts/test-e2e /vgs-api-client/scripts
+ADD ./spec /vgs-api-client/spec
+
+# Temporarily copying gem files to tmp/ dir
+ADD ./vgs_api_client.gemspec /vgs-api-client/tmp/vgs_api_client.gemspec
+ADD ./Gemfile /vgs-api-client/tmp/Gemfile
+
+WORKDIR /vgs-api-client/
+
+ENTRYPOINT ["bash", "./scripts/run.sh"]

data/scripts/test-e2e/run.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo "Installing lib from rubygems.org ${LIB_VERSION} ..."
+
+set +e
+ATTEMPT=1
+while [  $ATTEMPT -lt 10 ]; do
+  echo "Attempt ${ATTEMPT} ..."
+
+  bundle install --without production --binstubs
+  gem install vgs_api_client -v ${LIB_VERSION}
+
+  if [[ $? == 0 ]]; then
+    echo "Installed ${LIB_VERSION}"
+    break
+  fi
+
+  ATTEMPT=$((ATTEMPT+1))
+
+  sleep 5
+done
+set -e
+
+echo "Running tests"
+mv /vgs-api-client/tmp/Gemfile /vgs-api-client/
+mv /vgs-api-client/tmp/vgs_api_client.gemspec /vgs-api-client/
+bundle install --without production --binstubs
+bundle exec rspec ./spec/*.rb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vgs_api_client
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.36
 platform: ruby
 authors:
 - Very Good Security
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -90,12 +90,14 @@ files:
 - scripts/publish/run.sh
 - scripts/run-tests-e2e.sh
 - scripts/run-tests.sh
+- scripts/test-e2e/Dockerfile
+- scripts/test-e2e/run.sh
 - scripts/test/Dockerfile
 - scripts/test/run.sh
 - spec/api_client_spec.rb
 - spec/configuration_spec.rb
 - spec/spec_helper.rb
-- spec/test_api_spec.rb
+- spec/test_aliases_api_spec.rb
 - vgs_api_client.gemspec
 homepage: https://openapi-generator.tech
 licenses:
@@ -124,4 +126,4 @@ test_files:
 - spec/api_client_spec.rb
 - spec/configuration_spec.rb
 - spec/spec_helper.rb
-- spec/test_api_spec.rb
+- spec/test_aliases_api_spec.rb