samovar 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bd4d6e27c6922df8e1c114c97ebb3960df04473
-  data.tar.gz: 311072fee7aa41a8bb68cc36de8f7b3497c3c331
+  metadata.gz: 7a7156fc30783791549f5bbaa24754f40a8d0836
+  data.tar.gz: 298a257e5ca921533bb24e407f18ebc978b27d8e
 SHA512:
-  metadata.gz: 49ca3a2ccefff661c04eede9d56c0904fa323987319093c321c419254f105e799698701bf699b0fee8c5bb73d9a414559def3c4ff2567397482066a16ac15464
-  data.tar.gz: dd069406b3e275b2233f237961c9e46b287329d302fc23ed9849f069acd77a051cdd141c41a17622be9f4bc9ba2ef7b3c5e23a496049f4da0bd08c7c5cc74e7f
+  metadata.gz: c30c5704797b823905392e1ee6d76924980957bbaf8b581f240d3e35f84c4d09bb0a4155a2ce764f88e0ffeff90e948c778d1a16fff015051ba7ee98006e8be3
+  data.tar.gz: 8ca55afd6e7d32c2ee3da7171a2c39299f9aadfce9ef9faedd0d4d79421e8bef4b649e35b44a7c73abe10afd32070bede5364a9e153ca7a2b7604673aaf340fb

data/README.md

@@ -18,7 +18,7 @@ One of the other issues I had with existing frameworks is testability. Most fram
 
 - [Teapot](https://github.com/ioquatix/teapot/blob/master/lib/teapot/command.rb) is a build system and uses multiple top-level commands.
 - [Utopia](https://github.com/ioquatix/utopia/blob/master/lib/utopia/command.rb) is a web application platform and uses nested commands.
-- [LSync](https://github.com/ioquatix/lsync/blob/master/lib/lsync/command.rb) is a backup tool and sends commands across the network and has lots of options with default values.
+- [Synco](https://github.com/ioquatix/synco/blob/master/lib/synco/command.rb) is a backup tool and sends commands across the network and has lots of options with default values.
 
 ## Installation
 

data/lib/samovar/options.rb

@@ -34,10 +34,12 @@ module Samovar
 			
 			@default = default
 			
+			# If the value is given, it overrides the user specified input.
 			@value = value
 			@value ||= true if @flags.boolean?
 			
-			@type = block_given? ? block : type
+			@type = type
+			@block = block
 		end
 		
 		attr :flags
@@ -48,12 +50,28 @@ module Samovar
 		
 		attr :key
 		
+		def coerce_type(result)
+			if @type == Integer
+				Integer(result)
+			elsif @type == Float
+				Float(result)
+			elsif @type.respond_to? :call
+				@type.call(result)
+			elsif @type.respond_to? :new
+				@type.new(result)
+			end
+		end
+		
 		def coerce(result)
 			if @type
-				@type.call(result)
-			else
-				result
+				result = coerce_type(result)
+			end
+			
+			if @block
+				result = @block.call(result)
 			end
+			
+			return result
 		end
 		
 		def parse(input)

data/lib/samovar/version.rb

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

data/spec/samovar/type_spec.rb

@@ -8,13 +8,20 @@ module Command
 			option '--things <array>', "A list of things" do |input|
 				input.split(/\s*,\s*/)
 			end
+			
+			option '--count <integer>', "A number to count", type: Integer
 		end
 	end
 end
 
 describe Samovar::Command do
-	it "should use default value" do
+	it "should coerce to array" do
 		top = Command::Coerce.parse(['--things', 'a,b,c'])
 		expect(top.options[:things]).to be == ['a', 'b', 'c']
 	end
+	
+	it "should coerce to integer" do
+		top = Command::Coerce.parse(['--count', '10'])
+		expect(top.options[:count]).to be == 10
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samovar
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mapping
@@ -94,7 +94,6 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- flopp.gemspec
 - lib/samovar.rb
 - lib/samovar/command.rb
 - lib/samovar/command/system.rb
@@ -109,6 +108,7 @@ files:
 - lib/samovar/split.rb
 - lib/samovar/table.rb
 - lib/samovar/version.rb
+- samovar.gemspec
 - spec/samovar/command_spec.rb
 - spec/samovar/type_spec.rb
 - teapot.png