dynport_tools 0.2.6 → 0.2.8

data/.autotest

@@ -0,0 +1,4 @@
+Autotest.add_hook :initialize do |at|
+  at.add_exception(%r{^\./tmp/.*})
+  at.add_exception(".autotest")
+end

data/Gemfile

@@ -18,4 +18,5 @@ group :development do
   gem "autotest"
   gem "autotest-growl"
   gem "ruby-debug"
+  gem "timecop"
 end

data/Gemfile.lock

@@ -33,6 +33,7 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
+    timecop (0.3.5)
     typhoeus (0.2.4)
       mime-types
       mime-types
@@ -51,4 +52,5 @@ DEPENDENCIES
   redis
   rspec (~> 2.3.0)
   ruby-debug
+  timecop
   typhoeus

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.8

data/dynport_tools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dynport_tools}
-  s.version = "0.2.6"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-08-21}
+  s.date = %q{2011-08-23}
   s.description = %q{Collection of various tools}
   s.email = %q{tobias.schwab@dynport.de}
   s.executables = ["xmldiff", "redis_dumper"]
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
+    ".autotest",
     ".document",
     ".rbenv-version",
     ".rspec",
@@ -34,15 +35,19 @@ Gem::Specification.new do |s|
     "lib/dynport_tools.rb",
     "lib/dynport_tools/deep_merger.rb",
     "lib/dynport_tools/differ.rb",
+    "lib/dynport_tools/eta.rb",
     "lib/dynport_tools/have_attributes.rb",
     "lib/dynport_tools/jenkins.rb",
     "lib/dynport_tools/redis_dumper.rb",
+    "lib/dynport_tools/redis_q.rb",
     "lib/dynport_tools/xml_file.rb",
     "spec/dynport_tools/deep_merger_spec.rb",
     "spec/dynport_tools/differ_spec.rb",
+    "spec/dynport_tools/eta_spec.rb",
     "spec/dynport_tools/have_attributes_spec.rb",
     "spec/dynport_tools/jenkins_spec.rb",
     "spec/dynport_tools/redis_dumper_spec.rb",
+    "spec/dynport_tools/redis_q_spec.rb",
     "spec/dynport_tools/xml_file_spec.rb",
     "spec/dynport_tools_spec.rb",
     "spec/fixtures/file_a.xml",
@@ -71,6 +76,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<autotest>, [">= 0"])
       s.add_development_dependency(%q<autotest-growl>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<timecop>, [">= 0"])
     else
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<redis>, [">= 0"])
@@ -83,6 +89,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<autotest>, [">= 0"])
       s.add_dependency(%q<autotest-growl>, [">= 0"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<timecop>, [">= 0"])
     end
   else
     s.add_dependency(%q<nokogiri>, [">= 0"])
@@ -96,6 +103,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<autotest>, [">= 0"])
     s.add_dependency(%q<autotest-growl>, [">= 0"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<timecop>, [">= 0"])
   end
 end
 

data/lib/dynport_tools.rb

@@ -1,4 +1,4 @@
 module DynportTools
 end
 
-%w(deep_merger differ jenkins redis_dumper xml_file have_attributes).map { |m| require "dynport_tools/#{m}" }
+%w(deep_merger differ jenkins redis_dumper xml_file have_attributes redis_q eta).map { |m| require "dynport_tools/#{m}" }

data/lib/dynport_tools/eta.rb

@@ -0,0 +1,63 @@
+class DynportTools::ETA
+  attr_accessor :total, :current, :started
+  
+  def initialize(options = {})
+    options.each do |key, value|
+      self.send(:"#{key}=", value) if self.respond_to?(:"#{key}=")
+    end
+  end
+  
+  def percs
+    raise_error_when_current_or_total_not_set
+    current.to_f / total
+  end
+  
+  def pending
+    raise_error_when_current_or_total_not_set
+    total - current
+  end
+  
+  def running_for
+    Time.now - started
+  end
+  
+  def total_time
+    running_for / percs
+  end
+  
+  def to_go
+    total_time - running_for
+  end
+  
+  def eta
+    Time.now + to_go
+  end
+  
+  def per_second
+    current / running_for
+  end
+  
+  def to_s
+    "%.1f%%, %.1f/second, ETA: %s" % [percs * 100, per_second, eta.iso8601]
+  end
+  
+  def raise_error_when_current_or_total_not_set
+    raise "current and total must be set" if total.nil? || current.nil?
+  end
+  
+  class << self
+    FACTORS = [1, 60, 3600]
+    
+    def parse_time_string(string)
+      sum = 0.0
+      string.split(":").map { |s| s.to_i }.reverse.each_with_index do |value, i|
+        sum += value * FACTORS[i]
+      end
+      sum
+    end
+    
+    def from_time_string(string, options = {})
+      self.new(options.merge(:started => Time.now - parse_time_string(string)))
+    end
+  end
+end

data/lib/dynport_tools/jenkins.rb

@@ -34,4 +34,69 @@ class DynportTools::Jenkins
     hydra.run
     jobs
   end
+  
+  class Project
+    attr_accessor :name, :commands, :crontab_pattern, :days_to_keep, :num_to_keep, :node, :child_projects
+    DEFAUL_SCM = "hudson.scm.NullSCM"
+    
+    def initialize(name)
+      self.name = name
+      self.commands = []
+      self.child_projects = []
+    end
+    
+    def to_xml
+      Nokogiri::XML::Builder.new(:encoding => "UTF-8") do |xml|
+        xml.project do
+          xml.actions
+          xml.description
+          if days_to_keep || num_to_keep
+            xml.logRotator do
+              xml.daysToKeep days_to_keep || -1
+              xml.numToKeep num_to_keep || -1 
+              xml.artifactDaysToKeep -1
+              xml.artifactNumToKeep -1
+            end
+          end
+          xml.keepDependencies "false"
+          xml.properties
+          xml.scm(:class => DEFAUL_SCM)
+          xml.assignedNode node if node
+          xml.canRoam "true"
+          xml.disabled "false"
+          xml.blockBuildWhenDownstreamBuilding "false"
+          xml.blockBuildWhenUpstreamBuilding "false"
+          xml.triggers(:class => "vector") do
+            if crontab_pattern
+              xml.send("hudson.triggers.TimerTrigger") do
+                xml.spec crontab_pattern
+              end
+            end
+          end
+          xml.concurrentBuild "false"
+          xml.builders do
+            commands.each do |command|
+              xml.send("hudson.tasks.Shell") do
+                xml.command ["#!/bin/sh", command].join("\n")
+              end
+            end
+          end
+          xml.publishers do
+            if child_projects.any?
+              xml.send("hudson.tasks.BuildTrigger") do
+                xml.childProjects child_projects.map { |c| c.name }.join(",")
+                xml.threshold do
+                  xml.name "SUCCESS"
+                  xml.ordinal "0"
+                  xml.color "BLUE"
+                end
+              end
+            end
+          end
+          xml.buildWrappers do
+          end
+        end
+      end.to_xml
+    end
+  end
 end

data/lib/dynport_tools/redis_q.rb

@@ -0,0 +1,75 @@
+class DynportTools::RedisQ
+  DEFAULTS = { :retry_count => 3 }
+  attr_accessor :redis_key, :retry_count, :redis
+  
+  def initialize(redis_key, options = {})
+    DEFAULTS.merge(options).merge(:redis_key => redis_key).each do |key, value|
+      self.send(:"#{key}=", value) if self.respond_to?(:"#{key}=")
+    end
+  end
+  
+  def push(id, priority = nil, options = {})
+    priority ||= Time.now.to_i * -1
+    if nil_or_lower?(priority_of(id), priority)
+      redis.multi if !options[:no_multi]
+      redis.zrem(failed_key, id) if !options[:failed]
+      redis.zadd(redis_key, priority, id)
+      redis.exec if !options[:no_multi]
+    end
+  end
+  
+  def push_many(array, options = {})
+    redis.multi do
+     array.each do | (id, popularity) |
+        push(id, popularity, options.merge(:no_multi => true))
+      end
+    end
+  end
+  
+  def nil_or_lower?(a, b)
+    a.nil? || a.to_i < b
+  end
+  
+  def priority_of(id)
+    redis.zscore(redis_key, id)
+  end
+  
+  def count
+    redis.zcard(redis_key)
+  end
+  
+  def pop
+    redis.multi do
+      redis.zrevrange(redis_key, 0, 0, :with_scores => true)
+      redis.zremrangebyrank(redis_key, -1, -1)
+    end.first
+  end
+  
+  def failed_tries
+    @failed_tries ||= Hash.new(0)
+  end
+  
+  def each
+    entries_with_errors = []
+    stats = { :errors => {}, :ok => [] }
+    while (result = pop).any?
+      begin
+        yield(result.first)
+        stats[:ok] << result.first
+      rescue => err
+        stats[:errors][result.first] = ([err.message] + err.backtrace[0,5]).join("\n")
+        entries_with_errors << result if mark_failed(result.first) < retry_count
+      end
+    end
+    push_many(entries_with_errors, :failed => true) if entries_with_errors.any?
+    stats
+  end
+  
+  def mark_failed(id)
+    redis.zincrby(failed_key, 1, id).to_i
+  end
+  
+  def failed_key
+    "#{redis_key}/failed_counts"
+  end
+end

data/spec/dynport_tools/eta_spec.rb

@@ -0,0 +1,114 @@
+require 'spec_helper'
+require "time"
+
+describe "DynportTools::ETA" do
+  let(:eta) { DynportTools::ETA.new(:current => 17, :total => 100) }
+  let(:time) { Time.parse("2011-02-03 04:50") }
+  
+  before(:each) do
+    Timecop.freeze(time)
+  end
+  
+  it "can be initialized" do
+    DynportTools::ETA.new
+  end
+  
+  it "allows setting of total" do
+    eta.total = 10
+    eta.total.should == 10
+  end
+  
+  it "allos_setting of current" do
+    eta.current = 10
+    eta.current.should == 10
+  end
+  
+  it "allows setting of started" do
+    eta.started = "some value"
+    eta.started.should == "some value"
+  end
+  
+  it "allows setting of all value sthrough initalizer" do
+    eta = DynportTools::ETA.new(:total => 10, :current => 1, :started => "started")
+    eta.should return_values(:total => 10, :current => 1, :started => "started")
+  end
+  
+  describe "#parse_time_string" do
+    { 
+      "00:15:26" => 926,
+      "00:00:26" => 26,
+      "1:00:26" => 3626,
+    }.each do |from, to|
+      it "returns #{to} for #{from}" do
+        DynportTools::ETA.parse_time_string(from).should == to
+      end
+    end
+  end
+  
+  describe "#percs" do
+    it "returns the correct value for percs" do
+      eta.total = 100
+      eta.current = 62
+      eta.percs.should == 0.62
+    end
+
+    it "raises an error when total is not set" do
+      eta.total = nil
+      eta.current = 10
+      lambda {
+        eta.percs
+      }.should raise_error("current and total must be set")
+    end
+    
+    it "raises an error when current is not set" do
+      eta.current = nil
+      eta.total = 10
+      lambda {
+        eta.percs
+      }.should raise_error("current and total must be set")
+    end
+  end
+  
+  describe "#pending" do
+    it "returns teh correct amount for pending" do
+      eta.pending.should == 83
+    end
+    
+    it "calls raise_error_when_current_or_total_not_set" do
+      eta.should_receive(:raise_error_when_current_or_total_not_set)
+      eta.pending
+    end
+  end
+  
+  it "returns the correct amount for running_for" do
+    DynportTools::ETA.new(:current => 17, :total => 100, :started => time - 99).running_for.should == 99
+  end
+  
+  it "returns the correct amount of total time" do
+    DynportTools::ETA.new(:current => 10, :total => 100, :started => time - 10).total_time.should == 100
+  end
+  
+  it "returns the correct amount of time to go" do
+    DynportTools::ETA.new(:current => 10, :total => 100, :started => time - 10).to_go.should == 90
+  end
+  
+  it "returns the correct eta" do
+    DynportTools::ETA.new(:current => 10, :total => 100, :started => time - 10).eta.should == time + 90
+  end
+  
+  it "returns the correct value for per_second" do
+    DynportTools::ETA.new(:current => 10, :total => 100, :started => time - 1).per_second.should == 10
+  end
+  
+  it "returns the correct string" do
+    DynportTools::ETA.new(:current => 10, :total => 100, :started => time - 1).to_s.should == "10.0%, 10.0/second, ETA: 2011-02-03T04:50:09+01:00"
+  end
+  
+  describe "#from_time_string" do
+    it "sets the correct values" do
+      eta = DynportTools::ETA.from_time_string("00:01:10", :total => 100)
+      eta.should be_kind_of(DynportTools::ETA)
+      eta.should return_values(:started => time - 70, :total => 100)
+    end
+  end
+end

data/spec/dynport_tools/jenkins_spec.rb

@@ -3,8 +3,155 @@ require 'spec_helper'
 require "dynport_tools/jenkins"
 
 describe "DynportTools::Jenkins" do
-  let(:root) { "http://some.url.com:8098" }
-  let(:jenkins) { DynportTools::Jenkins.new(root) }
+  let(:url) { "http://some.url.com:8098" }
+  let(:jenkins) { DynportTools::Jenkins.new(url) }
+  
+  describe "Project" do
+    let(:job) { DynportTools::Jenkins::Project.new("Some Name") }
+    let(:doc) { Nokogiri::XML(job.to_xml) }
+    
+    describe "#initialize" do
+      it "sets the commands to an empty array" do
+        job.commands.should == []
+      end
+      
+      it "sets the commands to an empty array" do
+        job.child_projects.should == []
+      end
+      
+      it "sets the name" do
+        job.name.should == "Some Name"
+      end
+    end
+    
+    describe "#to_xml" do
+      it "returns a string" do
+        job.to_xml.should be_kind_of(String)
+      end
+      
+      it "includes a xml header line" do
+        job.to_xml.should include(%(<?xml version="1.0" encoding="UTF-8"?>))
+      end
+      
+      it "includes a project root" do
+        job.to_xml.should include("<project>")
+        job.to_xml.should include("</project>")
+      end
+      
+      %w(actions description properties builders publishers buildWrappers).each do |key|
+        it "includes an empty node #{key}" do
+          doc.at("/project/#{key}").children.should be_empty
+        end
+      end
+      
+      { 
+        "keepDependencies" => "false",
+        "canRoam" => "true",
+        "disabled" => "false",
+        "blockBuildWhenDownstreamBuilding" => "false",
+        "blockBuildWhenUpstreamBuilding" => "false",
+        "concurrentBuild" => "false"
+      }.each do |key, value|
+        it "sets #{key} to #{value}" do
+          doc.at("/project/#{key}").inner_text.should == value
+        end
+      end
+      
+      { "scm" => "hudson.scm.NullSCM", "triggers" => "vector" }.each do |key, clazz|
+        it "sets the class of #{key} to #{clazz}" do
+          doc.at("/project/#{key}")["class"].should == clazz
+        end
+      end
+      
+      it "includes all set commands" do
+        job.commands << "hostname"
+        job.commands << "date"
+        shell_tasks = doc.search("project/builders/*")
+        shell_tasks.map(&:name).should == ["hudson.tasks.Shell", "hudson.tasks.Shell"]
+        shell_tasks.map { |node| node.at("command").inner_text }.should == ["#!/bin/sh\nhostname", "#!/bin/sh\ndate"]
+      end
+      
+      it "includes crontab like triggers" do
+        pattern = "0 2 * * *"
+        job.crontab_pattern = pattern
+        triggers = doc.search("project/triggers/*")
+        triggers.map(&:name).should == ["hudson.triggers.TimerTrigger"]
+        triggers.first.at("spec").inner_text.should == "0 2 * * *"
+      end
+      
+      %w(logRotator assignedNode).each do |key|
+        it "does not include a #{key} node by default" do
+          doc.at("/project/#{key}").should be_nil
+        end
+      end
+      
+      it "sets assignedNode when node is set" do
+        job.node = "processor"
+        doc.at("/project/assignedNode").inner_text.should == "processor"
+      end
+      
+      describe "with days_to_keep set" do
+        before(:each) do
+          job.days_to_keep = 7
+        end
+        
+        it "sets days_to_keep to 7" do
+          doc.at("/project/logRotator/daysToKeep").inner_text.should == "7"
+        end
+        
+        %w(numToKeep artifactDaysToKeep artifactNumToKeep).each do |key|
+          it "sets #{key} to -1" do
+            doc.at("/project/logRotator/#{key}").inner_text.should == "-1"
+          end
+        end
+      end
+      
+      describe "with num_to_keep set" do
+        before(:each) do
+          job.num_to_keep = 30
+        end
+        
+        it "sets num_to_keep to 30" do
+          doc.at("/project/logRotator/numToKeep").inner_text.should == "30"
+        end
+        
+        %w(daysToKeep artifactDaysToKeep artifactNumToKeep).each do |key|
+          it "sets #{key} to -1" do
+            doc.at("/project/logRotator/#{key}").inner_text.should == "-1"
+          end
+        end
+      end
+      
+      it "sets numToKeep and daysToKeep when both set" do
+        job.num_to_keep = 10
+        job.days_to_keep = 2
+        doc.at("/project/logRotator/numToKeep").inner_text.should == "10"
+        doc.at("/project/logRotator/daysToKeep").inner_text.should == "2"
+      end
+      
+      describe "with child projects" do
+        let(:child1) { DynportTools::Jenkins::Project.new("child 1") }
+        let(:child2) { DynportTools::Jenkins::Project.new("child 2") }
+        let(:triggers) { doc.xpath("/project/publishers/hudson.tasks.BuildTrigger") }
+        
+        before(:each) do
+          job.child_projects << child2
+          job.child_projects << child1
+        end
+        
+        it "includes all child projects" do
+          triggers.count.should == 1
+          triggers.first.at("childProjects").inner_text.should == "child 2,child 1"
+        end
+        
+        { "name" => "SUCCESS", "ordinal" => "0", "color" => "BLUE" }.each do |key, value|
+          it "sets #{key} to #{value} in threshold" do
+            triggers.first.at("threshold/#{key}").inner_text.should == value
+          end
+        end
+      end
+    end
+  end
   
   describe "#initialize" do
     it "sets the root url" do
@@ -113,7 +260,7 @@ describe "DynportTools::Jenkins" do
           end
         }
       end
-      builder.to_xml.should == Nokogiri::XML(File.read(ROOT.join("spec/fixtures/jenkins_job.xml"))).to_s
+      builder.to_xml.should == Nokogiri::XML(File.read(root.join("spec/fixtures/jenkins_job.xml"))).to_s
     end
   end
 end

data/spec/dynport_tools/redis_q_spec.rb

@@ -0,0 +1,177 @@
+require 'spec_helper'
+
+describe DynportTools::RedisQ do
+  let(:key) { "test/redis_queue" }
+  let(:redis) { Redis.new(:path => root.join("tmp/redis.socket")) }
+  let(:queue) do 
+    q = DynportTools::RedisQ.new(key)
+    q.redis = redis
+    q
+  end
+  
+  before(:each) do
+    redis.del(key)
+    redis.del("test/redis_queue/failed_counts")
+  end
+  
+  describe "#initialize" do
+    it "sets the retry_count to the default value when nil" do
+      DynportTools::RedisQ.new("some/queue").retry_count.should == 3
+    end
+    
+    it "sets the retry_count to a custom value when given" do
+      DynportTools::RedisQ.new("some/queue", :retry_count => 2).retry_count.should == 2
+    end
+    
+    it "sets the redis_key" do
+      DynportTools::RedisQ.new("some/queue").redis_key.should == "some/queue"
+    end
+    
+    it "sets the redis connection" do
+      DynportTools::RedisQ.new("some/queue", :redis => "redis con").redis.should == "redis con"
+    end
+  end
+  
+  it "sets the redis key when initializing" do
+    queue = DynportTools::RedisQ.new("some/queue")
+    queue.redis_key.should == "some/queue"
+  end
+  
+  describe "#push" do
+    it "pushes the records with negative timestamps" do
+      Timecop.freeze(Time.at(112233))
+      queue.push(99)
+      Timecop.freeze(Time.at(112235))
+      queue.push(101)
+      redis.zrevrange(key, 0, -1, :with_scores => true).should == ["99", "-112233", "101", "-112235"]
+    end
+    
+    it "does not push records when already on the queue" do
+      Timecop.freeze(Time.at(112233))
+      queue.push(99)
+      Timecop.freeze(Time.at(112235))
+      queue.push(99)
+      redis.zrevrange(key, 0, -1, :with_scores => true).should == ["99", "-112233"]
+    end
+    
+    it "changes the priority of a member when higher" do
+      queue.push(99, 1)
+      queue.push(99, 2)
+      redis.zrevrange(key, 0, -1, :with_scores => true).should == ["99", "2"]
+    end
+    
+    it "uses a custom priority when given" do
+      queue.push(99, 1234)
+      redis.zrevrange(key, 0, -1, :with_scores => true).should == ["99", "1234"]
+    end
+    
+    it "removes the key from the failed zset" do
+      queue.mark_failed("99")
+      redis.zrevrange("test/redis_queue/failed_counts", 0, -1, :with_scores => true).should == ["99", "1"]
+      queue.push(99, 1234)
+      redis.zrevrange("test/redis_queue/failed_counts", 0, -1, :with_scores => true).should == []
+    end
+    
+    it "does not call redis.multi when no_multi is set to true" do
+      redis.should_not_receive(:multi)
+      queue.push(99, 1234, :no_multi => true)
+    end
+    
+    it "does not call redis.zrem when failed is true" do
+      redis.should_not_receive(:zrem)
+      queue.push(99, 1234, :failed => true)
+    end
+  end
+  
+  it "returns the correct number of elements" do
+    queue.count.should == 0
+    queue.push(99, 1234)
+    queue.push(101, 1234)
+    queue.count.should == 2
+  end
+  
+  describe "#pop" do
+    before(:each) do
+      queue.push(98, 10)
+      queue.push(99, 1)
+      queue.push(101, 100)
+    end
+    
+    it "returns the highest member and rank" do
+      queue.pop.should == ["101", "100"]
+    end
+    
+    it "removes the member from the set" do
+      queue.pop
+      redis.zrevrange(key, 0, -1, :with_scores => true).should == ["98", "10", "99", "1"]
+    end
+    
+    it "returns an empty array when nothing in the queue" do
+      queue.pop
+      queue.pop
+      queue.pop
+      queue.pop.should == []
+    end
+  end
+  
+  describe "#each" do
+    it "calls the block with all members in the queue" do
+      queue.push(99, 1)
+      queue.push(100, 9)
+      queue.push(101, 0)
+      ids = []
+      queue.each do |id|
+        ids << id
+      end
+      ids.should == ["100", "99", "101"]
+      redis.zrevrange(key, 0, -1, :with_scores => true).should == []
+    end
+    
+    it "readds all ids to the queue which raised errors" do
+      queue.push(99, 1)
+      queue.push(100, 9)
+      queue.push(101, 0)
+      processor = double("processor")
+      processor.should_receive(:process).with("99").and_return true
+      processor.should_receive(:process).with("101").and_return true
+      processor.should_receive(:process).with("100").and_raise("some error")
+      stats = queue.each do |id|
+        processor.process(id)
+      end
+      stats[:ok].should == ["99", "101"]
+      stats[:errors]["100"].should match(/^some error/)
+      redis.zrevrange(key, 0, -1, :with_scores => true).should == ["100", "9"]
+    end
+    
+    # change this to n times
+    it "only tries to process one failing id 3 times" do
+      queue.push(100, 9)
+      processor = double("processor")
+      processor.stub(:process).with("100").exactly(3).and_raise("some error")
+      
+      stats = queue.each { |id| processor.process(id) } 
+      redis.zrevrange(key, 0, -1, :with_scores => true).should == ["100", "9"]
+      redis.zrevrange("test/redis_queue/failed_counts", 0, -1, :with_scores => true).should == ["100", "1"]
+      
+      stats = queue.each { |id| processor.process(id) } 
+      redis.zrevrange(key, 0, -1, :with_scores => true).should == ["100", "9"]
+      redis.zrevrange("test/redis_queue/failed_counts", 0, -1, :with_scores => true).should == ["100", "2"]
+      
+      stats = queue.each { |id| processor.process(id) } 
+      redis.zrevrange(key, 0, -1, :with_scores => true).should == []
+      redis.zrevrange("test/redis_queue/failed_counts", 0, -1, :with_scores => true).should == ["100", "3"]
+    end
+  end
+  
+  describe "#mark_failed" do
+    it "increments the counter in the zset" do
+      queue.mark_failed("100")
+      redis.zrevrange("test/redis_queue/failed_counts", 0, -1, :with_scores => true).should == ["100", "1"]
+    end
+    
+    it "returns the new failed count" do
+      queue.mark_failed("100").should == 1
+      queue.mark_failed("100").should == 2
+    end
+  end
+end

data/spec/dynport_tools/xml_file_spec.rb

@@ -1,9 +1,8 @@
 require 'spec_helper'
 require "dynport_tools/xml_file"
 
-FILE1 = ROOT.join("spec/fixtures/file_a.xml")
-FILE2 = ROOT.join("spec/fixtures/file_b.xml")
-
+FILE1 = root.join("spec/fixtures/file_a.xml")
+FILE2 = root.join("spec/fixtures/file_b.xml")
 
 describe "DynportTools::XmlFile" do
   let(:file) { DynportTools::XmlFile.new(FILE1) }

data/spec/spec_helper.rb

@@ -2,13 +2,44 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'dynport_tools'
+require "timecop"
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
+  config.include DynportTools::HaveAttributesMatcher
+  config.after(:each) do
+    Timecop.return
+  end
 end
 
-ROOT = Pathname.new(File.expand_path("../../", __FILE__))
+def root
+  Pathname.new(File.expand_path("../../", __FILE__))
+end
+
+def redis_pidfile
+  root.join("tmp/redis.pid")
+end
+
+def redis_socket
+  root.join("tmp/redis.socket")
+end
+
+redis_config = [
+  "port 0",
+  "unixsocket #{redis_socket}",
+  "pidfile #{redis_pidfile}",
+  "daemonize yes"
+].join("\n")
+
+FileUtils.mkdir_p(File.dirname(redis_pidfile))
+
+system("echo '#{redis_config}' | redis-server -")
+
+at_exit do
+  pid = File.read(redis_pidfile).strip
+  system("kill #{pid}")
+  FileUtils.rm_f(redis_socket)
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynport_tools
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,12 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-21 00:00:00 +02:00
+date: 2011-08-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: nokogiri
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +30,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: nokogiri
-  version_requirements: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: redis
+  prerelease: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -43,12 +44,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: redis
-  version_requirements: *id002
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  name: typhoeus
+  prerelease: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,12 +58,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: typhoeus
-  version_requirements: *id003
-  prerelease: false
+  type: :runtime
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -73,12 +74,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  name: rspec
-  version_requirements: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -89,12 +90,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
-  version_requirements: *id005
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -105,12 +106,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  name: jeweler
-  version_requirements: *id006
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -119,12 +120,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
-  version_requirements: *id007
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  name: ZenTest
+  prerelease: false
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -135,12 +136,12 @@ dependencies:
         - 5
         - 0
         version: 4.5.0
-  name: ZenTest
-  version_requirements: *id008
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  name: autotest
+  prerelease: false
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -149,12 +150,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: autotest
-  version_requirements: *id009
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  name: autotest-growl
+  prerelease: false
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -163,12 +164,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: autotest-growl
-  version_requirements: *id010
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -177,9 +178,22 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: ruby-debug
-  version_requirements: *id011
+  type: :development
+  requirement: *id011
+- !ruby/object:Gem::Dependency 
+  name: timecop
   prerelease: false
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  requirement: *id012
 description: Collection of various tools
 email: tobias.schwab@dynport.de
 executables: 
@@ -191,6 +205,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files: 
+- .autotest
 - .document
 - .rbenv-version
 - .rspec
@@ -207,15 +222,19 @@ files:
 - lib/dynport_tools.rb
 - lib/dynport_tools/deep_merger.rb
 - lib/dynport_tools/differ.rb
+- lib/dynport_tools/eta.rb
 - lib/dynport_tools/have_attributes.rb
 - lib/dynport_tools/jenkins.rb
 - lib/dynport_tools/redis_dumper.rb
+- lib/dynport_tools/redis_q.rb
 - lib/dynport_tools/xml_file.rb
 - spec/dynport_tools/deep_merger_spec.rb
 - spec/dynport_tools/differ_spec.rb
+- spec/dynport_tools/eta_spec.rb
 - spec/dynport_tools/have_attributes_spec.rb
 - spec/dynport_tools/jenkins_spec.rb
 - spec/dynport_tools/redis_dumper_spec.rb
+- spec/dynport_tools/redis_q_spec.rb
 - spec/dynport_tools/xml_file_spec.rb
 - spec/dynport_tools_spec.rb
 - spec/fixtures/file_a.xml