rplex 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,5 @@
+=== 0.0.3 / 2012-02-24
+* Added reset queue functionality
 === 0.0.2 / 2012-01-04
 * Added backlog delivering queue sizes
 === 0.0.1 / 2011-12-11

data/README.txt

@@ -1,6 +1,6 @@
 = rplex
 
-http://c11865-prj.zuehlke.com
+https://github.com/damphyr/rplex
 
 == DESCRIPTION:
 

data/lib/rplex/client.rb

@@ -30,6 +30,17 @@ module Rplex
       raise ClientError, $!.message
     end
     
+    def reset workers
+      if workers && !workers.empty?
+        response=RestClient.post(@service, {"workers"=>workers}, :content_type => :json, :accept => :json)
+        return JSON.parse(response)
+      else
+        return []
+      end
+    rescue
+      raise ClientError, $!.message
+    end
+    
     def backlog
       response=RestClient.get(@service,:accept => :json)
       unless response.empty?

data/lib/rplex/jobs.rb

@@ -48,5 +48,13 @@ module Rplex
     rescue
       false
     end
+    #All worker queue names
+    def workers
+      @queues.keys
+    end
+    #Empties the worker queues
+    def reset workers
+      workers.each{|worker| @queues[worker].clear if @queues[worker]}
+    end
   end
 end

data/lib/rplex/server.rb

@@ -36,6 +36,17 @@ module Rplex
       [200,{'Content-Type' => 'application/json'},@overseer.backlog.to_json]
     end
     
+    post '/reset' do
+      begin
+        reply={}
+        workers= params["workers"] ? params["workers"] : @overseer.workers
+        @overseer.reset(workers)
+        [200,{'Content-Type' => 'application/json'},@overseer.backlog.to_json]
+      rescue
+        status 500
+      end
+    end
+    
     def self.define_settings cfg={}
       cfg||={}
       #the settings that are not public

data/lib/rplex.rb

@@ -2,7 +2,7 @@ module Rplex
   module Version
     MAJOR = 0
     MINOR = 0 
-    TINY = 2
+    TINY = 3
     STRING = "#{MAJOR}.#{MINOR}.#{TINY}"
   end
 end

data/test/test_jobs.rb

@@ -34,4 +34,20 @@ class TestOverseer < Test::Unit::TestCase
     ov<<job_data
     assert_equal([['worker1',1],['worker2',1]], ov.backlog)
   end
+  
+  def test_reset
+    ov=Rplex::Overseer.new
+    assert(ov.backlog.empty?)
+    jd1={"identifier"=>"8888","data"=>{:foo=>"bar",:bar=>"foo"}}
+    jd2={"identifier"=>"9999","data"=>{:foo=>"bar",:bar=>"foo"}}
+    ov['worker1']
+    ov['worker2']
+    ov<<jd1
+    ov<<jd2
+    assert_equal([['worker1',2],['worker2',2]], ov.backlog)
+    ov.reset(['worker2'])
+    assert_equal([['worker1',2],['worker2',0]], ov.backlog)
+    ov.reset(['worker1'])
+    assert_equal([['worker1',0],['worker2',0]], ov.backlog)
+  end
 end

data/test/test_server.rb

@@ -39,4 +39,16 @@ class ServerTest < Test::Unit::TestCase
     get '/backlog'
     assert_equal(200, last_response.status)
   end
+  
+  def test_reset
+    get '/job/worker'
+    payload={"identifier"=>"8888","data"=>{"url"=>"http://foo.bar/drops","revision"=>"8888"}}
+    post '/job', payload
+    post '/job', payload
+    get '/backlog'
+    assert_equal([["worker",2]], JSON.parse(last_response.body))
+    post '/reset',{"workers"=>['worker']}
+    get '/backlog'
+    assert_equal([["worker",0]], JSON.parse(last_response.body))
+  end
 end

metadata

@@ -1,103 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rplex
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Vassilis Rizopoulos
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-20 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153566880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.3.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153566880
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &2153565980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 6
-        - 7
+      - !ruby/object:Gem::Version
         version: 1.6.7
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153565980
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &2153565160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153565160
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &2153564380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 12
-        version: "2.12"
+      - !ruby/object:Gem::Version
+        version: '2.12'
   type: :development
-  version_requirements: *id004
-description: |-
-  http://c11865-prj.zuehlke.com
-  
+  prerelease: false
+  version_requirements: *2153564380
+description: ! 'https://github.com/damphyr/rplex
+
+
   == DESCRIPTION:
-  
+
+
   Simple asynchronous data based job management
-  
-  == INSTALL:
-email: 
+
+
+  == INSTALL:'
+email:
 - var@zuehlke.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
-files: 
+files:
 - Gemfile
 - History.txt
 - lib/rplex.rb
@@ -113,39 +89,31 @@ files:
 - .gemtest
 homepage: http://github.com/damphyr/rplex
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rplex
-rubygems_version: 1.8.6
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: rplex multiplexes jobs across multiple workers
-test_files: 
+test_files:
 - test/test_jobs.rb
 - test/test_rplex.rb
 - test/test_server.rb