cerberus 0.2.0 → 0.2.1

data/CHANGES

@@ -1,5 +1,11 @@
 = Cerberus Changelog
 
+== Version 0.2.1
+Minor fix release
+
+* publisher -> active flag now not mandatory. Use 'mail' publisher as active if not set any
+
+
 == Version 0.2.0
 Config file was changed since 0.1.1 and you need regenerate config files.
 Or change it by hands: see doc/OPTIONS file to list of all avalable options.

data/README

@@ -31,7 +31,7 @@ To use Cerberus it is very easy. First install it. Easiest way to do it through
 
 'gem install cerberus'
 
-or get Cerberus distribution package right from download page http://rubyforge.org/frs/?group_id=1794
+or get Cerberus distribution package right from download page http://rubyforge.org/frs/?group_id=1794&release_id=6442
 
 then you need to add project that will be watched by Cerberus. Do it by
 

data/Rakefile

@@ -14,8 +14,8 @@ PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"
 
-RUBY_FORGE_PROJECT = "cerberus"
-RUBY_FORGE_USER    = "anatol"
+RUBYFORGE_PROJECT = "cerberus"
+RUBYFORGE_USER    = "anatol"
 
 task :default => [:test, :clean]
 
@@ -75,7 +75,7 @@ GEM_SPEC = Gem::Specification.new do |s|
   s.author = "Anatol Pomozov"
   s.email = "anatol.pomozov@gmail.com"
   s.homepage = "http://rubyforge.org/projects/cerberus"
-  s.rubyforge_project = RUBY_FORGE_PROJECT
+  s.rubyforge_project = RUBYFORGE_PROJECT
 end
 
 
@@ -101,7 +101,7 @@ end
 task :reinstall => [:uninstall, :install]
 
 task :site_webgen do
-  sh %{pushd doc/site; webgen; scp -r output/* #{RUBY_FORGE_USER}@rubyforge.org:/var/www/gforge-projects/#{RUBY_FORGE_PROJECT}/; popd }
+  sh %{pushd doc/site; webgen; scp -r output/* #{RUBYFORGE_USER}@rubyforge.org:/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/; popd }
 end
 
 begin
@@ -115,12 +115,12 @@ rescue Object
 end
 
 task :site_coverage => [:rcov] do
-  sh %{ scp -r test/coverage/* #{RUBY_FORGE_USER}@rubyforge.org:/var/www/gforge-projects/#{RUBY_FORGE_PROJECT}/coverage/ }
+  sh %{ scp -r test/coverage/* #{RUBYFORGE_USER}@rubyforge.org:/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/coverage/ }
 end
 
 task :release_files => [:clean, :package] do
   require 'meta_project'
-  project = MetaProject::Project::XForge::RubyForge.new(RUBY_FORGE_PROJECT)
+  project = MetaProject::Project::XForge::RubyForge.new(RUBYFORGE_PROJECT)
 
   release_files = FileList[
     "pkg/#{PKG_FILE_NAME}.gem",
@@ -129,7 +129,7 @@ task :release_files => [:clean, :package] do
   ]
 
   Rake::XForge::Release.new(project) do |release|
-    release.user_name = RUBY_FORGE_USER
+    release.user_name = RUBYFORGE_USER
     release.password = ENV['RUBYFORGE_PASSWORD']
     release.files = release_files.to_a
     release.package_name    = PKG_NAME
@@ -141,9 +141,9 @@ end
 task :publish_news do
   require 'meta_project'
 
-  project = MetaProject::Project::XForge::RubyForge.new(RUBY_FORGE_PROJECT)
+  project = MetaProject::Project::XForge::RubyForge.new(RUBYFORGE_PROJECT)
   Rake::XForge::NewsPublisher.new(project) do |publisher|
-    publisher.user_name = RUBY_FORGE_USER
+    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')

data/lib/cerberus/config.rb

@@ -2,16 +2,17 @@ require 'rubygems'
 require 'active_support'
 
 require 'cerberus/constants'
+require 'cerberus/utils'
 
 module Cerberus
   class Config
-    def initialize(app_name, cli_options = {})
+    def initialize(app_name = nil, cli_options = {})
       @config = HashWithIndifferentAccess.new
       if app_name
-        @config.merge!(YAML.load(IO.read(CONFIG_FILE))) if test(?f, CONFIG_FILE)
-        @config.merge!(YAML.load(IO.read(HOME + "/config/#{app_name}.yml")))
+        merge!(YAML.load(IO.read(CONFIG_FILE))) if test(?f, CONFIG_FILE)
+        merge!(YAML.load(IO.read(HOME + "/config/#{app_name}.yml")))
       end
-      @config.merge!(cli_options)
+      merge!(cli_options)
     end
 
     def [](*path)
@@ -23,6 +24,14 @@ module Cerberus
       c
     end
 
+    def merge!(hash)          
+      @config.deep_merge!(hash)
+    end
+
+    def inspect
+      @config.inspect
+    end
+
     private
     def symbolize_hash(hash)
       hash.each_pair{|k,v|

data/lib/cerberus/manager.rb

@@ -111,14 +111,13 @@ module Cerberus
         end
 
         if [:failure, :broken, :revival, :setup].include?(state)
-          @config[:publisher, :active].split.each do |pub|
+          active_publishers = @config[:publisher, :active] || 'mail'
+          active_publishers.split(/\W+/).each do |pub|
+            raise "Publisher have no configuration: #{pub}" unless @config[:publisher, pub]
+            clazz = PUBLISHER_TYPES[pub.to_sym]
+            raise "There is no such publisher: #{pub}" unless clazz
             silence_stream(STDOUT) { #some of publishers like IRC very noisy
-              clazz = PUBLISHER_TYPES[pub.to_sym]
-              if clazz
-                clazz.publish(state, self, @config)
-              else
-                raise "There is no such publisher: #{pub}"
-              end
+              clazz.publish(state, self, @config)
             }
           end
         end

data/lib/cerberus/publisher/irc.rb

@@ -4,6 +4,7 @@ require 'cerberus/publisher/base'
 class Cerberus::Publisher::IRC < Cerberus::Publisher::Base
   def self.publish(state, build, options)
     irc_options = options[:publisher, :irc]
+    raise "There is no channel provided for IRC publisher" unless irc_options[:channel]
     subject,body = Cerberus::Publisher::Base.formatted_message(state, build, options)
     message = subject + "\n" + '*' * subject.length + "\n" + body
 

data/lib/cerberus/publisher/jabber.rb

@@ -5,6 +5,8 @@ class Cerberus::Publisher::Jabber < Cerberus::Publisher::Base
   def self.publish(state, build, options)
     begin
       jabber_options = options[:publisher, :jabber]
+      raise "There is no recipients provided for Jabber publisher" unless jabber_options[:recipients]
+
       subject,body = Cerberus::Publisher::Base.formatted_message(state, build, options)
 
       session = login(jabber_options[:jid], jabber_options[:password])

data/lib/cerberus/publisher/mail.rb

@@ -3,7 +3,10 @@ require 'cerberus/publisher/base'
 
 class Cerberus::Publisher::Mail < Cerberus::Publisher::Base
   def self.publish(state, build, options)
-    configure(options[:publisher, :mail].dup)
+    mail_opts = options[:publisher, :mail].dup
+    raise "There is no recipients provided for mail publisher" unless mail_opts[:recipients]
+
+    configure(mail_opts)
     ActionMailerPublisher.deliver_message(state, build, options)
   end
 

data/lib/cerberus/utils.rb

@@ -36,4 +36,16 @@ def `(cmd)
   rescue Exception => e           
     raise "Unable to execute: #{cmd}"
   end
+end
+
+class Hash
+  def deep_merge!(second)
+    second.each_pair do |k,v|
+      if self[k].is_a?(Hash) and second[k].is_a?(Hash)
+        self[k].deep_merge!(second[k])
+      else
+        self[k] = second[k]
+      end
+    end
+  end
 end

data/lib/cerberus/version.rb

@@ -2,7 +2,7 @@ module Cerberus
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/config_test.rb

@@ -23,4 +23,16 @@ class ConfigTest < Test::Unit::TestCase
     assert_equal 'app', cfg['g']
     assert_equal 'conf', cfg['m']
   end
+
+  def test_deep_merge
+    cfg = Cerberus::Config.new
+    cfg.merge!(:hello => {'msg' => {:a202 => 'bye'}})
+    cfg.merge!(:hello => {:msg => {:a203 => 'hello'}})
+    cfg.merge!(:hello => {:msg => {:a204 => 'another'}})
+    cfg.merge!(:hello => {:bread => {:a204 => 'bread'}})
+
+    assert_equal 'bye', cfg[:hello, :msg, :a202]
+    assert_equal 'hello', cfg[:hello, :msg, :a203]
+    assert_equal 'bread', cfg[:hello, :bread, :a204]
+  end
 end

data/test/functional_test.rb

@@ -88,7 +88,7 @@ class FunctionalTest < Test::Unit::TestCase
   end
 
   def test_have_no_awkward_header
-    add_application('myapp', SVN_URL)
+    add_application('myapp', SVN_URL, 'publisher' => {'active' => 'mail'})
 
     build = Cerberus::BuildCommand.new('myapp')
     build.run
@@ -97,6 +97,34 @@ class FunctionalTest < Test::Unit::TestCase
     assert_equal 0, build.scm.last_commit_message.index('-' * 72)
   end
 
+  def test_multiply_publishers_without_configuration
+    add_application('myapp', SVN_URL, 'publisher' => {'active' => 'mail ,  jabber , irc,    dddd'})
+
+    build = Cerberus::BuildCommand.new('myapp')
+
+    begin
+      build.run
+    rescue RuntimeError => e
+      assert_equal 'Publisher have no configuration: jabber', e.message
+    else
+      assert false
+    end
+  end
+
+  def test_application_and_config_together
+    add_config('publisher' => {'active' => 'jabber'})
+    add_application('myapp', SVN_URL)
+    build = Cerberus::BuildCommand.new('myapp')
+
+    begin
+      build.run
+    rescue RuntimeError => e
+      assert_equal 'Publisher have no configuration: jabber', e.message
+    else
+      assert false
+    end
+  end
+
   def test_batch_running
     add_application('myapp1', SVN_URL)
     add_application('myapp2', SVN_URL)

data/test/test_helper.rb

@@ -50,15 +50,19 @@ end"
   end
 
   def add_application(app_name, url, options = {})
-    opt = options.merge(
-      'scm'=>{'url'=>url}, 
-      'publisher'=>{
-        'active' => 'mail',
-        'mail'=>{'recipients'=>'somebody@com.com', 'delivery_method' => 'test'}
-    })
+    opt = {'scm'=>{'url'=>url}, 
+    'publisher'=>{
+      'mail'=>{'recipients'=>'somebody@com.com', 'delivery_method' => 'test'}
+    }}
+
+    opt.deep_merge!(options)
 
     dump_yml(HOME + "/config/#{app_name}.yml", opt)
   end
+
+  def add_config(options)
+    dump_yml(HOME + "/config.yml", options)
+  end
 end
 
 require 'cerberus/config'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: cerberus
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2006-08-11 00:00:00 +04:00
+  version: 0.2.1
+date: 2006-08-14 00:00:00 +04:00
 summary: Cerberus is a Continuous Integration tool that could be easily run from Cron.
 require_paths: 
 - lib