queue_classic_plus 4.0.0.alpha9 → 4.0.0.alpha11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 998da8f0e2f5f397e1125b9f47f447ba3cdb17908e79bb4eb9d34a5acb87f7d8
-  data.tar.gz: fb21b8b1175142d27792885d814597c145b68fe2e82e8541d6db78a000c30a86
+  metadata.gz: ff8976dc68cd90745c7f0761be48d57abefb93066f094781d2f7d8c5d1bad0c4
+  data.tar.gz: '05283113c365e521b0c2e6e29166ef6e4b88e0e93206fde58c3bb592ae05e87c'
 SHA512:
-  metadata.gz: 84850b2d1be63a0127adf54eab5d810b6fde5de1d9ee2826a2121f76343fc3442cac74de674858234fcf5ae1f25c418f70d578e242280f83485a892e935f13e3
-  data.tar.gz: 1e2e3b3ca6d2280c5aa445737b7179e2bd7f800c8c5a971d81fc3978f753189f437c99fe6ea81b7d69c079b631e4da41c1adf09032f9fe92863c8003e3fd8ee4
+  metadata.gz: 40100aa7380005e2d58ce5047bf94ddba43caadf4d0b55966fdf2a311c1ae68bd402ba4af00d99957c970139a2d2331466309e3ed6694da44a14ac8abc18b571
+  data.tar.gz: 6c969f33a7c29f0f4e6120305b09d40e2f982631cf2e33e7d25deb16d9b2223cfb6801bd16926fac02ec17bdc330a91515925e4f5c9386f32d9edc1755314925

data/.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 jobs:
   test:
     docker:
-      - image: circleci/ruby:2.7.4-node
+      - image: cimg/ruby:3.2.0
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -27,7 +27,7 @@ jobs:
 
   push_to_rubygems:
     docker:
-      - image: circleci/ruby:2.7.4
+      - image: cimg/ruby:3.2.0
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -47,6 +47,21 @@ jobs:
             gem build queue_classic_plus
             gem push queue_classic_plus-*.gem
 
+  update_jira:
+    docker:
+      - image: alpine:3.8
+        auth:
+          username: $DOCKERHUB_USERNAME
+          password: $DOCKERHUB_TOKEN
+    steps:
+      - run:
+          name: Install dependencies
+          command: apk add --no-cache bash curl git openssh
+      - checkout
+      - run:
+          name: Update JIRA
+          command: .circleci/update-jira.sh
+
 workflows:
   version: 2
   gem_release:
@@ -65,3 +80,10 @@ workflows:
                 - /^v.*/
           context:
             - DockerHub
+            - RubyGems
+      - update_jira:
+          context:
+            - DockerHub
+            - update-jira-webhook
+          requires:
+            - push_to_rubygems

data/.circleci/update-jira.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+# Use JIRA automation webhooks to move issues to SHIPPED:
+# https://support.atlassian.com/jira-software-cloud/docs/automation-triggers/#Automationtriggers-Incomingwebhook
+
+git log --max-count=50 --pretty=format:'%s' | grep -Eo '^\w+-[0-9]+' | sort -u | while read i; do
+  curl -X POST "$UPDATE_JIRA_WEBHOOK_URL?issue=$i"
+done

data/Gemfile

@@ -13,9 +13,9 @@ end
 
 group :test do
   gem 'byebug'
-  gem 'rake'
   gem 'rspec'
   gem 'timecop'
   gem 'newrelic_rpm'
   gem 'ddtrace'
+  gem 'simplecov', require: false
 end

data/lib/queue_classic_plus/base.rb

@@ -122,7 +122,7 @@ module QueueClassicPlus
       if defined?(ActiveRecord) && ActiveRecord::Base.connected?
         # If ActiveRecord is loaded, we use it's own transaction mechanisn since
         # it has slightly different semanctics for rollback.
-        ActiveRecord::Base.transaction(options, &block)
+        ActiveRecord::Base.transaction(**options, &block)
       else
         begin
           execute "BEGIN"

data/lib/queue_classic_plus/datadog.rb

@@ -2,8 +2,14 @@
 
 module QueueClassicDatadog
   def _perform(*args)
-    Datadog.tracer.trace('qc.job', service_name: 'qc.job', resource: "#{name}#perform") do |_|
-      super
+    if Gem.loaded_specs['ddtrace'].version >= Gem::Version.new('1')
+      Datadog::Tracing.trace('qc.job', service: 'qc.job', resource: "#{name}#perform") do |_|
+        super
+      end
+    else
+      Datadog.tracer.trace('qc.job', service_name: 'qc.job', resource: "#{name}#perform") do |_|
+        super
+      end
     end
   end
 

data/lib/queue_classic_plus/version.rb

@@ -1,3 +1,3 @@
 module QueueClassicPlus
-  VERSION = '4.0.0.alpha9'.freeze
+  VERSION = '4.0.0.alpha11'.freeze
 end

data/spec/base_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+require 'active_record'
 
 describe QueueClassicPlus::Base do
   context "A child of QueueClassicPlus::Base" do
@@ -189,5 +191,32 @@ describe QueueClassicPlus::Base do
       expect(Jobs::Tests::TestJob.librato_key).to eq('jobs.tests.test_job')
     end
   end
-end
 
+  context 'with ActiveRecord' do
+    before do
+      @old_conn_adapter = QC.default_conn_adapter
+      @activerecord_conn = ActiveRecord::Base.establish_connection(ENV["DATABASE_URL"])
+      QC.default_conn_adapter = QC::ConnAdapter.new(
+        connection: ActiveRecord::Base.connection.raw_connection
+      )
+    end
+
+    after do
+      @activerecord_conn.disconnect!
+      QC.default_conn_adapter = @old_conn_adapter
+    end
+
+    subject do
+      Class.new(QueueClassicPlus::Base) do
+        @queue = :test
+
+        def self.perform(foo, bar)
+        end
+      end
+    end
+
+    it 'works' do
+      expect { subject._perform(1, 2) }.not_to raise_error
+    end
+  end
+end

data/spec/datadog_spec.rb

@@ -10,8 +10,8 @@ describe 'requiring queue_classic_plus/new_relic' do
 
   it 'adds Datadog profiling support' do
     require 'queue_classic_plus/datadog'
-    expect(Datadog.tracer).to receive(:trace).with(
-      'qc.job', service_name: 'qc.job', resource: 'FunkyName#perform'
+    expect(Datadog::Tracing).to receive(:trace).with(
+      'qc.job', service: 'qc.job', resource: 'FunkyName#perform'
     )
     subject
   end

data/spec/spec_helper.rb

@@ -1,3 +1,10 @@
+require 'simplecov'
+
+SimpleCov.start do
+  add_filter(%r/^\/spec\//)
+  enable_coverage(:branch)
+end
+
 require 'queue_classic_plus'
 require 'pg'
 require 'timecop'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queue_classic_plus
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha9
+  version: 4.0.0.alpha11
 platform: ruby
 authors:
 - Simon Mathieu
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2023-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: queue_classic
@@ -92,10 +92,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".circleci/update-jira.sh"
 - ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
-- ".rvmrc"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: Useful extras for Queue Classic

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 2.1.3@queue_classic_plus --create