chore: update infrastructure

Author: Pavel Galkin

.drone.yml

@@ -0,0 +1,21 @@
+build:
+  test:
+    image: abakpress/dind-testing
+    pull: true
+    privileged: true
+    volumes:
+      - /home/data/drone/images:/images
+      - /home/data/drone/gems:/bundle
+    environment:
+      - COMPOSE_FILE_EXT=drone
+      - POSTGRES_IMAGE_TAG=9.6-latest
+      - RUBY_IMAGE_TAG=2.2-latest
+    commands:
+      - wrapdocker docker -v
+
+      - fetch-images
+        --image abakpress/ruby-app:$RUBY_IMAGE_TAG
+        --image abakpress/postgres-db:$POSTGRES_IMAGE_TAG
+
+      - dip provision
+      - dip rspec

.gitignore

@@ -7,6 +7,8 @@
 /pkg/
 /spec/reports/
 /tmp/
+/spec/internal/log
+/gemfiles
 *.bundle
 *.so
 *.o

Appraisals

@@ -1,11 +1,6 @@
-appraise 'rails3.1' do
-  gem 'activesupport', '~> 3.1.0'
-  gem 'activerecord', '~> 3.1.0'
-end
-
 appraise 'rails3.2' do
-  gem 'activesupport', '~> 3.2.0'
-  gem 'activerecord', '~> 3.2.0'
+  gem 'activesupport', '~> 3.2.14'
+  gem 'activerecord', '~> 3.2.14'
 end
 
 appraise 'rails4.0' do

Gemfile

@@ -1,13 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in redis_counters-dumpers.gemspec
-
-group :development, :test do
-  gem 'combustion', github: 'pat/combustion', ref: '7d0d24c3f36ce0eb336177fc493be0721bc26665'
-  gem 'activerecord-postgres-hstore', require: false
-  gem 'simple_hstore_accessor', '~> 0.2', require: false
-end
-
-gem 'rack', '< 2' if RUBY_VERSION < '2.2.0'
-
 gemspec

Makefile

@@ -1,5 +1,7 @@
 # RedisCounters::Dumpers
 
+[![Build Status](https://drone.railsc.ru/api/badges/abak-press/redis_counters-dumpers/status.svg)](https://drone.railsc.ru/abak-press/redis_counters-dumpers)
+
 Dump statistics from Redis to DB
 
 ## Installation

README.md

@@ -0,0 +1,46 @@
+version: '1'
+
+environment:
+  DOCKER_RUBY_VERSION: 2.2
+  RUBY_IMAGE_TAG: 2.2-latest
+  POSTGRES_IMAGE_TAG: 9.6-latest
+  COMPOSE_FILE_EXT: development
+
+compose:
+  files:
+    - docker-compose.yml
+    - docker-compose.${COMPOSE_FILE_EXT}.yml
+
+interaction:
+  sh:
+    service: app
+
+  irb:
+    service: app
+    command: irb
+
+  bundle:
+    service: app
+    command: bundle
+
+  rake:
+    service: app
+    command: bundle exec rake
+
+  appraisal:
+    service: app
+    command: bundle exec appraisal
+
+  rspec:
+    service: app
+    command: bundle exec appraisal bundle exec rspec
+
+  clean:
+    service: app
+    command: rm -f Gemfile.lock gemfiles/*.gemfile.*
+
+provision:
+  - docker volume create --name bundler_data
+  - dip bundle config --local https://gems.railsc.ru/ ${APRESS_GEMS_CREDENTIALS}
+  - dip bundle install --full-index
+  - dip appraisal install

Rakefile

@@ -0,0 +1,13 @@
+version: '2'
+
+services:
+  app:
+    volumes:
+      - .:/app
+      - ../:/localgems
+      - bundler-data:/bundle
+
+volumes:
+  bundler-data:
+    external:
+      name: bundler_data

dip.yml

@@ -0,0 +1,7 @@
+version: '2'
+
+services:
+  app:
+    volumes:
+      - .:/app
+      - /bundle:/bundle

docker-compose.development.yml

@@ -0,0 +1,19 @@
+version: '2'
+
+services:
+  app:
+    image: abakpress/ruby-app:$RUBY_IMAGE_TAG
+    environment:
+      - BUNDLE_PATH=/bundle/$DOCKER_RUBY_VERSION
+      - BUNDLE_CONFIG=/app/.bundle/config
+      - TEST_DB_HOST=db
+      - TEST_DB_NAME=docker
+      - TEST_DB_USERNAME=postgres
+    command: bash
+    depends_on:
+      - db
+
+  db:
+    image: abakpress/postgres-db:$POSTGRES_IMAGE_TAG
+    environment:
+      - POSTGRES_DB=docker

docker-compose.drone.yml

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'forwardable'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/object/blank'

docker-compose.yml

@@ -1,4 +1,3 @@
-# coding: utf-8
 module RedisCounters
   module Dumpers
     module Dsl

gemfiles/.gitignore

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'active_support/concern'
 require_relative 'base'
 

gemfiles/rails3.1.gemfile

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'active_support/concern'
 require_relative 'base'
 

gemfiles/rails3.2.gemfile

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'active_support/concern'
 require 'redis_counters/dumpers/engine'
 

gemfiles/rails4.0.gemfile

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'forwardable'
 require 'callbacks_rb'
 require 'active_support/core_ext/hash/indifferent_access'

gemfiles/rails4.1.gemfile

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'active_support/core_ext/hash/indifferent_access'
 require_relative 'dsl/list'
 

lib/redis_counters/dumpers/destination.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'redis_counters/dumpers/version'
@@ -17,20 +16,23 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport', '>= 3.0'
-  spec.add_dependency 'activerecord', '>= 3.0'
-  spec.add_dependency 'pg'
-  spec.add_dependency 'redis', '>= 3.0'
-  spec.add_dependency 'redis-namespace', '>= 1.3'
-  spec.add_dependency 'callbacks_rb', '>= 0.0.1'
-  spec.add_dependency 'redis_counters', '>= 1.3'
+  spec.add_runtime_dependency 'activesupport', '>= 3.0'
+  spec.add_runtime_dependency 'activerecord', '>= 3.0'
+  spec.add_runtime_dependency 'pg'
+  spec.add_runtime_dependency 'redis', '>= 3.0'
+  spec.add_runtime_dependency 'redis-namespace', '>= 1.3'
+  spec.add_runtime_dependency 'callbacks_rb', '>= 0.0.1'
+  spec.add_runtime_dependency 'redis_counters', '>= 1.3'
+  spec.add_runtime_dependency 'activerecord-postgres-hstore'
+  spec.add_runtime_dependency 'simple_hstore_accessor', '~> 0.2'
 
   spec.add_development_dependency 'bundler', '>= 1.7'
   spec.add_development_dependency 'rake', '>= 10.0'
   spec.add_development_dependency 'rspec', '>= 3.2'
   spec.add_development_dependency 'rspec-rails', '>= 3.2'
-  spec.add_development_dependency 'rspec-given', '>= 3.5'
   spec.add_development_dependency 'appraisal', '>= 1.0.2'
   spec.add_development_dependency 'mock_redis'
-  spec.add_development_dependency 'apress-changelogger'
+  spec.add_development_dependency 'combustion'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'test-unit'
 end

lib/redis_counters/dumpers/dsl/base.rb

@@ -0,0 +1,5 @@
+test:
+  adapter: postgresql
+  host: <%= ENV.fetch('TEST_DB_HOST', 'localhost') %>
+  database: <%= ENV.fetch('TEST_DB_NAME', 'docker') %>
+  username: <%= ENV.fetch('TEST_DB_USERNAME', 'docker') %>