gli 2.3.0.rc1 → 2.3.0

data/lib/gli/commands/scaffold.rb

@@ -279,7 +279,7 @@ require '#{project_name}'
 rescue LoadError
   STDERR.puts "In development, you need to use `bundle exec bin/todo` to run your app"
   STDERR.puts "At install-time, RubyGems will make sure lib, etc. are in the load path"
-  STDERR.puts "Feel free to remove this message from bin/todo now"
+  STDERR.puts "Feel free to remove this message from bin/#{project_name} now"
   exit 64
 end
 

data/lib/gli/option_parser_factory.rb

@@ -33,8 +33,9 @@ module GLI
     def self.setup_options(opts,tokens,options)
       tokens.each do |ignore,token|
         opts.on(*token.arguments_for_option_parser) do |arg|
-          [token.name,token.aliases].flatten.compact.each do |name|
+          [token.name,token.aliases].flatten.compact.map(&:to_s).each do |name|
             options[name] = arg
+            options[name.to_sym] = arg
           end
         end
       end

data/lib/gli/version.rb

@@ -1,5 +1,5 @@
 module GLI
   unless const_defined? :VERSION
-    VERSION = '2.3.0.rc1' #:nodoc:
+    VERSION = '2.3.0' #:nodoc:
   end
 end

data/test/tc_gli.rb

@@ -245,17 +245,27 @@ class TC_testGLI < Clean::Test::TestCase
       c.action do |global,options,args|
         assert_equal 'foo',global[:f]
         assert_equal global[:f],global[:flag]
+        assert_equal global[:f],global['f']
+        assert_equal global[:f],global['flag']
+        assert_equal global[:f],global['big-flag-name']
         assert_equal global[:f],global[:'big-flag-name']
 
         assert global[:s]
         assert global[:switch]
         assert global[:'big-switch-name']
+        assert global['s']
+        assert global['switch']
+        assert global['big-switch-name']
 
         assert_equal 'bar',options[:g]
+        assert_equal options[:g],options['g']
+        assert_equal options[:g],options['gflag']
         assert_equal options[:g],options[:gflag]
 
         assert options[:h]
+        assert options['h']
         assert options[:hswitch]
+        assert options['hswitch']
       end
     end
     @app.run(%w(-f foo -s command -g bar -h some_arg))

data/test/tc_subcommands.rb

@@ -123,8 +123,8 @@ class TC_testSubCommand < Clean::Test::TestCase
     lambda {
       @run_results.each do |command,results|
         if command == expected_command
-          assert_equal(Hash(options[:global_options]),results[0])
-          assert_equal(Hash(options[:command_options]),results[1])
+          assert_equal(indiffernt_hash(options[:global_options]),results[0])
+          assert_equal(indiffernt_hash(options[:command_options]),results[1])
           assert_equal(options[:args],results[2])
         else
           assert_nil results
@@ -133,8 +133,14 @@ class TC_testSubCommand < Clean::Test::TestCase
     }
   end
 
-  def Hash(possibly_nil_hash)
-    possibly_nil_hash || {}
+  def indiffernt_hash(possibly_nil_hash)
+    return {} if possibly_nil_hash.nil?
+    keys = possibly_nil_hash.keys
+    keys.map(&:to_s).each do |key|
+      possibly_nil_hash[key.to_sym] = possibly_nil_hash[key] if possibly_nil_hash[key]
+      possibly_nil_hash[key] = possibly_nil_hash[key.to_sym] if possibly_nil_hash[key.to_sym]
+    end
+    possibly_nil_hash
   end
 
   # options - 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gli
 version: !ruby/object:Gem::Version
-  version: 2.3.0.rc1
-  prerelease: 6
+  version: 2.3.0
+  prerelease: 
 platform: ruby
 authors:
 - David Copeland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-30 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -365,13 +365,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3796893543708416219
+      hash: 3822562624553397534
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 3822562624553397534
 requirements: []
 rubyforge_project: gli
 rubygems_version: 1.8.24