samovar 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06e76d86b275ed684abaabcadd799765248b67d8
-  data.tar.gz: 5dbb428a9e5523779b394d3c14cb8661ca14271c
+  metadata.gz: 6014f824c6dfa4a7d93f58d12a580eed8d47e6a9
+  data.tar.gz: 292f00004c02a16ad603b7ccbabf69ea79fe26bf
 SHA512:
-  metadata.gz: e412c9871a224a1ad5049fd9d13a94dc1cf6f3f1a6b5c4bb2a92f085ce3a7b629f9a2ab142fe428b1e6a766c2252ef93eaf059b3d92e9bd48582fa9aca6c5abd
-  data.tar.gz: ba4f76b3c6b9457647cf8132e02d94df20add0d19e6c7c610ca2277291544db21e767735b4a9850a4756fd765e341c8ecefa3ecc4d0016b063e008a8d1a9f3d9
+  metadata.gz: 92b356e5330830a7b82e0cc85fb574688167d3748ae5ede4ccaab970110a690821f1da4d49bc913e79f493c83baa2d721599dc3b1bb3c9f1cfc29c0a9e79beb9
+  data.tar.gz: 267c1a904ac4ec70ec74465a00443ef9be80bf9ac0321035388bcf74e33a5fdbef1c3b330208300bd440f259cd10da8f5d7ce7d7073faa2caec41b96e74f2b65

data/lib/samovar/many.rb

@@ -20,10 +20,11 @@
 
 module Samovar
 	class Many
-		def initialize(key, description, stop: /^-/)
+		def initialize(key, description, stop: /^-/, default: nil)
 			@key = key
 			@description = description
 			@stop = stop
+			@default = default
 		end
 		
 		attr :key
@@ -33,10 +34,16 @@ module Samovar
 		end
 		
 		def to_a
-			[to_s, @description]
+			usage = [to_s, @description]
+			
+			if @default
+				usage << "Default: #{@default.inspect}"
+			end
+			
+			return usage
 		end
 		
-		def parse(input, default)
+		def parse(input, default = @default)
 			if @stop and stop_index = input.index{|item| @stop === item}
 				input.shift(stop_index)
 			else

data/lib/samovar/one.rb

@@ -20,10 +20,11 @@
 
 module Samovar
 	class One
-		def initialize(key, description, pattern: //)
+		def initialize(key, description, pattern: //, default: nil)
 			@key = key
 			@description = description
 			@pattern = pattern
+			@default = default
 		end
 		
 		attr :key
@@ -33,10 +34,16 @@ module Samovar
 		end
 		
 		def to_a
-			[to_s, @description]
+			usage = [to_s, @description]
+			
+			if @default
+				usage << "Default: #{@default.inspect}"
+			end
+			
+			return usage
 		end
 		
-		def parse(input, default)
+		def parse(input, default = @default)
 			if input.first =~ @pattern
 				input.shift
 			end || default

data/lib/samovar/split.rb

@@ -20,10 +20,11 @@
 
 module Samovar
 	class Split
-		def initialize(key, description, marker: '--')
+		def initialize(key, description, marker: '--', default: nil)
 			@key = key
 			@description = description
 			@marker = marker
+			@default = default
 		end
 		
 		attr :key
@@ -33,10 +34,16 @@ module Samovar
 		end
 		
 		def to_a
-			[to_s, @description]
+			usage = [to_s, @description]
+			
+			if @default
+				usage << "Default: #{@default.inspect}"
+			end
+			
+			return usage
 		end
 		
-		def parse(input, default = nil)
+		def parse(input, default = @default)
 			if offset = input.index(@marker)
 				input.pop(input.size - offset).tap(&:shift)
 			end || default

data/lib/samovar/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Samovar
-	VERSION = "1.6.0"
+	VERSION = "1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samovar
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2017-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mapping