Merge pull request #22 from PipelineDeals/v.2.3.1

v2.3.1

Author: aossowski

.circleci/config.yml

@@ -0,0 +1,55 @@
+defaults: &defaults
+  working_directory: ~/mantle
+  parallelism: 1
+  docker:
+    - image: cimg/ruby:3.1.3
+      environment:
+        RAILS_ENV: test
+    - image: redis
+
+version: 2
+jobs:
+  build:
+    <<: *defaults
+    steps:
+      - restore_cache:
+          key: v1-mantle-repo-{{ .Environment.CIRCLE_SHA1 }}
+
+      - checkout
+
+      - save_cache:
+          key: v1-mantle-repo-{{ .Environment.CIRCLE_SHA1 }}
+          paths:
+            - ~/mantle
+
+      - restore_cache:
+          key: v1-mantle-bundle-{{ checksum "Gemfile.lock" }}
+
+      - run:
+          name: install bundler
+          command: |
+            gem install bundler:2.4.5
+      - run:
+          name: bundle install
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+      - save_cache:
+          paths:
+            - ~/mantle/vendor/bundle
+          key: v1-mantle-bundle-{{ checksum "Gemfile.lock" }}
+
+      - run:
+          name: Rspec
+          command: |
+            mkdir /tmp/test-results
+            TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)"
+            bundle exec rspec --format progress \
+                              --format RspecJunitFormatter \
+                              --out test_results/rspec.xml \
+                              -- $TEST_FILES
+      - store_test_results:
+          path: test_results
+
+      - store_artifacts:
+          path: test-results/rspec.xml
+          destination: test-results

CHANGELOG.md

@@ -1,3 +1,8 @@
+2.3.1
+-----------
+
+- Allow `sidekiq` version `6.x`
+
 2.3.0
 -----------
 

Gemfile.lock

@@ -1,43 +1,42 @@
 PATH
   remote: .
   specs:
-    mantle (2.3.0)
+    mantle (2.3.1)
       redis
-      sidekiq (~> 5.0)
+      sidekiq (< 7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.0)
-    connection_pool (2.2.2)
-    diff-lcs (1.2.5)
+    connection_pool (2.2.5)
+    diff-lcs (1.5.0)
     method_source (0.8.2)
     pry (0.10.0)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (2.0.9)
-    rack-protection (2.0.8.1)
-      rack
-    redis (4.1.3)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.2)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
+    rack (2.2.6.2)
+    redis (4.7.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
-    sidekiq (5.2.8)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack (< 2.1.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rspec_junit_formatter (0.5.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    sidekiq (6.5.1)
+      connection_pool (>= 2.2.2)
+      rack (~> 2.0)
+      redis (>= 4.2.0)
     slop (3.5.0)
 
 PLATFORMS
@@ -47,6 +46,7 @@ DEPENDENCIES
   mantle!
   pry
   rspec
+  rspec_junit_formatter
 
 BUNDLED WITH
-   2.1.4
+   2.4.5

circle.yml

@@ -1,3 +1,3 @@
 module Mantle
-  VERSION = '2.3.0'
+  VERSION = '2.3.1'
 end

lib/mantle/version.rb

@@ -18,8 +18,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency('redis')
-  gem.add_dependency('sidekiq', '~> 5.0')
+  gem.add_dependency('sidekiq', '< 7.0')
 
   gem.add_development_dependency('rspec')
   gem.add_development_dependency('pry')
+  gem.add_development_dependency("rspec_junit_formatter")
 end