resque-approval 1.0.0 → 1.0.1

data/.gitignore

@@ -1,4 +1,6 @@
 *.gem
 Gemfile.lock
 .rvmrc
-spec/tmp
+*.pid
+*.swp
+*.swo

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+## 1.0.1 (2012-06-06)
+
+* Bug fixes:
+  * Make return values from .approve and .reject more explicit.
+
+## 1.0.0 (2012-06-06)
+
+* Initial release

data/lib/resque-approval.rb

@@ -55,6 +55,8 @@ module Resque
         Resque.redis.hdel('pending_jobs', key)
         Resque.redis.lrem('queue:approval_required', 1, job.to_json)
         Resque.push(Resque.queue_from_class(self), job)
+
+        true
       end
 
       def reject(key)
@@ -66,6 +68,8 @@ module Resque
 
         Resque.redis.hdel('pending_jobs', key)
         Resque.redis.lrem('queue:approval_required', 1, job.to_json)
+
+        true
       end
     end
   end

data/lib/resque-approval/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module Approval
-      VERSION = '1.0.0'
+      VERSION = '1.0.1'
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,21 +1,41 @@
 require 'resque-approval'
 
-ROOT_PATH = File.expand_path('..', __FILE__)
-TMP_PATH = '/tmp'
-
 def start_redis
-  puts 'Starting redis for testing at localhost:9736...'
-  `redis-server #{ROOT_PATH}/redis-test.conf`
-  Resque.redis = 'localhost:9736'
-  sleep 0.1
+  redis_config = <<END
+daemonize yes
+pidfile #{redis_pid_file}
+port #{redis_port}
+END
+
+  puts "Starting Redis for testing on port #{redis_port}"
+  IO.popen("redis-server -", 'w+') do |server|
+    server.write(redis_config)
+    server.close_write
+  end
+  Resque.redis = "localhost:#{redis_port}"
+
+  sleep 0.1 # give Redis time to start
+
+  puts "Redis is running with PID #{redis_pid}"
 end
 
 def stop_redis
-  puts "\nKilling test redis server..."
-  %x{
-    cat #{TMP_PATH}/redis-test.pid | xargs kill -QUIT
-    rm -f #{TMP_PATH}/redis-test-dump.rdb
-  }
+  if redis_pid
+    puts "\nSending TERM signal to Redis (#{redis_pid})"
+    Process.kill("TERM", redis_pid)
+  end
+end
+
+def redis_port
+  9736
+end
+
+def redis_pid_file
+  File.expand_path('../redis-test.pid', __FILE__)
+end
+
+def redis_pid
+  File.exist?(redis_pid_file) && File.read(redis_pid_file).to_i
 end
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-approval
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &12740880 !ruby/object:Gem::Requirement
+  requirement: &12083540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12740880
+  version_requirements: *12083540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12740240 !ruby/object:Gem::Requirement
+  requirement: &12082920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12740240
+  version_requirements: *12082920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12739480 !ruby/object:Gem::Requirement
+  requirement: &12082180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12739480
+  version_requirements: *12082180
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &12737500 !ruby/object:Gem::Requirement
+  requirement: &12080700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12737500
+  version_requirements: *12080700
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &12732800 !ruby/object:Gem::Requirement
+  requirement: &12078080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12732800
+  version_requirements: *12078080
 description: ! "A Resque plugin allowing jobs to be sent to a temporary\n                         queue
   to await approval.  Once the job is approved, it\n                         is placed
   on its normal queue."
@@ -76,6 +76,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -85,7 +86,6 @@ files:
 - lib/resque-approval/version.rb
 - resque-approval.gemspec
 - spec/lib/resque-approval_spec.rb
-- spec/redis-test.conf
 - spec/spec_helper.rb
 homepage: https://github.com/eclubb/resque-approval
 licenses: []
@@ -113,5 +113,4 @@ specification_version: 3
 summary: A Resque plugin allowing jobs to be sent to a temporary queue to await approval.
 test_files:
 - spec/lib/resque-approval_spec.rb
-- spec/redis-test.conf
 - spec/spec_helper.rb

data/spec/redis-test.conf

@@ -1,7 +0,0 @@
-daemonize yes
-pidfile /tmp/redis-test.pid
-port 9736
-dbfilename redis-test-dump.rdb
-dir /tmp
-loglevel debug
-logfile stdout