Skip to content

Commit

Permalink
Merge branch 'release/2.0.0.rc2' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
benlangfeld committed Mar 22, 2012
2 parents e3cf22b + 9558754 commit d0896db
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 28 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
@@ -1,4 +1,6 @@
# [develop](https://github.com/adhearsion/adhearsion)

# [2.0.0.rc2](https://github.com/adhearsion/adhearsion/compare/v2.0.0.rc1...v2.0.0.rc2) - [2012-03-22](https://rubygems.org/gems/adhearsion/versions/2.0.0.rc2)
* Bugfix: Exceptions raised in call event handlers no longer kill the call actor
* Bugfix: More exceptions handled internally by Adhearsion are logged in an appropriate context
* Bugfix/Change: `Adhearsion::Calls` (`Adhearsion.active_calls`) is now an actor for better thread-safety, and mirrors the Hash API more closely.
Expand Down
29 changes: 1 addition & 28 deletions lib/adhearsion/version.rb
@@ -1,32 +1,5 @@
# encoding: utf-8

module Adhearsion #:nodoc:
VERSION = '2.0.0.rc1'

class PkgVersion
include Comparable

attr_reader :major, :minor, :revision

def initialize(version = nil)
version ||= ""
@major, @minor, @revision, @patchlevel = version.split(".", 4).map(&:to_i)
@major = 0 unless @major
end

def <=>(other)
return @major <=> other.major unless (@major <=> other.major) == 0
return @minor <=> other.minor unless (@minor <=> other.minor) == 0
return @revision <=> other.revision unless (@revision <=> other.revision) == 0
return 0
end

def self.sort
self.sort! { |a,b| a <=> b }
end

def to_s
"#{@major}.#{@minor}.#{@revision}"
end
end
VERSION = '2.0.0.rc2'
end

0 comments on commit d0896db

Please sign in to comment.