Skip to content

Commit

Permalink
Merge branch 'hotfix/gemspec'
Browse files Browse the repository at this point in the history
  • Loading branch information
kennethkalmer committed Feb 8, 2011
2 parents 0c09999 + 6a9e92d commit b4cef31
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 24 deletions.
13 changes: 8 additions & 5 deletions Gemfile
@@ -1,8 +1,11 @@
source :gemcutter

gem "rails", "3.0.3"
gem "sqlite3-ruby"
gem "rspec-rails", "~> 2.4.0"
gem "rcov"
gem "yard"
gem "jeweler"

group :development do
gem "sqlite3-ruby"
gem "rspec-rails", "~> 2.4.0"
gem "rcov"
gem "yard"
gem "jeweler"
end
4 changes: 0 additions & 4 deletions Rakefile
Expand Up @@ -19,10 +19,6 @@ begin
gem.authors = ["Brandon Keepers", "Kenneth Kalmer"]
gem.rdoc_options << '--main' << 'README.rdoc' << '--line-numbers' << '--inline-source'
gem.version = ActsAsAudited::VERSION

gem.add_dependency 'activerecord', '3.0.3'
gem.add_development_dependency "rails", '3.0.3'
gem.add_development_dependency "rspec-rails", '~> 2.4.0'
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
end
# Jeweler::GemcutterTasks.new
Expand Down
19 changes: 5 additions & 14 deletions acts_as_audited.gemspec
Expand Up @@ -9,7 +9,7 @@ Gem::Specification.new do |s|

s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
s.authors = ["Brandon Keepers", "Kenneth Kalmer"]
s.date = %q{2011-02-05}
s.date = %q{2011-02-08}
s.email = %q{brandon@opensoul.org}
s.extra_rdoc_files = [
"LICENSE",
Expand Down Expand Up @@ -101,24 +101,18 @@ Gem::Specification.new do |s|

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<rails>, ["= 3.0.3"])
s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 0"])
s.add_runtime_dependency(%q<rspec-rails>, ["~> 2.4.0"])
s.add_runtime_dependency(%q<rcov>, [">= 0"])
s.add_runtime_dependency(%q<yard>, [">= 0"])
s.add_runtime_dependency(%q<jeweler>, [">= 0"])
s.add_runtime_dependency(%q<activerecord>, ["= 3.0.3"])
s.add_development_dependency(%q<rails>, ["= 3.0.3"])
s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
s.add_development_dependency(%q<rspec-rails>, ["~> 2.4.0"])
s.add_development_dependency(%q<rcov>, [">= 0"])
s.add_development_dependency(%q<yard>, [">= 0"])
s.add_development_dependency(%q<jeweler>, [">= 0"])
else
s.add_dependency(%q<rails>, ["= 3.0.3"])
s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
s.add_dependency(%q<rspec-rails>, ["~> 2.4.0"])
s.add_dependency(%q<rcov>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<jeweler>, [">= 0"])
s.add_dependency(%q<activerecord>, ["= 3.0.3"])
s.add_dependency(%q<rails>, ["= 3.0.3"])
s.add_dependency(%q<rspec-rails>, ["~> 2.4.0"])
end
else
s.add_dependency(%q<rails>, ["= 3.0.3"])
Expand All @@ -127,9 +121,6 @@ Gem::Specification.new do |s|
s.add_dependency(%q<rcov>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<jeweler>, [">= 0"])
s.add_dependency(%q<activerecord>, ["= 3.0.3"])
s.add_dependency(%q<rails>, ["= 3.0.3"])
s.add_dependency(%q<rspec-rails>, ["~> 2.4.0"])
end
end

2 changes: 1 addition & 1 deletion lib/acts_as_audited.rb
Expand Up @@ -24,7 +24,7 @@

# To get started, please review ActsAsAudited::Auditor::ClassMethods#acts_as_audited
module ActsAsAudited
VERSION = '2.0.0.rc5'
VERSION = '2.0.0.rc6'

mattr_accessor :current_user_method
# The method to be called to return the current user for logging in the audits.
Expand Down

0 comments on commit b4cef31

Please sign in to comment.