bushpig 0.1.9 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75f414bd5b386fdcd5d452374ab9d6f1076e59353e6a08416cd710f8119f0b9b
-  data.tar.gz: 91cca09ccea7aa3b9169d15fe8174d16312892c8db7668408f0c594afcdcaef2
+  metadata.gz: 50478f11ab72c719f2b8ef316866f3822370b9680bbf926b66ee6e981688057e
+  data.tar.gz: 7a5e2e7b548556b6484a8d2b5998cc5eb59b167023a972628c44a23646fe6cbd
 SHA512:
-  metadata.gz: af10ea043bc302564ac0430b3531624c3d65b9c15cfc0e81e48f3cce9df314219b63c3bc1354de308420a6dd61d151858a9dcea1b9d999cdd23c201e9c12bcf3
-  data.tar.gz: e45960eddf67527a28203e73c7805b14cdfd7fc0399fac5b18d99833ee1d9d054794d437fb30c69c1c6b405a910127d2118d1d8bc9a92839c9a28404ad9e4e2e
+  metadata.gz: a2f3d17d804d1de3e378274408c8109c9dd26895249624ed175ea3f2fcbb0ac52410931f5c0d09378306595c44060abe3bc2875737d95d84f04192d4dfe06b29
+  data.tar.gz: 588e4f398d33a51e15264b15709a45523f75a954f283d73317551e5f089a609bfdbd489f0c604eacd5c12136ca00edd6cf8a2a0cc44e35a72b1d25b214e19330

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bushpig (0.1.9)
+    bushpig (0.1.14)
       connection_pool (~> 2.2)
       json (>= 1.8)
       redis (~> 3.3)
@@ -16,15 +16,23 @@ GEM
     coderay (1.1.3)
     connection_pool (2.2.5)
     e2mmap (0.1.0)
+    io-wait (0.1.0)
     jaro_winkler (1.5.4)
-    json (2.1.0)
+    json (2.5.1)
     kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     method_source (1.0.0)
-    mini_portile2 (2.5.1)
-    nokogiri (1.11.3)
+    mini_portile2 (2.5.2)
+      net-ftp (~> 0.1)
+    net-ftp (0.1.2)
+      net-protocol
+      time
+    net-protocol (0.1.1)
+      io-wait
+      timeout
+    nokogiri (1.11.6)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     parallel (1.20.1)
@@ -41,7 +49,7 @@ GEM
     reverse_markdown (2.0.0)
       nokogiri
     rexml (3.2.5)
-    rubocop (1.14.0)
+    rubocop (1.15.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -50,10 +58,10 @@ GEM
       rubocop-ast (>= 1.5.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.5.0)
+    rubocop-ast (1.7.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
-    solargraph (0.40.4)
+    solargraph (0.41.0)
       backport (~> 1.1)
       benchmark
       bundler (>= 1.17.2)
@@ -69,6 +77,8 @@ GEM
       yard (~> 0.9, >= 0.9.24)
     thor (1.1.0)
     tilt (2.0.10)
+    time (0.1.0)
+    timeout (0.1.1)
     unicode-display_width (2.0.0)
     yard (0.9.26)
 

data/gemset.nix

@@ -186,7 +186,7 @@
       path = ./.;
       type = "path";
     };
-    version = "0.1.9";
+    version = "0.1.14";
   };
   coderay = {
     groups = ["default" "development"];
@@ -367,6 +367,16 @@
     };
     version = "0.1.0";
   };
+  io-wait = {
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11zpcigndc11fkr2s6659d7nh1hj09zpmxlyqp9yq1mx76038s6w";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
   jaro_winkler = {
     groups = ["default" "development"];
     platforms = [];
@@ -531,10 +541,10 @@
     }];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+      sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "2.5.1";
   };
   kramdown = {
     dependencies = ["rexml"];
@@ -569,14 +579,37 @@
     version = "1.0.0";
   };
   mini_portile2 = {
+    dependencies = ["net-ftp"];
     groups = ["default" "development"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2";
+      sha256 = "0a2y04km3aciybk12yimkqn0ycrzy23iygl116n7addix9xdii3s";
       type = "gem";
     };
-    version = "2.5.1";
+    version = "2.5.2";
+  };
+  net-ftp = {
+    dependencies = ["net-protocol" "time"];
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1gx09b00k454fgn7q41r9xs5j5v9qj8xhfxnm650cns1ywcmzkil";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
+  net-protocol = {
+    dependencies = ["io-wait" "timeout"];
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ivxcqwgnrqbp2y0zpxz64in9a2cx9q9b0fxb630c51a1jaq63yz";
+      type = "gem";
+    };
+    version = "0.1.1";
   };
   nokogiri = {
     dependencies = ["mini_portile2" "racc"];
@@ -584,10 +617,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0";
+      sha256 = "1z4x366icbl9w13pk50vxx5kywlksvhxqxrpv8f5xpjxfl3jl64z";
       type = "gem";
     };
-    version = "1.11.3";
+    version = "1.11.6";
   };
   parallel = {
     groups = ["default" "development"];
@@ -847,10 +880,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0chjr6i0g7frbp7dhi4d83ppf7akkdaw7mcgcwbxd6a9mairafpp";
+      sha256 = "1xhay8qn3p5f3g6x8i6zh372zk5w2wjrv9dksysxal1r5brkly1w";
       type = "gem";
     };
-    version = "1.14.0";
+    version = "1.15.0";
   };
   rubocop-ast = {
     dependencies = ["parser"];
@@ -858,10 +891,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hx4im1a2qpiwipvsl3fma358ixjp4h0mhj56ichq15xrq709qlf";
+      sha256 = "1hnrfy928mwpa0ippqs4s8xwghwwp5h853naphgqxcd53l33chlv";
       type = "gem";
     };
-    version = "1.5.0";
+    version = "1.7.0";
   };
   ruby-progressbar = {
     groups = ["default" "development"];
@@ -879,10 +912,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xrad7amwf3nmdbif566qprk6xvwydxwz0s7arnzpvr01anc9gcl";
+      sha256 = "18daiaffwniprkfn9xq0njzqr8n37kw2605608njz2gz02m7b1rj";
       type = "gem";
     };
-    version = "0.40.4";
+    version = "0.41.0";
   };
   thor = {
     groups = ["default"];
@@ -1053,6 +1086,26 @@
     };
     version = "2.0.10";
   };
+  time = {
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ayfwm8b0c6n0z34vwfpmy83lf1gd0mq7jbybzarkqp2ylmdlzvy";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  timeout = {
+    groups = ["default" "development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lr1pp2hh6np1x9milzs4rim9sfpsb4izhs4dd5q5nnhkcwx8i63";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
   unicode-display_width = {
     groups = ["default" "development"];
     platforms = [];

data/lib/bushpig.rb

@@ -6,6 +6,7 @@ require 'bushpig/redis_pool'
 require 'bushpig/job'
 require 'bushpig/client'
 require 'bushpig/server'
+require 'bushpig/testing'
 
 module Bushpig
   NAME = 'Bushpig'
@@ -31,6 +32,14 @@ module Bushpig
     @server = server
   end
 
+  def self.testing
+    @testing ||= false
+  end
+
+  def self.testing=(testing)
+    @testing = testing
+  end
+
   def self.configure_server
     yield self if server?
   end

data/lib/bushpig/client.rb

@@ -19,11 +19,16 @@ module Bushpig
     end
 
     def submit(queue, job, score: default_score, ttl: default_ttl)
-      modified = @callback.call(job)
-      redis_pool.with do |conn|
-        conn.set(Bushpig.job_key(modified.job_key), modified.job_payload, ex: ttl)
-        conn.zadd(Bushpig.queue_key(queue), score, modified.job_key)
-      end
+      new = if Bushpig.testing
+              job.handle
+              true
+            else
+              redis_pool.with do |conn|
+                conn.set(Bushpig.job_key(job.job_key), job.job_payload, ex: ttl)
+                conn.zadd(Bushpig.queue_key(queue), score, job.job_key)
+              end
+            end
+      @callback.call(job, new)
     end
   end
 end

data/lib/bushpig/job.rb

@@ -30,8 +30,8 @@ module Bushpig
           JSON.generate({ class: self.class.name, id: job_id, args: each.to_a })
         end
 
-        def call(job)
-          self.class.job_handler.call(job)
+        def handle
+          self.class.job_handler.call(self)
         end
       end
     end
@@ -45,6 +45,10 @@ module Bushpig
           @job_handler
         end
 
+        def self.job_unique_key
+          @unique_key
+        end
+
         def job_id
           @job_id ||= SecureRandom.hex(32)
         end
@@ -54,7 +58,7 @@ module Bushpig
         end
 
         def job_key
-          @unique_key.inject(Digest::SHA256.new) do |digest, key|
+          self.class.job_unique_key.inject(Digest::SHA256.new.update(self.class.name)) do |digest, key|
             digest.update(self[key].to_s)
           end.hexdigest
         end
@@ -63,8 +67,8 @@ module Bushpig
           JSON.generate({ class: self.class.name, id: job_id, args: each.to_a })
         end
 
-        def call(job)
-          self.class.job_handler.call(job)
+        def handle
+          self.class.job_handler.call(self)
         end
       end
     end

data/lib/bushpig/server.rb

@@ -37,7 +37,10 @@ module Bushpig
 
       until @done
         job = fetch(queue)
-        next if job.nil?
+        if job.nil?
+          ActiveRecord::Base.clear_active_connections!
+          next
+        end
 
         handle(job)
         complete(job)
@@ -59,6 +62,7 @@ module Bushpig
       elapsed = finished - started
       puts "Job raised exception: jid-#{job.job_id} #{elapsed} seconds: #{e}"
       notify_exception(job, e)
+      ActiveRecord::Base.clear_active_connections!
     end
 
     def honeybadger

data/lib/bushpig/testing.rb

@@ -0,0 +1,14 @@
+
+# frozen_string_literal: true
+
+module Bushpig
+  module Testing
+    def self.inline!(&block)
+      old = Bushpig.testing
+      Bushpig.testing = true
+      result = block.call
+      Bushpig.testing = old
+      result
+    end
+  end
+end

data/lib/bushpig/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bushpig
-  VERSION = '0.1.9'
+  VERSION = '0.1.14'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bushpig
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.14
 platform: ruby
 authors:
 - Shaun Sharples
@@ -162,6 +162,7 @@ files:
 - lib/bushpig/job.rb
 - lib/bushpig/redis_pool.rb
 - lib/bushpig/server.rb
+- lib/bushpig/testing.rb
 - lib/bushpig/version.rb
 - shell.nix
 homepage: https://github.com/mpowered/bushpig
@@ -190,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.2.16
 signing_key:
 specification_version: 4
 summary: Simple job system.