@@ -7,7 +7,11 @@ namespace :merb do @sudo = @windows ? "" : "sudo " def filename_for(name) - Dir.glob("#{name}/pkg/#{File.basename(name)}*.gem")[0] + filepath = Dir.glob("#{name}/pkg/#{File.basename(name)}*.gem")[0] + unless filepath + filepath = Dir.glob("#{name}/pkg/#{File.basename(name.gsub('_', '-'))}*.gem")[0] + end + filepath end end @@ -64,15 +68,12 @@ namespace :merb do Rake::Task['merb:init'].invoke sh "#{@sudo} gem install -l -f #{Dir.glob("merb-core/pkg/merb*.gem")[0]}" Dir.glob("merb-more/pkg/merb*.gem").each do |gem_name| - puts "\n----------- #{@sudo} gem install -l -f #{gem_name}\n" sh "#{@sudo} gem install -l -f #{gem_name}" end Dir.glob("merb-more/merb-*").each do |dir| - puts "\n---------- #{@sudo} gem install -l -f #{filename_for(dir)}\n" sh "#{@sudo} gem install -l -f #{filename_for(dir)}" - end - Dir.glob("merb-plugins/merb_*").each do |dir| - puts "\n----------- "#{@sudo} gem install -l -f #{filename_for(dir)}\n" + end + Dir.glob("merb-plugins/merb*").each do |dir| sh "#{@sudo} gem install -l -f #{filename_for(dir)}" end end @@ -91,5 +92,19 @@ namespace :merb do sh "#{@sudo} jruby -S gem install -l -f #{filename_for(dir)}" end end + + desc "Pull,repackage and install all Merb gems with all subgems" + task :upgrade_all do + Rake::Task['merb:pull'].invoke + Rake::Task['merb:repackage'].invoke + Rake::Task['merb:install'].invoke + end + + desc "Pull,repackage and install all Merb gems for JRuby" + task :jupgrade_all do + Rake::Task['merb:pull'].invoke + Rake::Task['merb:repackage'].invoke + Rake::Task['merb:jinstall'].invoke + end end Rakefile 76cff60978104e13c222b39125b4612361a5fd33 Jaroslaw Zabiello zbiru@zbiru-at-home.local http://github.com/hipertracker/merb-scripts/commit/b4e8770fbe4b888fbf8896cfa09852c4f3e4b2ec b4e8770fbe4b888fbf8896cfa09852c4f3e4b2ec 2008-05-23T22:33:36-07:00 2008-05-23T22:33:36-07:00 Again new plugins (laszlo-* instead of laszlo_*) use inconsistent name. :( Fixed merb:install so it can work with these inconsitent names.\ Added new tasks: merb:upgrade_all which runs merb:pull, merb:repackage and merb:install. and merb:jupgrade_all which do the same for JRuby 071e8a4950bc4f0dbf8edaaa245118e56bb39579 Jaroslaw Zabiello zbiru@zbiru-at-home.local