manveru-ramaze 2009.04.01 → 2009.04.08

data/CHANGELOG

@@ -1,3 +1,204 @@
+[e2a87c9 | Mon Apr 06 02:27:14 UTC 2009] TJ Vanderpoel <bougy.man@gmail.com>
+
+  * changed path search to use request.request_uri instead of request.fullpath, to handle fastcgi, mod_rack, and any other method where rack strips part of fullpath to derive request_uri
+
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[69c3bf4 | Tue Apr 07 11:12:40 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Only MainController is automapped to '/'
+
+[de89b67 | Tue Apr 07 10:41:50 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Update tutorial HTML
+
+[e43fa1b | Tue Apr 07 13:38:18 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * render_template is really deprecated, no replacements
+
+[5922f3c | Tue Apr 07 02:21:18 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix link to book.ramaze.net
+
+[30fec68 | Mon Apr 06 10:41:41 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add information about, and usage of: Sequel::Model.plugin(:schema)
+
+[83d41e0 | Mon Apr 06 10:32:18 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add some info about configuration to tutorial
+
+[7467ff6 | Mon Apr 06 03:35:06 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix Flash and Link helpers
+
+[b6297da | Mon Apr 06 02:43:40 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add some lobster
+
+[eabb559 | Mon Apr 06 01:33:30 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Change ext to reflect new default templating engine
+
+[36431f7 | Sun Apr 05 23:57:58 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * nitpicking
+
+[983cede | Sun Apr 05 23:57:48 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Simplify Helper with options
+
+[5a31740 | Sun Apr 05 23:57:13 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Take over the Partial helper from Innate, please use the Render helper instead
+
+[9797116 | Sun Apr 05 17:38:19 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Adding Cache::LocalMemCache, see http://github.com/sck/localmemcache
+
+[d725385 | Sun Apr 05 14:26:10 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add methods removed from Innate::Request
+
+[ad0ce13 | Sun Apr 05 09:01:57 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Adding contrib/app_graph, which shows all your sites apps, controllers, mappings and actions
+
+[61f621a | Sat Apr 04 02:33:23 UTC 2009] TJ Vanderpoel <bougy.man@gmail.com>
+
+  * Removed ramaze dependencies from binary where not needed
+
+    * Allows including of custom library paths with standard ruby -I
+      functionality.
+    * Now passing ARGV along to irb with console command.
+    
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[38f1b77 | Sat Apr 04 01:29:18 UTC 2009] bougyman <bougyman@falcon.(none)>
+
+  * Remove version and help message from bin/ramaze
+
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[4cf3d4a | Sat Apr 04 14:17:35 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove trailing newlines from bin/ramaze
+
+[6d912c9 | Sat Apr 04 00:53:48 UTC 2009] bougyman <bougyman@falcon.(none)>
+
+  * Added more help and --version
+
+    * Create command exits and prints error if no PROJECT given
+    * Added more verbose description of each command
+    * Now defaults to printing help instead of starting an application
+    
+    TODO:
+    
+    * Add ability to merge application options.  Perhaps ENV setting.
+    
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[aed1603 | Sat Apr 04 06:26:53 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove contrib/sequel/fill, was quite useless anyway
+
+[02cd6ec | Sat Apr 04 06:25:59 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Improve bacon task so specs can fail on dependencies without messing up all the output
+
+[de5e21f | Sat Apr 04 04:05:21 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Use method instead of iv for App#url_map
+
+[597ec8c | Sat Apr 04 04:04:08 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add integration with rack/test, eventually we should port specs to that
+
+[59d3083 | Sat Apr 04 04:02:53 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Run specs in spec/contrib as well
+
+[49dd9d6 | Sat Apr 04 04:02:37 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add commented list of development dependencies for release
+
+[a4c080f | Sat Apr 04 03:43:24 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Improve bacon task
+
+[729ce2d | Fri Apr 03 04:06:22 UTC 2009] bougyman <bougyman@falcon.(none)>
+
+  * Added better help output and lowered debug output
+
+    * Pass along rackup --help options when requesting --help
+    * Removed debug output from default_pidfile
+    
+    TODO:
+    * Make ramaze --console work as expected
+    * Design a methodology to pass the ramaze application itself arguments, instead of just to rack(up)
+    
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[686a38d | Fri Apr 03 02:15:53 UTC 2009] bougyman <bougyman@falcon.(none)>
+
+  * Added --force and --amend support to ramaze create. Also updated Ramaze::Tool::Create to use ROOT instead of Ramaze::BaseDir
+
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[b1ae885 | Fri Apr 03 01:58:37 UTC 2009] bougyman <bougyman@falcon.(none)>
+
+  * Rewrite of bin/ramaze
+
+    * Simple optparser for start|stop|restart|create
+    * Passing all other args on to config.ru
+    * Used old ramaze tool/create for creation from prototype
+    
+    TODO:
+    * Enable --force and --amend to ramaze create
+    * Recognize app.rb and rackup's options to display in --help
+    
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[ea434b1 | Fri Apr 03 10:14:51 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Provide access to App#url_map
+
+[aa99126 | Fri Apr 03 09:54:05 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix link to sqlite
+
+[54f7ce0 | Fri Apr 03 09:49:13 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove the rack/innate dependencies until rack is out
+
+[e5af4e5 | Fri Apr 03 09:48:16 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix for redcloth spec
+
+[11118df | Fri Apr 03 09:28:26 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix the sequel_form spec
+
+[cf18430 | Fri Apr 03 09:26:53 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove the XSLT example and spec
+
+[0395321 | Tue Mar 31 16:53:40 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Change dependency to innate-manveru, there's no rubyforge gem for it anyway... but that will cause trouble for local rake install
+
+[eb7d389 | Tue Mar 31 16:34:33 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix Optinoal reference in blog example
+
+[5f210cc | Tue Mar 31 16:33:49 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Innate::Optional is now Innate::Optioned
+
+[851e1bd | Tue Mar 31 16:21:56 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2009.04.01
+
 [9033500 | Tue Mar 31 06:12:46 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
 
   * Use html syntax instead of xhtml for pdf generation

data/MANIFEST

@@ -1,4 +1,6 @@
 .mailmap
+CHANGELOG
+MANIFEST
 README.markdown
 Rakefile
 benchmark/results.txt
@@ -171,7 +173,6 @@ examples/templates/template_nagoro.rb
 examples/templates/template_redcloth.rb
 examples/templates/template_remarkably.rb
 examples/templates/template_tenjin.rb
-examples/templates/template_xslt.rb
 examples/templates/view/external.haml
 examples/templates/view/external.liquid
 examples/templates/view/external.mab
@@ -180,12 +181,11 @@ examples/templates/view/external.redcloth
 examples/templates/view/external.rem
 examples/templates/view/external.rhtml
 examples/templates/view/external.tenjin
-examples/templates/view/external.xsl
 examples/templates/view/external.zmr
 lib/proto/config.ru
 lib/proto/controller/init.rb
 lib/proto/controller/main.rb
-lib/proto/layout/default.nag
+lib/proto/layout/default.xhtml
 lib/proto/model/init.rb
 lib/proto/public/.htaccess
 lib/proto/public/css/screen.css
@@ -195,13 +195,15 @@ lib/proto/public/js/jquery.js
 lib/proto/public/ramaze.png
 lib/proto/spec/main.rb
 lib/proto/start.rb
-lib/proto/view/index.nag
-lib/proto/view/page.nag
+lib/proto/view/index.xhtml
+lib/proto/view/page.xhtml
 lib/ramaze.rb
 lib/ramaze/app.rb
 lib/ramaze/cache.rb
+lib/ramaze/cache/localmemcache.rb
 lib/ramaze/cache/memcache.rb
 lib/ramaze/cache/sequel.rb
+lib/ramaze/contrib/app_graph.rb
 lib/ramaze/contrib/email.rb
 lib/ramaze/contrib/facebook.rb
 lib/ramaze/contrib/facebook/facebook.rb
@@ -214,7 +216,6 @@ lib/ramaze/contrib/maruku_uv.rb
 lib/ramaze/contrib/profiling.rb
 lib/ramaze/contrib/rest.rb
 lib/ramaze/contrib/sequel/create_join.rb
-lib/ramaze/contrib/sequel/fill.rb
 lib/ramaze/contrib/sequel/form_field.rb
 lib/ramaze/contrib/sequel/image.rb
 lib/ramaze/contrib/sequel/relation.rb
@@ -311,6 +312,8 @@ lib/ramaze/spec/helper/bacon.rb
 lib/ramaze/spec/helper/pretty_output.rb
 lib/ramaze/spec/helper/snippets.rb
 lib/ramaze/spec/helper/template_examples.rb
+lib/ramaze/tool/create.rb
+lib/ramaze/tool/project_creator.rb
 lib/ramaze/version.rb
 lib/ramaze/view.rb
 lib/ramaze/view/erubis.rb
@@ -329,7 +332,6 @@ lib/vendor/etag.rb
 lib/vendor/route_exceptions.rb
 ramaze.gemspec
 spec/contrib/rest.rb
-spec/contrib/sequel/fill.rb
 spec/examples/caching.rb
 spec/examples/css.rb
 spec/examples/element.rb
@@ -346,7 +348,6 @@ spec/examples/templates/template_nagoro.rb
 spec/examples/templates/template_redcloth.rb
 spec/examples/templates/template_remarkably.rb
 spec/examples/templates/template_tenjin.rb
-spec/examples/templates/template_xslt.rb
 spec/helper.rb
 spec/ramaze/action/render.rb
 spec/ramaze/action/view/bar.xhtml
@@ -357,6 +358,7 @@ spec/ramaze/action/view/single_wrapper.xhtml
 spec/ramaze/action/view/sub/sub_wrapper.erb
 spec/ramaze/action/view/sub/sub_wrapper.xhtml
 spec/ramaze/app.rb
+spec/ramaze/cache/localmemcache.rb
 spec/ramaze/cache/memcache.rb
 spec/ramaze/cache/sequel.rb
 spec/ramaze/controller/actionless_templates.rb

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/gempackagetask'
 require 'time'
 require 'date'
 
-PROJECT_SPECS = Dir['spec/{examples,ramaze,snippets}/**/*.rb']
+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'
@@ -34,8 +34,24 @@ GEMSPEC = Gem::Specification.new{|s|
   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_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
 ============================================================
 

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
+