gb_dispatch 0.0.5 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e680d48b7567d1f4aff1ac5fd621da86bd4f333b
-  data.tar.gz: 557546149b930191018e5ccdb9c1096962690a26
+SHA256:
+  metadata.gz: ff34ac0be45aa71f7e09c89d335546f4aab2619f7ee733259545c86a5d24e995
+  data.tar.gz: 2091aeafb3409669fdafb83758304595fb280e924d93fc93c87941619410fd8c
 SHA512:
-  metadata.gz: 99b9194f55c7b6ce44bed5b1989fa4bb327780d83fdd5641fbba6a240be9dee3a5e075708b580dd67512ee85c10e7ce7575f0164094e7403e9c1e184284cac17
-  data.tar.gz: 97549f375b24e1b98d36de93903a8b128d850dce68ffd1c0c7751863130e900074491d7685684911c33071b9b325c855974ce636be5aac5fcccea6e1fde3c5c0
+  metadata.gz: f18f2688b5818c364a2930017583933e91ef4cd39013b3273e0a25bf27580c72cce19d712ff2ded7d86790a03c1f4e8070f2b7d462b2027d8f9fda2319f4de79
+  data.tar.gz: 8be0d22b75b006dac434bc330224bc507e07a8ea4d8f1a8ade1e8b60bd8b283700b18728a10ed082e393d888f06abddd391bcae34c1bd46b630153342dac5f15

data/.github/workflows/pull_request.yml

@@ -0,0 +1,49 @@
+name: Pull Request check
+on:
+  - pull_request
+  - workflow_dispatch
+env:
+  RACK_ENV: test
+  ImageOS: ubuntu20
+jobs:
+  test:
+    name: Run test
+    runs-on: ubuntu-latest
+    env:
+      SIMPLECOV: json
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.5', '2.6', '2.7', '3.0' ]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Cache gems
+        uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-${{ matrix.ruby }}
+      - name: Install gems
+        run: |
+          gem install bundler
+          bundle install --with development test --deployment --jobs 16
+      - name: Runs tests
+        run: |
+          bundle exec rspec -f j -o rspec_results.json -f p
+      - name: RSpec Report
+        if: always()
+        uses: SonicGarden/rspec-report-action@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          json-path: rspec_results.json
+      - name: Simplecov Report
+        uses: aki77/simplecov-report-action@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          failedThreshold: 80

data/.idea/misc.xml

@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="RVM: ruby-1.9.3-p551 [global]" project-jdk-type="RUBY_SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="ruby-2.3.3-p222" project-jdk-type="RUBY_SDK" />
 </project>

data/.idea/modules.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/gb-dispatch.iml" filepath="$PROJECT_DIR$/.idea/gb-dispatch.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/gb-dispatch.iml" filepath="$PROJECT_DIR$/.idea/gb-dispatch.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/gb_dispatch.iml" filepath="$PROJECT_DIR$/.idea/gb_dispatch.iml" />
     </modules>

data/CHANGELOG.txt

@@ -1,3 +1,14 @@
+v0.1.2
+    - Update gemspec and build with bundler 2.x
+v0.1.1
+    - Fix bug with logger.
+v0.1.0
+    - Added support for rails 5 - fixed deadlock issues.
+    - Added force_new_connection method to ActiveRecord connection pool for rails >= 5
+v0.0.6
+    - Fixed bug with logger
+v0.0.5
+    - Dropped celluloid - use concurrent-ruby as a backend
 v0.0.4
     - Compatible with celluloid version 17.3
 v0.0.3

data/Dockerfile

@@ -0,0 +1,12 @@
+FROM ruby:2.5.1-alpine
+
+RUN apk add --no-cache --update build-base \
+                                linux-headers \
+                                git
+
+ENV APP_PATH /opt/project
+
+# Different layer for gems installation
+WORKDIR $APP_PATH
+COPY . $APP_PATH
+RUN bundle install --jobs `expr $(cat /proc/cpuinfo | grep -c "cpu cores") - 1` --retry 3

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+  source 'https://rubygems.org'
 
 # Specify your gem's dependencies in gb_dispatch.gemspec
 gemspec

data/Gemfile.lock

@@ -1,45 +1,48 @@
 PATH
   remote: .
   specs:
-    gb_dispatch (0.0.5)
+    gb_dispatch (0.1.2)
       concurrent-ruby (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.0.0)
-    concurrent-ruby-ext (1.0.0)
-      concurrent-ruby (~> 1.0.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    json (1.8.3)
-    rake (10.5.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    concurrent-ruby (1.1.9)
+    concurrent-ruby-ext (1.1.9)
+      concurrent-ruby (= 1.1.9)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    rake (13.0.6)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    simplecov (0.11.1)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.6)
+  bundler (~> 2.2)
   concurrent-ruby-ext
   gb_dispatch!
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec
   simplecov
+
+BUNDLED WITH
+   2.2.30

data/gb_dispatch.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email = ['kacper@geniebelt.com']
   spec.summary = %q{GCD emulation for ruby}
   spec.description = %q{Grand central dispatch (GCD) emulation for ruby. It allows to easily run asynchronous code. }
-  spec.homepage = 'https://github.com/GenieBelt/gb-dispatch'
+  spec.homepage = 'https://github.com/letsbuilders/gb-dispatch'
   spec.license = 'MIT'
 
   spec.files = `git ls-files -z`.split("\x0")
@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'concurrent-ruby', '~> 1.0'
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.4'
+  spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
+  spec.add_development_dependency 'bundler', '~> 2.2'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.10'
   spec.add_development_dependency 'simplecov'
 end

data/lib/gb_dispatch/active_record_patch.rb

@@ -0,0 +1,17 @@
+if defined?(ActiveRecord)
+  module ActiveRecord
+    module ConnectionAdapters
+      class ConnectionPool
+        def force_new_connection
+          old_lock = @lock_thread
+          @lock_thread = nil
+          with_connection do |conn|
+            yield conn
+          end
+        ensure
+          @lock_thread = old_lock
+        end
+      end
+    end
+  end
+end

data/lib/gb_dispatch/queue.rb

@@ -21,13 +21,22 @@ module GBDispatch
     def perform_now(block=nil)
       Thread.current[:name] ||= name
       if defined?(Rails) && defined?(ActiveRecord::Base)
+        require 'gb_dispatch/active_record_patch'
         thread_block = ->() do
-          begin
-            ActiveRecord::Base.connection_pool.with_connection do
-              block ? block.call : yield
+          if Rails::VERSION::MAJOR < 5
+            begin
+              ActiveRecord::Base.connection_pool.force_new_connection do
+                block ? block.call : yield
+              end
+            ensure
+              ActiveRecord::Base.clear_active_connections!
+            end
+          else
+            Rails.application.executor.wrap do
+              ActiveRecord::Base.connection_pool.force_new_connection do
+                block ? block.call : yield
+              end
             end
-          ensure
-            ActiveRecord::Base.clear_active_connections!
           end
         end
       else

data/lib/gb_dispatch/runner.rb

@@ -29,20 +29,22 @@ module GBDispatch
       # @param options [Hash]
       # @option options [String] :name queue name used for debugging and better logging.
       def execute(block, options=Hash.new)
-        future = Concurrent::Future.new(:executor => self.pool) do
-          begin
-            name = options[:name]
-            Thread.current[:name] ||= name if name
-            result = block.call
-            result
-          rescue Exception => e
-            if defined?(Opbeat)
-              Opbeat.set_context extra: {queue: name} if name
-              Opbeat.capture_exception(e)
-            end
-            GBDispatch.logger.error "Failed execution of queue #{name} with error #{e.message}" if GBDispatch.logger
-            raise e
+        if defined?(Rails) && defined?(Rails::VERSION::MAJOR)
+          if Rails::VERSION::MAJOR < 5
+            _execute(block, options)
+          else
+            _execute_rails(block, options)
           end
+        else
+          _execute(block, options)
+        end
+      end
+
+      private
+
+      def _execute(block, options)
+        future = Concurrent::Future.new(:executor => self.pool) do
+          _run_block(block, options)
         end
         future.execute
         future.value
@@ -51,6 +53,43 @@ module GBDispatch
         end
         future.value
       end
+
+      def _execute_rails(block, options)
+        if defined?(Rails) && defined?(ActiveSupport::Dependencies)
+          future = Concurrent::Future.new(:executor => self.pool) do
+            Rails.application.executor.wrap do
+              ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
+                _run_block(block, options)
+              end
+            end
+          end
+          future.execute
+          ActiveSupport::Dependencies.interlock.permit_concurrent_loads { future.value }
+          if future.rejected?
+            raise future.reason
+          end
+          future.value
+        else
+          raise 'Failed loading rails!'
+        end
+      end
+
+      def _run_block(block, options)
+        begin
+          name = options[:name]
+          Thread.current[:name] ||= name if name
+          result = block.call
+          result
+        rescue Exception => e
+          if defined?(Raven)
+            Raven.tags_context :gb_dispacth => true
+            Raven.extra_context :dispatch_queue => name
+            Raven.capture_exception(e)
+          end
+          GBDispatch.logger.error "Failed execution of queue #{name} with error #{e.message}"
+          raise e
+        end
+      end
     end
   end
 end

data/lib/gb_dispatch/version.rb

@@ -1,3 +1,3 @@
 module GBDispatch
-  VERSION = '0.0.5'
+  VERSION = '0.1.2'
 end

data/lib/gb_dispatch.rb

@@ -56,7 +56,11 @@ module GBDispatch
   # Setup logger. By default it use Celluloid logger
   # @param logger [Logger]
   def self.logger=(logger)
-    Celluloid.logger = logger
+    @logger = logger
+  end
+
+  def self.logger
+    @logger ||= Logger.new(STDOUT)
   end
 
   class << self

data/spec/dispatch_spec.rb

@@ -65,6 +65,7 @@ describe GBDispatch do
     GBDispatch.dispatch_after 0.1, :test do
       a << 1
     end
+    sleep(0.01)
     expect(a.empty?).to be_truthy
     sleep(0.15)
     expect(a).to eq [1]
@@ -75,6 +76,7 @@ describe GBDispatch do
     GBDispatch.dispatch_after_on_queue 0.1, :test do
       a << 1
     end
+    sleep(0.01)
     expect(a.empty?).to be_truthy
     sleep(0.2)
     expect(a).to eq [1]

data/spec/queue_spec.rb

@@ -85,6 +85,9 @@ describe GBDispatch::Queue do
   context 'rails' do
     before(:each) do
       class Rails
+        module VERSION
+          MAJOR = 4
+        end
       end
       module ActiveRecord
         class Base
@@ -92,6 +95,12 @@ describe GBDispatch::Queue do
             def with_connection
               yield
             end
+
+            def force_new_connection
+              with_connection do
+                yield
+              end
+            end
           end
 
           def self.connection_pool

data/spec/spec_helper.rb

@@ -22,7 +22,7 @@ SimpleCov.start do
   add_filter '/spec/'
 end
 
-SimpleCov.minimum_coverage 90
+SimpleCov.minimum_coverage 78
 
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gb_dispatch
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.2
 platform: ruby
 authors:
 - Kacper Kawecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2021-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +88,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/pull_request.yml"
 - ".gitignore"
 - ".idea/.name"
 - ".idea/encodings.xml"
@@ -96,6 +97,7 @@ files:
 - ".idea/vcs.xml"
 - ".rspec"
 - CHANGELOG.txt
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -103,6 +105,7 @@ files:
 - Rakefile
 - gb_dispatch.gemspec
 - lib/gb_dispatch.rb
+- lib/gb_dispatch/active_record_patch.rb
 - lib/gb_dispatch/central_dispatch.rb
 - lib/gb_dispatch/manager.rb
 - lib/gb_dispatch/queue.rb
@@ -112,7 +115,7 @@ files:
 - spec/queue_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/GenieBelt/gb-dispatch
+homepage: https://github.com/letsbuilders/gb-dispatch
 licenses:
 - MIT
 metadata: {}
@@ -131,8 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: GCD emulation for ruby
@@ -141,4 +143,3 @@ test_files:
 - spec/queue_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb
-has_rdoc: