q 0.0.0 → 0.0.1

data/test/methods/delayed_job_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+
+class DelayedJobUser
+  include Q::Methods::DelayedJob
+
+  def self.bar; end
+
+  queue(:foo) do |value|
+    puts "Calling DelayedJobUser::Foo with value #{value}"
+    DelayedJobUser.bar
+  end
+end
+
+class DelayedJobTest < Test::Unit::TestCase
+
+  def setup
+    # @pid, @capture = start_delayed_job
+  end
+
+  def teardown
+    # kill_process(@pid)
+  end
+
+  def output
+    @output ||= ""
+    @output << @capture.string
+  end
+
+  # def test_delayed_job_non_inline_works
+  #   value = rand(1..99)
+  #   DelayedJobUser.queue.foo(value)
+  #   sleep 1
+  #   assert_match "Calling DelayedJobUser::Foo with value #{value}", output
+  # end
+end

data/test/methods/resque_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+SETUP_RESQUE_NAMESPACE.call
+
+class ResqueUser
+  include Q::Methods::Resque
+
+  def self.bar; end
+
+  queue(:foo) do |value|
+    Resque.logger.info "Calling ResqueUser::Foo with value #{value}"
+    ResqueUser.bar
+  end
+end
+
+class ResqueTest < Test::Unit::TestCase
+
+  def setup
+    @pid, @capture = start_resque
+  end
+
+  def teardown
+    kill_process(@pid)
+  end
+
+  def output
+    @output ||= ""
+    @output << @capture.string
+  end
+
+  def test_resque_non_inline_works
+    value = rand(1..99)
+    ResqueUser.queue.foo(value)
+    sleep 5
+    assert_match "Calling ResqueUser::Foo with value #{value}", output
+  end
+end

data/test/methods/sidekiq_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+require 'q/methods/resque'
+
+
+class SidekiqTest < Test::Unit::TestCase
+
+  def setup
+    @pid, @capture = start_sidekiq
+  end
+
+  def teardown
+    kill_process(@pid)
+  end
+
+  def output
+    @output ||= ""
+    @output << @capture.string
+  end
+
+  def test_sidekiq_non_inline_works
+    value = rand(1..99)
+    SidekiqUser.queue.foo(value)
+    sleep 1
+    assert_match output, "Calling SidekiqUser::Foo with value #{value}"
+  end
+
+  # def test_sidekiq_with_inline_works
+  #   value = rand(1..99)
+  #   Q.queue_config.inline = true
+
+  #   SidekiqUser.queue.foo(value)
+  #   sleep 1
+  #   assert_match "Calling SidekiqUser::Foo with value #{value}", output
+  # ensure
+  #   Q.queue_config.inline = false
+  # end
+end

data/test/methods/threaded_test.rb

@@ -0,0 +1,89 @@
+require 'test_helper'
+
+# TODO: seperate threaded tests from Q general regession tests in this file
+class User
+  include Q::Methods::Threaded
+
+  def self.find(id)
+    self.new
+  end
+
+  queue :foo do
+  end
+
+  def self.bar(*args)
+  end
+
+  queue :bar do |*args|
+    User.bar(*args)
+  end
+end
+
+class Foo
+  include Q::Methods::Threaded
+
+  def self.bar(*args)
+  end
+
+  queue :bar do |*args|
+    Foo.bar(*args)
+  end
+
+  queue :early_return_if do |bool|
+    return true if bool
+    Foo.bar
+  end
+end
+
+
+class ThreadedTest < Test::Unit::TestCase
+
+  def setup
+    Q.queue_config.inline = true
+  end
+
+  def teardown
+    Q.queue_config.inline = false
+  end
+
+  def test_queue_is_defined
+    assert_match  "foo", User.queue.methods.join(', ')
+  end
+
+  def test_dequeue
+    args = [1,2,3]
+    User.expects(:bar).with(args).twice
+
+    user = User
+    user.queue.bar(args)
+
+    user = User.new
+    user.queue.bar(args)
+  end
+
+  # make sure the namespace works correctly Foo::Bar and User::Bar
+  def test_namespacing_works
+    refute_equal Foo::Bar, User::Bar
+  end
+
+  def test_early_returns_do_not_blow_up
+    Foo.expects(:bar).once
+    Foo.queue.early_return_if false
+    Foo.queue.early_return_if true
+  end
+
+  def test_non_inline
+    Q.queue_config.inline = false
+
+    args = [1,2,3]
+    User.expects(:bar).with(args).twice
+
+    user = User
+    user.queue.bar(args)
+
+    user = User.new
+    user.queue.bar(args)
+  ensure
+    Q.queue_config.stop
+  end
+end

data/test/methods_test.rb

@@ -0,0 +1,63 @@
+require 'test_helper'
+
+
+f = Proc.new do |queue_type|
+
+
+  class MtPoro
+    include Q::Methods
+
+    queue(:quux) do
+
+    end
+  end
+end
+
+class MethodsTest < Test::Unit::TestCase
+
+  def teardown
+    Q.reset_queue!
+  end
+
+  def test_propper_switching
+
+    Q.queue = :threaded
+
+    assert_equal Q::Methods::Threaded, Q.queue
+    Q::Methods::Threaded::QueueBuild.expects(:call).once
+    Q::Methods::Threaded::QueueMethod.expects(:call).once
+
+    Class.new do
+      include Q::Methods
+      queue(:quux) {}
+    end
+
+    Q.queue = :resque
+
+    assert_equal Q::Methods::Resque, Q.queue
+    Q::Methods::Resque::QueueBuild.expects(:call).once
+    Q::Methods::Resque::QueueMethod.expects(:call).once
+
+    Class.new do
+      include Q::Methods
+      queue(:quux){}
+    end
+  end
+
+  def test_env
+    Q.queue = :threaded
+    assert Q.env.threaded?
+    refute Q.env.resque?
+
+    Q.reset_queue!
+
+    assert Q.env.threaded?
+    refute Q.env.resque?
+
+    Q.queue = :resque
+
+    refute Q.env.threaded
+    assert Q.env.resque?
+  end
+
+end

data/test/q_test.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+
+
+class QTest < Test::Unit::TestCase
+
+  def test_queue_lookup
+    assert_equal Q::Methods::Resque,     Q.queue_lookup[:resque].call
+    assert_equal Q::Methods::Sidekiq,    Q.queue_lookup[:sidekiq].call
+    assert_equal Q::Methods::DelayedJob, Q.queue_lookup[:delayed_job].call
+    assert_equal Q::Methods::Threaded,   Q.queue_lookup[:threaded].call
+  end
+end

data/test/support/delayed_job.rb

@@ -0,0 +1,66 @@
+require 'delayed_job_active_record'
+
+require 'q/methods/delayed_job'
+
+require 'delayed_job'
+
+
+ESTABLISH_ACTIVERECORD = Proc.new do
+  ActiveRecord::Base.establish_connection adapter: "sqlite3", database: "test/db/test.db"
+
+  ActiveRecord::Schema.define do
+    create_table :delayed_jobs, :force => true do |table|
+      table.integer  :priority, :default => 0
+      table.integer  :attempts, :default => 0
+      table.text     :handler
+      table.text     :last_error
+      table.datetime :run_at
+      table.datetime :locked_at
+      table.datetime :failed_at
+      table.string   :locked_by
+      table.string   :queue
+      table.timestamps
+    end
+  end
+end
+
+ESTABLISH_ACTIVERECORD.call
+
+def start_delayed_job
+  stdout = StringIO.new
+  pid = Process.fork do
+    ESTABLISH_ACTIVERECORD.call
+    Delayed::Worker.logger = Logger.new(stdout)
+    Q::Methods::DelayedJob::QueueTask.call
+  end
+
+  return pid, stdout
+end
+
+
+namespace :jobs do
+
+  desc "Clear the delayed_job queue."
+  task :clear do
+    Delayed::Job.delete_all
+  end
+
+  desc "Start a delayed_job worker."
+  task :work => :environment_options do
+    Delayed::Worker.new(@worker_options).start
+  end
+
+  desc "Start a delayed_job worker and exit when all available jobs are complete."
+  task :workoff => :environment_options do
+    Delayed::Worker.new(@worker_options.merge({:exit_on_complete => true})).start
+  end
+
+  task :environment_options do
+    @worker_options = {
+      :min_priority => ENV['MIN_PRIORITY'],
+      :max_priority => ENV['MAX_PRIORITY'],
+      :queues => (ENV['QUEUES'] || ENV['QUEUE'] || '').split(','),
+      :quiet => false
+    }
+  end
+end

data/test/support/resque.rb

@@ -0,0 +1,25 @@
+require 'resque'
+require 'resque/tasks'
+
+require 'q/methods/resque'
+
+RESQUE_NAMESPACE = "q:redis:namespace"
+
+# useful so we don't accidentally run other code
+SETUP_RESQUE_NAMESPACE = Proc.new do
+  Resque.redis.namespace = RESQUE_NAMESPACE
+end
+
+SETUP_RESQUE_NAMESPACE.call
+
+def start_resque
+  stdout = StringIO.new
+  Resque.inline  = false
+  pid = Process.fork do
+    SETUP_RESQUE_NAMESPACE.call
+    Resque.logger = Logger.new(stdout)
+    Q::Methods::Resque::QueueTask.call
+  end
+
+  return pid, stdout
+end

data/test/support/sidekiq.rb

@@ -0,0 +1,38 @@
+require 'q'
+require 'sidekiq'
+require 'q/methods/sidekiq'
+
+SIDEKIQ_NAMESPACE = "q:sidekiq:namespace"
+
+SETUP_SIDEKIQ_NAMESPACE = Proc.new do
+  Sidekiq.configure_client do |config|
+    config.redis = { :namespace => SIDEKIQ_NAMESPACE }
+  end
+end
+
+def start_sidekiq
+  stdout = StringIO.new
+  Q::Methods::Sidekiq::QueueConfig.call.inline = false
+  pid = Process.fork do
+    SETUP_SIDEKIQ_NAMESPACE.call
+    # Object.const_set(:STDOUT, stdout
+    Sidekiq.logger = Logger.new(stdout)
+    Q::Methods::Sidekiq::QueueTask.call
+  end
+
+  return pid, stdout
+end
+
+
+SETUP_SIDEKIQ_NAMESPACE.call
+
+class SidekiqUser
+  include Q::Methods::Sidekiq
+
+  def self.bar; end
+
+  queue(:foo) do |value|
+    Sidekiq.logger.info "Calling SidekiqUser::Foo with value #{value}"
+    SidekiqUser.bar
+  end
+end

data/test/support/threaded_in_memory_queue.rb

@@ -0,0 +1,5 @@
+require 'threaded_in_memory_queue'
+
+ThreadedInMemoryQueue.configure do |config|
+  config.size = 2
+end

data/test/test_helper.rb

@@ -0,0 +1,22 @@
+Bundler.require
+
+require 'q'
+require 'test/unit'
+require "mocha/setup"
+
+
+Dir.glob("test/support/*.rb").each do |support|
+  require support.gsub('test/', '').gsub('.rb', '')
+end
+
+class Dummy
+end
+
+def kill_process(pid)
+  Process.kill :INT, pid
+end
+
+if defined?(Rake)
+  task = Rake::Task.define_task("environment") do
+  end
+end

metadata

@@ -1,146 +1,200 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: q
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 0
-  version: 0.0.0
+version: !ruby/object:Gem::Version
+  version: 0.0.1
 platform: ruby
-authors: 
-- Christopher M. Hobbs
+authors:
+- Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-05 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: i18n
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+date: 2013-12-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: proc_to_lambda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: trollop
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: threaded_in_memory_queue
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: chronic
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: dm-core
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: dm-migrations
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id005
-description: q is a command line activity logger/time tracker.
-email: 
-- chris@altbit.org
-executables: 
-- q
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: resque
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: delayed_job_active_record
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ' A universal interface for Ruby queueing backends. '
+email:
+- richard.schneeman+rubygems@gmail.com
+executables: []
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
-- .rvmrc
+- CHANGELOG.md
 - Gemfile
+- QUEUE_AUTHORS.md
 - README.md
 - Rakefile
-- bin/q
 - lib/q.rb
+- lib/q/errors.rb
+- lib/q/helpers.rb
+- lib/q/methods.rb
+- lib/q/methods/base.rb
+- lib/q/methods/delayed_job.rb
+- lib/q/methods/resque.rb
+- lib/q/methods/sidekiq.rb
+- lib/q/methods/threaded_in_memory_queue.rb
+- lib/q/tasks.rb
 - lib/q/version.rb
 - q.gemspec
-- spec/.gitignore
-has_rdoc: true
-homepage: http://github.com/hooobs/q
-licenses: []
-
+- test/methods/base_test.rb
+- test/methods/delayed_job_test.rb
+- test/methods/resque_test.rb
+- test/methods/sidekiq_test.rb
+- test/methods/threaded_test.rb
+- test/methods_test.rb
+- test/q_test.rb
+- test/support/delayed_job.rb
+- test/support/resque.rb
+- test/support/sidekiq.rb
+- test/support/threaded_in_memory_queue.rb
+- test/test_helper.rb
+homepage: https://github.com/schneems/q
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: q is for Journal
-test_files: 
-- spec/.gitignore
+specification_version: 4
+summary: Use Q to switch betwen queue backends as you please. Simplifies creating
+  and calling background jobs
+test_files:
+- test/methods/base_test.rb
+- test/methods/delayed_job_test.rb
+- test/methods/resque_test.rb
+- test/methods/sidekiq_test.rb
+- test/methods/threaded_test.rb
+- test/methods_test.rb
+- test/q_test.rb
+- test/support/delayed_job.rb
+- test/support/resque.rb
+- test/support/sidekiq.rb
+- test/support/threaded_in_memory_queue.rb
+- test/test_helper.rb
+has_rdoc: