Skip to content

Commit

Permalink
try manually setting string encoding setting
Browse files Browse the repository at this point in the history
  • Loading branch information
cpjolicoeur committed Mar 24, 2011
1 parent 2ffee5d commit 8d9ba14
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 7 deletions.
15 changes: 10 additions & 5 deletions Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
= Cerberus Changelog

== Version 0.8.0
Ruby 1.9 bugfixes

* Fixed Ruby 1.9 string encoding bug [git SCM]

== Veresion 0.7.9
Bugfixes

Expand All @@ -15,7 +20,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
Expand All @@ -28,7 +33,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
Expand Down Expand Up @@ -125,7 +130,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:
Expand All @@ -150,7 +155,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
Expand All @@ -177,7 +182,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].
Expand Down
1 change: 1 addition & 0 deletions bin/cerberus
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/cerberus/constants.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ module Cerberus

LOCK_WAIT = 30 * 60 # 30 minutes

VERSION = '0.7.9'
VERSION = '0.8.0'
end
4 changes: 3 additions & 1 deletion lib/cerberus/scm/git.rb
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ def execute(command, parameters = nil, with_path = true)
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

Expand Down

0 comments on commit 8d9ba14

Please sign in to comment.