gli 2.6.0 → 2.6.1

data/lib/gli/command_line_token.rb

@@ -18,6 +18,11 @@ module GLI
       self.name.to_s <=> other.name.to_s
     end
 
+    # Array of the name and aliases, as string
+    def names_and_aliases
+      [self.name,self.aliases].flatten.compact.map(&:to_s)
+    end
+
     private
     # Returns a string of all possible forms
     # of this flag.  Mostly intended for printing

data/lib/gli/commands/help_modules/command_help_format.rb

@@ -67,8 +67,7 @@ COMMANDS
                           sub.flags.merge(sub.switches)
                         end
           usage << sub_options.map { |option_name,option| 
-            all_names = [option.name,Array(option.aliases)].flatten
-            all_names.map { |_| 
+            option.names_and_aliases.map { |_| 
               CommandLineOption.name_as_string(_,false) + (option.kind_of?(Flag) ? " #{option.argument_name }" : '')
             }.join('|')
           }.map { |_| "[#{_}]" }.sort.join(' ')

data/lib/gli/option_parser_factory.rb

@@ -37,8 +37,12 @@ module GLI
   private
 
     def set_defaults(options_by_name,options_hash)
-      options_by_name.each do |name,option|
-        options_hash[name] = option.default_value if options_hash[name].nil?
+      options_by_name.values.each do |option|
+        option.names_and_aliases.each do |option_name|
+          [option_name,option_name.to_sym].each do |name|
+            options_hash[name] = option.default_value if options_hash[name].nil?
+          end
+        end
       end
     end
 
@@ -53,7 +57,7 @@ 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.map(&:to_s).each do |name|
+          token.names_and_aliases.each do |name|
             options[name] = arg
             options[name.to_sym] = arg
           end

data/lib/gli/version.rb

@@ -1,5 +1,5 @@
 module GLI
   unless const_defined? :VERSION
-    VERSION = '2.6.0'
+    VERSION = '2.6.1'
   end
 end

data/test/tc_gli.rb

@@ -419,11 +419,11 @@ class TC_testGLI < Clean::Test::TestCase
       c.flag :i
       c.flag :s
       c.action do |g,o,a|
-        assert_equal "5", o[:i]
-        assert_equal "a", o[:s]
+        assert_equal "1", o[:i]
+        assert_equal nil, o[:s]
       end
     end
-    @app.run(['foo', '-i','5','-s','a'])
+    @app.run(['foo','a'])
   end
 
   def test_switch_with_default_of_true
@@ -480,6 +480,39 @@ class TC_testGLI < Clean::Test::TestCase
     @app.run(['foo', '-i5','-sa'])
   end
 
+  def test_default_values_are_available_on_all_aliases
+    @app.reset
+    @app.on_error { |e| raise e }
+
+    @app.default_value "global_default"
+    @app.flag [ :f, :flag ]
+
+    @global_options = {}
+    @command_options = {}
+
+    @app.command [:foo] do |c|
+      c.default_value "command_default"
+      c.flag [ :c,:commandflag]
+
+      c.action do |g,o,a|
+        @global_options = g
+        @command_options = o
+      end
+    end
+
+    @app.run(["foo"])
+
+    assert_equal "global_default", @global_options[:f]
+    assert_equal "global_default", @global_options[:flag]
+    assert_equal "global_default", @global_options["f"]
+    assert_equal "global_default", @global_options["flag"]
+
+    assert_equal "command_default", @command_options[:c]
+    assert_equal "command_default", @command_options[:commandflag]
+    assert_equal "command_default", @command_options["c"]
+    assert_equal "command_default", @command_options["commandflag"]
+  end
+
   def test_exits_zero_on_success
     @app.reset
     assert_equal 0,@app.run([]),@fake_stderr.to_s

data/test/tc_subcommands.rb

@@ -137,10 +137,12 @@ class TC_testSubCommand < Clean::Test::TestCase
 
   def indifferent_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]
+    possibly_nil_hash.keys.each do |key|
+      if key.kind_of? Symbol
+        possibly_nil_hash[key.to_s] = possibly_nil_hash[key] unless possibly_nil_hash.has_key?(key.to_s)
+      elsif key.kind_of? String
+        possibly_nil_hash[key.to_sym] = possibly_nil_hash[key] unless possibly_nil_hash.has_key?(key.to_sym)
+      end
     end
     possibly_nil_hash
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gli
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake