samovar 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df07fe3139c96d3f34b9e4d1ae5416e1f311eb2f
-  data.tar.gz: e2ef640c6126fa551258c29bafca19bdeb92ff0c
+  metadata.gz: 0bd4d6e27c6922df8e1c114c97ebb3960df04473
+  data.tar.gz: 311072fee7aa41a8bb68cc36de8f7b3497c3c331
 SHA512:
-  metadata.gz: fbb6dea46c1245ae3e471f67ae62b75d5ce20937dba2c06fd82671e6ebad78f8fbe136816bbc7afc902f18d9aedbb98a9547a13792e167d5e791b6bfd36c12e9
-  data.tar.gz: 4ff9e33ab4b1cdc1969c547e8ba56733e9b406876409568d1ced9ee8b54d70ade58e456e66064f6055a8f6b0b818157308924de9060d83b1a807ed7d6d126f0e
+  metadata.gz: 49ca3a2ccefff661c04eede9d56c0904fa323987319093c321c419254f105e799698701bf699b0fee8c5bb73d9a414559def3c4ff2567397482066a16ac15464
+  data.tar.gz: dd069406b3e275b2233f237961c9e46b287329d302fc23ed9849f069acd77a051cdd141c41a17622be9f4bc9ba2ef7b3c5e23a496049f4da0bd08c7c5cc74e7f

data/README.md

@@ -45,6 +45,9 @@ Or install it yourself as:
 			option '-f/--frobulate <text>', "Frobulate the text"
 			option '-x | -y', "Specify either x or y axis.", key: :axis
 			option '-F/--yeah/--flag', "A boolean flag with several forms."
+			option '--things <a,b,c>', "A list of things" do |value|
+				value.split(/\s*,\s*/)
+			end
 		end
 	end
 	
@@ -56,6 +59,9 @@ Or install it yourself as:
 	
 	application = Application.new(['-F'])
 	application.options[:flag] # true
+	
+	application = Application.new(['--things', 'x,y,z'])
+	application.options[:things] # ['x', 'y', 'z']
 
 ### Nested Commands
 

data/lib/samovar/options.rb

@@ -22,7 +22,7 @@ require_relative 'flags'
 
 module Samovar
 	class Option
-		def initialize(flags, description, key: nil, default: nil, value: nil)
+		def initialize(flags, description, key: nil, default: nil, value: nil, type: nil, &block)
 			@flags = Flags.new(flags)
 			@description = description
 			
@@ -36,6 +36,8 @@ module Samovar
 			
 			@value = value
 			@value ||= true if @flags.boolean?
+			
+			@type = block_given? ? block : type
 		end
 		
 		attr :flags
@@ -46,9 +48,17 @@ module Samovar
 		
 		attr :key
 		
+		def coerce(result)
+			if @type
+				@type.call(result)
+			else
+				result
+			end
+		end
+		
 		def parse(input)
 			if result = @flags.parse(input)
-				@value.nil? ? result : @value
+				@value.nil? ? coerce(result) : @value
 			else
 				@default
 			end
@@ -91,8 +101,8 @@ module Samovar
 		attr :key
 		attr :defaults
 		
-		def option(*args, **options)
-			self << Option.new(*args, **options)
+		def option(*args, **options, &block)
+			self << Option.new(*args, **options, &block)
 		end
 		
 		def << option

data/lib/samovar/version.rb

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

data/spec/samovar/type_spec.rb

@@ -0,0 +1,20 @@
+
+require 'samovar'
+require 'stringio'
+
+module Command
+	class Coerce < Samovar::Command
+		options do
+			option '--things <array>', "A list of things" do |input|
+				input.split(/\s*,\s*/)
+			end
+		end
+	end
+end
+
+describe Samovar::Command do
+	it "should use default value" do
+		top = Command::Coerce.parse(['--things', 'a,b,c'])
+		expect(top.options[:things]).to be == ['a', 'b', 'c']
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samovar
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mapping
@@ -110,6 +110,7 @@ files:
 - lib/samovar/table.rb
 - lib/samovar/version.rb
 - spec/samovar/command_spec.rb
+- spec/samovar/type_spec.rb
 - teapot.png
 homepage: https://github.com/ioquatix/samovar
 licenses:
@@ -138,3 +139,4 @@ summary: Samovar is a flexible option parser excellent support for sub-commands
   help documentation.
 test_files:
 - spec/samovar/command_spec.rb
+- spec/samovar/type_spec.rb