gli 0.2.1 → 0.2.3

data/README.rdoc

@@ -99,7 +99,7 @@ You can also specify some global code to run before, after and on errors:
       puts "After successful execution of #{command.name}"
     end
 
-    on_error do |global_options,command,options,args|
+    on_error do |ex|
       puts "We go an error"
       return true    # does the standard error handling code
       # return false # this would skip standard error handling code

data/lib/gli.rb

@@ -2,6 +2,7 @@ require 'gli/command_line_token.rb'
 require 'gli/command.rb'
 require 'gli/switch.rb'
 require 'gli/flag.rb'
+require 'gli/options.rb'
 require 'support/help.rb'
 require 'support/rdoc.rb'
 
@@ -40,22 +41,22 @@ module GLI
   def default_value(val); @@next_default_value = val; end
 
   # Create a flag, which is a switch that takes an argument
-  def flag(names)
-    flag = Flag.new(names,@@next_desc,@@next_arg_name,@@next_default_value,@@next_long_desc)
+  def flag(*names)
+    flag = Flag.new([names].flatten,@@next_desc,@@next_arg_name,@@next_default_value,@@next_long_desc)
     flags[flag.name] = flag
     clear_nexts
   end
 
   # Create a switch
-  def switch(names)
-    switch = Switch.new(names,@@next_desc,@@next_long_desc)
+  def switch(*names)
+    switch = Switch.new([names].flatten,@@next_desc,@@next_long_desc)
     switches[switch.name] = switch
     clear_nexts
   end
 
   # Define a command.
-  def command(names)
-    command = Command.new(names,@@next_desc,@@next_arg_name,@@next_long_desc)
+  def command(*names)
+    command = Command.new([names].flatten,@@next_desc,@@next_arg_name,@@next_long_desc)
     commands[command.name] = command
     yield command
     clear_nexts
@@ -123,7 +124,7 @@ module GLI
   #  * command options (as a Hash)
   #  * arguments (as an Array)
   def parse_options(args)
-    global_options,command,options,arguments = parse_options_helper(args.clone,Hash.new,nil,Hash.new,Array.new)
+    global_options,command,options,arguments = parse_options_helper(args.clone,Options.new,nil,Options.new,Array.new)
     flags.each { |name,flag| global_options[name] = flag.default_value if !global_options[name] }
     command.flags.each { |name,flag| options[name] = flag.default_value if !options[name] }
     return [global_options,command,options,arguments]

data/lib/gli/command.rb

@@ -40,15 +40,15 @@ module GLI
     # set the default value of the next flag
     def default_value(val); @next_default_value = val; end
 
-    def flag(names)
-      flag = Flag.new(names,@next_desc,@next_arg_name,@next_default_value)
+    def flag(*names)
+      flag = Flag.new([names].flatten,@next_desc,@next_arg_name,@next_default_value)
       flags[flag.name] = flag
       clear_nexts
     end
 
     # Create a switch
-    def switch(names)
-      switch = Switch.new(names,@next_desc)
+    def switch(*names)
+      switch = Switch.new([names].flatten,@next_desc)
       switches[switch.name] = switch
       clear_nexts
     end

data/lib/gli/options.rb

@@ -0,0 +1,14 @@
+require 'ostruct'
+
+class Options < OpenStruct
+
+  def[](k)
+    @table[k.to_sym]
+  end
+
+  def[]=(k, v)
+    @table[k.to_sym] = v
+  end
+
+end
+

data/lib/support/scaffold.rb

@@ -139,11 +139,13 @@ flag [:f,:flagname]
 EOS
             first = true
             commands.each do |command|
-              if first
-                file.puts <<EOS
+              file.puts <<EOS
 
 desc 'Describe #{command} here'
 arg_name 'Describe arguments to #{command} here'
+EOS
+              if first
+                file.puts <<EOS
 command :#{command} do |c|
   c.desc 'Describe a switch to #{command}'
   c.switch :s
@@ -171,6 +173,7 @@ EOS
               first = false
             end
             file.puts <<EOS
+
 pre do |global,command,options,args|
   # Pre logic here
   # Return true to proceed; false to abourt and not call the

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gli
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors: 
 - David Copeland
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-12 00:00:00 -04:00
+date: 2009-07-25 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -27,6 +27,7 @@ files:
 - lib/gli/command_line_token.rb
 - lib/gli/flag.rb
 - lib/gli/switch.rb
+- lib/gli/options.rb
 - lib/gli.rb
 - lib/support/help.rb
 - lib/support/rdoc.rb