cerberus 0.3.5 → 0.3.6

data/lib/cerberus/builder/ruby_base.rb

@@ -1,47 +1,48 @@
-require 'cerberus/builder/base'
-
-class Cerberus::Builder::RubyBase
-  attr_reader :output
-
-  def initialize(config, cmd)
-    @config = config
-    @cmd = cmd
-  end
-
-  def run
-    Dir.chdir @config[:application_root]
-    @output = `#{@config[:bin_path]}#{choose_exec()} #{@config[:builder, @cmd.to_sym, :task]} 2>&1`
-    successful?
-  end
-
-  def successful?
-    $?.exitstatus == 0 and not @output.include?("#{@cmd} aborted!")
-  end
-
-  def brokeness
-    if @output =~ /\d+ tests, \d+ assertions, (\d+) failures, (\d+) errors/
-      $1.to_i + $2.to_i
-    end
-  end
-
-  private
-  def choose_exec
-    ext = ['']
-
-    if os() == :windows 
-      ext << '.bat' << '.cmd'
-    end
-
-    silence_stream(STDERR) {
-      ext.each do |e|
-        begin
-          out = `#{@config[:bin_path]}#{@cmd}#{e} --version 2>&1`
-          return "#{@cmd}#{e}" if out =~ /#{@cmd}/
-        rescue
-        end
-      end
-    }
-
-    raise "#{@cmd} builder did not find. Make sure that such script exists and have executable permissions."
-  end
-end
+require 'cerberus/builder/base'
+
+class Cerberus::Builder::RubyBase
+  attr_reader :output
+
+  def initialize(config, name, cmd = name)
+    @config = config
+    @cmd = cmd
+    @name = name
+  end
+
+  def run
+    Dir.chdir @config[:application_root]
+    @output = `#{@config[:bin_path]}#{choose_exec()} #{@config[:builder, @name.to_sym, :task]} 2>&1`
+    successful?
+  end
+
+  def successful?
+    $?.exitstatus == 0 and not @output.include?("#{@cmd} aborted!")
+  end
+
+  def brokeness
+    if @output =~ /\d+ tests, \d+ assertions, (\d+) failures, (\d+) errors/
+      $1.to_i + $2.to_i
+    end
+  end
+
+  private
+  def choose_exec
+    ext = ['']
+
+    if os() == :windows 
+      ext << '.bat' << '.cmd'
+    end
+
+    silence_stream(STDERR) {
+      ext.each do |e|
+        begin
+          out = `#{@config[:bin_path]}#{@cmd}#{e} --version 2>&1`
+          return "#{@cmd}#{e}" if out =~ /#{@cmd}/
+        rescue
+        end
+      end
+    }
+
+    raise "#{@cmd} builder did not find. Make sure that such script exists and have executable permissions."
+  end
+end

data/lib/cerberus/cli.rb

@@ -1,70 +1,73 @@
-require 'cerberus/manager'
-require 'cerberus/utils'
-require 'cerberus/constants'
-
-module Cerberus
-  class CLI     
-    def initialize(*args)
-      say HELP if args.empty?
-
-      command = args.shift
-      say HELP unless %w(add build buildall list).include?(command)
-
-      cli_options = extract_options(args)
-
-      case command
-      when 'add'
-        path = args.shift || Dir.pwd
-        
-        command = Cerberus::AddCommand.new(path, cli_options)
-        command.run
-      when 'build'
-        say HELP if args.empty?
-
-        application_name  = args.shift
-
-        command = Cerberus::BuildCommand.new(application_name, cli_options)
-        command.run
-      when 'buildall'
-        command = Cerberus::BuildAllCommand.new(cli_options)
-        command.run
-      when 'list'
-        command = Cerberus::ListCommand.new(cli_options)
-        command.run
-      end
-    end
-
-    private 
-    def extract_options(args)
-      result = {}
-      args_copy = args.dup
-      args_copy.each do |arg|
-        case arg
-        when /^(\w+)=(.*)$/
-          result[$1.downcase.to_sym] = $2
-          args.delete(arg)
-        when '--force'
-          result[:force] = true
-          args.delete(arg)
-        end
-      end
-
-      result
-    end
-  end
-
-  HELP = %{
-    Cerberus is a lightweight command-line Continuous Integration tool for Ruby.
-
-    Usage:
-      cerberus add <URL>     --- add project from svn repository to list watched of applications
-      cerberus add <PATH>    --- add project from local path to list of watched applications
-      cerberus build <NAME>  --- build watched application
-      cerberus buildall      --- build all watched applications
-      cerberus list          --- see the list of all watched applications
-
-    Version: #{Cerberus::VERSION}
-    Cerberus Path: "#{Cerberus::HOME}"
-    Cerberus Homepage: http://cerberus.rubyforge.org
-    }.gsub("\n    ","\n")
-end
+require 'cerberus/manager'
+require 'cerberus/utils'
+require 'cerberus/constants'
+
+module Cerberus
+  class CLI     
+    def initialize(*args)
+      say HELP if args.empty?
+
+      command = args.shift
+      say HELP unless %w(add remove build buildall list).include?(command)
+
+      cli_options = extract_options(args)
+
+      case command
+      when 'add'
+        path = args.shift || Dir.pwd
+        command = Cerberus::AddCommand.new(path, cli_options)
+        command.run
+      when 'remove'
+        command = Cerberus::RemoveCommand.new(args.shift, cli_options)
+        command.run
+      when 'build'
+        say HELP if args.empty?
+
+        application_name  = args.shift
+
+        command = Cerberus::BuildCommand.new(application_name, cli_options)
+        command.run
+      when 'buildall'
+        command = Cerberus::BuildAllCommand.new(cli_options)
+        command.run
+      when 'list'
+        command = Cerberus::ListCommand.new(cli_options)
+        command.run
+      end
+    end
+
+    private 
+    def extract_options(args)
+      result = {}
+      args_copy = args.dup
+      args_copy.each do |arg|
+        case arg
+        when /^(\w+)=(.*)$/
+          result[$1.downcase.to_sym] = $2
+          args.delete(arg)
+        when '--force'
+          result[:force] = true
+          args.delete(arg)
+        end
+      end
+
+      result
+    end
+  end
+
+  HELP = %{
+    Cerberus is a lightweight command-line Continuous Integration tool for Ruby.
+
+    Usage:
+      cerberus add <URL>     --- add project from svn repository to list watched of applications
+      cerberus add <PATH>    --- add project from local path to list of watched applications
+      cerberus remove <NAME> --- remove given project from cerberus
+      cerberus build <NAME>  --- build watched application
+      cerberus buildall      --- build all watched applications
+      cerberus list          --- see the list of all watched applications
+
+    Version: #{Cerberus::VERSION}
+    Cerberus Path: "#{Cerberus::HOME}"
+    Cerberus Homepage: http://cerberus.rubyforge.org
+    }.gsub("\n    ","\n")
+end

data/lib/cerberus/component_lazy_loader.rb

@@ -38,6 +38,7 @@ module Cerberus
   module Publisher
     TYPES = {
       :mail => 'Mail', #Cerberus::Publisher
+      :gmailer => 'Gmailer',
       :jabber => 'Jabber',
       :irc => 'IRC',
       :rss => 'RSS',
@@ -56,6 +57,7 @@ module Cerberus
     TYPES = {
       :maven2 => 'Maven2', #Cerberus::Builder
       :rake => 'Rake',
+      :rspec => 'RSpec',
       :rant => 'Rant',
       :bjam => 'Bjam'
     }

data/lib/cerberus/config.example.yml

@@ -1,29 +1,29 @@
-publisher:
-#  active: mail jabber rss campfire
-  mail:
-    address: smtp.gmail.com
-    port: 587
-    domain: gmail.com
-    authentication: plain
-    user_name: someuser
-    password: somepassword
-#    on_event: all
-#  jabber:
-#    jid: somemailbox@gmail.com/cerberus
-#    password: somepassword
-#  irc:
-#    nick: cerb
-#    server: irc.freenode.net
-#    channel: cerberus
-#  campfire:
-#    url: http://someemail:password@cerberustool.campfirenow.com/room/51660
-#  rss:
-#    file: /usr/www/rss.xml
-#builder:
-#  rake:
-#    task: migrate test
-#changeset_url: POINT_TO_YOUR_TRAC/changeset/
-#hook:
-#  rcov:
-#    on_event: successful, setup #by default - run hook for any state
+publisher:
+#  active: mail jabber rss campfire
+  mail:
+    address: smtp.gmail.com
+    port: 587
+    domain: gmail.com
+    authentication: plain
+    user_name: someuser
+    password: somepassword
+#    on_event: all
+#  jabber:
+#    jid: somemailbox@gmail.com/cerberus
+#    password: somepassword
+#  irc:
+#    nick: cerb
+#    server: irc.freenode.net
+#    channel: cerberus
+#  campfire:
+#    url: http://someemail:password@cerberustool.campfirenow.com/room/51660
+#  rss:
+#    file: /usr/www/rss.xml
+#builder:
+#  rake:
+#    task: migrate test
+#changeset_url: POINT_TO_YOUR_TRAC/changeset/
+#hook:
+#  rcov:
+#    on_event: successful, setup #by default - run hook for any state
 #    action: 'export CERBERUS_HOME=/home/anatol && sudo chown www-data -R /home/anatol/cerberus && rcov' #Add here any hook you want

data/lib/cerberus/config.rb

@@ -1,47 +1,48 @@
-require 'cerberus/constants'
-require 'cerberus/utils'
-
-module Cerberus
-  class Config
-    def initialize(app_name = nil, cli_options = {})
-      @config = HashWithIndifferentAccess.new
-      if app_name
-        merge!(YAML.load(IO.read(CONFIG_FILE))) if test(?f, CONFIG_FILE)
-        merge!(YAML.load(IO.read(HOME + "/config/#{app_name}.yml")))
-      end
-      merge!(cli_options)
-    end
-
-    def [](*path)
-      c = @config
-      path.each{|p|
-        c = c[p]
-        return if c.nil?
-      }
-      c
-    end
-
-    def merge!(hash, overwrite = true)
-      if overwrite
-        @config.deep_merge!(hash)
-      else
-        d = HashWithIndifferentAccess.new(hash)
-        d.deep_merge!(@config)
-        @config = d
-      end
-    end
-
-    def inspect
-      @config.inspect
-    end
-
-    private
-    def symbolize_hash(hash)
-      hash.each_pair{|k,v|
-        if v === Hash
-          hash[k] = HashWithIndifferentAccess.new(symbolize_hash(v))
-        end
-      }
-    end
-  end
+require 'cerberus/constants'
+require 'cerberus/utils'
+require 'erb'
+
+module Cerberus
+  class Config
+    def initialize(app_name = nil, cli_options = {})
+      @config = HashWithIndifferentAccess.new
+      if app_name
+        merge!(YAML.load(ERB.new(IO.read(CONFIG_FILE)).result)) if test(?f, CONFIG_FILE)
+        merge!(YAML.load(ERB.new(IO.read(HOME + "/config/#{app_name}.yml")).result))
+      end
+      merge!(cli_options)
+    end
+
+    def [](*path)
+      c = @config
+      path.each{|p|
+        c = c[p]
+        return if c.nil?
+      }
+      c
+    end
+
+    def merge!(hash, overwrite = true)
+      if overwrite
+        @config.deep_merge!(hash)
+      else
+        d = HashWithIndifferentAccess.new(hash)
+        d.deep_merge!(@config)
+        @config = d
+      end
+    end
+
+    def inspect
+      @config.inspect
+    end
+
+    private
+    def symbolize_hash(hash)
+      hash.each_pair{|k,v|
+        if v === Hash
+          hash[k] = HashWithIndifferentAccess.new(symbolize_hash(v))
+        end
+      }
+    end
+  end
 end

data/lib/cerberus/constants.rb

@@ -1,8 +1,8 @@
-module Cerberus
-  HOME = File.expand_path(ENV['CERBERUS_HOME'] || '~/.cerberus')
-  CONFIG_FILE = "#{HOME}/config.yml"
-
-  LOCK_WAIT = 30 * 60 #30 minutes
-
-  VERSION = '0.3.5'
-end
+module Cerberus
+  HOME = File.expand_path(ENV['CERBERUS_HOME'] || '~/.cerberus')
+  CONFIG_FILE = "#{HOME}/config.yml"
+
+  LOCK_WAIT = 30 * 60 #30 minutes
+
+  VERSION = '0.3.6'
+end

data/lib/cerberus/latch.rb

@@ -1,27 +1,27 @@
-require 'fileutils'
-
-module Cerberus
-  class Latch
-    #Emulate File.flock
-    def self.lock(lock_file, options = {})
-      if File.exists?(lock_file)
-        modif_time = File::Stat.new(lock_file).mtime
-        ttl = options[:lock_ttl]
-
-        if ttl and modif_time + ttl < Time.now
-          File.delete(lock_file)
-        else
-          return
-        end
-      end
-
-      begin
-        FileUtils.mkpath(File.dirname(lock_file))
-        File.new(lock_file, 'w').close
-        yield
-      ensure
-        File.delete(lock_file)
-      end
-    end
-  end
+require 'fileutils'
+
+module Cerberus
+  class Latch
+    #Emulate File.flock
+    def self.lock(lock_file, options = {})
+      if File.exists?(lock_file)
+        modif_time = File::Stat.new(lock_file).mtime
+        ttl = options[:lock_ttl]
+
+        if ttl and modif_time + ttl < Time.now
+          File.delete(lock_file)
+        else
+          return
+        end
+      end
+
+      begin
+        FileUtils.mkpath(File.dirname(lock_file))
+        File.new(lock_file, 'w').close
+        yield
+      ensure
+        File.delete(lock_file)
+      end
+    end
+  end
 end