redis_counters-dumpers 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e14453e48ca15c05c626c6a9c2b267a50ef1e9da
-  data.tar.gz: '0779a0ddb4eec188a21cf7fe163e565339898583'
+  metadata.gz: b0cf08857a7fe296b1ccb59f5472630235414c22
+  data.tar.gz: 2739dfa6ab87472f73c49e745c5a17934669e81d
 SHA512:
-  metadata.gz: e7651d848f01b98b1f5e2c3086f2b46a17b54497fd7692c8f7108bf072fa79f696e498b00ae23c901376430a7d4995157426d2c931af6d922d9388949cc36783
-  data.tar.gz: e972fb15ec3058bb99d53fb6341ae85f5b25f2a301a11257cbf51cfe4ca393fc1030564bf469cf7e05fd6c4680d5ed12049c1f654a146fe10c184d5f3d365f91
+  metadata.gz: e4a6bf161dd2330d8e6a2324ea6ae3ae7d8e4e6dd67bdcc9e27f42798749e3e403ade710f90ab991f6bb1aaf36b68623cd127508aeff8b0e77db3bf975f92015
+  data.tar.gz: 66f74d188bb8ed737efcdc9f07ad5e3a8f416f7463b2ef02a9d7dca9f0898617930f09360d377c44a2e8d724b2e9cb44e31d12694b72aa2aff494945fedbc512

data/.drone.yml

@@ -1,32 +1,86 @@
-build:
-  test:
-    image: abakpress/dind-testing
-    pull: true
-    privileged: true
-    volumes:
-      - /home/data/drone/images:/images
-      - /home/data/drone/gems:/bundle
+name: build
+
+kind: pipeline
+type: docker
+
+volumes:
+  - name: rubygems
+    host:
+      path: /home/data/drone/rubygems
+  - name: images
+    host:
+      path: /home/data/drone/images
+  - name: bundle
+    host:
+      path: /home/data/drone/gems
+  - name: keys
+    host:
+      path: /home/data/drone/key_cache
+
+spec_step_common: &spec_step_common
+  image: abakpress/dind-testing:1.0.3
+  pull: if-not-exists
+  privileged: true
+  volumes:
+    - name: images
+      path: /images
+    - name: bundle
+      path: /bundle
+    - name: keys
+      path: /ssh_keys
+  commands:
+    - prepare-build
+
+    - fetch-images
+      --image whilp/ssh-agent
+      --image abakpress/ruby-app:$RUBY_IMAGE_TAG
+      --image abakpress/postgres-db:$POSTGRES_IMAGE_TAG
+      --image redis:$REDIS_IMAGE_TAG
+
+    - dip ssh add -T -v /ssh_keys -k /ssh_keys/id_rsa
+    - dip provision
+    - dip rspec
+
+steps:
+  - name: Tests Ruby 2.2
     environment:
-      - COMPOSE_FILE_EXT=drone
-      - POSTGRES_IMAGE_TAG=9.6-latest
-      - RUBY_IMAGE_TAG=2.2-latest
-    commands:
-      - wrapdocker docker -v
+      COMPOSE_FILE_EXT: drone
+      DOCKER_RUBY_VERSION: 2.2
+      RUBY_IMAGE_TAG: 2.2-latest
+      POSTGRES_IMAGE_TAG: 9.6-latest
+      REDIS_IMAGE_TAG: 4-alpine
+      RAILS_ENV: test
+    <<: *spec_step_common
 
-      - fetch-images
-        --image abakpress/ruby-app:$RUBY_IMAGE_TAG
-        --image abakpress/postgres-db:$POSTGRES_IMAGE_TAG
+  - name: Tests Ruby 2.3
+    environment:
+      COMPOSE_FILE_EXT: drone
+      DOCKER_RUBY_VERSION: 2.3
+      RUBY_IMAGE_TAG: 2.3-latest
+      POSTGRES_IMAGE_TAG: 9.6-latest
+      REDIS_IMAGE_TAG: 4-alpine
+      RAILS_ENV: test
+    <<: *spec_step_common
 
-      - dip provision
-      - dip rspec
+  - name: Tests Ruby 2.4
+    environment:
+      COMPOSE_FILE_EXT: drone
+      DOCKER_RUBY_VERSION: 2.4
+      RUBY_IMAGE_TAG: 2.4-latest
+      POSTGRES_IMAGE_TAG: 9.6-latest
+      REDIS_IMAGE_TAG: 4-alpine
+      RAILS_ENV: test
+    <<: *spec_step_common
 
-  release:
-    image: abakpress/gem-publication
-    pull: true
+  - name: release
+    image: abakpress/gem-publication:latest
+    pull: if-not-exists
     when:
       event: push
       branch: master
+      status: success
     volumes:
-      - /home/data/drone/rubygems:/root/.gem
+      - name: rubygems
+        path: /root/.gem
     commands:
       - release-gem --public

data/.gitignore

@@ -14,3 +14,4 @@
 *.o
 *.a
 mkmf.log
+/.idea/

data/Appraisals

@@ -1,14 +1,11 @@
-appraise 'rails3.2' do
-  gem 'activesupport', '~> 3.2.14'
-  gem 'activerecord', '~> 3.2.14'
+if RUBY_VERSION < '2.4'
+  appraise 'rails4.0' do
+    gem 'activesupport', '~> 4.0.0'
+    gem 'activerecord', '~> 4.0.0'
+  end
 end
 
-appraise 'rails4.0' do
-  gem 'activesupport', '~> 4.0.0'
-  gem 'activerecord', '~> 4.0.0'
-end
-
-appraise 'rails4.1' do
-  gem 'activesupport', '~> 4.1.0'
-  gem 'activerecord', '~> 4.1.0'
+appraise 'rails4.2' do
+  gem 'activesupport', '~> 4.2.0'
+  gem 'activerecord', '~> 4.2.0'
 end

data/CHANGELOG.md

@@ -1,6 +1,11 @@
+# v1.2.3
+
+* 2021-08-06 [fb93322](../../commit/fb93322) - __(TamarinEA)__ chore: add rubygems volume 
+* 2021-08-05 [ea4350e](../../commit/ea4350e) - __(TamarinEA)__ Release 1.2.3 
+* 2021-08-05 [06cc372](../../commit/06cc372) - __(TamarinEA)__ chore: add ruby 2.4 support 
+
 # v1.2.2
 
-* 2019-02-26 [a57f56a](../../commit/a57f56a) - __(Oleg Perminov)__ Release v1.2.2 
 * 2018-12-21 [6dd9509](../../commit/6dd9509) - __(Oleg Perminov)__ fix: add type text to updating expression 
 https://jira.railsc.ru/browse/CRM-4532
 

data/dip.yml

@@ -1,9 +1,10 @@
 version: '1'
 
 environment:
-  DOCKER_RUBY_VERSION: 2.2
-  RUBY_IMAGE_TAG: 2.2-latest
+  DOCKER_RUBY_VERSION: 2.4
+  RUBY_IMAGE_TAG: 2.4-latest
   POSTGRES_IMAGE_TAG: 9.6-latest
+  REDIS_IMAGE_TAG: 4-alpine
   COMPOSE_FILE_EXT: development
 
 compose:

data/docker-compose.yml

@@ -9,11 +9,17 @@ services:
       - TEST_DB_HOST=db
       - TEST_DB_NAME=docker
       - TEST_DB_USERNAME=postgres
+      - TEST_REDIS_HOST=redis
     command: bash
     depends_on:
       - db
+      - redis
 
   db:
     image: abakpress/postgres-db:$POSTGRES_IMAGE_TAG
     environment:
       - POSTGRES_DB=docker
+
+  redis:
+    image: redis:$REDIS_IMAGE_TAG
+    command: 'redis-server --bind 0.0.0.0'

data/lib/redis_counters/dumpers/version.rb

@@ -1,5 +1,5 @@
 module RedisCounters
   module Dumpers
-    VERSION = '1.2.2'.freeze
+    VERSION = '1.2.3'.freeze
   end
 end

data/redis_counters-dumpers.gemspec

@@ -26,10 +26,9 @@ Gem::Specification.new do |spec|
   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-rails', '~> 3.9.1'
   spec.add_development_dependency 'appraisal', '>= 1.0.2'
   spec.add_development_dependency 'mock_redis'
   spec.add_development_dependency 'combustion'
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'test-unit'
 end

data/spec/lib/redis_counters/dumpers/engine_spec.rb

@@ -60,7 +60,7 @@ describe RedisCounters::Dumpers::Engine do
   end
 
   before do
-    allow(dumper).to receive(:redis_session).and_return(MockRedis.new)
+    allow(dumper).to receive(:redis_session).and_return(Redis.new(host: ENV['TEST_REDIS_HOST']))
   end
 
   describe '#process!' do

data/spec/spec_helper.rb

@@ -1,19 +1,13 @@
 require 'redis_counters/dumpers'
 
-if ::ActiveRecord::VERSION::MAJOR < 4
-  require 'activerecord-postgres-hstore'
-  require 'simple_hstore_accessor'
-end
-
 require 'combustion'
 Combustion.initialize! :active_record
 
 require 'rspec/rails'
 require 'pry-byebug'
 
-require 'mock_redis'
 require 'redis'
-Redis.current = MockRedis.new
+Redis.current = Redis.new(host: ENV['TEST_REDIS_HOST'])
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_counters-dumpers
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Merkushin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -146,16 +146,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.9.1
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -212,20 +212,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - bibendi@bk.ru