davetron5000-gli 0.1.4 → 0.1.5

data/README.rdoc

@@ -28,10 +28,10 @@ the command name on the command line.
     switch :n
 
 
-This is  describes a command line flag that is global and has a default value of <tt>.</tt>.  It also
-specified a short description of its argument.  This is used to print command line help.  Note that we
+This describes a command line flag that is global and has a default value of '<tt>.</tt>'.  It also
+specifies a short description of its argument.  This is used to print command line help.  Note that we
 have specified two different aliases for this flag.  <tt>-r</tt> (because it is listed first) is the default
-one and <tt>--root</tt> is also supported.  This means that <tt>-r some_dir</tt> and <tt>--root=some_dir</tt> mean
+one and <tt>--root</tt> (note two-dash syntax) is also supported.  This means that <tt>-r some_dir</tt> and <tt>--root=some_dir</tt> mean
 the same thing to the application.
 
     desc 'Root dir in which to create project'
@@ -69,6 +69,8 @@ You can also specify some global code to run before, after and on errors:
 
     pre do |global_options,command,options,args|
       puts "After parsing, but before #{command.name} is run"
+      return true
+      # return false if we want to skip command execution for some reason
     end
 
     post do |global_options,command,options,args|

data/bin/gli

@@ -14,7 +14,7 @@ switch :version
 desc 'Dry run; don\'t change the disk'
 switch :n
 
-desc 'Root dir in which to create project'
+desc 'Root dir of project'
 default_value '.'
 flag [:r,:root]
 
@@ -53,9 +53,9 @@ post do |global,command,options,args|
   puts "Executed #{command.name}" if global[:v]
 end
 
-on_error do |global,command,options,args|
-  puts "Got an error" if global[:v]
-  true
-end
+#on_error do |global,command,options,args|
+#  puts "Got an error" if global[:v]
+#  true
+#end
 
 run(ARGV)

data/lib/gli.rb

@@ -10,7 +10,7 @@ require 'support/help.rb'
 module GLI
   extend self
 
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 
   @@program_name = $0.split(/\//)[-1]
   @@post_block = nil
@@ -72,7 +72,8 @@ module GLI
   end
 
   # Define a block to run if an error occurs.
-  # The block will receive the global-options,command,options, and arguments
+  # The block will receive the exception that was caught.
+  # It should return false to avoid the built-in error handling
   def on_error(&a_proc)
     @@error_block = a_proc
   end
@@ -91,9 +92,7 @@ module GLI
       end
     rescue UnknownCommandException, UnknownArgumentException, MissingArgumentException => ex
       regular_error_handling = true
-      if @@error_block
-        regular_error_handling = @@error_block.call(global_options,command,options,arguments,ex)
-      end
+      regular_error_handling = @@error_block.call(ex) if @@error_block
 
       if regular_error_handling
         puts "error: #{ex}"

data/lib/support/scaffold.rb

@@ -20,10 +20,12 @@ module GLI
       if !File.exist?(bin_file) || force
         if !dry_run
           File.open(bin_file,'w') do |file|
+            file.chmod(0755)
             file.puts '#!/usr/bin/ruby'
             file.puts '$: << File.expand_path(File.dirname(__FILE__) + \'/../lib\')'
             file.puts '$: << File.expand_path(File.dirname(__FILE__) + \'/../ext\')' if create_ext_dir
             file.puts <<EOS
+require 'rubygems'
 require 'gli'
 
 include GLI
@@ -36,8 +38,10 @@ default_value 'the default'
 arg_name 'The name of the argument'
 flag [:f,:flagname]
 EOS
+            first = true
             commands.each do |command|
-              file.puts <<EOS
+              if first
+                file.puts <<EOS
 
 desc 'Describe #{command} here'
 arg_name 'Describe arguments to #{command} here'
@@ -48,14 +52,42 @@ command :#{command} do |c|
   c.desc 'Describe a flag to #{command}'
   c.default_value 'default'
   c.flag :s
-
   c.action do |global_options,options,args|
     # Your command logic here
   end
 end
 EOS
+              else
+                file.puts <<EOS
+command :#{command} do |c|
+  c.action do |global_options,options,args|
+  end
+end
+EOS
+              end
+              first = false
             end
-            puts "Create #{bin_file}"
+            file.puts <<EOS
+pre do |global,command,options,args|
+  # Pre logic here
+  # Return true to proceed; false to abourt and not call the
+  # chosen command
+  true
+end
+
+post do |global,command,options,args|
+  # Post logic here
+end
+
+on_error do |exception|
+  # Error logic here
+  # return false to skip default error handling
+  true
+end
+
+GLI.run(ARGV)
+EOS
+            puts "Created #{bin_file}"
           end
         end
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: davetron5000-gli
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - David Copeland
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-03 00:00:00 -08:00
+date: 2009-02-13 00:00:00 -08:00
 default_executable: 
 dependencies: []