From c1785f32825431d30a5d826066d37dfb0403cd46 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 4 Feb 2010 18:28:45 -0800 Subject: Release using gemcutter gem:push tasks --- activemodel/Rakefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'activemodel') diff --git a/activemodel/Rakefile b/activemodel/Rakefile index f098ce0671..e043a6d69d 100755 --- a/activemodel/Rakefile +++ b/activemodel/Rakefile @@ -44,9 +44,15 @@ end require 'rake/packagetask' require 'rake/gempackagetask' +require 'rake/gemcutter' spec = eval(File.read("#{dir}/activemodel.gemspec")) Rake::GemPackageTask.new(spec) do |p| p.gem_spec = spec end + +Rake::Gemcutter::Tasks(spec) + +desc "Release to gemcutter" +task :release => [:package, 'gem:push'] -- cgit v1.2.3 From 7b81f5981fd6dfcede61a89da80b09a1650e2c02 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 4 Feb 2010 18:44:14 -0800 Subject: Fix task defines --- activemodel/Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activemodel') diff --git a/activemodel/Rakefile b/activemodel/Rakefile index e043a6d69d..565277d6bd 100755 --- a/activemodel/Rakefile +++ b/activemodel/Rakefile @@ -52,7 +52,7 @@ Rake::GemPackageTask.new(spec) do |p| p.gem_spec = spec end -Rake::Gemcutter::Tasks(spec) +Rake::Gemcutter::Tasks.new(spec).define desc "Release to gemcutter" task :release => [:package, 'gem:push'] -- cgit v1.2.3 From 459ecaf95db12ec64e70c02f8ee58ddb1133021e Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 5 Feb 2010 00:03:03 -0800 Subject: Submarine the rake-gemcutter dep in Rakefiles --- activemodel/Rakefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'activemodel') diff --git a/activemodel/Rakefile b/activemodel/Rakefile index 565277d6bd..5ea7b373fc 100755 --- a/activemodel/Rakefile +++ b/activemodel/Rakefile @@ -44,7 +44,6 @@ end require 'rake/packagetask' require 'rake/gempackagetask' -require 'rake/gemcutter' spec = eval(File.read("#{dir}/activemodel.gemspec")) @@ -52,7 +51,9 @@ Rake::GemPackageTask.new(spec) do |p| p.gem_spec = spec end -Rake::Gemcutter::Tasks.new(spec).define - desc "Release to gemcutter" -task :release => [:package, 'gem:push'] +task :release => :package do + require 'rake/gemcutter' + Rake::Gemcutter::Tasks.new(spec).define + Rake::Task['gem:push'].invoke +end -- cgit v1.2.3 From c548e213658386f3a5b00097bc5b30bf3736e6b4 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 5 Feb 2010 09:24:12 -0800 Subject: Bump git versions to 3.0.0.beta1 since we've released --- activemodel/activemodel.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activemodel') diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec index 64ae6e0760..e5b0207e39 100644 --- a/activemodel/activemodel.gemspec +++ b/activemodel/activemodel.gemspec @@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = 'activemodel' - s.version = '3.0.0.beta' + s.version = '3.0.0.beta1' s.summary = "A toolkit for building other modeling frameworks like ActiveRecord" s.description = %q{Extracts common modeling concerns from ActiveRecord to share between similar frameworks like ActiveResource.} @@ -12,7 +12,7 @@ Gem::Specification.new do |s| s.has_rdoc = true - s.add_dependency('activesupport', '= 3.0.0.beta') + s.add_dependency('activesupport', '= 3.0.0.beta1') s.require_path = 'lib' s.files = Dir["CHANGELOG", "MIT-LICENSE", "README", "lib/**/*"] -- cgit v1.2.3 From 1d9d9d2d89a90a85f27a1909e3c435c070bc1b40 Mon Sep 17 00:00:00 2001 From: Prem Sichanugrist Date: Sat, 6 Feb 2010 21:36:46 +0700 Subject: Fix tiny version number from '3.0.0beta' to '3.0.0.beta1', so 'rake install' will be run correctly [#3879 status:resolved] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Valim --- activemodel/lib/active_model/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activemodel') diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb index f569447bc8..d51423ae1b 100644 --- a/activemodel/lib/active_model/version.rb +++ b/activemodel/lib/active_model/version.rb @@ -2,7 +2,7 @@ module ActiveModel module VERSION #:nodoc: MAJOR = 3 MINOR = 0 - TINY = "0.beta" + TINY = "0.beta1" STRING = [MAJOR, MINOR, TINY].join('.') end -- cgit v1.2.3 From 5fe3dc4bf52eb315310a714c0fc1f627d47428fa Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Mon, 8 Feb 2010 15:30:10 +1100 Subject: Adding ruby version spec to all gemspec files to at least 1.8.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Valim --- activemodel/activemodel.gemspec | 1 + 1 file changed, 1 insertion(+) (limited to 'activemodel') diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec index e5b0207e39..b4fbe26d97 100644 --- a/activemodel/activemodel.gemspec +++ b/activemodel/activemodel.gemspec @@ -4,6 +4,7 @@ Gem::Specification.new do |s| s.version = '3.0.0.beta1' s.summary = "A toolkit for building other modeling frameworks like ActiveRecord" s.description = %q{Extracts common modeling concerns from ActiveRecord to share between similar frameworks like ActiveResource.} + s.required_ruby_version = '>= 1.8.7' s.author = "David Heinemeier Hansson" s.email = "david@loudthinking.com" -- cgit v1.2.3 From 9fd9e5d4f7ce96dd10c775bf46be75cf49e070f4 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Wed, 10 Feb 2010 23:26:47 +0100 Subject: fixes doc generation Signed-off-by: Jeremy Kemper --- activemodel/CHANGELOG | 11 +++++++++++ activemodel/CHANGES | 12 ------------ activemodel/Rakefile | 6 +++--- 3 files changed, 14 insertions(+), 15 deletions(-) delete mode 100644 activemodel/CHANGES (limited to 'activemodel') diff --git a/activemodel/CHANGELOG b/activemodel/CHANGELOG index 7489c0daa5..eae337e737 100644 --- a/activemodel/CHANGELOG +++ b/activemodel/CHANGELOG @@ -1,5 +1,16 @@ *Edge* +* ActiveModel::Observer#add_observer! + + It has a custom hook to define after_find that should really be in a + ActiveRecord::Observer subclass: + + def add_observer!(klass) + klass.add_observer(self) + klass.class_eval 'def after_find() end' unless + klass.respond_to?(:after_find) + end + * Change the ActiveModel::Base.include_root_in_json default to true for Rails 3 [DHH] * Add validates_format_of :without => /regexp/ option. #430 [Elliot Winkler, Peer Allan] diff --git a/activemodel/CHANGES b/activemodel/CHANGES deleted file mode 100644 index 217a6d6bf7..0000000000 --- a/activemodel/CHANGES +++ /dev/null @@ -1,12 +0,0 @@ -Changes from extracting bits to ActiveModel - -* ActiveModel::Observer#add_observer! - - It has a custom hook to define after_find that should really be in a - ActiveRecord::Observer subclass: - - def add_observer!(klass) - klass.add_observer(self) - klass.class_eval 'def after_find() end' unless - klass.respond_to?(:after_find) - end diff --git a/activemodel/Rakefile b/activemodel/Rakefile index 5ea7b373fc..14c02f183f 100755 --- a/activemodel/Rakefile +++ b/activemodel/Rakefile @@ -32,13 +32,13 @@ require 'rake/rdoctask' # Generate the RDoc documentation Rake::RDocTask.new do |rdoc| - rdoc.rdoc_dir = "#{dir}/doc" + rdoc.rdoc_dir = "doc" rdoc.title = "Active Model" rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object' rdoc.options << '--charset' << 'utf-8' rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo' - rdoc.rdoc_files.include("#{dir}/README", "#{dir}/CHANGES") - rdoc.rdoc_files.include("#{dir}/lib/**/*.rb") + rdoc.rdoc_files.include("README", "CHANGELOG") + rdoc.rdoc_files.include("lib/**/*.rb") end -- cgit v1.2.3