From 3d94d9f8f37c4c891116f186cadde8ccc191f1f7 Mon Sep 17 00:00:00 2001 From: "Michael S. Klishin" Date: Fri, 25 Jul 2008 00:15:48 +0300 Subject: [PATCH 1/2] Ignore bundle/*. --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f52401b..8e54484 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ log log/* */log/* coverage -*/coverage \ No newline at end of file +*/coverage +bundle/* \ No newline at end of file From cf83af557e4f9ee001b3bb322a3472b166ac8cf8 Mon Sep 17 00:00:00 2001 From: "Michael S. Klishin" Date: Fri, 25 Jul 2008 00:17:08 +0300 Subject: [PATCH 2/2] Make merb-plugins gems use extlib release tasks. --- Rakefile | 9 +++++++++ merb_activerecord/Rakefile | 20 +++++++++++++++++++- merb_helpers/Rakefile | 17 +++++++++++++++++ merb_laszlo/Rakefile | 20 ++++++++++++++++++-- merb_param_protection/Rakefile | 18 ++++++++++++++++++ merb_screw_unit/Rakefile | 22 +++++++++++++++++++--- merb_sequel/Rakefile | 20 ++++++++++++++++++-- merb_stories/Rakefile | 20 ++++++++++++++++++-- merb_test_unit/Rakefile | 20 ++++++++++++++++++-- 9 files changed, 154 insertions(+), 12 deletions(-) diff --git a/Rakefile b/Rakefile index 1268563..862000d 100644 --- a/Rakefile +++ b/Rakefile @@ -35,3 +35,12 @@ task :bundle do end end end + +namespace :release do + desc "Publish Merb More gem to RubyForge, one by one." + task :gems => [ :bundle ] do + gems.each do |gem| + Dir.chdir(gem){ sh "rake release" } + end + end +end diff --git a/merb_activerecord/Rakefile b/merb_activerecord/Rakefile index ee83e53..70f6b1d 100644 --- a/merb_activerecord/Rakefile +++ b/merb_activerecord/Rakefile @@ -42,4 +42,22 @@ namespace :jruby do sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri} end -end \ No newline at end of file +end + + +############################################################################## +# Release +############################################################################## +RUBY_FORGE_PROJECT = NAME + +PKG_NAME = NAME +PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' +PKG_VERSION = GEM_VERSION + PKG_BUILD +PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" + +RELEASE_NAME = "REL #{PKG_VERSION}" + +# FIXME: hey, someone take care of me +RUBY_FORGE_USER = "" + +require "extlib/tasks/release" diff --git a/merb_helpers/Rakefile b/merb_helpers/Rakefile index e7dd8c3..38a3064 100644 --- a/merb_helpers/Rakefile +++ b/merb_helpers/Rakefile @@ -61,3 +61,20 @@ Spec::Rake::SpecTask.new('rcov') do |t| t.rcov_opts = ['--exclude', 'gems', '--exclude', 'spec'] end + +############################################################################## +# Release +############################################################################## +RUBY_FORGE_PROJECT = NAME + +PKG_NAME = NAME +PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' +PKG_VERSION = GEM_VERSION + PKG_BUILD +PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" + +RELEASE_NAME = "REL #{PKG_VERSION}" + +# FIXME: hey, someone take care of me +RUBY_FORGE_USER = "" + +require "extlib/tasks/release" diff --git a/merb_laszlo/Rakefile b/merb_laszlo/Rakefile index bb58b03..e585248 100644 --- a/merb_laszlo/Rakefile +++ b/merb_laszlo/Rakefile @@ -45,10 +45,26 @@ task :make_spec do end namespace :jruby do - desc "Run :package and install the resulting .gem with jruby" task :install => :package do sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri} end - end + + +############################################################################## +# Release +############################################################################## +RUBY_FORGE_PROJECT = NAME + +PKG_NAME = NAME +PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' +PKG_VERSION = GEM_VERSION + PKG_BUILD +PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" + +RELEASE_NAME = "REL #{PKG_VERSION}" + +# FIXME: hey, someone take care of me +RUBY_FORGE_USER = "" + +require "extlib/tasks/release" diff --git a/merb_param_protection/Rakefile b/merb_param_protection/Rakefile index 5ba401b..f5c4491 100644 --- a/merb_param_protection/Rakefile +++ b/merb_param_protection/Rakefile @@ -60,3 +60,21 @@ Spec::Rake::SpecTask.new("rcov") do |t| t.libs = ["lib", "server/lib" ] t.rcov = true end + + +############################################################################## +# Release +############################################################################## +RUBY_FORGE_PROJECT = NAME + +PKG_NAME = NAME +PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' +PKG_VERSION = GEM_VERSION + PKG_BUILD +PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" + +RELEASE_NAME = "REL #{PKG_VERSION}" + +# FIXME: hey, someone take care of me +RUBY_FORGE_USER = "" + +require "extlib/tasks/release" diff --git a/merb_screw_unit/Rakefile b/merb_screw_unit/Rakefile index df3a1c5..a5339bf 100644 --- a/merb_screw_unit/Rakefile +++ b/merb_screw_unit/Rakefile @@ -39,10 +39,26 @@ task :install => [:package] do end namespace :jruby do - desc "Run :package and install the resulting .gem with jruby" task :install => :package do sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri} end - -end \ No newline at end of file +end + + +############################################################################## +# Release +############################################################################## +RUBY_FORGE_PROJECT = NAME + +PKG_NAME = NAME +PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' +PKG_VERSION = GEM_VERSION + PKG_BUILD +PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" + +RELEASE_NAME = "REL #{PKG_VERSION}" + +# FIXME: hey, someone take care of me +RUBY_FORGE_USER = "" + +require "extlib/tasks/release" diff --git a/merb_sequel/Rakefile b/merb_sequel/Rakefile index 4f6e46c..9628041 100644 --- a/merb_sequel/Rakefile +++ b/merb_sequel/Rakefile @@ -38,10 +38,26 @@ task :install => :package do end namespace :jruby do - desc "Run :package and install the resulting .gem with jruby" task :install => :package do sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri} end +end + + +############################################################################## +# Release +############################################################################## +RUBY_FORGE_PROJECT = NAME + +PKG_NAME = NAME +PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' +PKG_VERSION = GEM_VERSION + PKG_BUILD +PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" + +RELEASE_NAME = "REL #{PKG_VERSION}" + +# FIXME: hey, someone take care of me +RUBY_FORGE_USER = "" -end \ No newline at end of file +require "extlib/tasks/release" diff --git a/merb_stories/Rakefile b/merb_stories/Rakefile index 1ecccaf..5e00b09 100644 --- a/merb_stories/Rakefile +++ b/merb_stories/Rakefile @@ -37,10 +37,26 @@ task :install => [:package] do end namespace :jruby do - desc "Run :package and install the resulting .gem with jruby" task :install => :package do sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri} end - end + + +############################################################################## +# Release +############################################################################## +RUBY_FORGE_PROJECT = NAME + +PKG_NAME = NAME +PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' +PKG_VERSION = GEM_VERSION + PKG_BUILD +PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" + +RELEASE_NAME = "REL #{PKG_VERSION}" + +# FIXME: hey, someone take care of me +RUBY_FORGE_USER = "" + +require "extlib/tasks/release" diff --git a/merb_test_unit/Rakefile b/merb_test_unit/Rakefile index 076ce85..f4de2f8 100644 --- a/merb_test_unit/Rakefile +++ b/merb_test_unit/Rakefile @@ -36,10 +36,26 @@ task :install => [:package] do end namespace :jruby do - desc "Run :package and install the resulting .gem with jruby" task :install => :package do sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri} end - end + + +############################################################################## +# Release +############################################################################## +RUBY_FORGE_PROJECT = NAME + +PKG_NAME = NAME +PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' +PKG_VERSION = GEM_VERSION + PKG_BUILD +PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" + +RELEASE_NAME = "REL #{PKG_VERSION}" + +# FIXME: hey, someone take care of me +RUBY_FORGE_USER = "" + +require "extlib/tasks/release"