Changeset 231

Timestamp:

05/03/07 13:07:50 (2 years ago)

Author:

e.@brainspl.at

Message:

commiting rogelio's patch for a merb script/runner alike, closes #43 , thanks rogelio

Files:

• trunk/lib/merb/merb_server.rb (modified) (3 diffs)

trunk/lib/merb/merb_server.rb

@@ -92 +92 @@
-          end
-          
+          opts.on("-r", "--script-runner ['RUBY CODE'| FULL_SCRIPT_PATH]", "Command-line option to run scripts and/or code in the merb app") do |stuff_to_run|
+            options[:runner] = stuff_to_run
+          end
+          
-          opts.on("-g", "--generate-app PATH", "Generate a fresh merb app at PATH") do |path|
-            options[:generate] = path || Dir.pwd
@@ -103 +107 @@
-            options[:merb_config] = config
-          end
- 
-hing on and off the mutex lock
+
+ing the mutex lock on and off
-            if mutex == 'off'
-              options[:use_mutex] = false
@@ -204 +208 @@
-          exit!
-        end
+
+        if @@merb_opts[:runner]
+          initialize_merb
+          code_or_file = @@merb_opts[:runner] 
+          if File.exists?(code_or_file)
+            eval(File.read(code_or_file))
+          else
+            eval(code_or_file)
+          end
+          exit!
+        end
-        
-        if @@merb_opts[:start_drb]