fibered_mysql2 0.1.4 → 0.1.5.pre.ga.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 886e707f8337bfa2ac7949cda23807f33caeee9cb68b409b05695c65cebc73ce
-  data.tar.gz: 9c4bb45a65868e23427bea1563ce128c9716ab0146244139d035a3d9dd49d547
+  metadata.gz: 8ce1936ef559c3317a017cafacb9e1fafec1cf01c5bda075303479f97a0287cd
+  data.tar.gz: a475f56c870d6fd8e56f92d07a73ea6a73752d79f280eb796bf951c9990ce9ae
 SHA512:
-  metadata.gz: ef965907130eb174255a789abe06284eaf29b4784d5429431680e2e3049802dd70fe326a36f37117c3d21395555cd25f55944e6c77b96bca2acddba466addfd4
-  data.tar.gz: 19691c1282faaff78212ee6eab9036a9231a137c3f14bd8bfbbcef3fd4625bea7a71edc1add1b3d84ce8d3d22e8a67cbb72c33eb1ef8d7c1003af5e0b1279fc0
+  metadata.gz: bdb30f2c76ade268e36e8adbddbee09b01fb2a7ff82611158d04d3c60f8e483f7e61de589f33c362bce0fe9fffcfc34abe0498e0e2dac618d2d830263a193373
+  data.tar.gz: 2e4aa4b1ae2b9a809641f2a41e74dab8d780279cc9f3f5cf8352117b03b34273ea005d12258abfcb06540f046844597af682f9d44f4a6ee6f63b4f5db8c2e2cc

data/.github/workflows/build.yml

@@ -0,0 +1,25 @@
+---
+name: FiberedMySQL2 Gem Build
+on: [push, pull_request]
+jobs:
+  test:
+    name: Unit Tests
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.5, 2.6, 2.7, '3.0', 3.1]
+        gemfile:
+        - Gemfile
+        - gemfiles/rails_5.gemfile
+        - gemfiles/rails_6.gemfile
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler: 2.2.29
+        bundler-cache: true
+    - run: bundle exec rspec

data/.github/workflows/release.yml

@@ -0,0 +1,38 @@
+---
+on:
+  push:
+    tags:
+    - 'v*'
+    - '!v*.pre*'
+
+name: Create Release
+
+jobs:
+  build:
+    name: Create Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get version from tag
+        id: tag_name
+        shell: bash
+        run: |
+          echo ::set-output name=current_version::${GITHUB_REF#refs/tags/v}
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Get Changelog Entry
+        id: changelog_reader
+        uses: mindsers/changelog-reader-action@v1
+        with:
+          version: ${{ steps.tag_name.outputs.current_version }}
+          path: ./CHANGELOG.md
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GEM_RELEASE_GIT_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          body: ${{ steps.changelog_reader.outputs.log_entry }}
+          draft: false
+          prerelease: false

data/.ruby-version

@@ -0,0 +1 @@
+2.7.5

data/Appraisals

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-appraise 'rails-4' do
-  gem 'rails', '~> 4.2'
-end
-
 appraise 'rails-5' do
   gem 'rails', '~> 5.2'
 end

data/CHANGELOG.md

@@ -4,6 +4,11 @@ Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.1.5] - Unreleased
+### Changed
+- Upgraded Bundler to 2.2.29 and Ruby to 2.7.5. Removed support for Rails 4.
+- Modified FiberedMysql2::FiberedConditionVariable class to ensure compatibility with newer Ruby versions.
+
 ## [0.1.4] - 2021-06-25
 ### Fixed
 - Disable the ConnectionPool::Reaper in Rails 5 and 6 as it was in 4. This is important since it is

data/Gemfile

@@ -6,12 +6,11 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 gem 'appraisal'
-gem 'bundler',    '~> 1.8'
 gem 'coveralls', require: false
-gem 'mimemagic',  '~> 0.3',     git: 'git@github.com:Invoca/mimemagic',                      ref: 'b084ce8d50c080f5a312156498be21a541fe72a2'
-gem 'mysql2',     '0.4.5'
+gem 'mysql2',     '~> 0.4.5'
+gem 'nokogiri',   '< 1.13'
 gem 'pry',        '~> 0.13'
 gem 'pry-byebug', '~> 3.9'
 gem 'rails',      '< 6.1'
-gem 'rake',       '~> 10.0'
+gem 'rake',       '~> 13.0'
 gem 'rspec',      '~> 3.0'

data/Gemfile.lock

@@ -1,16 +1,9 @@
-GIT
-  remote: git@github.com:Invoca/mimemagic
-  revision: b084ce8d50c080f5a312156498be21a541fe72a2
-  ref: b084ce8d50c080f5a312156498be21a541fe72a2
-  specs:
-    mimemagic (0.3.5)
-
 PATH
   remote: .
   specs:
-    fibered_mysql2 (0.1.4)
+    fibered_mysql2 (0.1.5.pre.ga.0)
       em-synchrony (~> 1.0)
-      rails (>= 4.2, < 7)
+      rails (>= 5.2, < 7)
 
 GEM
   remote: https://rubygems.org/
@@ -104,19 +97,24 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (1.0.0)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.6.1)
     minitest (5.14.3)
-    mysql2 (0.4.5)
+    mysql2 (0.4.10)
     nio4r (2.5.4)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -146,7 +144,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
-    rake (10.5.0)
+    rake (13.0.6)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -191,16 +189,15 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
-  bundler (~> 1.8)
   coveralls
   fibered_mysql2!
-  mimemagic (~> 0.3)!
-  mysql2 (= 0.4.5)
+  mysql2 (~> 0.4.5)
+  nokogiri (< 1.13)
   pry (~> 0.13)
   pry-byebug (~> 3.9)
   rails (< 6.1)
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.17.3
+   2.2.29

data/README.md

@@ -21,7 +21,7 @@ Or install it yourself as:
     $ gem install fibered_mysql2
 
 ## Support
-Tested with Rails versions 4.2, 5.2, and 6.0.
+Tested with Rails versions 5.2 and 6.0.
 
 ## Usage
 

data/fibered_mysql2.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'em-synchrony', '~> 1.0'
-  spec.add_dependency 'rails', '>= 4.2', '< 7'
+  spec.add_dependency 'rails', '>= 5.2', '< 7'
 end

data/gemfiles/rails_5.gemfile

@@ -3,13 +3,13 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "bundler", "~> 1.8"
+gem "bundler", "~> 2.2"
 gem "coveralls", require: false
-gem "mysql2", "0.4.5"
+gem "mysql2", "~> 0.4.5"
 gem "pry", "~> 0.13"
 gem "pry-byebug", "~> 3.9"
+gem "rails", "~> 5.2"
 gem "rake", "~> 10.0"
 gem "rspec", "~> 3.0"
-gem "rails", "~> 5.2"
 
 gemspec path: "../"

data/gemfiles/rails_6.gemfile

@@ -3,13 +3,13 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "bundler", "~> 1.8"
+gem "bundler", "~> 2.2"
 gem "coveralls", require: false
-gem "mysql2", "0.4.5"
+gem "mysql2", "~> 0.4.5"
 gem "pry", "~> 0.13"
 gem "pry-byebug", "~> 3.9"
+gem "rails", "~> 6.0.0"
 gem "rake", "~> 10.0"
 gem "rspec", "~> 3.0"
-gem "rails", "~> 6.0.0"
 
 gemspec path: "../"

data/lib/fibered_mysql2/fibered_database_connection_pool.rb

@@ -12,7 +12,73 @@ require 'fibered_mysql2/fibered_mutex_with_waiter_priority'
 EventMachine::Synchrony::Thread::Mutex.prepend(FiberedMysql2::FiberedMutexWithWaiterPriority)
 
 module FiberedMysql2
-  class FiberedConditionVariable < MonitorMixin::ConditionVariable
+  class FiberedConditionVariable
+    EXCEPTION_NEVER = {Exception => :never}.freeze
+    EXCEPTION_IMMEDIATE = {Exception => :immediate}.freeze
+
+    #
+    # FIXME: This isn't documented in Nutshell.
+    #
+    # Since MonitorMixin.new_cond returns a ConditionVariable, and the example
+    # above calls while_wait and signal, this class should be documented.
+    #
+    class Timeout < Exception; end
+
+    #
+    # Releases the lock held in the associated monitor and waits; reacquires the lock on wakeup.
+    #
+    # If +timeout+ is given, this method returns after +timeout+ seconds passed,
+    # even if no other thread doesn't signal.
+    #
+    def wait(timeout = nil)
+      Thread.handle_interrupt(EXCEPTION_NEVER) do
+        @monitor.__send__(:mon_check_owner)
+        count = @monitor.__send__(:mon_exit_for_cond)
+        begin
+          Thread.handle_interrupt(EXCEPTION_IMMEDIATE) do
+            @cond.wait(@monitor.instance_variable_get(:@mon_mutex), timeout)
+          end
+          return true
+        ensure
+          @monitor.__send__(:mon_enter_for_cond, count)
+        end
+      end
+    end
+
+    #
+    # Calls wait repeatedly while the given block yields a truthy value.
+    #
+    def wait_while
+      while yield
+        wait
+      end
+    end
+
+    #
+    # Calls wait repeatedly until the given block yields a truthy value.
+    #
+    def wait_until
+      until yield
+        wait
+      end
+    end
+
+    #
+    # Wakes up the first thread in line waiting for this lock.
+    #
+    def signal
+      @monitor.__send__(:mon_check_owner)
+      @cond.signal
+    end
+
+    #
+    # Wakes up all threads waiting for this lock.
+    #
+    def broadcast
+      @monitor.__send__(:mon_check_owner)
+      @cond.broadcast
+    end
+
     def initialize(monitor)
       @monitor = monitor
       @cond = EM::Synchrony::Thread::ConditionVariable.new
@@ -90,8 +156,6 @@ module FiberedMysql2
       FiberedConditionVariable.new(self)
     end
 
-    private
-
     # Initializes the FiberedMonitorMixin after being included in a class
     def mon_initialize
       @mon_owner = nil
@@ -103,6 +167,8 @@ module FiberedMysql2
       @mon_owner == Fiber.current or raise FiberError, "current fiber not owner"
     end
 
+    private
+
     def mon_enter_for_cond(count)
       @mon_owner = Fiber.current
       @mon_count = count

data/lib/fibered_mysql2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FiberedMysql2
-  VERSION = "0.1.4"
+  VERSION = "0.1.5.pre.ga.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fibered_mysql2
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5.pre.ga.0
 platform: ruby
 authors:
 - Invoca Development
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2022-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-synchrony
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -40,20 +40,22 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
-description: 
+description:
 email:
 - development@invoca.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".ruby-version"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -63,7 +65,6 @@ files:
 - bin/console
 - bin/setup
 - fibered_mysql2.gemspec
-- gemfiles/rails_4.gemfile
 - gemfiles/rails_5.gemfile
 - gemfiles/rails_6.gemfile
 - lib/active_record/connection_adapters/fibered_mysql2_adapter.rb
@@ -77,7 +78,7 @@ licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/Invoca/fibered_mysql2
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -88,12 +89,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: An adapter for fibered mysql2
 test_files: []

data/.travis.yml

@@ -1,12 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.1
-gemfile:
-  - gemfiles/rails_4.gemfile
-  - gemfiles/rails_5.gemfile
-  - gemfiles/rails_6.gemfile
-script:
-  - bundle exec rspec

data/gemfiles/rails_4.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "bundler", "~> 1.8"
-gem "coveralls", require: false
-gem "mysql2", "0.4.5"
-gem "pry", "~> 0.13"
-gem "pry-byebug", "~> 3.9"
-gem "rake", "~> 10.0"
-gem "rspec", "~> 3.0"
-gem "rails", "~> 4.2"
-
-gemspec path: "../"