Pistos-ramaze 2009.02 → 2009.04.08

data/Rakefile

@@ -1,248 +1,81 @@
-begin
-  require 'rubygems'
-rescue LoadError
-end
+begin; require 'rubygems'; rescue LoadError; end
 
 require 'rake'
 require 'rake/clean'
-require 'rake/packagetask'
 require 'rake/gempackagetask'
-require 'rake/rdoctask'
-
-require 'pp'
-require 'date'
 require 'time'
-require 'fileutils'
-
-include FileUtils
-
-$:.unshift File.join(File.dirname(__FILE__), "lib")
-
-require 'ramaze/version'
-load 'rake_tasks/conf.rake'
-load 'rake_tasks/maintenance.rake'
-load 'rake_tasks/spec.rake'
-load 'rake_tasks/coverage.rake'
-load 'rake_tasks/release.rake'
-load 'rake_tasks/git.rake'
-load 'rake_tasks/gem.rake'
-load 'rake_tasks/metric.rake'
-
-task :default => ['spec']
-task :test => ['spec']
-# task :package => ['jquery']
-
-desc 'download latest jquery and put in /lib/proto/public/js/jquery.js'
-task :jquery do
-  require 'open-uri'
-  $stdout.sync = true
-
-  File.open('lib/proto/public/js/jquery.js', 'w+') do |jquery|
-    remote = open('http://code.jquery.com/jquery-latest.js')
-    print "openend remote side, copying..."
-    while chunk = remote.read(4096)
-      print '.'
-      jquery.write(chunk)
-    end
-    puts " done."
-  end
-end
-
-desc 'Check gemspec file list against real file list'
-task :check_gemspec do
-  base_dir = File.expand_path(File.dirname(__FILE__))
-  gemspec_files = eval(File.read(File.join(base_dir,'ramaze.gemspec'))).files.map{|file|File.join(base_dir,file)}
-
-  deleted_files = gemspec_files.select{|file|!File.exists?(file)}.map{|file|file[(base_dir.size+1)..-1]}
-
-  added_files = Dir.glob(File.join(File.dirname(__FILE__),'**/*')).select do |file|
-    !gemspec_files.index(file)
-  end.map do |file|
-    file[(base_dir.size+1)..-1]
-  end.select do |file|
-    !( file == 'pkg' or file =~ /.*\.gem/ )
-  end
-
-  unless deleted_files.empty?
-    puts "The following files appear in the gemspec but cannot be found:"
-    deleted_files.each do |file|
-      puts "\t#{file}"
-    end
-  end
-  unless added_files.empty?
-    puts "The following files exist, but cannot be found in the gemspec:"
-    added_files.each do |file|
-      puts "\t#{file}"
-    end
-  end
-end
-
-task :rcov_dir do
-  mkdir_p 'doc/output/tools/rcov/'
-end
-
-desc "Generate HTML coverage report"
-task :rcov_summary => :rcov_dir do
-  `rcov --version`
-  raise LoadError, "Please `gem install rcov` first" if $?.exitstatus == 127
-  raise "Run `rake coverage` to generate coverage data first" unless File.exists? 'coverage.data'
-  sh "rcov --aggregate coverage.data -o doc/output/tools/rcov/"
-end
-
-desc "generate rdoc"
-task :rdoc => [:clean] do
-  sh "rdoc #{(RDOC_OPTS + RDOC_FILES).join(' ')}"
-end
-
-desc "generate improved allison-rdoc"
-task :allison => :clean do
-  opts = RDOC_OPTS
-  path = `allison --path`.strip
-  raise LoadError, "Please `gem install allison` first" if $?.exitstatus == 127
-  opts << %W[--template '#{path}']
-  sh "rdoc #{(RDOC_OPTS + RDOC_FILES).join(' ')}"
-end
-
-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,README.md,rake_tasks} pkg/ramaze-#{VERS}/"
-
-  Dir.chdir('pkg') do |pwd|
-    sh "tar -zcvf ramaze-#{VERS}.tar.gz ramaze-#{VERS}"
-    sh "tar -jcvf ramaze-#{VERS}.tar.bz2 ramaze-#{VERS}"
-  end
-
-  sh "rm -rf pkg/ramaze-#{VERS}"
-end
-
-desc "show a todolist from all the TODO tags in the source"
-task :todo do
-  files = Dir[File.join(BASEDIR, '{lib,spec}', '**/*.rb')]
-
-  files.each do |file|
-    lastline = todo = comment = long_comment = false
-
-    File.readlines(file).each_with_index do |line, lineno|
-      lineno += 1
-      comment = line =~ /^\s*?#.*?$/
-      long_comment = line =~ /^=begin/
-      long_comment = line =~ /^=end/
-      todo = true if line =~ /TODO/ and (long_comment or comment)
-      todo = false if line.gsub('#', '').strip.empty?
-      todo = false unless comment or long_comment
-      if todo
-        unless lastline and lastline + 1 == lineno
-          puts
-          puts "vim #{file} +#{lineno}"
-        end
-
-        l = line.strip.gsub(/^#\s*/, '')
-        print '  ' unless l =~ /^-/
-        puts l
-        lastline = lineno
-      end
-    end
-  end
-end
-
-desc "opens a simple readline that makes making requests easier"
-task 'request' do
-  ARGV.clear
-  require 'open-uri'
-  require 'pp'
-
-  loop do
-    print 'do request? [enter] '
-    gets
-    begin
-      pp open('http://localhost:7000/xxx').read
-    rescue Object => ex
-      puts ex
-    end
-  end
-end
-
-desc 'listing of available traits per class/module'
-task 'traits' do
-  nodes = Hash.new{|h,k| h[k] = []}
-  Dir['lib/**/*.rb'].each do |file|
-    content = File.read(file)
-    traits = content.grep(/^\s*trait\s*:/)
-    traits.each do |trait|
-      space = content[0..content.index(trait)].scan(/^\s*(?:class|module)\s+(.*)$/)
-      space = space.flatten.join('::')
-      nodes[space] << trait.strip
-    end
-  end
-
-  nodes.each do |space, traits|
-    puts space
-    traits.each do |trait|
-      print '  ', trait, "\n"
-    end
-    puts
-  end
-end
-
-desc "Update doc/CHANGELOG"
-task 'doc/CHANGELOG' do
-  File.open('doc/CHANGELOG', 'w+') do |f|
-    f.puts `git log`
-  end
-end
-
-desc "#{README} to doc/README.html"
-task 'doc/README.html' => [README] do
-  sh "maruku #{README}"
-  mv 'README.html', 'doc/README.html'
-end
-
-desc "Compile the #{README} from the parts of doc/readme"
-task 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(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
-
-desc 'Generate YARD documentation'
-task :ydoc do
-  sh('yardoc -o ydoc -r README.md')
-end
-
-task :publish => [:ydoc]
-
-begin
-  require 'grancher/task'
+require 'date'
 
-  Grancher::Task.new do |g|
-    g.branch = 'gh-pages'
-#     g.push_to = 'origin'
-    g.message = 'Updated website'
-    g.directory 'ydoc', '.'
-  end
-rescue LoadError
-  # oh well :)
-end
+PROJECT_SPECS = Dir['spec/{contrib,examples,ramaze,snippets}/**/*.rb']
+PROJECT_MODULE = 'Ramaze'
+PROJECT_JQUERY_FILE = 'lib/proto/public/js/jquery.js'
+PROJECT_README = 'README.markdown'
+PROJECT_RUBYFORGE_GROUP_ID = 3034
+PROJECT_COPYRIGHT = [
+  "#          Copyright (c) #{Time.now.year} Michael Fellinger m.fellinger@gmail.com",
+  "# All files in this distribution are subject to the terms of the Ruby license."
+]
+
+# To release the monthly version do:
+# $ PROJECT_VERSION=2009.03 rake release
+
+GEMSPEC = Gem::Specification.new{|s|
+  s.name         = 'ramaze'
+  s.author       = "Michael 'manveru' Fellinger"
+  s.summary      = "Ramaze is a simple and modular web framework"
+  s.description  = s.summary
+  s.email        = 'm.fellinger@gmail.com'
+  s.homepage     = 'http://github.com/manveru/org'
+  s.platform     = Gem::Platform::RUBY
+  s.version      = (ENV['PROJECT_VERSION'] || Date.today.strftime("%Y.%m.%d"))
+  s.files        = `git ls-files`.split("\n").sort
+  s.has_rdoc     = true
+  s.require_path = 'lib'
+  s.bindir = "bin"
+  s.executables = ["ramaze"]
+  s.rubyforge_project = "ramaze"
+
+  # s.add_dependency('rack', '>= 0.9.9') # lies!
+  # s.add_dependency('manveru-innate', '>= 2009.04')
+
+  # s.add_development_dependency('rack-test',  '>=0.1.0')
+  # s.add_development_dependency('json',       '>=1.1.3')
+  # s.add_development_dependency('erubis',     '>=2.6.4')
+  # s.add_development_dependency('ezamar')
+  # s.add_development_dependency('haml',       '~>2.0.9')
+  # s.add_development_dependency('hpricot',    '>=0.7')
+  # s.add_development_dependency('liquid',     '~>2.0.0')
+  # s.add_development_dependency('memcache',   '~>1.7.0')
+  # s.add_development_dependency('nagoro')
+  # s.add_development_dependency('Remarkably', '~>0.5.2')
+  # s.add_development_dependency('sequel',     '>=2.11.0')
+  # s.add_development_dependency('tagz',       '>=5.0.1')
+  # s.add_development_dependency('tenjin',     '~>0.6.1')
+
+  s.post_install_message = <<MESSAGE.strip
+============================================================
+
+Thank you for installing Ramaze!
+You can now do create a new project:
+# ramaze --create yourproject
+
+============================================================
+MESSAGE
+}
+
+Dir['tasks/*.rake'].each{|f| import(f) }
+
+task :default => [:bacon]
+
+CLEAN.include %w[
+  **/.*.sw?
+  *.gem
+  .config
+  **/*~
+  **/{data.db,cache.yaml}
+  *.yaml
+  pkg
+  rdoc
+  ydoc
+  *coverage*
+]

data/bin/ramaze

@@ -1,80 +1,167 @@
 #!/usr/bin/env ruby
 
-begin
-  $:.unshift File.join(File.dirname(__FILE__), '../lib')
-  require 'ramaze'
-rescue LoadError
-  $:.shift
-
+def include_ramaze
   begin
-    require 'rubygems'
+    $:.unshift File.join(File.dirname(__FILE__), '/../lib')
+    require 'ramaze'
   rescue LoadError
+    $:.shift
+
+    begin
+      require 'rubygems'
+    rescue LoadError
+    end
+    require 'ramaze'
   end
-  require 'ramaze'
 end
 
-additions = lambda do |op|
-  op.separator ''
-  op.separator 'Specialized options:'
+def usage
+  <<-TXT
+  Usage:
 
-  op.on('--create PROJECT', 'New application from proto') do |project_name|
-    require 'ramaze/tool/create'
-    Ramaze::Tool::Create.create(project_name)
-    exit
-  end
+    ramaze <start [PIDFILE]|stop [PIDFILE]|restart [PIDFILE]|create PROJECT|console> [ruby/rack options]
 
-  op.on('-i', '--instant', "Start up with bare-bones Controller") do |instant|
-    require 'ramaze/controller/main'
-  end
+    Commands:
+      start   - Starts an instance of this application. Supply a pidfile name if you do
+                not want it to use the default (PROJECT.pid).
 
-  op.on('-e', '--execute STRING', String, "Execute string instead of a start.rb.") do |execute|
-    eval execute
-  end
-end
+      stop    - Stops a running instance of this application. Supply a pidfile name if you
+                started it with a pidfile other than the default (PROJECT.pid).
+
+      restart - Stops running instance of this application, then starts it back up.  Pidfile
+                (if supplied) is used for both stop and start.
 
-runner = ARGV.reverse.find{|arg| File.file?(arg) }
-runner ||= 'start.rb' if File.file?('start.rb')
+      create  - Creates a new prototype Ramaze application in a directory named PROJECT in
+                the current directory.  ramaze create foo would make ./foo containing an
+                application prototype. Rack options are meaningless here.
 
-if runner
-  overlay = {
-    :root => File.dirname(runner),
-    :runner => runner, :origin => :console,
-  }
+      console - Starts an irb console with app.rb (and irb completion) loaded. This command
+                ignores rack options.
 
-  [overlay, ENV, ARGV].each do |opt|
-    Ramaze::Global.merge!(opt, &additions)
+    Rack Options
+      #{%x{rackup --help}.split("\n").reject { |line| line.match(/^Usage:/) }.join("\n\t")}
+  TXT
+end
+
+## Methods for commands {{{
+def start
+  # Find the name of this app
+  app_name = default_pidfile.sub(/\.pid$/,'')
+  if daemonize = OURARGS.detect { |arg| arg.match(/^(-[dD]|--daemonize)$/) }
+    if pid_arg = OURARGS.detect { |arg| arg.match(/^(-P|--pid)/) }
+      puts "User supplied pid: #{pid_arg}"
+      pid_file = OURARGS[OURARGS.index(pid_arg) + 1]
+      puts "Starting daemon with user defined pidfile: #{pid_file}"
+      exec("rackup", "config.ru", *ARGV)
+    else
+      puts "Starting daemon with default pidfile: #{default_pidfile}"
+      exec("rackup", "config.ru", "-P", default_pidfile, *ARGV)
+    end
+  else
+    exec("rackup", "config.ru", *ARGV)
   end
+end
 
-  runner = File.expand_path(runner)
-  
-  console = Ramaze::Global.console
+def create(command)
+  project_name = OURARGS[OURARGS.index(command) + 1]
+  if project_name.nil?
+    $stderr.puts "Must supply a project name" if project_name.nil?
+    puts usage
+    exit 1
+  end
+  opts = {}
+  if OURARGS.detect { |arg| arg.match(/^(--force)/) }
+    puts "Overwriting any existing files as requested."
+    opts[:force] = true
+  end
+  if OURARGS.detect { |arg| arg.match(/^(--amend)/) }
+    puts "Only amending missing files as requested."
+    opts[:amend] = true
+  end
+  include_ramaze
+  require 'ramaze/tool/create'
+  Ramaze::Tool::Create.create(project_name, opts)
+end
 
-  if console
-    ARGV.clear #Avoid passing args to IRB
+def stop(command)
+  return false unless pid_file = find_pid(command)
+  pid = File.read(pid_file).to_i
+  puts "Killing pid #{pid}"
+  Process.kill("INT", pid)
+  sleep 1
+  begin
+    Process.getpriority(Process::PRIO_PROCESS, pid)
+    $stdout.puts "Process #{pid} did not die, forcing it with -9"
+    Process.kill(9, pid)
+    File.unlink(pid_file) if File.file?(pid_file)
+    true
+  rescue Errno::ESRCH
+    File.unlink(pid_file) if File.file?(pid_file)
+    true
+  end
+end
 
-    Ramaze.trait[:started] = true
-    require runner
+## End Command methods }}}
 
-    require 'irb'
-    require 'irb/completion'
+# Helper methods {{{
+def default_pidfile
+  return @default_pidfile if @default_pidfile
+  @default_pidfile = (File.basename(File.expand_path(ENV["PWD"])) + ".pid").strip
+  @default_pidfile
+end
 
-    ENV['IRBRC'] = ".irbrc" if File.exists? ".irbrc"
-    Ramaze.start! :run_loose => true
-    IRB.start
-    Ramaze.shutdown
+def find_pid(command)
+  pid_file = OURARGS[OURARGS.index(command) + 1]
+  if pid_file.nil? or not File.file?(pid_file)
+    pid_file = default_pidfile
+  end
+  unless File.file?(pid_file)
+    $stderr.puts "Could not find running process id."
+    return false
   end
-  
-  daemonize = Ramaze::Global.daemonize
+  pid_file
+end
+
+## End helper methods }}}
+
+OURARGS = ARGV.dup
+command = ARGV.detect { |arg| arg.match(/^(?:--?)?(?:start|stop|restart|create|h(?:elp)?|v(?:ersion)?|console)/) }
+if command.nil?
+  command = ""
+else
+  ARGV.delete(command)
+end
 
-  unless daemonize.empty?
-    require 'ramaze/tool/daemonize'
-    Ramaze::daemonize(runner, daemonize)
+case command
+when /^(?:--?)?restart$/
+  stop(command)
+  start
+when /^(?:--?)?start$/
+  start
+when /^(?:--?)?create$/
+  create(command)
+when /^(?:--?)?stop$/
+  if stop(command)
+    puts "Ramazement has ended, go in peace"
+    $stdout.flush
   else
-    Ramaze.trait[:started] = true
-    require runner
-    Ramaze.start!
+    puts "Ramaze failed to stop (or was not running)"
   end
+when /^(?:--?)?console$/
+  exec("irb", "-r", "irb/completion", "-r", "app", *ARGV)
+when /^(?:--?)?h(elp)?$/
+  puts usage
+when /^(?:--?)?v(ersion)?$/
+  include_ramaze
+  puts Ramaze::VERSION
+  exit
+when /^$/
+  puts "Must supply a valid command"
+  puts usage
+  exit 1
 else
-  Ramaze::Global.merge!(ARGV, &additions)
-  puts Ramaze::Global.option_parser(&additions)
+  puts "#{command} not implemented"
+  puts usage
+  exit 1
 end
+

data/doc/AUTHORS

@@ -1,29 +1,37 @@
-Following persons (in alphabetical order) have contributed to Ramaze:
-
-   Aman Gupta            :  aman@ramaze.net
-   Andy Smith            :  andy@tinnedfruit.org
-   Ara T. Howard         :  ara.t.howard@gmail.com
-   Carlo Zottmann        :  carlo@zottmann.org
-   Chris Duncan          :  celldee@gmail.com
-   Christian Neukirchen  :  chneukirchen@gmail.com
-   Clive Crous           :  clive@crous.co.za
-   Colin Shea            :  comp.lang.zenix+ramaze@gmail.com
-   Fabian Buch           :  fabian.buch@fabian-buch.de
-   Gabriele Renzi        :  rff.rff@gmail.com
-   James Tucker          :  raggi@mbk.local
-   Jeremy Evans          :  code@jeremyevans.net
-   Joe Holt              :  joe07734@gmail.com
-   Jonathan Buch         :  john@oxyliquit.de
-   Keita Yamaguchi       :  keita.yamaguchi@gmail.com
-   Lars Olsson           :  lasso@lassoweb.se
-   Leo Borisenko         :  leo.borisenko@gmail.com
-   Martin Hilbig         :  blueonyx@dev-area.net
-   Michael Fellinger     :  m.fellinger@gmail.com
-   Pistos                :  jesuswasramazing.10.pistos@geoshell.com
-   Richard Outten        :  outtenr@gmail.com
-   Ryan Grove            :  ryan@wonko.com
-   Stephan Maka          :  stephan@spaceboyz.net
-   Thomas Leitner        :  thomas.leitner@gmail.com
-   samcarr               :  samcarr@gmail.com
-   skaar                 :  skaar@waste.org
+Following persons have contributed to ramaze.
+(Sorted by number of submitted patches, then alphabetically)
 
+  2394 Michael Fellinger <m.fellinger@gmail.com>
+   215 Aman Gupta <aman@ramaze.net>
+    87 Jonathan Buch <john@oxyliquit.de>
+    62 Clive Crous <clive@crous.co.za>
+    27 Keita Yamaguchi <keita.yamaguchi@gmail.com>
+    17 Ryan Grove <ryan@wonko.com>
+    11 Pistos <gitsomegrace.5.pistos@geoshell.com>
+    11 Wang, Jinjing <nfjinjing@gmail.com>
+     6 Aki Reijonen <aki.reijonen@gmail.com>
+     6 Sam Carr <samcarr@gmail.com>
+     5 Tadahiko Uehara <kikofx@gmail.com>
+     4 James Tucker <jftucker@gmail.com>
+     3 Chris Duncan <celldee@gmail.com>
+     3 Clinton R. Nixon <clinton.nixon@viget.com>
+     2 Andrew Farmer <xichekolas@gmail.com>
+     2 Jonathan Buch <jonathan.buch@gmail.com>
+     2 Lars Olsson <lasso@lassoweb.se>
+     2 Riku Raisaenen <riku@helloit.fi>
+     1 Andreas Karlsson <andreas@proxel.se>
+     1 Ara T. Howard <ara.t.howard@gmail.com>
+     1 Carlo Zottmann <carlo@zottmann.org>
+     1 Cheah Chu Yeow <chuyeow@gmail.com>
+     1 Christian Neukirchen <chneukirchen@gmail.com>
+     1 Colin Shea <colin@centuar.(none)>
+     1 Fabian Buch <fabian.buch@fabian-buch.de>
+     1 Gavin Kistner <gavin@phrogz.net>
+     1 Jean-Francois Chevrette <jfchevrette@iweb.ca>
+     1 Jeremy Evans <code@jeremyevans.net>
+     1 Martin Hilbig <blueonyx@dev-area.net>
+     1 Matt Rubens <mrubens@goldencookie.localdomain>
+     1 Rob Lievaart <rob@rebeltechnologies.nl>
+     1 Thomas Leitner <thomas.leitner@gmail.com>
+     1 Vincent Roy <VincentRoy8@gmail.com>
+     1 Yasushi Abe <yasushi.abe@gmail.com>

data/doc/FAQ

@@ -70,7 +70,7 @@ always change the whole framework to fit your needs.
 - View
 
    Ramaze offers a plethora of Templating-engines that you can use in your
-   View, including Amrita2, Erubis (ERB), HAML, Liquid, Remarkably, Markaby and
+   View, including Erubis (ERB), HAML, Liquid, Remarkably, Markaby and
    the default, called Ezamar.
 
    The View in Ramaze is tightly coupled with the Controller, that means that