@@ -20,8 +20,27 @@ PROJECT_COPYRIGHT = [ "# All files in this distribution are subject to the terms of the Ruby license." ] -# To release the monthly version do: -# $ VERSION=2009.03 rake release +DEPENDENCIES = { + 'innate' => {:version => '= 2009.07'}, +} + +DEVELOPMENT_DEPENDENCIES = { + 'Remarkably' => {:version => '~> 0.5.2', :lib => 'remarkably'}, + 'bacon' => {:version => '>= 1.1.0'}, + 'erubis' => {:version => '>= 2.6.4'}, + 'ezamar' => {:version => '>= 2009.06'}, + 'haml' => {:version => '~> 2.0.9'}, + 'hpricot' => {:version => '>= 0.8.1'}, + 'json' => {:version => '>= 1.1.6'}, + 'liquid' => {:version => '~> 2.0.0'}, + 'localmemcache' => {:version => '~> 0.4.0'}, + 'memcache-client' => {:version => '~> 1.7.2', :lib => 'memcache'}, + 'nagoro' => {:version => '>= 2009.05'}, + 'rack-test' => {:version => '>= 0.3.0', :lib => 'rack/test'}, + 'sequel' => {:version => '= 3.1.0'}, + 'tagz' => {:version => '>= 5.0.1'}, + 'tenjin' => {:version => '~> 0.6.1'}, +} GEMSPEC = Gem::Specification.new{|s| s.name = 'ramaze' @@ -40,25 +59,6 @@ GEMSPEC = Gem::Specification.new{|s| s.rubyforge_project = "ramaze" s.required_rubygems_version = '>= 1.3.1' - s.add_dependency('innate', '= 2009.06.12') - - # rip those out if they cause you trouble - s.add_development_dependency('Remarkably', '~> 0.5.2') - s.add_development_dependency('bacon', '>= 1.1.0') - s.add_development_dependency('erubis', '>= 2.6.4') - s.add_development_dependency('ezamar', '>= 2009.06') - s.add_development_dependency('haml', '~> 2.0.9') - s.add_development_dependency('hpricot', '>= 0.8.1') - s.add_development_dependency('json', '>= 1.1.6') - s.add_development_dependency('liquid', '~> 2.0.0') - s.add_development_dependency('localmemcache', '~> 0.4.0') - s.add_development_dependency('memcache-client', '~> 1.7.2') - s.add_development_dependency('nagoro', '>= 2009.05') - s.add_development_dependency('rack-test', '>= 0.3.0') - s.add_development_dependency('sequel', '= 3.1.0') - s.add_development_dependency('tagz', '>= 5.0.1') - s.add_development_dependency('tenjin', '~> 0.6.1') - s.post_install_message = <<MESSAGE.strip ============================================================ @@ -70,6 +70,14 @@ You can now do create a new project: MESSAGE } +DEPENDENCIES.each do |name, options| + GEMSPEC.add_dependency(name, options[:version]) +end + +DEVELOPMENT_DEPENDENCIES.each do |name, options| + GEMSPEC.add_development_dependency(name, options[:version]) +end + Dir['tasks/*.rake'].each{|f| import(f) } task :default => [:bacon] Rakefile @@ -44,8 +44,10 @@ task :gem_setup do setup end - # first try to activate, install and try to activate again if activation - # fails the first time + # First try to activate. + # If activation fails, try to install and activate again. + # If the second activation also fails, try to require as it may just as + # well be in $LOAD_PATH. def setup_gem(name, options) version = [options[:version]].compact lib_name = options[:lib] || name @@ -53,9 +55,10 @@ task :gem_setup do log "activating #{name}" Gem.activate(name, *version) - rescue LoadError + rescue Gem::LoadError + log "activating #{name} failed, try to install" + install_gem(name, options) - Gem.activate(name, *version) end # tell rubygems to install a gem @@ -63,9 +66,19 @@ task :gem_setup do installer = Gem::DependencyInstaller.new(options) temp_argv(options[:extconf]) do - log "Installing #{name}" + log "installing #{name}" installer.install(name, options[:version]) end + + Gem.activate(name, *version) + + log "install and final activation successful" + rescue Gem::GemNotFoundException => ex + log "installation failed: #{ex}, use normal require" + + require(options[:lib] || name) + + log "require successful, cannot verify version though" end # prepare ARGV for rubygems installer tasks/gem_setup.rake @@ -1,6 +1,12 @@ desc 'install all possible dependencies' task :setup => [:gem_setup] do - GemSetup.new :verbose => true do - setup_gemspec GEMSPEC + GemSetup.new :verbose => false do + DEPENDENCIES.each do |name, options| + gem(name, options) + end + + DEVELOPMENT_DEPENDENCIES.each do |name, options| + gem(name, options) + end end end tasks/setup.rake dd9d8381583466a9f7e6078bcaf7fb85138996ac Michael Fellinger m.fellinger@gmail.com http://github.com/manveru/ramaze/commit/1389dd8eb9fd5c476f09c411b9a881efae79c792 1389dd8eb9fd5c476f09c411b9a881efae79c792 2009-07-02T02:28:12-07:00 2009-07-02T02:28:12-07:00 Improve gem_setup task cc5b66dde89662edbdfb182880c5f746e57ba8a4 Michael Fellinger m.fellinger@gmail.com