ddtrace 0.26.1 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e58205299222f3c3a75a0a032ad3cca7c739fc68
-  data.tar.gz: 41e87bd0031a447ce9267c24bd1df4c7bc2598fd
+  metadata.gz: e0968ba35be08053c082756099e810143bf93531
+  data.tar.gz: d648169405d516eb09c208776254bbd2b0bb858b
 SHA512:
-  metadata.gz: 7b81c99d62190ba829ebca7671493dbb6a187eaf5ef8ddeaf6a6dcf1fc32f543d2acde719208e6aba0bd65f1a2690dc16b043f5649da0e16cccf7974907a7d7e
-  data.tar.gz: 28c7fa70a10769ed61a23bb60d1a474b939d1e3308225174110cf39fdc856ffa7745c17e9f0b1ef66f95852171ac7293138b9c6261bb75892ed5d9649552902d
+  metadata.gz: 3c7ae3e5c9c25819adf0432f1e88057b64cdf16a143139bccae1b1d9649738d39abffdf0ba97a05f11d9dd70ab137cf2ef28da2d15ec2121ab4e3fe387d72b67
+  data.tar.gz: 72c24e92cbba1f15f9188da97319f333a4a1eca4c702bbb05c4d18aef6a136e06f23790f5b3ad789b6abca5d441d9e3b7e2455d89fc82eba359de1e691fbf9ad

data/.circleci/config.yml

@@ -4,10 +4,6 @@ job_defaults: &job_defaults
   shell: /bin/bash --login
 
 ruby_containers: &ruby_containers
-  - &container-1_9
-    image: palazzem/docker-library:ddtrace_rb_1_9_3
-    environment:
-      - BUNDLE_GEMFILE=/app/Gemfile
   - &container-2_0
     image: palazzem/docker-library:ddtrace_rb_2_0_0
     environment:
@@ -28,6 +24,14 @@ ruby_containers: &ruby_containers
     image: palazzem/docker-library:ddtrace_rb_2_4_6
     environment:
       - BUNDLE_GEMFILE=/app/Gemfile
+  - &container-2_5
+    image: marcotc/docker-library:ddtrace_rb_2_5_6
+    environment:
+      - BUNDLE_GEMFILE=/app/Gemfile
+  - &container-2_6
+    image: marcotc/docker-library:ddtrace_rb_2_6_4
+    environment:
+      - BUNDLE_GEMFILE=/app/Gemfile
 
 test_containers: &test_containers
   - &container_postgres
@@ -101,61 +105,6 @@ filters_only_release_tags: &filters_only_release_tags
 
 version: 2.0
 jobs:
-  checkout-1.9:
-    <<: *job_defaults
-    docker:
-      - *container-1_9
-    steps:
-      - checkout
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-repo-1.9-{{ .Environment.CIRCLE_SHA1 }}'
-          paths:
-            - /app
-  build-1.9:
-    <<: *job_defaults
-    docker:
-      - *container-1_9
-    steps:
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-1.9-{{ .Environment.CIRCLE_SHA1 }}'
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-repo-1.9-{{ .Environment.CIRCLE_SHA1 }}'
-      - *step_init_bundle_checksum
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-1.9-{{ checksum ".circleci/bundle_checksum" }}'
-      - *step_bundle_install
-      - *step_appraisal_install
-      - *step_compute_bundle_checksum
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-1.9-{{ .Environment.CIRCLE_SHA1 }}'
-          paths:
-            - /app
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-1.9-{{ checksum ".circleci/bundle_checksum" }}'
-          paths:
-            - /usr/local/bundle
-  test-1.9:
-    <<: *job_defaults
-    docker:
-      - <<: *container-1_9
-        environment:
-          - TEST_DATADOG_INTEGRATION: 1
-      - *container_postgres
-      - *container_mysql
-      - *container_elasticsearch
-      - *container_redis
-      - *container_mongo
-      - *container_memcached
-      - *container_agent
-    steps:
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-1.9-{{ .Environment.CIRCLE_SHA1 }}'
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-1.9-{{ checksum ".circleci/bundle_checksum" }}'
-      - *step_run_all_tests
   checkout-2.0:
     <<: *job_defaults
     docker:
@@ -458,10 +407,125 @@ jobs:
           keys:
             - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.4-{{ checksum ".circleci/bundle_checksum" }}'
       - *step_run_all_tests
+
+  checkout-2.5:
+    <<: *job_defaults
+    docker:
+      - *container-2_5
+    steps:
+      - checkout
+      - save_cache:
+          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-repo-2.5-{{ .Environment.CIRCLE_SHA1 }}'
+          paths:
+            - /app
+  build-2.5:
+    <<: *job_defaults
+    docker:
+      - *container-2_5
+    steps:
+      - restore_cache:
+          keys:
+            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.5-{{ .Environment.CIRCLE_SHA1 }}'
+            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-repo-2.5-{{ .Environment.CIRCLE_SHA1 }}'
+      - *step_init_bundle_checksum
+      - restore_cache:
+          keys:
+            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.5-{{ checksum ".circleci/bundle_checksum" }}'
+      - *step_bundle_install
+      - *step_rubocop
+      - *step_appraisal_install
+      - *step_compute_bundle_checksum
+      - save_cache:
+          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.5-{{ .Environment.CIRCLE_SHA1 }}'
+          paths:
+            - /app
+      - save_cache:
+          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.5-{{ checksum ".circleci/bundle_checksum" }}'
+          paths:
+            - /usr/local/bundle
+  test-2.5:
+    <<: *job_defaults
+    docker:
+      - <<: *container-2_5
+        environment:
+          - TEST_DATADOG_INTEGRATION: 1
+      - *container_postgres
+      - *container_mysql
+      - *container_elasticsearch
+      - *container_redis
+      - *container_mongo
+      - *container_memcached
+      - *container_agent
+    steps:
+      - restore_cache:
+          keys:
+            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.5-{{ .Environment.CIRCLE_SHA1 }}'
+      - restore_cache:
+          keys:
+            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.5-{{ checksum ".circleci/bundle_checksum" }}'
+      - *step_run_all_tests
+
+  checkout-2.6:
+    <<: *job_defaults
+    docker:
+      - *container-2_6
+    steps:
+      - checkout
+      - save_cache:
+          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-repo-2.6-{{ .Environment.CIRCLE_SHA1 }}'
+          paths:
+            - /app
+  build-2.6:
+    <<: *job_defaults
+    docker:
+      - *container-2_6
+    steps:
+      - restore_cache:
+          keys:
+            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.6-{{ .Environment.CIRCLE_SHA1 }}'
+            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-repo-2.6-{{ .Environment.CIRCLE_SHA1 }}'
+      - *step_init_bundle_checksum
+      - restore_cache:
+          keys:
+            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.6-{{ checksum ".circleci/bundle_checksum" }}'
+      - *step_bundle_install
+      - *step_rubocop
+      - *step_appraisal_install
+      - *step_compute_bundle_checksum
+      - save_cache:
+          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.6-{{ .Environment.CIRCLE_SHA1 }}'
+          paths:
+            - /app
+      - save_cache:
+          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.6-{{ checksum ".circleci/bundle_checksum" }}'
+          paths:
+            - /usr/local/bundle
+  test-2.6:
+    <<: *job_defaults
+    docker:
+      - <<: *container-2_6
+        environment:
+          - TEST_DATADOG_INTEGRATION: 1
+      - *container_postgres
+      - *container_mysql
+      - *container_elasticsearch
+      - *container_redis
+      - *container_mongo
+      - *container_memcached
+      - *container_agent
+    steps:
+      - restore_cache:
+          keys:
+            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.6-{{ .Environment.CIRCLE_SHA1 }}'
+      - restore_cache:
+          keys:
+            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.6-{{ checksum ".circleci/bundle_checksum" }}'
+      - *step_run_all_tests
+
   "deploy release":
     <<: *job_defaults
     docker:
-      - *container-2_4
+      - *container-2_5
     steps:
       - checkout
       - run:
@@ -479,7 +543,7 @@ jobs:
   "deploy prerelease Gem":
     <<: *job_defaults
     docker:
-      - *container-2_4
+      - *container-2_5
     steps:
       - checkout
       - run:
@@ -490,10 +554,10 @@ jobs:
       - run:
           name: Rename to pre-release version based on branch name and build number
           command: |
-             # create safe version string
-             PRE=$(echo "${CIRCLE_BRANCH:-unknown}.${CIRCLE_BUILD_NUM:-R$RANDOM}" | sed -e 's/[^a-zA-Z0-9+]\{1,\}/./g')
-             echo PRE=$PRE
-             sed lib/ddtrace/version.rb -i -e "s/^\([\t ]*PRE\) *=*/\1 = \'${PRE}\' #/g"
+            # create safe version string
+            PRE=$(echo "${CIRCLE_BRANCH:-unknown}.${CIRCLE_BUILD_NUM:-R$RANDOM}" | sed -e 's/[^a-zA-Z0-9+]\{1,\}/./g')
+            echo PRE=$PRE
+            sed lib/ddtrace/version.rb -i -e "s/^\([\t ]*PRE\) *=*/\1 = \'${PRE}\' #/g"
       - run:
           name: Upload prereleas Gem and rebuild index
           command: S3_DIR=prerelease bundle exec rake release:gem
@@ -505,16 +569,6 @@ workflows:
   version: 2
   build-and-test:
     jobs:
-       - checkout-1.9:
-           <<: *filters_all_branches_and_tags
-       - build-1.9:
-           <<: *filters_all_branches_and_tags
-           requires:
-             - checkout-1.9
-       - test-1.9:
-           <<: *filters_all_branches_and_tags
-           requires:
-             - build-1.9
        - checkout-2.0:
            <<: *filters_all_branches_and_tags
        - build-2.0:
@@ -569,21 +623,43 @@ workflows:
            <<: *filters_all_branches_and_tags
            requires:
              - build-2.4
+       - checkout-2.5:
+           <<: *filters_all_branches_and_tags
+       - build-2.5:
+           <<: *filters_all_branches_and_tags
+           requires:
+             - checkout-2.5
+       - test-2.5:
+           <<: *filters_all_branches_and_tags
+           requires:
+             - build-2.5
+       - checkout-2.6:
+           <<: *filters_all_branches_and_tags
+       - build-2.6:
+           <<: *filters_all_branches_and_tags
+           requires:
+             - checkout-2.6
+       - test-2.6:
+           <<: *filters_all_branches_and_tags
+           requires:
+             - build-2.6
        - "deploy prerelease Gem":
            <<: *filters_all_branches_and_tags
            requires:
-             - test-1.9
              - test-2.0
              - test-2.1
              - test-2.2
              - test-2.3
              - test-2.4
+             - test-2.5
+             - test-2.6
        - "deploy release":
            <<: *filters_only_release_tags
            requires:
-             - test-1.9
              - test-2.0
              - test-2.1
              - test-2.2
              - test-2.3
              - test-2.4
+             - test-2.5
+             - test-2.6

data/.circleci/images/primary/{Dockerfile-1.9.3 → Dockerfile-2.5.6}

@@ -1,9 +1,5 @@
-# Last version: https://github.com/docker-library/ruby/blob/90c4e3be58d565007c518d311d4bd05086a1638c/1.9/Dockerfile
-FROM ruby:1.9.3
-
-# Add Jessie repos
-# Fixes https://superuser.com/questions/1423486/issue-with-fetching-http-deb-debian-org-debian-dists-jessie-updates-inrelease
-RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list
+# Current version: https://github.com/docker-library/ruby/blob/6a7df7a72b4a3d1b3e06ead303841b3fdaca560e/2.5/buster/Dockerfile
+FROM ruby:2.5.6
 
 # Make apt non-interactive
 RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \
@@ -63,8 +59,12 @@ RUN DOCKERIZE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cac
   && dockerize --version
 
 # Install RubyGems
-RUN gem update --system 2.7.9
-RUN gem install bundler -v '1.17.3'
+RUN gem update --system
+RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
+
+# Install RubyGems
+RUN gem update --system
+RUN gem install bundler
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 RUN mkdir /app

data/.circleci/images/primary/Dockerfile-2.6.4

@@ -0,0 +1,73 @@
+# Current version: https://github.com/docker-library/ruby/blob/6a7df7a72b4a3d1b3e06ead303841b3fdaca560e/2.6/buster/Dockerfile
+FROM ruby:2.6.4
+
+# Make apt non-interactive
+RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \
+  && echo 'DPkg::Options "--force-confnew";' >> /etc/apt/apt.conf.d/90circleci
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Install required packages
+RUN set -ex; \
+        apt-get update; \
+        mkdir -p /usr/share/man/man1; \
+        apt-get install -y --no-install-recommends \
+            git mercurial xvfb \
+            locales sudo openssh-client ca-certificates tar gzip parallel \
+            net-tools netcat unzip zip bzip2 gnupg curl wget \
+            tzdata rsync vim; \
+        rm -rf /var/lib/apt/lists/*;
+
+# Set timezone to UTC by default
+RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
+
+# Set language
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+
+# Install jq
+RUN JQ_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cache/linux-amd64/jq-latest" \
+  && curl --silent --show-error --location --fail --retry 3 --output /usr/bin/jq $JQ_URL \
+  && chmod +x /usr/bin/jq \
+  && jq --version
+
+# Install Docker
+RUN set -ex \
+  && export DOCKER_VERSION=$(curl --silent --fail --retry 3 https://download.docker.com/linux/static/stable/x86_64/ | grep -o -e 'docker-[.0-9]*-ce\.tgz' | sort -r | head -n 1) \
+  && DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_VERSION}" \
+  && echo Docker URL: $DOCKER_URL \
+  && curl --silent --show-error --location --fail --retry 3 --output /tmp/docker.tgz "${DOCKER_URL}" \
+  && ls -lha /tmp/docker.tgz \
+  && tar -xz -C /tmp -f /tmp/docker.tgz \
+  && mv /tmp/docker/* /usr/bin \
+  && rm -rf /tmp/docker /tmp/docker.tgz \
+  && which docker \
+  && (docker version || true)
+
+# Install Docker Compose
+RUN COMPOSE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cache/linux-amd64/docker-compose-latest" \
+  && curl --silent --show-error --location --fail --retry 3 --output /usr/bin/docker-compose $COMPOSE_URL \
+  && chmod +x /usr/bin/docker-compose \
+  && docker-compose version
+
+# Install Dockerize
+RUN DOCKERIZE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cache/linux-amd64/dockerize-latest.tar.gz" \
+  && curl --silent --show-error --location --fail --retry 3 --output /tmp/dockerize-linux-amd64.tar.gz $DOCKERIZE_URL \
+  && tar -C /usr/local/bin -xzvf /tmp/dockerize-linux-amd64.tar.gz \
+  && rm -rf /tmp/dockerize-linux-amd64.tar.gz \
+  && dockerize --version
+
+# Install RubyGems
+RUN gem update --system
+RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
+
+# Install RubyGems
+RUN gem update --system
+RUN gem install bundler
+ENV BUNDLE_SILENCE_ROOT_WARNING 1
+
+RUN mkdir /app
+WORKDIR /app
+
+CMD ["/bin/sh"]

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @DataDog/apm-ruby

data/Appraisals

@@ -1,96 +1,5 @@
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('1.9.3')
-  raise NotImplementedError, 'Ruby versions < 1.9.3 are not supported!'
-elsif Gem::Version.new('1.9.3') <= Gem::Version.new(RUBY_VERSION) \
-      && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
-  if RUBY_PLATFORM != 'java'
-    appraise 'rails30-postgres' do
-      gem 'test-unit'
-      gem 'rails', '3.0.20'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-      gem 'rake', '< 12.3'
-    end
-
-    appraise 'rails30-postgres-sidekiq' do
-      gem 'test-unit'
-      gem 'rails', '3.0.20'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'sidekiq', '4.0.0'
-      gem 'rack-cache', '1.7.1'
-      gem 'rake', '< 12.3'
-    end
-
-    appraise 'rails32-mysql2' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'mysql2', '0.3.21', platform: :ruby
-      gem 'activerecord-mysql-adapter', platform: :ruby
-      gem 'activerecord-jdbcmysql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-      gem 'rake', '< 12.3'
-    end
-
-    appraise 'rails32-postgres' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-      gem 'rake', '< 12.3'
-    end
-
-    appraise 'rails32-postgres-redis' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'redis-rails'
-      gem 'redis', '< 4.0'
-      gem 'rack-cache', '1.7.1'
-      gem 'rake', '< 12.3'
-    end
-
-    appraise 'rails32-postgres-sidekiq' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'sidekiq', '4.0.0'
-      gem 'rack-cache', '1.7.1'
-      gem 'rake', '< 12.3'
-    end
-
-    appraise 'contrib-old' do
-      gem 'active_model_serializers', '~> 0.9.0'
-      gem 'activerecord', '3.2.22.5'
-      gem 'activerecord-mysql-adapter', platform: :ruby
-      gem 'aws-sdk', '~> 2.0'
-      gem 'concurrent-ruby'
-      gem 'dalli'
-      gem 'delayed_job'
-      gem 'delayed_job_active_record'
-      gem 'elasticsearch-transport'
-      gem 'excon'
-      gem 'hiredis'
-      gem 'mongo', '< 2.5'
-      gem 'mysql2', '0.3.21', platform: :ruby
-      gem 'rack', '1.4.7'
-      gem 'rack-cache', '1.7.1'
-      gem 'rack-test', '0.7.0'
-      gem 'rake', '< 12.3'
-      gem 'redis', '< 4.0'
-      gem 'rest-client', '< 2.0'
-      gem 'resque', '< 2.0'
-      gem 'sequel', '~> 4.0', '< 4.37'
-      gem 'sidekiq', '~> 3.5.4'
-      gem 'sinatra', '1.4.5'
-      gem 'sqlite3', '~> 1.3.6'
-      gem 'sucker_punch'
-      gem 'timers', '< 4.2'
-    end
-  end
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
+  raise NotImplementedError, 'Ruby versions < 2.0.0 are not supported!'
 elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
       && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.1.0')
   if RUBY_PLATFORM != 'java'
@@ -157,6 +66,7 @@ elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'delayed_job'
       gem 'delayed_job_active_record'
       gem 'elasticsearch-transport'
+      gem 'ethon'
       gem 'excon'
       gem 'hiredis'
       gem 'mongo', '< 2.5'
@@ -174,6 +84,7 @@ elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'sqlite3', '~> 1.3.6'
       gem 'sucker_punch'
       gem 'timers', '< 4.2'
+      gem 'typhoeus'
     end
   end
 elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
@@ -262,6 +173,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'delayed_job'
       gem 'delayed_job_active_record'
       gem 'elasticsearch-transport'
+      gem 'ethon'
       gem 'excon'
       gem 'hiredis'
       gem 'mongo', '< 2.5'
@@ -280,6 +192,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'sqlite3', '~> 1.3.6'
       gem 'sucker_punch'
       gem 'timers', '< 4.2'
+      gem 'typhoeus'
     end
   end
 elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
@@ -377,6 +290,12 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
     end
 
     appraise 'rails5-postgres-redis' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'redis'
+    end
+
+    appraise 'rails5-postgres-redis-activesupport' do
       gem 'rails', '~> 5.2.1'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis-rails'
@@ -391,6 +310,8 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
     end
 
     appraise 'contrib' do
+      gem 'actionpack'
+      gem 'actionview'
       gem 'active_model_serializers', '>= 0.10.0'
       gem 'activerecord', '< 5.1.5'
       gem 'aws-sdk'
@@ -399,6 +320,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'delayed_job'
       gem 'delayed_job_active_record'
       gem 'elasticsearch-transport'
+      gem 'ethon'
       gem 'excon'
       gem 'grape'
       gem 'graphql', '< 1.9.4'
@@ -419,6 +341,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'sinatra'
       gem 'sqlite3', '~> 1.3.6'
       gem 'sucker_punch'
+      gem 'typhoeus'
     end
   end
 elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
@@ -516,6 +439,12 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
     end
 
     appraise 'rails5-postgres-redis' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'redis'
+    end
+
+    appraise 'rails5-postgres-redis-activesupport' do
       gem 'rails', '~> 5.2.1'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis-rails'
@@ -530,6 +459,8 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
     end
 
     appraise 'contrib' do
+      gem 'actionpack'
+      gem 'actionview'
       gem 'active_model_serializers', '>= 0.10.0'
       gem 'activerecord', '< 5.1.5'
       gem 'aws-sdk'
@@ -538,6 +469,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'delayed_job'
       gem 'delayed_job_active_record'
       gem 'elasticsearch-transport'
+      gem 'ethon'
       gem 'excon'
       gem 'grape'
       gem 'graphql'
@@ -558,11 +490,115 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'sinatra'
       gem 'sqlite3', '~> 1.3.6'
       gem 'sucker_punch'
+      gem 'typhoeus'
     end
   end
-elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION)
+elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
+      && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.5.0')
   if RUBY_PLATFORM != 'java'
+    appraise 'rails5-mysql2' do
+      gem 'rails', '~> 5.2.1'
+      gem 'mysql2', '< 0.5', platform: :ruby
+    end
+
+    appraise 'rails5-postgres' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+    end
+
+    appraise 'rails5-postgres-redis' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'redis-rails'
+      gem 'redis'
+    end
+
+    appraise 'rails5-postgres-redis-activesupport' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'redis-rails'
+      gem 'redis'
+    end
+
+    appraise 'rails5-postgres-sidekiq' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'sidekiq'
+      gem 'activejob'
+    end
+
+    appraise 'contrib' do
+      gem 'actionpack'
+      gem 'actionview'
+      gem 'active_model_serializers', '>= 0.10.0'
+      gem 'activerecord', '< 5.1.5'
+      gem 'aws-sdk'
+      gem 'concurrent-ruby'
+      gem 'dalli'
+      gem 'delayed_job'
+      gem 'delayed_job_active_record'
+      gem 'elasticsearch-transport'
+      gem 'ethon'
+      gem 'excon'
+      gem 'grape'
+      gem 'graphql'
+      gem 'grpc'
+      gem 'hiredis'
+      gem 'mongo', '>= 2.8.0'
+      gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'racecar', '>= 0.3.5'
+      gem 'rack'
+      gem 'rack-test'
+      gem 'rake', '>= 12.3'
+      gem 'redis', '< 4.0'
+      gem 'rest-client'
+      gem 'resque', '< 2.0'
+      gem 'sequel'
+      gem 'shoryuken'
+      gem 'sidekiq'
+      gem 'sinatra'
+      gem 'sqlite3', '~> 1.3.6'
+      gem 'sucker_punch'
+      gem 'typhoeus'
+    end
+  end
+elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
+      && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.6.0')
+  if RUBY_PLATFORM != 'java'
+    appraise 'rails5-mysql2' do
+      gem 'rails', '~> 5.2.1'
+      gem 'mysql2', '< 0.5', platform: :ruby
+    end
+
+    appraise 'rails5-postgres' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+    end
+
+    appraise 'rails5-postgres-redis' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'redis-rails'
+      gem 'redis'
+    end
+
+    appraise 'rails5-postgres-redis-activesupport' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'redis-rails'
+      gem 'redis'
+    end
+
+    appraise 'rails5-postgres-sidekiq' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'sidekiq'
+      gem 'activejob'
+    end
+
     appraise 'contrib' do
+      gem 'actionpack'
+      gem 'actionview'
       gem 'active_model_serializers', '>= 0.10.0'
       gem 'activerecord', '< 5.1.5'
       gem 'aws-sdk'
@@ -571,6 +607,7 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION)
       gem 'delayed_job'
       gem 'delayed_job_active_record'
       gem 'elasticsearch-transport'
+      gem 'ethon'
       gem 'excon'
       gem 'grape'
       gem 'graphql'
@@ -591,6 +628,76 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION)
       gem 'sinatra'
       gem 'sqlite3', '~> 1.3.6'
       gem 'sucker_punch'
+      gem 'typhoeus'
+    end
+  end
+elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION)
+  if RUBY_PLATFORM != 'java'
+    appraise 'rails5-mysql2' do
+      gem 'rails', '~> 5.2.1'
+      gem 'mysql2', '< 0.5', platform: :ruby
+    end
+
+    appraise 'rails5-postgres' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+    end
+
+    appraise 'rails5-postgres-redis' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'redis-rails'
+      gem 'redis'
+    end
+
+    appraise 'rails5-postgres-redis-activesupport' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'redis-rails'
+      gem 'redis'
+    end
+
+    appraise 'rails5-postgres-sidekiq' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'sidekiq'
+      gem 'activejob'
+    end
+
+    appraise 'contrib' do
+      gem 'actionpack'
+      gem 'actionview'
+      gem 'active_model_serializers', '>= 0.10.0'
+      gem 'activerecord', '< 5.1.5'
+      gem 'aws-sdk'
+      gem 'concurrent-ruby'
+      gem 'dalli'
+      gem 'delayed_job'
+      gem 'delayed_job_active_record'
+      gem 'elasticsearch-transport'
+      gem 'ethon'
+      gem 'excon'
+      gem 'grape'
+      gem 'graphql'
+      gem 'grpc'
+      gem 'hiredis'
+      gem 'mongo', '>= 2.8.0'
+      gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'racecar', '>= 0.3.5'
+      gem 'rack'
+      gem 'rack-test'
+      gem 'rake', '>= 12.3'
+      gem 'redis', '< 4.0'
+      gem 'rest-client'
+      gem 'resque', '< 2.0'
+      gem 'sequel'
+      gem 'shoryuken'
+      gem 'sidekiq'
+      gem 'sinatra'
+      gem 'sqlite3', '~> 1.3.6'
+      gem 'sucker_punch'
+      gem 'typhoeus'
     end
   end
 end
+