resque_jobs_tree 0.4.2 → 0.4.3

data/lib/resque_jobs_tree/job.rb

@@ -23,9 +23,23 @@ class ResqueJobsTree::Job
     def node tree_name, job_name, *resources_arguments
       node_definition = ResqueJobsTree.find(tree_name).find job_name
       resources       = ResqueJobsTree::ResourcesSerializer.instancize resources_arguments
-      node_definition.spawn resources
+      node = node_definition.spawn(resources)
+      if node.exists?
+        node
+      else
+        puts "Warning, the job #{node.definition.tree.name}##{node.definition.name}##{node.resources.inspect} " \
+             "doesn't exist. Cleaning-up."
+        node.cleanup
+        FakeNode.new
+      end
     end
 
   end
 
+  class FakeNode
+    def method_missing *args
+      # do nothing
+    end
+  end
+
 end

data/lib/resque_jobs_tree/storage/node.rb

@@ -51,6 +51,14 @@ module ResqueJobsTree::Storage::Node
     "#{key}:lock"
   end
 
+  def exists?
+    if definition.root?
+      tree.exists?
+    else
+      redis.exists(childs_key) || redis.hexists(PARENTS_KEY, key)
+    end
+  end
+
 	private
 
   def lock

data/lib/resque_jobs_tree/storage/tree.rb

@@ -16,6 +16,10 @@ module ResqueJobsTree::Storage::Tree
   def uniq?
     !redis.sismember LAUNCHED_TREES, key
   end
+
+  def exists?
+    redis.sismember LAUNCHED_TREES, key
+  end
   
   private
 

data/lib/resque_jobs_tree/version.rb

@@ -1,3 +1,3 @@
 module ResqueJobsTree
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/test/job_test.rb

@@ -5,9 +5,18 @@ class JobTest < MiniTest::Unit::TestCase
 	def test_node
 		create_tree
 		args = [@tree_definition.name, @tree_definition.find('job1').name, 1, 2, 3]
+    redis.sadd ResqueJobsTree::Storage::LAUNCHED_TREES, @tree_definition.spawn([1,2,3]).key
 		assert_equal @tree_definition.find(:job1), ResqueJobsTree::Job.send(:node, *args).definition
 		assert_equal ResqueJobsTree.find(:tree1), ResqueJobsTree::Job.send(:node, *args).definition.tree
 		assert_equal [1, 2, 3], ResqueJobsTree::Job.send(:node, *args).resources
 	end
 
+  def test_unregistred_node
+		create_tree
+		args = [@tree_definition.name, @tree_definition.find('job1').name, 1, 2, 3]
+    silenced_stdout do
+		  assert ResqueJobsTree::Job.send(:node, *args).kind_of?(ResqueJobsTree::Job::FakeNode)
+    end
+  end
+
 end

data/test/process_test.rb

@@ -244,12 +244,4 @@ class ProcessTest < MiniTest::Unit::TestCase
     redis.srem 'queues', queue_name
   end
 
-  def silenced_stdout
-    orig_stdout = $stdout
-    $stdout = File.new('/dev/null', 'w')
-    yield
-  ensure
-    $stdout = orig_stdout
-  end
-
 end

data/test/storage_node_test.rb

@@ -82,6 +82,22 @@ class StorageNodeTest < MiniTest::Unit::TestCase
 		assert_equal result, @root.send(:node_info_from_key, key)
 	end
 
+  def test_exists
+    create_tree
+    leaf = @tree_definition.find(:job2).spawn([])
+    assert !leaf.exists?, 'leaf not registred'
+    redis.hset ResqueJobsTree::Storage::PARENTS_KEY, leaf.key, true
+    assert leaf.exists?, 'leaf with parent'
+    redis.hdel ResqueJobsTree::Storage::PARENTS_KEY, leaf.key
+    redis.set leaf.childs_key, true
+    assert leaf.exists?, 'leaf with child'
+
+    root = @tree_definition.find(:job1).spawn([])
+    assert !root.exists?, 'root not registred'
+    redis.sadd ResqueJobsTree::Storage::LAUNCHED_TREES, root.tree.key
+    assert root.exists?, 'root with tree registred'
+  end
+
 	private
 
 	def assert_parent_key expected

data/test/test_helper.rb

@@ -89,4 +89,12 @@ class MiniTest::Unit::TestCase
     end
   end
 
+  def silenced_stdout
+    orig_stdout = $stdout
+    $stdout = File.new('/dev/null', 'w')
+    yield
+  ensure
+    $stdout = orig_stdout
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque_jobs_tree
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors: