@@ -3,5 +3,11 @@ require File.dirname(__FILE__) + '/../lib/rush' require File.dirname(__FILE__) + '/../lib/rush/shell' -Rush::Shell.new.run +shell = Rush::Shell.new + +if ARGV.size > 0 + shell.execute ARGV.join(' ') +else + shell.run +end bin/rush @@ -31,6 +31,21 @@ module Rush Array.class_eval commands end + # Run a single command. + def execute(cmd) + res = eval(cmd, @pure_binding) + $last_res = res + eval("_ = $last_res", @pure_binding) + print_result res + rescue Rush::Exception => e + puts "Exception #{e.class} -> #{e.message}" + rescue ::Exception => e + puts "Exception #{e.class} -> #{e.message}" + e.backtrace.each do |t| + puts " #{::File.expand_path(t)}" + end + end + # Run the interactive shell using readline. def run loop do @@ -40,19 +55,7 @@ module Rush next if cmd == "" Readline::HISTORY.push(cmd) - begin - res = eval(cmd, @pure_binding) - $last_res = res - eval("_ = $last_res", @pure_binding) - print_result res - rescue Rush::Exception => e - puts "Exception #{e.class} -> #{e.message}" - rescue ::Exception => e - puts "Exception #{e.class} -> #{e.message}" - e.backtrace.each do |t| - puts " #{::File.expand_path(t)}" - end - end + execute(cmd) end end lib/rush/shell.rb 8f658eafd5397c479ff6f6a4ad66b357dde02c91 Adam Wiggins adam@heroku.com http://github.com/adamwiggins/rush/commit/433cfd3e5a71e40c02b084f2aebd15a2fcb02305 433cfd3e5a71e40c02b084f2aebd15a2fcb02305 2008-03-27T15:09:15-07:00 2008-03-27T15:09:15-07:00 run rush with arguments to execute them instead of interactive shell 4bc1d16a0343fdf0e2fd6345af263e27e081df0c Adam Wiggins adam@heroku.com