cyclop 0.1.1 → 0.1.2

data/.rspec

@@ -1,2 +1,3 @@
+-I lib
 --color
 --format documentation

data/LICENSE

@@ -0,0 +1,22 @@
+cyclop is Copyright © 2011 TalentBox SA
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -78,6 +78,10 @@ Usage
 * Start a worker:
 
         cyclop -c config.yml
+        
+* To get help about the format for config.yml
+
+        cyclop -h
 
 About
 -----

data/bin/cyclop

@@ -58,6 +58,9 @@ else
       queues: [
         "email", "cache"
       ]
+      # Limit this worker to job queued by this host
+      # use "localhost" to let Cyclop set it to the host running the worker
+      limit_to_host: "server1.mydomain.tld"
       # Load actions in this directory (default to ./actions)
       actions: "/app/actions"
       sleep_interval: 0.5 # in seconds

data/cyclop.gemspec

@@ -12,8 +12,6 @@ Gem::Specification.new do |s|
   s.summary     = "Job queue with MongoDB"
   s.description = "Job queue with MongoDB with emphasis on never losing any task even if worker fails hard (segfault)."
 
-  s.rubyforge_project = "cyclop"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/cyclop/version.rb

@@ -1,3 +1,3 @@
 module Cyclop
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/cyclop/worker.rb

@@ -8,6 +8,8 @@ module Cyclop
     attr_accessor :sleep_interval
     # Path to actions directory
     attr_accessor :actions
+    # Options passed to Cyclop.next to get next job
+    attr_accessor :job_opts
 
     def initialize(config={})
       raise ArgumentError, 'mongo["database"] is required' unless config["mongo"] && config["mongo"]["database"]
@@ -16,6 +18,11 @@ module Cyclop
       self.logger = Logger.new(config["log_file"] || $stdout)
       self.sleep_interval = config["sleep_interval"] || 1
       self.actions = config["actions"] || "./actions"
+      @job_opts = {}
+      if config["limit_to_host"]
+        @job_opts[:host] = config["limit_to_host"]
+        @job_opts[:host] = Cyclop.host if @job_opts[:host]=="localhost"
+      end
       connection = if config["mongo"]["hosts"]
         Mongo::ReplSetConnection.new(
           *config["mongo"]["hosts"],
@@ -110,7 +117,7 @@ module Cyclop
     end
 
     def next_job
-      Cyclop.next *queues
+      Cyclop.next *queues, job_opts
     end
 
     def procline(line)

data/lib/cyclop.rb

@@ -82,6 +82,7 @@ module Cyclop
   # Returns a `Cyclop::Job`
   #
   def push(opts={})
+    opts["created_by"] = opts.delete :host
     Cyclop::Job.create opts
   end
 

data/spec/cyclop/worker_spec.rb

@@ -74,5 +74,30 @@ describe Cyclop::Worker do
         job.attempts.should == 2
       end
     end
+    
+    context "limiting to jobs queued by a given host" do
+      let(:host) { "test.local" }
+      let(:worker) do
+        Cyclop::Worker.new({
+          "log_file" => File.expand_path("../../../test.log", __FILE__),
+          "mongo" => {"database" => "cyclop_test"},
+          "actions" => File.expand_path("../../fixtures/actions", __FILE__),
+          "limit_to_host" => host,
+        }) 
+      end
+      it "run only jobs from this host" do
+        job = Cyclop.push queue: "slow", job_params: ["tony@starkenterprises.com", :welcome]
+        job_local = Cyclop.push queue: "slow", job_params: ["tony@starkenterprises.com", :welcome], host: host
+        2.times do
+          t = Thread.new { worker.run }
+          sleep 1
+          worker.stop
+          t.join
+        end
+        job.reload
+        job.attempts.should == 0
+        Cyclop::Job.find(job_local._id).should be_nil
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyclop
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-09 00:00:00.000000000 +02:00
+date: 2011-06-22 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2165985760 !ruby/object:Gem::Requirement
+  requirement: &2165763360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *2165985760
+  version_requirements: *2165763360
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2165985240 !ruby/object:Gem::Requirement
+  requirement: &2165762840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *2165985240
+  version_requirements: *2165762840
 - !ruby/object:Gem::Dependency
   name: posix-spawn
-  requirement: &2165984760 !ruby/object:Gem::Requirement
+  requirement: &2165762360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *2165984760
+  version_requirements: *2165762360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2165984280 !ruby/object:Gem::Requirement
+  requirement: &2165761880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2165984280
+  version_requirements: *2165761880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2165983800 !ruby/object:Gem::Requirement
+  requirement: &2165761380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2165983800
+  version_requirements: *2165761380
 - !ruby/object:Gem::Dependency
   name: rocco
-  requirement: &2165983320 !ruby/object:Gem::Requirement
+  requirement: &2165760900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,7 +78,7 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *2165983320
+  version_requirements: *2165760900
 description: Job queue with MongoDB with emphasis on never losing any task even if
   worker fails hard (segfault).
 email:
@@ -92,6 +92,7 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/cyclop
@@ -127,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: cyclop
+rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3