Pablo 0.0.2 → 0.1.0

data/CHANGELOG

@@ -0,0 +1,3 @@
+0.0.1    :: Initial release
+0.0.2    :: Added version command
+0.1.0    :: Fixed bug regarding default! and added version and help blocks

data/lib/pablo.rb

@@ -378,12 +378,18 @@ module Pablo
         #
         def version? args
             return false unless @version
+
             found = args.index { |a|
                 @version_aliases.any? { |v| v == a }
             }
-            found = 0 if args.empty?
+
+            found = 0 if args.empty? and not @tokens.any? { |t|
+                t.default
+            }
+
             return false unless found
-            Pablo::version @options
+
+            Pablo::version @options, @version_block
             return true
         end
 
@@ -393,16 +399,23 @@ module Pablo
         # - executes +Pablo::help+
         # - and returns true
         # otherwise only returns false.
+        # TODO: help and version add tokens that get default set and call these functions?
         #
         def help? args
             return false unless @help
+
             found = args.index { |a|
                 @help_aliases.any? { |h| h == a }
             }
-            found = 0 if args.empty?
+
+            found = 0 if args.empty? and not @tokens.any? { |t|
+                t.default
+            }
+
             return false unless found
+
             a = args[found+1..-1] || []
-            Pablo::help a, @everyone, @options
+            Pablo::help a, @everyone, @options, @help_block
             return true
         end
 
@@ -413,9 +426,12 @@ module Pablo
         # +alis+ are the aliases the help command should respond to.
         # By default these are _help_, _--help_ and _-h_.
         #
-        def help! alis = ['help', '--help', '-h']
+        # +block+ will be called after the help text has been rendered.
+        #
+        def help! alis = ['help', '--help', '-h'], &block
             @help = true
             @help_aliases = alis
+            @help_block = block
         end
 
         ##TODO: usage!, each token gives it's usage -> [alias1|alias2 usage]
@@ -427,9 +443,12 @@ module Pablo
         # +alis+ are the aliases the version command should respond to.
         # By default these are _version_, _--version_ and _-v_.
         #
-        def version! alis = ['version', '--version', '-v']
+        # +block+ will be called after the version text has been rendered.
+        #
+        def version! alis = ['version', '--version', '-v'], &block
             @version = true
             @version_aliases = alis
+            @version_block = block
         end
     end
 
@@ -446,7 +465,9 @@ module Pablo
     # +options+ must be a hash of options that will be used to generate the
     # output, namely +:program+, +:version+, +:usage+.
     #
-    def self.help args, tokens, options
+    # +block+ must be the block to call after rendering, or nil.
+    #
+    def self.help args, tokens, options, block
         msg = ""
         aliases = []
         tokens.each { |t| t.aliases.each { |a| aliases << [a,t] } }
@@ -503,6 +524,8 @@ module Pablo
             puts "\n::Defaults" unless strs.empty?
             puts strs.join ", "
         end
+
+        block.call if block
     end
 
     ##
@@ -512,9 +535,12 @@ module Pablo
     # +options+ must be a hash of options that will be used to generate the
     # output, namely +:version+, +:program+.
     #
-    def self.version options
+    # +block+ must be the block to call after rendering, or nil.
+    # 
+    def self.version options, block
         puts "#{options[:program]} v#{options[:version]}" if
             options[:program] and options[:version]
+        block.call if block
     end
 
 end

data/tests/help.rb

@@ -16,7 +16,14 @@ def message msg
 end
 
 class Help < Test::Unit::TestCase
-
+    def self.val
+		@@val
+	end
+
+	def self.val= v
+		@@val = v
+	end
+	
     def assert_output
         puts
         print 'Does the output match? [yn]  '
@@ -128,7 +135,6 @@ class Help < Test::Unit::TestCase
     end
 
     def testHelpDefault
-
         puts
         message 'Expected output: an empty help message'
         message "-----------------------------------------"
@@ -142,24 +148,19 @@ class Help < Test::Unit::TestCase
         assert_output
     end
 
-    def testVersion
-
-        puts
-        message 'Expected output: a version message'
-        message "-----------------------------------------"
+    def testHelpBlock
+        Help.val = 0
 
-        Pablo::parse ['version'], :program => 'bacon',
-            :version => [0,0,1,'alpha'] do
-            version!
+        Pablo::parse [] do
+            help! do
+                Help.val = 12
+            end
         end
 
-        message '-----------------------------------------'
-        message 'End of expected output'
-        assert_output
+        assert_equal 12, Help.val
     end
 
     def testVersion
-
         puts
         message 'Expected output: a version message'
         message "-----------------------------------------"
@@ -174,8 +175,19 @@ class Help < Test::Unit::TestCase
         assert_output
     end
 
-    def testVersionHelpDefault
+    def testVersionBlock
+        Help.val = 0
+
+        Pablo::parse [] do
+            version! do
+                Help.val = 12
+            end
+        end
 
+        assert_equal 12, Help.val
+    end
+
+    def testVersionHelpDefault
         puts
         message 'Expected output: a help message'
         message "-----------------------------------------"
@@ -195,5 +207,24 @@ class Help < Test::Unit::TestCase
         message 'End of expected output'
         assert_output
     end
+
+    def testHelpVersionNonDefault
+        Help.val = 1
+
+        Pablo::parse [], :program => 'bacon',
+            :version => [0,0,1,'alpha'] do
+            version!
+            help!
+
+            command do
+                name 'stupid'
+                short_desc 'foo'
+                default!
+                run { Help.val = 2 }
+            end
+        end
+        
+        assert_equal 2, Help.val
+    end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Pablo
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Fabian Streitel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-26 00:00:00 -08:00
+date: 2009-01-01 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -21,9 +21,11 @@ extensions: []
 
 extra_rdoc_files: 
 - README
+- CHANGELOG
 files: 
 - lib/pablo.rb
 - README
+- CHANGELOG
 has_rdoc: true
 homepage: http://pablo.rubyforge.org/
 post_install_message: