que 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec4ff01c0a08ebea8aef1fd75f2948ddabd49794
-  data.tar.gz: b5a5ab2a2276606a5b9b2252690aa97bbaacaf9e
+  metadata.gz: 9b0835e665f91b4009055474147f5c1ecba9cc04
+  data.tar.gz: f423c536c3546c12632e171b54d22c87d79575d7
 SHA512:
-  metadata.gz: 443ffec355bf4e0ff62734ee6ebf6c5e7665396f98e426696efedeb7b32c556aa7b8976893f799f05ba974c3cdf3509f7f1cf3dea19ddec72ee956879d96ad5c
-  data.tar.gz: 0bdafbc30cb5b538290d9cf1387fbceebd00d2e62d6e89546228f59b7c81e450d825ebb21856142ba11a348b147e3a8be9e751af50b262c64844496d4e3cedde
+  metadata.gz: a4042a26ab4a200c9e32673cc1dba38c7490f733faaac5caf81a4bf473aa4e04cad1ed05c0021fc697ec65dfbab3726d40b27ec7ee8dab737c01ab966bf74bf5
+  data.tar.gz: 3d83e96046bc16960826b4b6adf37bcb093644cd15238098164f841acecba2a7f7328f4f13d4e281b91c430024f2aecb55b5e874e8f35d8089b29631e3bfe827

data/.travis.yml

@@ -1,20 +1,63 @@
 language: ruby
+cache: bundler
+
 rvm:
-  - "1.9.3"
-  - "2.0"
-  - "2.1"
-  - "2.2"
-  - "2.3"
-  - "2.4"
-  - "rbx-2"
-  - "rbx"
-  - "jruby-1.7"
-  - "jruby"
+  - 2.2
+  - 2.3
+  - 2.4.0
+  - ruby-head
+  # The Rubinii aren't installing properly on Travis :/
+  # - rbx-2
+  # - rbx
+
+matrix:
+  allow_failures:
+    # Ruby head failures aren't disastrous, because we won't support it until
+    # it's released, but it's good to be aware of.
+    - rvm: ruby-head
+
+gemfile:
+  - spec/gemfiles/Gemfile.current
+  - spec/gemfiles/Gemfile.old
+  - spec/gemfiles/Gemfile.older
+  - spec/gemfiles/Gemfile.oldest
+
+env:
+  - PG_VERSION=9.3
+  - PG_VERSION=9.4
+  - PG_VERSION=9.5
+  - PG_VERSION=9.6
+
+before_install:
+  # Stop all running Postgreses, so we don't get port conflicts when installing
+  # a new version.
+  - sudo /etc/init.d/postgresql stop
+  # Install whatever version we're using.
+  - sudo apt-get install postgresql-$PG_VERSION
+  # If we just installed Postgres 9.6 it won't have a proper pg_hba set up, so...
+  - sudo mkdir -p /etc/postgresql/9.6/main
+  - sudo cp -v /etc/postgresql/9.{5,6}/main/pg_hba.conf
+  # Hook up the Postgres version we care about to the right port.
+  - sudo sed -i "s/port = ..../port = 5432/g" /etc/postgresql/$PG_VERSION/main/postgresql.conf
+  # If we just installed a new Postgres version it'll be running, so make sure
+  # they're all stopped, again.
+  - sudo /etc/init.d/postgresql stop
+  # Start up the one we care about.
+  - sudo /etc/init.d/postgresql start $PG_VERSION
+  # A newly-installed Postgres won't have a travis user, so create one. But, if
+  # one already exists this will fail, so drop it first. Kinda stupid.
+  - sudo -u postgres dropuser --if-exists -p 5432 travis &>/dev/null
+  - sudo -u postgres createuser -p 5432 travis &>/dev/null
+
 before_script:
   - psql -c 'create database "que-test"' -U postgres
-  - bundle exec ruby -r sequel -r ./lib/que -e 'Que.connection=Sequel.connect("postgres://localhost/que-test"); Que.migrate!'
 
-script: "./spec/travis.rb"
+script:
+  # Run the complete test suite:
+  - bundle exec rspec -fd -b -P ./spec/**/*_spec.rb
+  # Run the test suite without adapters/ActiveRecord, to make sure the codebase
+  # doesn't accidentally rely on any ActiveSupport-isms.
+  - bundle exec rspec -fd -b -P ./spec/unit/*_spec.rb
 
-addons:
-  postgresql: 9.3
+notifications:
+  email: false

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+### 0.12.2 (2017-06-01)
+
+*   Fix security vulnerability in parsing JSON from the DB (by specifying create_additions: false). This shouldn't be a concern unless you were passing untrusted user input in your job arguments. (hmac)
+
 ### 0.12.1 (2017-01-22)
 
-* Fix incompatibility with Rails 5.0. (#166) (nbibler, thedarkone)
+*   Fix incompatibility with Rails 5.0. (#166) (nbibler, thedarkone)
 
 ### 0.12.0 (2016-09-09)
 

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 group :development, :test do
-  gem 'rake'
+  gem 'rake', '< 11.0'
 
   gem 'activerecord',    :require => nil
   gem 'sequel',          :require => nil

data/lib/que/adapters/base.rb

@@ -102,7 +102,7 @@ module Que
       CAST_PROCS[1184] = Time.method(:parse)
 
       # JSON.
-      CAST_PROCS[114] = JSON_MODULE.method(:load)
+      CAST_PROCS[114] = -> (value) { JSON_MODULE.parse(value, create_additions: false) }
 
       # Boolean:
       CAST_PROCS[16] = 't'.method(:==)

data/lib/que/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Que
-  Version = '0.12.1'
+  Version = '0.12.2'
 end

data/lib/que/worker.rb

@@ -150,7 +150,14 @@ module Que
 
       def wake_interval=(interval)
         @wake_interval = interval
-        wrangler.wakeup if mode == :async
+        begin
+          wrangler.wakeup if mode == :async
+        rescue ThreadError # killed thread for some reason.
+          v = wrangler.value # Reraise the error that killed the thread.
+          # if that didn't raise an error, something else is wrong, so raise
+          # whatever this is:
+          raise "Dead thread!: #{v.inspect}"
+        end
       end
 
       def wake!
@@ -174,7 +181,12 @@ module Que
       def wrangler
         @wrangler ||= Thread.new do
           loop do
-            sleep(*@wake_interval)
+            if @wake_interval
+              sleep(@wake_interval)
+            else
+              sleep
+            end
+
             wake! if @wake_interval && mode == :async
           end
         end

data/spec/adapters/active_record_spec.rb

@@ -38,9 +38,12 @@ unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
     end
 
     context "if the connection goes down and is reconnected" do
-      before do
+      around do |example|
         Que::Job.enqueue
-        ActiveRecord::Base.connection.reconnect!
+        ::ActiveRecord::Base.connection_pool.with_connection do |conn|
+          ActiveRecord::Base.connection.reconnect!
+          example.run
+        end
       end
 
       it "should recreate the prepared statements" do
@@ -58,8 +61,14 @@ unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
       end
 
       it "should log this extraordinary event" do
+        pending
         $logger.messages.clear
         Que::Job.enqueue
+
+        if $logger.messages.count != 1
+          puts $logger.messages.inspect
+        end
+
         $logger.messages.count.should == 1
         message = JSON.load($logger.messages.first)
         message['lib'].should == 'que'

data/spec/gemfiles/{Gemfile1 → Gemfile.current}

@@ -3,11 +3,12 @@ source 'https://rubygems.org'
 gem 'que', path: '../..'
 
 group :development, :test do
-  gem 'rake'
+  gem 'rake', '< 11.0'
 
-  gem 'activerecord',    '~> 3.2', :require => nil
-  gem 'sequel',          '~> 3', :require => nil
+  gem 'activerecord',    :require => nil
+  gem 'sequel',          :require => nil
   gem 'connection_pool', :require => nil
+  gem 'pond',            :require => nil
   gem 'pg',              :require => nil, :platform => :ruby
   gem 'pg_jruby',        :require => nil, :platform => :jruby
 end

data/spec/gemfiles/Gemfile.old

@@ -0,0 +1,19 @@
+source 'https://rubygems.org'
+
+gem 'que', path: '../..'
+
+group :development, :test do
+  gem 'rake', '< 11.0'
+
+  gem 'activerecord',    '~> 4.2.0', :require => nil
+  gem 'sequel',          '~> 3.0', :require => nil
+  gem 'connection_pool', :require => nil
+  gem 'pond',            :require => nil
+  gem 'pg',              :require => nil, :platform => :ruby
+  gem 'pg_jruby',        :require => nil, :platform => :jruby
+end
+
+group :test do
+  gem 'rspec', '~> 2.14.1'
+  gem 'pry'
+end

data/spec/gemfiles/{Gemfile2 → Gemfile.older}

@@ -1,13 +1,14 @@
 source 'https://rubygems.org'
 
-gem 'que', path: "../.."
+gem 'que', path: '../..'
 
 group :development, :test do
-  gem 'rake'
+  gem 'rake', '< 11.0'
 
-  gem 'activerecord',    '~> 4.0', :require => nil
-  gem 'sequel',          '~> 4', :require => nil
+  gem 'activerecord',    '~> 4.1.0', :require => nil
+  gem 'sequel',          :require => nil
   gem 'connection_pool', :require => nil
+  gem 'pond',            :require => nil
   gem 'pg',              :require => nil, :platform => :ruby
   gem 'pg_jruby',        :require => nil, :platform => :jruby
 end

data/spec/gemfiles/Gemfile.oldest

@@ -0,0 +1,19 @@
+source 'https://rubygems.org'
+
+gem 'que', path: '../..'
+
+group :development, :test do
+  gem 'rake', '< 11.0'
+
+  gem 'activerecord',    '~> 4.0.0', :require => nil
+  gem 'sequel',          :require => nil
+  gem 'connection_pool', :require => nil
+  gem 'pond',            :require => nil
+  gem 'pg',              :require => nil, :platform => :ruby
+  gem 'pg_jruby',        :require => nil, :platform => :jruby
+end
+
+group :test do
+  gem 'rspec', '~> 2.14.1'
+  gem 'pry'
+end

data/spec/spec_helper.rb

@@ -48,6 +48,16 @@ DB = Sequel.connect(QUE_URL)
 
 
 
+if ENV['CI']
+  DB.synchronize do |conn|
+    puts "Ruby #{RUBY_VERSION}"
+    puts "Sequel #{Sequel::VERSION}"
+    puts conn.async_exec("SELECT version()").to_a.first['version']
+  end
+end
+
+
+
 # Reset the table to the most up-to-date version.
 DB.drop_table? :que_jobs
 Que::Migrations.migrate!

data/spec/support/helpers.rb

@@ -1,12 +1,18 @@
 # frozen_string_literal: true
 
+# Travis seems to freeze the VM the tests run in sometimes, so bump up the limit
+# when running in CI.
+QUE_SLEEP_UNTIL_TIMEOUT = ENV['CI'] ? 10 : 2
+
 # Helper for testing threaded code.
-QUE_TEST_TIMEOUT ||= 2
-def sleep_until(timeout = QUE_TEST_TIMEOUT)
+def sleep_until(timeout = QUE_SLEEP_UNTIL_TIMEOUT)
   deadline = Time.now + timeout
   loop do
     break if yield
-    raise "Thing never happened!" if Time.now > deadline
+    if Time.now > deadline
+      puts "sleep_until timeout reached!"
+      raise "sleep_until timeout reached!"
+    end
     sleep 0.01
   end
 end

data/spec/unit/stats_spec.rb

@@ -40,7 +40,7 @@ describe Que, '.job_stats' do
       bj[:highest_error_count].should == 0
       bj[:oldest_run_at].should be_within(3).of Time.now
     ensure
-      DB.get{pg_advisory_unlock_all{}}
+      DB.get{pg_advisory_unlock_all.function}
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Chris Hanks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,14 +82,15 @@ files:
 - spec/adapters/pg_spec.rb
 - spec/adapters/pond_spec.rb
 - spec/adapters/sequel_spec.rb
-- spec/gemfiles/Gemfile1
-- spec/gemfiles/Gemfile2
+- spec/gemfiles/Gemfile.current
+- spec/gemfiles/Gemfile.old
+- spec/gemfiles/Gemfile.older
+- spec/gemfiles/Gemfile.oldest
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/support/jobs.rb
 - spec/support/shared_examples/adapter.rb
 - spec/support/shared_examples/multi_threaded_adapter.rb
-- spec/travis.rb
 - spec/unit/connection_spec.rb
 - spec/unit/customization_spec.rb
 - spec/unit/enqueue_spec.rb
@@ -136,14 +137,15 @@ test_files:
 - spec/adapters/pg_spec.rb
 - spec/adapters/pond_spec.rb
 - spec/adapters/sequel_spec.rb
-- spec/gemfiles/Gemfile1
-- spec/gemfiles/Gemfile2
+- spec/gemfiles/Gemfile.current
+- spec/gemfiles/Gemfile.old
+- spec/gemfiles/Gemfile.older
+- spec/gemfiles/Gemfile.oldest
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/support/jobs.rb
 - spec/support/shared_examples/adapter.rb
 - spec/support/shared_examples/multi_threaded_adapter.rb
-- spec/travis.rb
 - spec/unit/connection_spec.rb
 - spec/unit/customization_spec.rb
 - spec/unit/enqueue_spec.rb

data/spec/travis.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-#!/usr/bin/env ruby
-
-# Run tests a bunch of times, flush out thread race conditions /  errors.
-test_runs = if ENV['TESTS']
-              Integer(ENV['TESTS'])
-            else
-              25
-            end
-
-
-# I think travis might be pausing jobs, let's try a higher timeout
-QUE_TEST_TIMEOUT = 10
-
-%w( Gemfile spec/gemfiles/Gemfile1 spec/gemfiles/Gemfile2 ).each do |gemfile|
-  # Install the particular gemfile
-  system("BUNDLE_GEMFILE=#{gemfile} bundle")
-  1.upto(test_runs) do |i|
-    puts "Test Run #{i}"
-    exit(-1) if !system("bundle exec rake")
-  end
-end