ramaze 0.0.9 → 0.1.0

data/Rakefile

@@ -10,63 +10,11 @@ require 'pp'
 include FileUtils
 
 $:.unshift File.join(File.dirname(__FILE__), "lib")
-require 'ramaze/version'
-
-AUTHOR = "manveru"
-EMAIL = "m.fellinger@gmail.com"
-DESCRIPTION = "Ramaze tries to be a very simple Webframework without the voodoo"
-HOMEPATH = 'http://ramaze.rubyforge.org'
-BIN_FILES = %w( ramaze )
-
-BASEDIR = File.dirname(__FILE__)
-
-NAME = "ramaze"
-REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
-VERS = ENV['VERSION'] || (Ramaze::VERSION + (REV ? ".#{REV}" : ""))
-COPYRIGHT = [
-  "#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com",
-  "# All files in this distribution are subject to the terms of the Ruby license."
-]
-CLEAN.include %w[
-  **/.*.sw?
-  *.gem
-  .config
-  **/*~
-  **/{data.db,cache.yaml}
-  *.yaml
-  pkg
-]
-RDOC_OPTS = %w[
-  --all
-  --quiet
-  --op rdoc
-  --line-numbers
-  --inline-source
-  --main doc/README
-  --opname index.html
-  --title "Ramaze\ documentation"
-  --exclude "^(_darcs|spec|examples|bin|pkg)/"
-  --exclude "lib/proto"
-  --include "doc"
-  --accessor "trait"
-]
-RDOC_FILES = %w[
-  lib doc doc/README doc/FAQ doc/CHANGELOG
-]
-POST_INSTALL_MESSAGE = %{
-#{'=' * 60}
 
-Thank you for installing Ramaze!
-You can now do following:
-
-* Create a new project using the `ramaze' command:
-    ramaze --create yourproject
-
-* Browse and try the Examples in
-    #{File.join(Gem.path, 'gems', 'ramaze-' + VERS, 'examples')}
-
-#{'=' * 60}
-}.strip
+require 'ramaze/version'
+load 'rake_tasks/conf.rake'
+load 'rake_tasks/gem.rake'
+load 'rake_tasks/maintaince.rake'
 
 desc "Packages up ramaze gem."
 task :default => [:test]
@@ -74,54 +22,9 @@ task :default => [:test]
 desc "clean up temporary files and gems"
 task :package => [:clean]
 
-spec =
-    Gem::Specification.new do |s|
-        s.name = NAME
-        s.version = VERS
-        s.platform = Gem::Platform::RUBY
-        s.has_rdoc = true
-        s.extra_rdoc_files = RDOC_FILES
-        s.rdoc_options += RDOC_OPTS
-        s.summary = DESCRIPTION
-        s.description = DESCRIPTION
-        s.author = AUTHOR
-        s.email = EMAIL
-        s.homepage = HOMEPATH
-        s.executables = BIN_FILES
-        s.bindir = "bin"
-        s.require_path = "lib"
-        s.post_install_message = POST_INSTALL_MESSAGE
-
-        s.add_dependency('rake', '>=0.7.1')
-        s.add_dependency('rspec', '>=0.7.5.1')
-        s.add_dependency('rack', '>=0.1.0')
-        # s.required_ruby_version = '>= 1.8.5'
-
-        s.files = (RDOC_FILES + %w[Rakefile] + Dir["{examples,bin,doc,spec,lib}/**/*"]).uniq
-
-        # s.extensions = FileList["ext/**/extconf.rb"].to_a
-    end
-
-Rake::GemPackageTask.new(spec) do |p|
-    p.need_tar = true
-    p.gem_spec = spec
-end
-
-desc "package and install ramaze"
-task :install do
-  name = "#{NAME}-#{VERS}.gem"
-  sh %{rake package}
-  sh %{sudo gem install pkg/#{name}}
-end
-
-desc "uninstall the ramaze gem"
-task :uninstall => [:clean] do
-  sh %{sudo gem uninstall #{NAME}}
-end
-
 desc "sanitize the code and darcs record"
 task :record => ['fix-end-spaces', 'add-copyright'] do
-  system("darcs", "record")
+  sh "darcs record"
 end
 
 desc "create the doc/changes.xml"
@@ -148,23 +51,6 @@ task :changelog => :changes do
   cp 'doc/changes.txt', 'doc/CHANGELOG'
 end
 
-desc "add copyright to all .rb files in the distribution"
-task 'add-copyright' do
-  puts "adding copyright to files that don't have it currently"
-  Dir['{lib,test}/**/*{.rb}'].each do |file|
-    next if file =~ /_darcs/
-    lines = File.readlines(file).map{|l| l.chomp}
-    unless lines.first(2) == COPYRIGHT
-      puts "fixing #{file}"
-      File.open(file, 'w+') do |f|
-        (COPYRIGHT + lines).each do |line|
-          f.puts(line)
-        end
-      end
-    end
-  end
-end
-
 task :rcov_dir do
   mkdir_p 'doc/output/tools/rcov/'
 end
@@ -180,7 +66,7 @@ end
 
 desc "run the specs and clean up afterwards"
 task :test do
-  ruby "#{File.dirname(__FILE__)}/spec/spec_all.rb"
+  ruby "#{File.dirname(__FILE__)}/spec/all.rb"
   sh "rake clean"
 end
 
@@ -200,7 +86,7 @@ desc "create bzip2 and tarball"
 task :distribute => :gem do
   sh "rm -rf pkg/ramaze-#{VERS}"
   sh "mkdir -p pkg/ramaze-#{VERS}"
-  sh "cp -r {bin,doc,lib,examples,spec,Rakefile,setup.rb} pkg/ramaze-#{VERS}/"
+  sh "cp -r {bin,doc,lib,examples,spec,Rakefile,rake_tasks} pkg/ramaze-#{VERS}/"
 
   Dir.chdir('pkg') do |pwd|
     sh "tar -zcvf ramaze-#{VERS}.tar.gz ramaze-#{VERS}"
@@ -210,24 +96,6 @@ task :distribute => :gem do
   sh "rm -rf pkg/ramaze-#{VERS}"
 end
 
-desc "doc/README to html"
-Rake::RDocTask.new('gen-readme2html') do |rd|
-  rd.options = %w[
-    --quiet
-    --opname readme.html
-  ]
-
-  rd.rdoc_dir = 'readme'
-  rd.rdoc_files = ['doc/README']
-  rd.main = 'doc/README'
-  rd.title = "Ramaze documentation"
-end
-
-desc "doc/README to doc/README.html"
-task 'readme2html' => 'gen-readme2html' do
-  cp('readme/files/doc/README.html', 'doc/README.html')
-  rm_rf('readme')
-end
 
 desc "list all still undocumented methods"
 task :undocumented do
@@ -259,7 +127,7 @@ end
 
 desc "show a todolist from all the TODO tags in the source"
 task :todo do
-  files = Dir[File.join(BASEDIR, '{lib,test}', '**/*.rb')]
+  files = Dir[File.join(BASEDIR, '{lib,spec}', '**/*.rb')]
 
   files.each do |file|
     lastline = todo = comment = long_comment = false
@@ -287,34 +155,6 @@ task :todo do
   end
 end
 
-desc "generate doc/TODO from the TODO tags in the source"
-task 'todolist' do
-  list = invoke('todo').split("\n")[2..-1]
-  tasks = {}
-  current = nil
-
-  list.map do |line|
-    if line =~ /TODO/ or line.empty?
-    elsif line =~ /^vim/
-      current = line.split[1]
-      tasks[current] = []
-    else
-      tasks[current] << line
-    end
-  end
-
-  lines = tasks.map{ |name, items| [name, items, ''] }.flatten
-  lines.pop
-
-  File.open(File.join('doc', 'TODO'), 'w+') do |f|
-    f.puts "This list is programmaticly generated by `rake todolist`"
-    f.puts "If you want to add/remove items from the list, change them at the"
-    f.puts "position specified in the list."
-    f.puts
-    f.puts(lines)
-  end
-end
-
 desc "show how many patches we made so far"
 task :patchsize do
   size = `darcs changes`.split("\n").reject{|l| l =~ /^\s/ or l.empty?}.size
@@ -322,27 +162,12 @@ task :patchsize do
   puts "shall i now play some Death-Metal for you?" if size == 666
 end
 
-desc "remove those annoying spaces at the end of lines"
-task 'fix-end-spaces' do
-  Dir['{lib,test}/**/*.rb'].each do |file|
-    next if file =~ /_darcs/
-    lines = File.readlines(file)
-    new = lines.dup
-    lines.each_with_index do |line, i|
-      if line =~ /\s+\n/
-        puts "fixing #{file}:#{i + 1}"
-        p line
-        new[i] = line.rstrip
-      end
-    end
-
-    unless new == lines
-      File.open(file, 'w+') do |f|
-        new.each do |line|
-          f.puts(line)
-        end
-      end
-    end
+desc "show who made how many patches"
+task :patchstat do
+  patches = `darcs changes`.split("\n").grep(/^\S/).map{|e| e.split.last}
+  committs = patches.inject(Hash.new(0)){|s,v| s[v] += 1; s}
+  committs.sort.each do |committer, patches|
+    puts "#{committer.ljust(25)}: #{patches}"
   end
 end
 
@@ -362,73 +187,3 @@ task 'request' do
     end
   end
 end
-
-desc "Compile the doc/README from the parts of doc/readme"
-task 'build-readme' do
-  require 'enumerator'
-
-  chapters = [
-    'About Ramaze',         'introduction',
-    'Features Overview',    'features',
-    'Basic Principles',     'principles',
-    'Installation',         'installing',
-    'Getting Started',      'getting_started',
-    'A couple of Examples', 'examples',
-    'How to find Help',     'getting_help',
-    'Appendix',             'appendix',
-    'And thanks to...',     'thanks',
-  ]
-
-  File.open('doc/README', 'w+') do |readme|
-    readme.puts COPYRIGHT.map{|l| l[1..-1]}, ''
-
-    chapters.each_slice(2) do |title, file|
-      file = File.join('doc', 'readme_chunks', "#{file}.txt")
-      chapter = File.read(file)
-      readme.puts "= #{title}", '', chapter
-      readme.puts '', '' unless title == chapters[-2]
-    end
-  end
-end
-
-task 'tutorial2html' do
-  require 'bluecloth'
-
-  basefile = File.join('doc', 'tutorial', 'todolist')
-
-  content = File.read(basefile + '.txt')
-
-  html = BlueCloth.new(content).to_html
-
-  wrap = %{
-  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-  <html>
-    <head>
-      <title>Ramaze Tutorial: Todolist</title>
-      <style>
-        body {
-          background: #eee;
-        }
-        code {
-          background: #ddd;
-        }
-        pre code {
-          background: #ddd;
-          width: 70%;
-          display: block;
-          margin: 1em;
-          padding: 0.7em;
-          overflow: auto;
-        }
-      </style>
-      <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-    </head>
-    <body>
-      #{html}
-    </body>
-  </html>
-  }.strip
-
-  File.open(basefile + '.html', 'w+'){|f| f.puts(wrap) }
-end

data/bin/ramaze

@@ -38,10 +38,13 @@
 #                      updated files in your application
 # -r, --run-loose:: don't take control after startup.
 #                   this is useful for testcases.
+# -c, --console:: Start an IRB-like session.
+# --backtrace:: Show full backtrace at errors on start.
 # --cache:: use the simple caching based on the signature
 #           of your requests (experimental)
 # --tidy:: run Tool::Tidy over text/html output
 #
+#
 # -h, --help::      print this help
 # -v, --version::   print the version
 # -c, --copyright:: print the copyright
@@ -54,7 +57,7 @@
 
 require 'ramaze'
 
-runner = ARGV.find{|file| File.file?(file)} || 'main.rb'
+runner = File.expand_path(ARGV.find{|file| File.file?(file)} || 'main.rb')
 
 begin
   require 'getoptlong'
@@ -86,6 +89,7 @@ begin
     [ '--run-loose',      '-r', GetoptLong::NO_ARGUMENT       ],
 
     [ '--console',        '-c', GetoptLong::NO_ARGUMENT       ],
+    [ '--backtrace',            GetoptLong::NO_ARGUMENT       ],
     [ '--help',           '-h', GetoptLong::NO_ARGUMENT       ],
     [ '--version',        '-v', GetoptLong::NO_ARGUMENT       ],
     [ '--copyright',            GetoptLong::NO_ARGUMENT       ],
@@ -108,41 +112,64 @@ begin
     options[:inform_tags] = Set.new([:debug, :info, :error])
 
     case sopt
-    when :create            : create[arg]
-    when :help              : RDoc::ramazes_usage('Usage')
-    when :version           : puts("ramaze #{Ramaze::VERSION}") or exit
-    when :copyright         : RDoc::ramazes_usage('Copyright')
-    when *adapter           : options[:adapter] = sopt
-
-    when :benchmark         : options[:inform_tags] << :benchmark
-    when :debug             : options
-    when :stage             : options[:inform_tags].subtract [:debug]
-    when :live              : options[:inform_tags].subtract [:info, :debug]
-    when :silent            : options[:inform_tags].subtract options[:inform_tags]
-
-    when :host              : options[:host] = arg
-    when :port              : options[:port] = arg
-
-    when :no_errorpage      : options[:error_page] = false
-    when :template_root     : options[:template_root] = arg
-    when :autoreload        : options[:autoreload] = arg.to_i
-    when :run_loose         : options[:run_loose] = true
+    when :create
+      create[arg]
+    when :help
+      RDoc::ramazes_usage('Usage')
+    when :version
+      puts("ramaze #{Ramaze::VERSION}") or exit
+    when :copyright
+      RDoc::ramazes_usage('Copyright')
+    when *adapter
+      options[:adapter] = sopt
+
+    when :benchmark
+      options[:inform_tags] << :benchmark
+    when :debug
+      options
+    when :stage
+      options[:inform_tags].subtract [:debug]
+    when :live
+      options[:inform_tags].subtract [:info, :debug]
+    when :silent
+      options[:inform_tags].subtract options[:inform_tags]
+
+    when :host
+      options[:host] = arg
+    when :port
+      options[:port] = arg
+
+    when :no_errorpage
+      options[:error_page] = false
+    when :template_root
+      options[:template_root] = arg
+    when :autoreload
+      options[:autoreload] = arg.to_i
+    when :run_loose
+      options[:run_loose] = true
+    when :console
+      options[:console] = true
+    when :backtrace
+      options[:backtrace] = true
     end
   end
 
   begin
-    puts "running #{File.expand_path(runner)}"
+    puts "running #{runner}"
     require runner
-  rescue LoadError
-    puts "Cannot find #{runner}, please provide a file to execute"
-    puts "Example: $ ramaze myapp.rb"
+  rescue LoadError => ex
+    puts ex
+    puts ex.backtrace if options[:backtrace]
+    puts "Maybe i cannot find `#{runner}'"
+    puts "You could provide a file to execute like:"
+    puts "$ ramaze myapp.rb"
     exit
   end
 
   if options.delete(:console)
     options.merge!(:run_loose => true)
 
-    ARGV.clear # Avoid passing args to IRB 
+    ARGV.clear # Avoid passing args to IRB
 
     Ramaze.start(options)