faktory_worker_ruby 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca8f1a3c8f94200639fe96c6ed6664ab02e3240a4176d73463cfd185bf0dd577
-  data.tar.gz: c0a039afe5d4a3ca54d5c8ef779c282cd2266bce6665998c8da60d1829fa4cb2
+  metadata.gz: 8ba3a7a6dbf71b034a2e9a209830f3049132c72b12105262b6ce971df9e602e6
+  data.tar.gz: f0adb0757fdaed227ec36d13786dadf7a9e39b6854589f4c25e65a8c9101cf86
 SHA512:
-  metadata.gz: 3ccf18cb61e1428fa6443c7f9862861d959bbf40d0914f94c8457642c97e72be367c5e3d019ae3a9cfc30f65dae22ad865b591892f6985a3a460d44dc442c378
-  data.tar.gz: c9822086ef38bf740abd2a6b6afd099305e0d1998e0adcdefb6dbf5ccb84d7b4a6497ef22359320d13fef70899dfb7ebf29c361bd405ea7bb93eb41463719070
+  metadata.gz: 89471fb1dfd8624f9b562c773909378b4c40a4b52fd7dd198b7d2808199b2057a760b2cbcd919b8aa4494569979092c53762dd24e57be6ecfe7143a97540521d
+  data.tar.gz: 734b8145a57e435ecac307006723608998958bd9952a194c804fe033681579530d0ccc84ed591ffe8cfbbc5393abe4bd6b95045c49d02ceb3c87f742f6027905

data/.github/workflows/ci.yml

@@ -0,0 +1,29 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.5, 2.6, 2.7, '3.0']
+    runs-on: ubuntu-latest
+    services:
+      faktory:
+        image: contribsys/faktory:latest
+        ports:
+            - 7419:7419
+            - 7420:7420
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle install
+      - run: bundle exec rake

data/Changes.md

@@ -1,5 +1,9 @@
 # Changes
 
+## 1.1.1
+
+- Fix OpenSSL error [#59]
+
 ## 1.1.0
 
 - Send process RSS to Faktory for /Busy page

data/Gemfile.lock

@@ -7,34 +7,35 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activejob (6.0.3.2)
-      activesupport (= 6.0.3.2)
+    activejob (6.1.3.2)
+      activesupport (= 6.1.3.2)
       globalid (>= 0.3.6)
-    activesupport (6.0.3.2)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    concurrent-ruby (1.1.6)
-    connection_pool (2.2.3)
-    docile (1.3.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    concurrent-ruby (1.1.9)
+    connection_pool (2.2.5)
+    docile (1.4.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.1)
+    minitest (5.14.4)
     minitest-hooks (1.5.0)
       minitest (> 5.3)
-    rake (13.0.1)
-    simplecov (0.18.5)
+    rake (13.0.3)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.4.0)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,6 +1,6 @@
 # faktory\_worker\_ruby
 
-![travis](https://travis-ci.org/contribsys/faktory_worker_ruby.svg?branch=master)
+![CI status](https://github.com/contribsys/faktory_worker_ruby/actions/workflows/ci.yml/badge.svg)
 
 Faktory\_worker\_ruby is the official Ruby client and worker process for the
 Faktory background job server.  It is similar to [Sidekiq](http://sidekiq.org).

data/lib/faktory/client.rb

@@ -241,6 +241,7 @@ module Faktory
 
     def open(timeout = DEFAULT_TIMEOUT)
       if tls?
+        require 'openssl'
         sock = TCPSocket.new(@location.hostname, @location.port)
         sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
 
@@ -262,6 +263,7 @@ module Faktory
         "hostname": Socket.gethostname,
         "pid": $$,
         "labels": Faktory.options[:labels] || ["ruby-#{RUBY_VERSION}"],
+        "username": @location.user,
         "v": 2,
       }
 

data/lib/faktory/io.rb

@@ -37,9 +37,9 @@ module Faktory
       loop do
         result = @sock.read_nonblock(nbytes, exception: false)
         if result == :wait_readable
-          raise Faktory::TimeoutError unless @sock.wait_readable(@timeout)
+          raise Faktory::TimeoutError unless @sock.to_io.wait_readable(@timeout)
         elsif result == :wait_writable
-          raise Faktory::TimeoutError unless @sock.wait_writeable(@timeout)
+          raise Faktory::TimeoutError unless @sock.to_io.wait_writeable(@timeout)
         elsif result == nil
           raise Errno::ECONNRESET
         else

data/lib/faktory/job.rb

@@ -56,6 +56,11 @@ module Faktory
         @opts = opts
       end
 
+      def set(opts)
+        @opts = Util.deep_merge(@opts, opts)
+        self
+      end
+
       def perform_async(*args)
         client_push(@opts.merge('args'.freeze => args))
       end
@@ -104,7 +109,7 @@ module Faktory
     module ClassMethods
 
       def set(options)
-        Setter.new(options.merge('jobtype'.freeze => self))
+        Setter.new(Util.deep_merge(get_faktory_options, options, 'jobtype'.freeze => self))
       end
 
       def perform_async(*args)
@@ -193,5 +198,23 @@ module Faktory
       end
 
     end
+
+    module Util
+      def deep_merge(*hashes)
+        initial = hashes.shift.transform_keys(&:to_s)
+        hashes.reduce(initial) do |acc, other_hash|
+          other_hash.transform_keys!(&:to_s)
+          acc.merge(other_hash) do |_key, this_val, other_val|
+            if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+              deep_merge(this_val, other_val)
+            else
+              other_val
+            end
+          end
+        end
+      end
+      module_function :deep_merge
+    end
+
   end
 end

data/lib/faktory/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Faktory
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faktory_worker_ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Mike Perham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -94,8 +94,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - Changes.md
 - Gemfile
 - Gemfile.lock

data/.travis.yml

@@ -1,11 +0,0 @@
-sudo: required
-
-language: ruby
-
-services:
-  - docker
-
-before_install:
-  - docker pull contribsys/faktory:latest
-  - docker run -d -p 127.0.0.1:7419:7419 -p 127.0.0.1:7420:7420 contribsys/faktory:latest /faktory -b :7419 -w :7420
-  - docker ps -a