Changeset 410

Timestamp:

08/10/07 05:55:50 (1 year ago)

Author:

rogelio.samo..@gmail.com

Message:

- Applied patch to fix some leftover merb_ prefix bugs. Closes #119
- rake merb:freeze_from_svn now actually creates the script/merb binary (it wouldn't before)

Files:

• trunk/lib/merb.rb (modified) (2 diffs)
• trunk/lib/tasks/merb.rake (modified) (1 diff)

trunk/lib/merb.rb

@@ -87 +87 @@
-  lib = File.join(__DIR__, 'merb')
-  if Merb::Server.memory_session 
-rb_me
+
-    Merb::MemorySessionContainer.setup
-    include ::Merb::SessionMixin
@@ -101 +101 @@
-      puts "Rails session compatibilty disabled. If you need this then install the actionpack gem"
-    end    
-merb_
+
-    include ::Merb::SessionMixin
-  end
-
-  if Merb::Server.mem_cache_session
-rb_me
+
-    include ::Merb::SessionMixin
-    puts "MemCache session mixed in"

trunk/lib/tasks/merb.rake

@@ -40 +40 @@
-    
-    puts "  Use script/merb to start instead of plain merb"
+    tmpl = "#!/usr/local/bin/ruby\nrequire File.expand_path(File.dirname(__FILE__)+'/../dist/framework/merb/merb_server')\nMerb::Server.run\n"
+    File.open(MERB_ROOT / 'script/merb', 'wb') {|f|
+      f.write tmpl 
+      f.chmod(0744)
+    }
+ 
-  end
-