Changeset 398

Timestamp:

01/09/2008 00:01:45 (8 months ago)

Author:

why

Message:

• shoes/world.c: exception handling prior to launch. so file not found doesn't spawn shoes.
  
• lib/shoes.rb: added --version.
  

Location:

trunk

Files:

• lib/shoes.rb (modified) (1 diff)
• samples/jot.rb (modified) (1 diff)
• shoes/world.c (modified) (4 diffs)

trunk/lib/shoes.rb

@@ -85 +85 @@
     opts.banner = "Usage: shoes [options] (app.rb or app.shy)"
     
-    opts.separator ""
-    opts.separator "Specific options:"
-    
     opts.on("-m", "--manual",
-            "Open the built-in manual.") do |s|
+            "Open the built-in manual.") do
       @main_app = Shoes::Help
     end
+
     opts.on("-s", "--shy DIRECTORY",
             "Compress a directory into a Shoes YAML (SHY) archive.") do |s|
       @main_app = ShyMake.call(s)
+    end
+
+    opts.on_tail("-v", "--version", "Display the version info.") do
+      puts "shoes #{Shoes::RELEASE_NAME.downcase} (0.r#{Shoes::REVISION})"
+      raise SystemExit
+    end
+
+    opts.on_tail("-h", "--help", "Show this message") do
+      puts opts
+      raise SystemExit
     end
   end

trunk/samples/jot.rb

@@ -4 +4 @@
 
 Shoes.app :title => "vJot Clone", 
-  :width => 420, :height => 560 do
+  :width => 420, :height => 560, :resizable => false do
 
   @note = NOTES.first

trunk/shoes/world.c

@@ -52 +52 @@
 }
 
+static VALUE
+shoes_load_begin(VALUE v)
+{
+  char *bootup = (char *)v;
+  return rb_eval_string(bootup);
+}
+
+static VALUE
+shoes_load_exception(VALUE v, VALUE exc)
+{
+  return exc;
+}
+
 shoes_code
 shoes_load(char *path, char *uri)
@@ -60 +73 @@
   {
     char bootup[SHOES_BUFSIZE];
-    sprintf(bootup,
-      "begin;"
-        "Shoes.load(%%q<%s>);"
-      "rescue Object => e;"
-        SHOES_META
-          EXC_RUN
-        "end;"
-      "end;", path);
-    rb_eval_string(bootup);
+    sprintf(bootup, "Shoes.load(%%q<%s>);", path);
+    VALUE v = rb_rescue2(shoes_load_begin, (VALUE)bootup, shoes_load_exception, Qnil, rb_cObject, 0);
+    if (rb_obj_is_kind_of(v, rb_eException))
+    {
+      VALUE msg = rb_funcall(v, rb_intern("message"), 0);
+      printf("%s\n", RSTRING_PTR(msg));
+      return SHOES_QUIT;
+    }
   }
 
@@ -86 +98 @@
 {
   ruby_set_argv(argc, argv);
+}
+
+static VALUE
+shoes_start_begin(VALUE v)
+{
+  return rb_eval_string("$SHOES_URI = Shoes.args!");
+}
+
+static VALUE
+shoes_start_exception(VALUE v, VALUE exc)
+{
+  return exc;
 }
 
@@ -118 +142 @@
 
   char *load_uri_str = NULL;
-  VALUE load_uri = rb_eval_string("$SHOES_URI = Shoes.args!");
+  VALUE load_uri = rb_rescue2(shoes_start_begin, Qnil, shoes_start_exception, Qnil, rb_cObject, 0);
   if (!RTEST(load_uri))
     return SHOES_QUIT;
+  if (rb_obj_is_kind_of(load_uri, rb_eSystemExit))
+    return SHOES_QUIT;
+  if (rb_obj_is_kind_of(load_uri, rb_eException))
+  {
+    VALUE msg = rb_funcall(load_uri, rb_intern("message"), 0);
+    printf("%s\n", RSTRING_PTR(msg));
+    return SHOES_QUIT;
+  }
 
   if (rb_obj_is_kind_of(load_uri, rb_cString))