shinq 1.0.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0cdad6cb88d95c3f54ef38ac64b7db0314850912693d9f87eae2d88c59c11be
-  data.tar.gz: aed02806856d77fda982ae5d2039be2bf4558f32e7732a6d3681299fc25aac26
+  metadata.gz: b1a98bea1ff59d4ac82c52fe23e23bd70605ff985dacb6a8771b2581304a69b2
+  data.tar.gz: a595be8097e59bc3ddebdb247e6a9e3f9e37421f1fbbf96462a54dee2b3c60fc
 SHA512:
-  metadata.gz: 7f8e92ee4d147158524f66aa2d1bfb596abe66c0dddf49924d1e642a379f8ae30075127cee711dc535da8c97305025a983753802ead7b5f11eebccda399522f7
-  data.tar.gz: 45ee3dcf8f20c696c078cb2db67475da5aa66160f1699b0db03108540a42cf641595f05ebd529e5110a9972e61710b7e9644e9881d74e2ffd799618a5cef3207
+  metadata.gz: 9b9d15ab2e0c053ad30d3508661536159a3bff7635780ff2379245e1a852f3c686804b5b98a73f53400526ef3035398311108b1eb4fd3ec8c1c281de77a80b37
+  data.tar.gz: 0c6b367b9667cf79495642883dcfcc96d9e651d5d6ea49887453e59ca8e010f46a462b0ce7fde9e4c3c3ba06d513b73026229da3c923867b923c612e73b2a194

data/.github/workflows/test.yml

@@ -0,0 +1,47 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  workflow_dispatch:  
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    
+    strategy:
+      max-parallel: 4
+      fail-fast: true
+      matrix:
+        ruby: [2.4, 2.5, 2.6, 2.7]
+    services:
+      mysql:
+        image: iwata/centos6-mysql56-q4m-hs
+        ports:
+          - 3306:3306
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rspec

data/README.md

@@ -1,5 +1,6 @@
 # Shinq
-[![Build Status](https://travis-ci.org/ryopeko/shinq.svg)](https://travis-ci.org/ryopeko/shinq)
+
+[![CI](https://github.com/ryopeko/shinq/workflows/test/badge.svg?event=push)](https://github.com/ryopeko/shinq/actions?query=workflow%3Atest+event%3Apush)
 
 Worker and enqueuer for Q4M using the interface of ActiveJob.
 

data/lib/shinq/client.rb

@@ -69,7 +69,7 @@ module Shinq
       @column_names_by_table_name[table_name.to_sym] ||= begin
         quoted = SQL::Maker::Quoting.quote(table_name)
         column = Shinq.connection.query(<<-EOS).map { |record| record['column_name'] }
-select column_name from information_schema.columns where table_schema = database() and table_name = #{quoted}
+select column_name as column_name from information_schema.columns where table_schema = database() and table_name = #{quoted}
         EOS
       end
     end

data/shinq.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "shinq"
-  spec.version       = '1.0.2'
+  spec.version       = '1.2.0'
   spec.authors       = ["Ryoichi SEKIGUCHI"]
   spec.email         = ["ryopeko@gmail.com"]
   spec.summary       = %q{Worker and enqueuer for Q4M using the interface of ActiveJob.}
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mysql2", ">= 0.3.16", "< 0.6"
   spec.add_dependency "sql-maker", "~> 0.0.4"
-  spec.add_dependency "activesupport", ">= 4.2.0", "< 6"
-  spec.add_dependency "activejob", ">= 4.2.0", "< 6"
+  spec.add_dependency "activesupport", ">= 4.2.0", "< 6.1"
+  spec.add_dependency "activejob", ">= 4.2.0", "< 6.1"
   spec.add_dependency 'serverengine', '~> 1.5.9'
 end

data/spec/config/database.yml

@@ -1,5 +1,6 @@
 test:
   encoding: utf8
   username: root
-  host: localhost
+  host: 127.0.0.1
+  port: 3306
   database: shinq_test

data/spec/db/{structure.sql.erb → structure.sql}

@@ -1,10 +1,13 @@
+CREATE DATABASE IF NOT EXISTS shinq_test;
+USE shinq_test;
+
 DROP TABLE IF EXISTS `queue_test`;
 CREATE TABLE `queue_test` (
   `job_id` varchar(255) NOT NULL,
   `title` varchar(255),
   `scheduled_at` bigint(20) NOT NULL DEFAULT '0',
   `enqueued_at` datetime NOT NULL
-) ENGINE=<%= engine %>;
+) ENGINE=QUEUE;
 
 DROP TABLE IF EXISTS `queue_test_without_scheduled_at`;
 
@@ -12,4 +15,4 @@ CREATE TABLE `queue_test_without_scheduled_at` (
   `job_id` varchar(255) NOT NULL,
   `title` varchar(255),
   `enqueued_at` datetime NOT NULL
-) ENGINE=<%= engine %>;
+) ENGINE=QUEUE;

data/spec/integration_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'shinq'
 require 'shinq/client'
 
-describe "Integration", skip: ENV['TRAVIS'] do
+describe "Integration" do
 
   before do
     Shinq.configuration = {

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ require 'mysql2'
 require 'timecop'
 
 def load_database_config
-  db_config = YAML.load_file(File.expand_path('./config/database.yml', __dir__)).symbolize_keys
+  db_config = YAML.load_file(File.expand_path('./config/database.yml', __dir__)).deep_symbolize_keys
 end
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
@@ -31,12 +31,13 @@ RSpec.configure do |config|
   end
 
   config.before(:suite) do
-    # MySQL on Travis does not have Q4M plugins.
-    # We use QUEUE engine and run Q4M specific spec (integration_spec) only when ENV['TRAVIS'] is nil.
-    engine = ENV['TRAVIS'] ? 'InnoDB' : 'QUEUE' # Travis MySQL does not have Q4M plugins.
-    sql = ERB.new(File.read(File.expand_path('./db/structure.sql.erb', __dir__))).result(binding)
+    sql = Pathname('./db/structure.sql').expand_path(__dir__).read
 
-    connection = Mysql2::Client.new(load_database_config[:test].merge(flags: Mysql2::Client::MULTI_STATEMENTS))
+    config_for_setup = load_database_config[:test]
+      .except(:database) # To create database
+      .merge(flags: Mysql2::Client::MULTI_STATEMENTS)
+
+    connection = Mysql2::Client.new(config_for_setup)
     result = connection.query(sql)
 
     while connection.next_result

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shinq
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Ryoichi SEKIGUCHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2023-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -165,7 +165,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -175,7 +175,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +185,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -195,7 +195,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: serverengine
   requirement: !ruby/object:Gem::Requirement
@@ -218,9 +218,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -240,7 +240,7 @@ files:
 - lib/shinq/statistics.rb
 - shinq.gemspec
 - spec/config/database.yml
-- spec/db/structure.sql.erb
+- spec/db/structure.sql
 - spec/helpers/my_worker.rb
 - spec/integration_spec.rb
 - spec/shinq/cli_spec.rb
@@ -267,13 +267,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.0
 signing_key: 
 specification_version: 4
 summary: Worker and enqueuer for Q4M using the interface of ActiveJob.
 test_files:
 - spec/config/database.yml
-- spec/db/structure.sql.erb
+- spec/db/structure.sql
 - spec/helpers/my_worker.rb
 - spec/integration_spec.rb
 - spec/shinq/cli_spec.rb

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-sudo: false
-cache: bundler
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.6
-  - 2.7
-gemfile:
-  - Gemfile
-before_install:
-  - gem update bundler
-  - mysql -e "create database IF NOT EXISTS shinq_test;" -uroot
-script: bundle exec rspec