diff --git a/CHANGELOG b/CHANGELOG index 42827c9..fe22ea7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,12 @@ +- 0.6.0 + + * add SCRAM-SHA-1 authentication mechanism + * add aggregation pipeline + * allow passing options to create_collection + + * fix usage of em-mongo git repos with bundler + * update dependencies to bson <= 2.0, eventmachine >=0.12.10, <= 2.0 + - 0.5.1 * fixed bson dependency (do not use 2.x) diff --git a/VERSION b/VERSION index 09a3acf..a918a2a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.0 \ No newline at end of file +0.6.0 diff --git a/em-mongo.gemspec b/em-mongo.gemspec index d661e42..021680c 100755 --- a/em-mongo.gemspec +++ b/em-mongo.gemspec @@ -1,4 +1,6 @@ -require_relative 'lib/em-mongo/version.rb' #for version +lib = File.expand_path('../lib', __FILE__) +$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) +require 'em-mongo/version.rb' #for version Gem::Specification.new do |s| s.name = 'em-mongo' @@ -23,6 +25,6 @@ Gem::Specification.new do |s| s.summary = 'An EventMachine driver for MongoDB.' - s.add_dependency 'eventmachine', ['<= 2.0'] - s.add_dependency 'bson', ['<= 2.0'] + s.add_dependency 'eventmachine', ['>=0.12.10', '< 2.0'] + s.add_dependency 'bson', ['>=1.9.2' , '< 2.0'] end