resque_unit_without_mock 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbfdabc7af3a22de5e40c2119246b035acfdbd5d08f561ec2e77aeb231fd590c
-  data.tar.gz: 4a70f374c92a06b79dc79026b00163707d04cb24a505f56824ec92719ce2a043
+  metadata.gz: f0480a122f77d1d18286cb621fbeb409b98756bf1b73b03eee9797f7d0b34d50
+  data.tar.gz: 50f4fe0dee23957fc0564d72272d24d7422a58d0d651ea230247e5f3e34ca040
 SHA512:
-  metadata.gz: 229d1222c929a7861cecaace68aad49761ad4a98019e77782cdbdbd96c18c3085ead46f3ff036714bda8e4c0b8de537111f486743baa75898236d12c877b071c
-  data.tar.gz: 055350c0fd3319ca38dc6570292039c401698dd19a991d193cca3c73f6a1bb46824baf35e334efe23996b7b023b0adb1d15901a08cde072af280e000236c1566
+  metadata.gz: 6a5cff13ad9f68f3c72f9f64363665f1521f19d79c9008a843ea530e30f01b87a7349c3c5b4d885829c7cbcbefa85293fb7dd39bb5c74bc5f86b0bf685c83052
+  data.tar.gz: 28de5f6591a912e18faef29a8f2816213c4520f3b48e320d668e7daceadbb98213521ccf5fb64483dbd4df77e5b88057610bf23a50179733aca08e3136b1acfa

data/.github/workflows/ruby.yml

@@ -0,0 +1,33 @@
+name: Ruby
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    strategy:
+      matrix:
+        ruby-version: ['2.7', '3.0', '3.1']
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Install Redis
+      run: sudo apt-get install -y redis-tools redis-server
+    - name: Verify that redis is up
+      run: redis-cli ping
+    - name: Run tests
+      run: |-
+        bundle exec rake

data/Dockerfile

@@ -0,0 +1,6 @@
+FROM ruby:3.0
+WORKDIR /app
+RUN apt-get update && apt-get install redis -y
+RUN bundle config set --global force_ruby_platform true
+RUN gem i bundler
+COPY . .

data/Gemfile.lock

@@ -1,49 +1,53 @@
 PATH
   remote: .
   specs:
-    resque_unit_without_mock (0.1.0)
+    resque_unit_without_mock (0.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.11.3)
+    connection_pool (2.3.0)
+    minitest (5.16.3)
     minitest-hooks (1.5.0)
       minitest (> 5.3)
-    mono_logger (1.1.0)
-    multi_json (1.13.1)
-    mustermann (1.0.3)
-    rack (2.0.6)
-    rack-protection (2.0.5)
+    mono_logger (1.1.1)
+    multi_json (1.15.0)
+    mustermann (3.0.0)
+      ruby2_keywords (~> 0.0.1)
+    rack (2.2.4)
+    rack-protection (3.0.3)
       rack
-    rake (10.5.0)
-    redis (4.1.0)
-    redis-namespace (1.6.0)
-      redis (>= 3.0.4)
-    resque (2.0.0)
+    rake (13.0.6)
+    redis (5.0.5)
+      redis-client (>= 0.9.0)
+    redis-client (0.11.2)
+      connection_pool
+    redis-namespace (1.9.0)
+      redis (>= 4)
+    resque (2.4.0)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.6)
       sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-    sinatra (2.0.5)
-      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.5)
+    ruby2_keywords (0.0.5)
+    sinatra (3.0.3)
+      mustermann (~> 3.0)
+      rack (~> 2.2, >= 2.2.4)
+      rack-protection (= 3.0.3)
       tilt (~> 2.0)
-    tilt (2.0.9)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
+    tilt (2.0.11)
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 1.17)
-  minitest (~> 5.0)
+  bundler
+  minitest
   minitest-hooks
-  rake (~> 10.0)
+  rake
   resque
   resque_unit_without_mock!
 
 BUNDLED WITH
-   1.17.1
+   2.3.26

data/README.md

@@ -15,10 +15,10 @@ And then execute:
 
     $ bundle
 
-## Usage
-### resque_unitとの違い
+## `resque_unit`との違い
 resque_unitで提供していた `Resque.queues` は `Resque.queued` になっています。
 
+## Usage
 ### `Resque.reset!` はプロジェクト内で再定義してください
 専用のredis-serverプロセスを使っているなら `flushdb`でいいですが、  
 相乗りしているredis-serverの場合は https://gist.github.com/aserafin/6916037 みたいな感じで初期化するとよいでしょう。
@@ -35,6 +35,11 @@ end
 Resque.singleton_class.prepend(ResqueHelpersExt)
 ```
 
+## Development
+* docker compose run --rm app bash
+* bundle install
+* bundle exec rake
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/docker-compose.yml

@@ -0,0 +1,11 @@
+version: '3'
+services:
+  app:
+    build: .
+    volumes:
+      - './:/app:delegated'
+      - bundle_path:/bundle
+    environment:
+      - BUNDLE_PATH=/bundle
+volumes:
+  bundle_path:

data/lib/resque_unit_without_mock/scheduler.rb

@@ -8,11 +8,16 @@ module ResqueUnitWithoutMock::Scheduler
     # タイムスタンプを確認している.
     # 実物Redisを使うにあたって同じ振る舞いにしたいのでクラス変数を使ってresque_unitと同じことを実現する.
     def enqueue_at(timestamp, klass, *args)
-      queue = queue_for(klass)
+      enqueue_at_with_queue(
+        queue_for(klass), timestamp, klass, *args
+      )
+    end
+
+    def enqueue_at_with_queue(queue, timestamp, klass, *args)
       @@enqueue_ats ||= {}
       @@enqueue_ats[queue] ||= []
       @@enqueue_ats[queue] << { timestamp: timestamp, klass: klass, args: args }
-      Resque.enqueue(klass, *args)
+      Resque.enqueue_to(queue, klass, *args)
     end
 
     def enqueue_ats(queue)

data/lib/resque_unit_without_mock/scheduler_assertions.rb

@@ -1,6 +1,13 @@
 module ResqueUnitWithoutMock::SchedulerAssertions
   def assert_queued_at(expected_timestamp, klass)
-    queue = Resque.queue_for(klass)
+    assert_queued_at_with_queue(Resque.queue_for(klass), expected_timestamp, klass)
+  end
+
+  def assert_not_queued_at(expected_timestamp, klass)
+    assert_not_queued_at_with_queue(Resque.queue_for(klass), expected_timestamp, klass)
+  end
+
+  def assert_queued_at_with_queue(queue, expected_timestamp, klass)
     result = Resque.enqueue_ats(queue).detect { |hash| hash[:timestamp] <= expected_timestamp && hash[:klass] == klass }
     assert(
       result,
@@ -8,8 +15,7 @@ module ResqueUnitWithoutMock::SchedulerAssertions
     )
   end
 
-  def assert_not_queued_at(expected_timestamp, klass)
-    queue = Resque.queue_for(klass)
+  def assert_not_queued_at_with_queue(queue, expected_timestamp, klass)
     result = Resque.enqueue_ats(queue).detect { |hash| hash[:timestamp] <= expected_timestamp && hash[:klass] == klass }
     assert(
       !result,

data/lib/resque_unit_without_mock/version.rb

@@ -1,3 +1,3 @@
 module ResqueUnitWithoutMock
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/resque_unit_without_mock.gemspec

@@ -1,4 +1,3 @@
-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "resque_unit_without_mock/version"
@@ -11,8 +10,9 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{resque_unit(without mock)}
   spec.description   = spec.summary
-  spec.homepage      = "https://github.com/jiikko/resque_unit_without_mock"
+  spec.homepage      = "https://github.com/ubiregiinc/resque_unit_without_mock"
   spec.license       = "MIT"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -23,9 +23,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
   spec.add_development_dependency "minitest-hooks"
   spec.add_development_dependency "resque"
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: resque_unit_without_mock
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - jiikko
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-02-04 00:00:00.000000000 Z
+date: 2024-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-hooks
   requirement: !ruby/object:Gem::Requirement
@@ -87,8 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -96,6 +97,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docker-compose.yml
 - lib/resque_unit_without_mock.rb
 - lib/resque_unit_without_mock/resque_assertions.rb
 - lib/resque_unit_without_mock/resque_helpers.rb
@@ -104,11 +106,11 @@ files:
 - lib/resque_unit_without_mock/version.rb
 - lib/resque_unit_without_mock_scheduler.rb
 - resque_unit_without_mock.gemspec
-homepage: https://github.com/jiikko/resque_unit_without_mock
+homepage: https://github.com/ubiregiinc/resque_unit_without_mock
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -116,16 +118,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: resque_unit(without mock)
 test_files: []

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.5.3
-before_install: gem install bundler -v 1.17.1