cerberus 0.4.2 → 0.4.3

data/CHANGES

@@ -1,5 +1,10 @@
 = Cerberus Changelog
 
+== Version 0.4.3
+Custom Builder Scheduling
+
+* Added at_time project config option to schedule when project is built via "cerberus buildall" command
+
 == Version 0.4.2
 RSpec builder bugfixes
 

data/Rakefile

@@ -27,9 +27,11 @@ end
 
 desc "Clean all generated files"
 task :clean => :clobber_package do
-  rm_rf "#{File.dirname(__FILE__)}/test/__workdir"
-  rm_rf "#{File.dirname(__FILE__)}/coverage"
-  rm_rf "#{File.dirname(__FILE__)}/doc/site/output"
+  root = File.dirname(__FILE__)
+  rm_rf "#{root}/test/__workdir"
+  rm_rf "#{root}/coverage"
+  rm_rf "#{root}/doc/site/out"
+  rm_rf "#{root}/doc/site/webgen.cache"
 end
 
 
@@ -142,22 +144,19 @@ task :publish_news do
     publisher.user_name = RUBYFORGE_USER
     publisher.password = ENV['RUBYFORGE_PASSWORD']
     publisher.subject = "[ANN] Cerberus #{PKG_VERSION} Released"
-    publisher.details = IO.read(File.dirname(__FILE__) + '/README')
+    publisher.details = IO.read(File.dirname(__FILE__) + '/CHANGES')
   end
 end
 
-
-
 require 'webgen/webgentask'
-
-task :www => :webgen
+task :generate_site => :webgen
 
   Webgen::WebgenTask.new do |t|
     t.directory = File.join( File.dirname( __FILE__ ), 'doc/site')
     t.clobber_outdir = true
   end
 
-task :publish_site => :webgen do
+task :publish_site => :generate_site do
   sh %{scp -r -q doc/site/out/* #{RUBYFORGE_USER}@rubyforge.org:/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/}
 end
 

data/lib/cerberus/constants.rb

@@ -4,5 +4,5 @@ module Cerberus
 
   LOCK_WAIT = 30 * 60 #30 minutes
 
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/lib/cerberus/manager.rb

@@ -81,7 +81,8 @@ module Cerberus
     attr_reader :builder, :success, :scm, :status
     
     DEFAULT_CONFIG = {:scm => {:type => 'svn'}, 
-      :log => {:enable => true}
+      :log => {:enable => true},
+      :at_time => '* *',
     }
     
     def initialize(application_name, cli_options = {})
@@ -161,6 +162,15 @@ module Cerberus
         end
       end
     end
+
+    def run_time?(time)
+      minute, hour = @config[:at_time].split
+      say "Run time is configured wrong." if minute.nil? or hour.nil?
+      if hour.cron_match?(time.hour)
+        return minute.cron_match?(time.min)
+      end
+      return false
+    end
     
     private
     def get_configuration_option(hash, defining_key = nil, default_option = nil)
@@ -184,7 +194,7 @@ module Cerberus
         application_name = $1
         
         command = Cerberus::BuildCommand.new(application_name, @cli_options)
-        threads << Thread.new { command.run }
+        threads << Thread.new { command.run } if command.run_time?(Time.now)
       end
       
       @already_waited = false

data/lib/cerberus/utils.rb

@@ -155,3 +155,33 @@ class IO
     File.open(filename, 'w'){|f| f.write str}
   end
 end
+
+class String
+  def cron_match?(number)
+    return false if not number.is_a?(Integer)
+    return true if self == "*"
+    parts = self.split(",")
+    parts.each do |p|
+      match = p.match(/(\d+|\*)-?(\d+)?(\/(\d+))?$/)
+      return false if not match
+      if not match[2]
+        if match[1] == "*" and match[4]
+          return true if number % match[4].to_i == 0
+        end
+        return true if match[1].to_i == number
+      else
+        range = (match[1].to_i)..(match[2].to_i)
+        if not match[3]
+          return true if range.include?(number)
+        else
+          range.each do |r|
+            if (r - range.first) % match[4].to_i == 0
+              return true if r == number
+            end
+          end
+        end
+      end
+    end
+    return false
+  end
+end

data/test/cron_string_test.rb

@@ -0,0 +1,94 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+require 'cerberus/utils'
+
+class CronStringTest < Test::Unit::TestCase
+
+  def test_simple_number
+    assert "1".cron_match?(1)
+  end
+
+  def test_star
+    assert "*".cron_match?(0)
+    assert "*".cron_match?(1000)
+  end
+
+  def test_not_match_simple
+    assert_equal false, "1".cron_match?(2)
+  end
+
+  def test_separate_numbers
+    str = "1,3,5"
+    assert str.cron_match?(1)
+    assert str.cron_match?(3)
+    assert str.cron_match?(5)
+    assert(!str.cron_match?(0))
+    assert(!str.cron_match?(2))
+    assert(!str.cron_match?(4))
+    assert(!str.cron_match?(6))
+  end
+  
+  def test_range
+    str = "2-4"
+    assert(!str.cron_match?(1))
+    assert str.cron_match?(2)
+    assert str.cron_match?(3)
+    assert str.cron_match?(4)
+    assert(!str.cron_match?(5))
+  end
+
+  def test_comma_and_range
+    str = "3-4,7-8"
+    assert(!str.cron_match?(2))
+    assert str.cron_match?(3)
+    assert str.cron_match?(4)
+    assert(!str.cron_match?(5))
+    assert(!str.cron_match?(6))
+    assert str.cron_match?(7)
+    assert str.cron_match?(8)
+    assert(!str.cron_match?(9))
+  end
+
+  def test_divisor
+    str = "1-6/2"
+    assert(!str.cron_match?(0))
+    assert str.cron_match?(1)
+    assert(!str.cron_match?(2))
+    assert str.cron_match?(3)
+    assert(!str.cron_match?(4))
+    assert str.cron_match?(5)
+    assert(!str.cron_match?(6))
+  end
+
+  def test_garble
+    assert(!"1,x".cron_match?(6))
+    assert(!",".cron_match?(6))
+    assert(!"x".cron_match?(6))
+    assert(!"1-10/x".cron_match?(6))
+    assert(!"~-10/2".cron_match?(6))
+  end
+
+  def test_star_and_divisor
+    str = "*/3"
+    assert str.cron_match?(0)
+    assert(!str.cron_match?(1))
+    assert(!str.cron_match?(2))
+    assert str.cron_match?(3)
+    assert(!str.cron_match?(4))
+    assert(!str.cron_match?(5))
+    assert str.cron_match?(6)
+    assert str.cron_match?(9)
+    assert str.cron_match?(12)
+    assert str.cron_match?(129)
+  end
+
+  def test_star_with_letters
+    assert(!"*".cron_match?('A'))
+  end
+
+  def test_star_in_wrong_place
+    assert(!"*-12".cron_match?('1'))
+    assert(!"*-12/2".cron_match?('2'))
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cerberus
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Anatol Pomozov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-26 00:00:00 -05:00
+date: 2009-02-13 00:00:00 -05:00
 default_executable: cerberus
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -128,6 +128,7 @@ files:
 - lib/cerberus/utils.rb
 - test/bjam_builder_test.rb
 - test/config_test.rb
+- test/cron_string_test.rb
 - test/data
 - test/data/darcs.zip
 - test/data/git.zip
@@ -183,6 +184,7 @@ summary: Cerberus is a Continuous Integration tool that could be easily run from
 test_files: 
 - test/bjam_builder_test.rb
 - test/config_test.rb
+- test/cron_string_test.rb
 - test/functional_test.rb
 - test/integration_test.rb
 - test/irc_publisher_test.rb