stormtroopers 0.1.0 → 0.1.1

data/README.md

@@ -54,6 +54,12 @@ Each Army can be given a set of options:
 
 You set the Army's Factory with the factory type or class option. When using type this is translated into a builtin class, when using class you can specify the name of whatever class you like (it needs to implement the appropriate interface to be able to work of course, have a look through the source code and specs to figure out what you need to do). Besides specifying the type or class, you can also specify the Factory's name (used for logging purposes), if you don't give the Factory a name then the Army's name is propagated to the Factory. The factory options also include specific settings for the chosen backend, for DelayedJob you can specify the queues that jobs may be picked up from. If you don't specify queues then the factory will pick up jobs from all queues.
 
+## TODO
+
+- Daemonization
+- Other backends
+- Documentation
+
 ## Contributing
 
 1. Fork it

data/lib/stormtroopers/army.rb

@@ -4,7 +4,9 @@ module Stormtroopers
 
     def initialize(config)
       @name = config[:name] || factory_class(config).name
-      @factory = factory_class(config).new({name: config[:name]}.merge(config[:factory]))
+      factory_options = HashWithIndifferentAccess.new(config[:factory])
+      factory_options[:name] ||= config[:name]
+      @factory = factory_class(config).new(factory_options)
       @max_threads = config[:max_threads] || 1
       @threads = []
     end

data/lib/stormtroopers/factory.rb

@@ -1,9 +1,10 @@
 module Stormtroopers
   class Factory
-    attr_reader :options
+    attr_reader :options, :name
 
     def initialize(options = {})
       @options = options
+      @name = options[:name]
     end
 
     def produce

data/lib/stormtroopers/factory/delayed_job.rb

@@ -4,7 +4,7 @@ module Stormtroopers
       worker = Delayed::Worker.new(options)
       worker.name = "rand #{Time.now.utc.to_f} #{rand(1000)}"
       if job = Delayed::Job.reserve(worker)
-        logger.info("#{options[:name]} producing trooper to run #{job.queue} job #{job.id}")
+        logger.info("#{self.name} producing trooper to run #{job.queue} job #{job.id}")
         DelayedJobTrooper.new(job)
       end
     end

data/lib/stormtroopers/trooper/delayed_job.rb

@@ -23,6 +23,7 @@ module Stormtroopers
       else
         logger.error("PERMANENTLY removing #{job.name} because of #{job.attempts} consecutive failures.")
         job.hook(:failure)
+        job.fail!
       end
     end
 

data/lib/stormtroopers/version.rb

@@ -1,3 +1,3 @@
 module Stormtroopers
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/stormtroopers/army_spec.rb

@@ -18,7 +18,7 @@ describe Stormtroopers::Army do
       factory_class = stub
       Stormtroopers::Army.any_instance.should_receive(:factory_class).and_return(factory_class)
       factory_instance = stub
-      factory_class.should_receive(:new).with(name: "Dad's Factory", type: :dummy).and_return(factory_instance)
+      factory_class.should_receive(:new).with("name" => "Dad's Factory", "type" => :dummy).and_return(factory_instance)
       army.factory.should equal(factory_instance)
     end
 
@@ -26,7 +26,7 @@ describe Stormtroopers::Army do
       factory_class = stub
       Stormtroopers::Army.any_instance.should_receive(:factory_class).and_return(factory_class)
       factory_instance = stub
-      factory_class.should_receive(:new).with(name: "Dad's Army", type: :dummy).and_return(factory_instance)
+      factory_class.should_receive(:new).with("name" => "Dad's Army", "type" => :dummy).and_return(factory_instance)
       army = Stormtroopers::Army.new(name: "Dad's Army", max_threads: 2, factory: {type: :dummy})
       army.factory.should equal(factory_instance)
     end

data/spec/stormtroopers/factory_spec.rb

@@ -9,6 +9,14 @@ describe Stormtroopers::Factory do
     end
   end
 
+  describe "#name" do
+    it "returns name extracted from the options during #initialize" do
+      options = {name: "The Fun Factory"}
+      factory = Stormtroopers::Factory.new(options)
+      factory.name.should eq("The Fun Factory")
+    end
+  end
+
   describe "#produce" do
     it "is not implemented" do
       factory = Stormtroopers::Factory.new

data/spec/stormtroopers/trooper/delayed_job_spec.rb

@@ -49,6 +49,7 @@ describe Stormtroopers::DelayedJobTrooper do
         job.stub(:attempts).and_return(3)
         job.stub(:max_attempts).and_return(3)
         job.should_receive(:hook).with(:failure)
+        job.should_receive(:fail!)
         trooper.reschedule
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stormtroopers
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease:
 platform: ruby
 authors:
@@ -117,3 +117,4 @@ test_files:
 - spec/stormtroopers/manager_spec.rb
 - spec/stormtroopers/trooper/delayed_job_spec.rb
 - spec/stormtroopers/trooper_spec.rb
+has_rdoc: