lib/geocoder/cli.rb in geocoder-1.1.8 vs lib/geocoder/cli.rb in geocoder-1.1.9

- old
+ new

@@ -6,10 +6,15 @@ def self.run(args, out = STDOUT) show_url = false show_json = false + # remove arguments that are probably coordinates so they are not + # processed as arguments (eg: -31.96047031,115.84274631) + coords = args.select{ |i| i.match(/^-\d/) } + args -= coords + OptionParser.new{ |opts| opts.banner = "Usage:\n geocode [options] <location>" opts.separator "\nOptions: " opts.on("-k <key>", "--key <key>", @@ -63,10 +68,12 @@ out << "Report bugs and contribute at http://github.com/alexreisner/geocoder\n" exit end }.parse!(args) - query = args.join(" ") + # concatenate args with coords that might have been removed + # before option processing + query = (args + coords).join(" ") if query == "" out << "Please specify a location (run `geocode -h` for more info).\n" exit 1 end