cli-parser 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f46baa494ac45ec68b037ae8575060c88efc6dcb
-  data.tar.gz: 8a534b47ddc3bb831f43359b68bd5c1ff437dbe3
+  metadata.gz: a26752a93198472cd4b0993ef9e23de77dd09294
+  data.tar.gz: 80fd5ca71bfa47386e2310cfc8512f78bb86f0b5
 SHA512:
-  metadata.gz: 9baf45f4a0936b4bd57829106f65e58033147b64b42433c88ea6d0e9a087c2d262bc790d5a83e0f118f153c69cafd10466f511299946776754491aff9cbae47f
-  data.tar.gz: 8077f765c9a7f6480790cc98a46b09affaff860ce003ea54a78770a71c5bec75a141a0174cfa4d3d491efe03c596ee43fbba34b421abe7f99bd2e5215076f6a0
+  metadata.gz: 7593106ae9dabb313d73221cb9958596ef7e4443d264cac151bb7ba36e62bc866dc189c35afa2f9ef3b8e9fcb75cce5c2ad9a1d0c6dc7e2c215fd24074b00d76
+  data.tar.gz: 099ba5ef6b5ad88ac70a55d50aec4b5cb9d861c6f8186db1b782b65621dbcc730ee01a4b4243ab627592456425e988c0c0010ac24f60d5304e397788d6149dd6

data/lib/cli-parser.rb

@@ -7,8 +7,8 @@ module CliParser
 		result_opts = {}
 
 		keywords = %w("[^"]*" [^\s-][^\s]+)
-		keywords << flags.collect { | f | Regexp.quote(f) }.join('|')
-		keywords << options.collect { | o | Regexp.quote(o) + '\s+([^\s"]+|"[^"]*")+'  }.join('|')
+		keywords << flags.collect { | f | Regexp.quote(f) }.join('|') unless flags.empty?
+		keywords << options.collect { | o | Regexp.quote(o) + '\s+([^\s"]+|"[^"]*")+'  }.join('|') unless options.empty?
 		regex = Regexp.new('(' + keywords.compact.join('|') + ')')
 
 		cmd.scan(regex).each { | a |

data/test/manual_test.rb

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require '../lib/cli-parser'
+require 'json'
+
+arguments, options = CliParser.parse(%w(-w), %w(-o -t))
+
+puts 'Arguments: ' + JSON.pretty_generate(arguments)
+puts 'Options: ' + JSON.pretty_generate(options)

data/test/test-cli-parser.rb

@@ -7,16 +7,31 @@ module CliParserTest
 
 		#noinspection RubyStringKeysInHashInspection
 		def test_parse
+
+			cmd = 'test1 test2 test3'
+			args, options = CliParser.parse([], [], cmd)
+			assert_equal(%w(test1 test2 test3), args)
+			assert_equal({}, options)
+
+
 			cmd = '-w arg1 -o Test arg2 -t "Hello World" arg3'
 
 			args, options = CliParser.parse(%w(-w), %w(-o -t), cmd)
 			assert_equal(%w(arg1 arg2 arg3), args)
 			assert_equal({ '-w' => true, '-o' => 'Test', '-t' => 'Hello World' }, options)
 
-			cmd = 'test1 test2 test3'
+			args, options = CliParser.parse([], %w(-o -t), cmd)
+			assert_equal(%w(arg1 arg2 arg3), args)
+			assert_equal({'-o' => 'Test', '-t' => 'Hello World' }, options)
+
+			args, options = CliParser.parse(%w(-w), [], cmd)
+			assert_equal(['arg1', 'Test', 'arg2', '"Hello World"', 'arg3'], args)
+			assert_equal({'-w' => true }, options)
+
 			args, options = CliParser.parse([], [], cmd)
-			assert_equal(%w(test1 test2 test3), args)
+			assert_equal(['arg1', 'Test', 'arg2', '"Hello World"', 'arg3'], args)
 			assert_equal({}, options)
+
 		end
 
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cli-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Taco Jan Osinga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies: []
 description: A command-line parser. Extracts arguments, switches and options.
 email: info@osingasoftware.nl
@@ -18,6 +18,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - lib/cli-parser.rb
+- test/manual_test.rb
 - test/test-cli-parser.rb
 homepage: https://github.com/tjosinga/cli-parser
 licenses:
@@ -44,4 +45,5 @@ signing_key:
 specification_version: 4
 summary: CLI Parser
 test_files:
+- test/manual_test.rb
 - test/test-cli-parser.rb