cerberus 0.7.9 → 0.8.0

data/Changelog.txt

@@ -1,6 +1,16 @@
 = Cerberus Changelog
 
-== Veresion 0.7.9
+== Version 0.8.0
+Ruby 1.9 bugfixes & new config options
+
+* Fixed Ruby 1.9 string encoding bug [git SCM]
+* :require_revision_change - set to true to avoid Cerberus rebuilding a project
+if the SCM revision hasn't changed, even if the prior build was unsuccessful
+(default false - for backwards compatibility)
+* :max_wait_time - set to Integer (number of seconds) for the build command to
+wait for a timeout before cancelling build (default 30 minutes).
+
+== Version 0.7.9
 Bugfixes
 
 * Fix issue with tests and mailer with Rails 3 installed
@@ -15,7 +25,7 @@ Added channel password option to IRC publisher
 Bugfixes, publisher and config options updates, ActionMailer gem version requirements
 
 * Projects are now sorted when displayed via Cerberus CLI
-* Git builder now includes just the commit message instead of the commit diff 
+* Git builder now includes just the commit message instead of the commit diff
 in the publisher output and log file
 * Updated output/reporting of :setup_script during Manager#run.  Results
 are included in Publisher's formatted_message
@@ -28,7 +38,7 @@ Bugfixes and updates to RSS publisher
 
 * Fix mercurial builder to properly read revision number of merged commits
 * Updated RSS publisher to output a properly formatted RSS feed with the
-ability to keep a certain number of previous builds in the feed.  For more 
+ability to keep a certain number of previous builds in the feed.  For more
 info on the changes please see the commit message on the following commit:
 http://github.com/cpjolicoeur/cerberus/commit/1f7176a6a611f30a0d70e0f75ec90724f6302043
 * Update usage documentation
@@ -125,7 +135,7 @@ Git, Twitter support
 == Version 0.3.6
 RSpec, Gmailer support
 
-* Added out of box support of RSpec tests. 
+* Added out of box support of RSpec tests.
   Usage: add to your project configuration following config
 
   builder:
@@ -150,7 +160,7 @@ RSpec, Gmailer support
     :username, :password, :proxy_host, :proxy_port, :proxy_user, :proxy_pass
 
 * Remove to_xs helper. Using one from actionsuport
-      
+
 
 == Version 0.3.5
 Bug fixing
@@ -177,7 +187,7 @@ Major changes
 * Correctly implement Jabber publisher using XMPP4R library
 * Upgrade Webgen to 0.4.1
 * Added 'getting better/worse' to build messages' subject
-* Added possibility to configure events on what you would like to receive messages. 
+* Added possibility to configure events on what you would like to receive messages.
   By default used 'default' events. It means all except 'successful' state.
   You could set to this options list of any valid states such as [broken, failed, revival, successful, setup] or predefined sets as
   [all, default, none].

data/bin/cerberus

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
 # Add lib dir to load path so that we don't have to be installed in rubygems
 require 'pathname' # Use Pathname to follow symlinks

data/lib/cerberus/constants.rb

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

data/lib/cerberus/manager.rb

@@ -3,29 +3,30 @@ require 'fileutils'
 require 'cerberus/utils'
 require 'cerberus/constants'
 require 'cerberus/config'
+require 'cerberus/status'
 require 'cerberus/latch'
 require 'cerberus/component_lazy_loader'
 
 module Cerberus
   class AddCommand
     EXAMPLE_CONFIG = File.expand_path(File.dirname(__FILE__) + '/config.example.yml')
-    
+
     def initialize(path, cli_options = {})
       @path, @cli_options = path, HashWithIndifferentAccess.new(cli_options)
     end
-    
+
     def run
       scm_type = @cli_options[:scm] || Cerberus::SCM.guess_type(@path) || 'svn'
       scm = Cerberus::SCM.get(scm_type).new(@path, Config.new(nil, @cli_options))
       say "Can't find any #{scm_type} application under #{@path}" unless scm.url
-      
+
       application_name = @cli_options[:application_name] || extract_project_name(@path)
-      
+
       create_example_config
-      
+
       config_name = "#{HOME}/config/#{application_name}.yml"
       say "Application #{application_name} already present in Cerberus" if File.exists?(config_name)
-      
+
       app_config = { 'scm' => {
           'url' => scm.url,
           'type' =>  scm_type },
@@ -35,111 +36,113 @@ module Cerberus
       dump_yml(config_name, app_config)
       puts "Application '#{application_name}' has been added to Cerberus successfully" unless @cli_options[:quiet]
     end
-    
+
     private
 
     def extract_project_name(path)
       path = File.expand_path(path) if test(?d, path)
       File.basename(path).strip.gsub( /\.git$/, '' )
     end
-    
+
     def create_example_config
       FileUtils.mkpath(HOME) unless test(?d, HOME)
       FileUtils.cp(EXAMPLE_CONFIG, CONFIG_FILE) unless test(?f, CONFIG_FILE)
     end
   end
-  
+
   class RemoveCommand
-    # DRY: this is ugly and needs refactoring. It duplicates functionality from other 
+    # DRY: this is ugly and needs refactoring. It duplicates functionality from other
     # classes a lot.
-    
+
     def initialize(application_name, cli_options = {})
       unless File.exists?("#{HOME}/config/#{application_name}.yml")
         say "Project '#{application_name}' does not exist in Cerberus. Type 'cerberus list' to see the list of all active projects."
       end
       @app_root = "#{HOME}/work/#{application_name}"
-      
+
       def_options = {:application_root => @app_root, :application_name => application_name}
       @config = Config.new(application_name, cli_options.merge(def_options))
     end
-    
+
     def run
       application_name = @config[:application_name]
-      
+
       config_name = "#{HOME}/config/#{application_name}.yml"
-      
+
       if not File.exists?(config_name)
         say "Unknown application #{application_name}"
-        exit(1) 
+        exit(1)
       end
       FileUtils.rm_rf @config[:application_root]
       File.unlink config_name
       puts "Application '#{application_name}' removed." unless @config[:quiet]
     end
   end
-  
+
   class BuildCommand
     attr_reader :builder, :success, :scm, :status, :setup_script_output
-    
-    DEFAULT_CONFIG = {:scm => {:type => 'svn'}, 
+
+    DEFAULT_CONFIG = {:scm => {:type => 'svn'},
       :log => {:enable => true},
       :at_time => '* *',
+      :max_wait_time => LOCK_WAIT,
+      :require_revision_change => false
     }
-    
+
     def initialize(application_name, cli_options = {})
       unless File.exists?("#{HOME}/config/#{application_name}.yml")
         say "Project '#{application_name}' does not exist in Cerberus. Type 'cerberus list' to see the list of all active projects."
       end
-      
+
       app_root = "#{HOME}/work/#{application_name}"
-      
+
       def_options = {:application_root => app_root + '/sources', :application_name => application_name} #pseudo options that stored in config. Could not be set in any config file not through CLI
       @config = Config.new(application_name, cli_options.merge(def_options))
       @config.merge!(DEFAULT_CONFIG, false)
-      
+
       @status = Status.read("#{app_root}/status.log")
-      
+
       scm_type = @config[:scm, :type]
       @scm = SCM.get(scm_type).new(@config[:application_root], @config)
       say "Client for SCM '#{scm_type}' does not installed" unless @scm.installed?
-      
+
       builder_type = get_configuration_option(@config[:builder], :type, :rake)
       @builder = Builder.get(builder_type).new(@config)
     end
-    
+
     def run
       begin
-        Latch.lock("#{HOME}/work/#{@config[:application_name]}/.lock", :lock_ttl => 2 * LOCK_WAIT) do
+        Latch.lock("#{HOME}/work/#{@config[:application_name]}/.lock", :lock_ttl => @config[:max_wait_time]) do
           @scm.update!
-          if @scm.has_changes? or @config[:force] or !@status.previous_build_successful
+          if ( @config[:force] || @scm.has_changes? || ( @status.previous_build_failed? && !@config[:require_revision_change] ) )
             Dir.chdir File.join(@config[:application_root], @config[:build_dir] || '')
             @setup_script_output = `#{@config[:setup_script]}` if @config[:setup_script]
 
             build_successful = @builder.run
             @status.keep(build_successful, @scm.current_revision, @builder.brokeness)
-            
+
             #Save logs to directory
             if @config[:log, :enable]
               log_dir = "#{HOME}/work/#{@config[:application_name]}/logs/"
               FileUtils.mkpath(log_dir)
-              
+
               time = Time.now.strftime("%Y%m%d%H%M%S")
               file_name = "#{log_dir}/#{time}-#{@status.current_state.to_s}.log"
               body = [ @setup_script_output, scm.last_commit_message, builder.output ].join("\n\n")
               IO.write(file_name, body)
             end
-            
+
             #send notifications
             active_publishers = get_configuration_option(@config[:publisher], :active, 'mail')
             active_publishers.split(/\W+/).each do |pub|
-              
+
               publisher_config = @config[:publisher, pub]
               raise "Publisher have no configuration: #{pub}" unless publisher_config
-              
+
               events = interpret_state(publisher_config[:on_event] || @config[:publisher, :on_event] || 'default')
               Publisher.get(pub, publisher_config).publish(@status, self, @config) if events.include?(@status.current_state)
             end
-            
+
             #Process hooks
             hooks = @config[:hook]
             hooks.each_pair{|name, hook|
@@ -149,13 +152,13 @@ module Cerberus
               end
             } if hooks
           end
-          
+
         end #lock
       rescue Exception => e
         if ENV['CERBERUS_ENV'] == 'TEST'
           raise e
         else
-          File.open("#{HOME}/error.log", File::WRONLY|File::APPEND|File::CREAT) do |f| 
+          File.open("#{HOME}/error.log", File::WRONLY|File::APPEND|File::CREAT) do |f|
             f.puts Time.now.strftime("%a, %d %b %Y %H:%M:%S [#{@config[:application_name]}] --  #{e.class}")
             f.puts e.message unless e.message.empty?
             f.puts e.backtrace.collect{|line| ' '*5 + line}
@@ -173,7 +176,7 @@ module Cerberus
       end
       return false
     end
-    
+
     private
     def get_configuration_option(hash, defining_key = nil, default_option = nil)
       if hash
@@ -183,24 +186,24 @@ module Cerberus
       return default_option
     end
   end
-  
+
   class BuildAllCommand
     def initialize(cli_options = {})
       @cli_options = cli_options
     end
-    
+
     def run
       threads = []
       Dir["#{HOME}/config/*.yml"].each do |fn|
         fn =~ %r{#{HOME}/config/(.*).yml}
         application_name = $1
-        
+
         command = Cerberus::BuildCommand.new(application_name, @cli_options)
         threads << Thread.new { command.run } if command.run_time?(Time.now)
       end
-      
+
       @already_waited = false
-      threads.each do |t| 
+      threads.each do |t|
         if @already_waited or not t.join(LOCK_WAIT)
           t.kill
           @already_waited = true
@@ -208,37 +211,37 @@ module Cerberus
       end
     end
   end
-  
+
   class ListCommand
-    def initialize(cli_options = {})                                                                             
+    def initialize(cli_options = {})
     end
-    
+
     def run
       projects = Dir["#{HOME}/config/*.yml"]
       if projects.empty?
-        puts "There are no active projects" 
+        puts "There are no active projects"
       else
         puts "List of active projects:"
-        
+
         projects.sort.each do |fn|
           fn =~ %r{#{HOME}/config/(.*).yml}
-          
+
           puts "  * #{$1}"
         end
-        
+
         puts "\nType 'cerberus build PROJECT_NAME' to build any of these projects"
       end
     end
   end
 
   class StatusCommand
-    def initialize(cli_options = {})                                                                             
+    def initialize(cli_options = {})
     end
-    
+
     def run
       projects = Dir["#{HOME}/config/*.yml"].sort.map { |fn| fn.gsub(/.*\/(.*).yml$/, '\1') }
       if projects.empty?
-        puts "There are not any active projects" 
+        puts "There are not any active projects"
       else
         delim = ' | '
         cols  = [
@@ -273,88 +276,5 @@ module Cerberus
     end
 
   end
-  
-  #
-  # Fields that are contained in status file
-  #
-  #   successful_build_timestamp
-  #   timestamp
-  #   successful (true mean previous build was successful, otherwise - false)
-  #   revision
-  #   brokeness
-  #   successful_build_revision
-  #
-  class Status
-    attr_reader :previous_build_successful, :previous_brokeness, :current_build_successful, :current_brokeness, :revision, :successful_build_revision
-    
-    def initialize(param)
-      if param.is_a? Hash
-        @hash = param
-        @current_build_successful = @hash['state']
-        @already_kept = true
-      else
-        @path = param
-        value = File.exists?(@path) ? YAML.load(IO.read(@path)) : nil
-        
-        @hash =
-        case value
-        when String
-          value = %w(succesful successful setup).include?(value) #fix typo in status values
-          {'successful' => value}
-        when nil
-          {}
-        else
-          value
-        end
-        
-        @already_kept = false
-      end
-      
-      @revision = @hash['revision']
-      @successful_build_revision = @hash['successful_build_revision']
-      @previous_build_successful = @hash['successful']
-      @previous_brokeness = @hash['brokeness']
-
-      # Create some convenience methods to access status
-      @hash.keys.each { |key| self.class.send( :define_method, key ) { @hash[key] } }
-    end
-    
-    def self.read(file_name)
-      Status.new(file_name)
-    end
-    
-    def keep(build_successful, revision, brokeness)
-      raise 'Status could be kept only once. Please try to reread status file.' if @already_kept
-      
-      @current_brokeness = brokeness
-      @current_build_successful = build_successful
-      
-      hash = {'successful' => @current_build_successful, 'timestamp' => Time.now, 'revision' => revision, 'brokeness' => brokeness}
-      if build_successful
-        hash['successful_build_timestamp'] = Time.now
-        hash['successful_build_revision'] = revision
-      else
-        hash['successful_build_timestamp'] = @hash['successful_build_timestamp']
-        hash['successful_build_revision'] = @hash['successful_build_revision']
-      end
-      
-      File.open(@path, "w+", 0777) { |file| file.write(YAML.dump(hash)) }
-      
-      @already_kept = true
-    end
-    
-    def current_state
-      raise "Invalid project state. Before calculating status please do keeping of it." unless @already_kept
-      
-      if @current_build_successful
-        if @previous_build_successful.nil?
-          :setup
-        else
-          @previous_build_successful ? :successful : :revival
-        end
-      else
-        @previous_build_successful ? :failed : :broken
-      end
-    end
-  end
+
 end

data/lib/cerberus/scm/git.rb

@@ -71,7 +71,9 @@ class Cerberus::SCM::Git < Cerberus::SCM::Base
   end
 
   def extract_commit_info( commit=remote_head )
-    message = execute("log", "#{ commit } -1 --pretty='format:%an(%ae)|%ai|%H|%s%n%n%b'").split("|")
+    message = String.new.respond_to?(:force_encoding) ?
+      execute("log", "#{ commit } -1 --pretty='format:%an(%ae)|%ai|%H|%s%n%n%b'").force_encoding('utf-8').split("|") :
+      execute("log", "#{ commit } -1 --pretty='format:%an(%ae)|%ai|%H|%s%n%n%b'").split("|")
     return { :author => message[0], :date => message[1], :revision => message[2], :message => message[3] }
   end
 

data/lib/cerberus/status.rb

@@ -0,0 +1,93 @@
+module Cerberus
+  # Fields that are contained in status file
+  #
+  #   successful_build_timestamp
+  #   timestamp
+  #   successful (true mean previous build was successful, otherwise - false)
+  #   revision
+  #   brokeness
+  #   successful_build_revision
+  #
+  class Status
+    attr_reader :previous_build_successful, :previous_brokeness, :current_build_successful, :current_brokeness, :revision, :successful_build_revision
+  
+    def initialize(param)
+      if param.is_a? Hash
+        @hash = param
+        @current_build_successful = @hash['state']
+        @already_kept = true
+      else
+        @path = param
+        value = File.exists?(@path) ? YAML.load(IO.read(@path)) : nil
+      
+        @hash =
+        case value
+        when String
+          value = %w(succesful successful setup).include?(value) #fix typo in status values
+          {'successful' => value}
+        when nil
+          {}
+        else
+          value
+        end
+      
+        @already_kept = false
+      end
+    
+      @revision = @hash['revision']
+      @successful_build_revision = @hash['successful_build_revision']
+      @previous_build_successful = @hash['successful']
+      @previous_brokeness = @hash['brokeness']
+
+      # Create some convenience methods to access status
+      @hash.keys.each { |key| self.class.send( :define_method, key ) { @hash[key] } }
+    end
+  
+    def self.read(file_name)
+      Status.new(file_name)
+    end
+  
+    def keep(build_successful, revision, brokeness)
+      raise 'Status could be kept only once. Please try to reread status file.' if @already_kept
+    
+      @current_brokeness = brokeness
+      @current_build_successful = build_successful
+    
+      hash = {'successful' => @current_build_successful, 'timestamp' => Time.now, 'revision' => revision, 'brokeness' => brokeness}
+      if build_successful
+        hash['successful_build_timestamp'] = Time.now
+        hash['successful_build_revision'] = revision
+      else
+        hash['successful_build_timestamp'] = @hash['successful_build_timestamp']
+        hash['successful_build_revision'] = @hash['successful_build_revision']
+      end
+    
+      File.open(@path, "w+", 0777) { |file| file.write(YAML.dump(hash)) }
+    
+      @already_kept = true
+    end
+  
+    def previous_build_failed?
+      # if @previous_build_successful.nil?
+      #   return false
+      # else
+      #   ( :setup == current_state ) ? false : !@previous_build_successful
+      # end
+      @previous_build_successful.nil? ? false : !@previous_build_successful
+    end
+  
+    def current_state
+      raise "Invalid project state. Before calculating status please do keeping of it." unless @already_kept
+    
+      if @current_build_successful
+        if @previous_build_successful.nil?
+          :setup
+        else
+          @previous_build_successful ? :successful : :revival
+        end
+      else
+        @previous_build_successful ? :failed : :broken
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cerberus
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 63
+  prerelease: 
   segments: 
   - 0
-  - 7
-  - 9
-  version: 0.7.9
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Craig P Jolicoeur
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 -05:00
+date: 2011-04-02 00:00:00 -04:00
 default_executable: cerberus
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,6 +106,7 @@ files:
 - lib/cerberus/scm/hg.rb
 - lib/cerberus/scm/perforce.rb
 - lib/cerberus/scm/svn.rb
+- lib/cerberus/status.rb
 - lib/cerberus/utils.rb
 - lib/vendor/addressable/addressable.gemspec
 - lib/vendor/addressable/CHANGELOG
@@ -466,7 +467,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cerberus
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Cerberus is a Continuous Integration tool that could be easily run from Cron.