doodle 0.2.0 → 0.2.2

data/History.txt

@@ -1,3 +1,14 @@
+== 0.2.2 / 2009-03-02
+
+- Features:
+  - added obj.doodle.keys method
+  - added more examples to website
+
+== 0.2.1 / 2009-03-02
+
+- Bug fixes:
+  - Doodle::App not displaying help text
+
 == 0.2.0 / 2009-02-08
 - Features:
   - object.doodle.values for easy access to array of attribute values

data/lib/doodle.rb

@@ -404,6 +404,13 @@ class Doodle
       attributes(tf).map{ |k, a| @this.send(k)}
     end
 
+    # returns array of attribute names
+    # - if tf == true, returns all inherited attribute names (default)
+    # - if tf == false, returns only those attribute names defined in current object
+    def keys(tf = true)
+      attributes(tf).keys
+    end
+
     # return class level attributes
     def class_attributes
       attrs = Doodle::OrderedHash.new

data/lib/doodle/app.rb

@@ -27,6 +27,8 @@ require 'pp'
 class Doodle
   # command line option handling DSL implemented using Doodle
   class App < Doodle
+    class HelpExit < ::Exception
+    end
     # specialised classes for handling attributes
 
     # replace the full directory path with ./ where appropriate
@@ -251,6 +253,8 @@ class Doodle
 
       # use this to include 'standard' flags: help (-h, --help), verbose (-v, --verbose) and debug (-d, --debug)
       def std_flags
+        # FIXME: this is bogus
+        m = method(:help_text)
         boolean :help, :flag => "h", :doc => "display this help"
         boolean :verbose, :flag => "v", :doc => "verbose output"
         boolean :debug, :flag => "D", :doc => "turn on debugging"
@@ -261,13 +265,14 @@ class Doodle
       # call App.run to start your application (calls instance.run)
       def run(argv = ARGV)
         begin
-          app = from_argv(argv)
-          if app.help
+          # cheating
+          if argv.include?('-h') or argv.include?('--help')
             puts help_text
           else
+            app = from_argv(argv)
             app.run
           end
-        rescue Object => e
+        rescue Exception => e
           if exit_status == 0
             exit_status 1
           end

data/lib/doodle/version.rb

@@ -2,7 +2,7 @@ class Doodle #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 0
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: doodle
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors: 
 - Sean O'Halpin