bake 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 229a72fb2b01f8620666a273b5cbbb1e326b80fd0c3b0a1cc2967cf628bbca6e
-  data.tar.gz: 240325c384794ab40525c1b1c47152f0bcdd6f319afa61df577c8b46b4659b6d
+  metadata.gz: fc8a46a50ac43cd0fb5db9d9898327b4c999f3fbe7991b549b7710340268c5a8
+  data.tar.gz: a299278a280a3613490b0acc96dc826f498d7950abe38289fb56dcd22165f049
 SHA512:
-  metadata.gz: deb0caf57627b894e24c260c4ff86dd634860f72507680e796fed42bc3a131a8c1de0e48f93a69b5f578b1c043da15ba5cb0d0a410295d13a4e64d55f6ecd8d9
-  data.tar.gz: c76b247bb14ac2846bacf732db20155e7255cb9ec53cccc583b72b36f2ec3215aa409fb9c9e1ab837d488e216b3d39194c6cae07e0ac5626728df08d37fdedec
+  metadata.gz: 3b4ff92cffbb0653dfdb7cd8cbddf8d4d117563f3f934d65c12eacdcb2a1da34646706c845565a32b23854335008a6a6b332ec9901a7c43a49b4b3dfa4428435
+  data.tar.gz: 22d5cd4677921eb326ae85998b365b7ee151abf53a3752acab4d883b048140cf685f4c34037a052ca8e08406dff1636177e2bc99b7c3a95fa7c1700d37de1e28

data/lib/bake/context.rb

@@ -97,14 +97,18 @@ module Bake
 		attr :loaders
 		
 		def call(*commands)
+			last_result = nil
+			
 			while command = commands.shift
 				if recipe = @recipes[command]
 					arguments, options = recipe.prepare(commands)
-					recipe.call(*arguments, **options)
+					last_result = recipe.call(*arguments, **options)
 				else
 					raise ArgumentError, "Could not find recipe for #{command}!"
 				end
 			end
+			
+			return last_result
 		end
 		
 		def lookup(command)

data/lib/bake/recipe.rb

@@ -18,13 +18,18 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require_relative 'types'
+
 module Bake
+	PARAMETER = /@param\s+(?<name>.*?)\s+\[(?<type>.*?)\]\s+(?<details>.*?)\Z/
+	
 	class Recipe
 		def initialize(scope, name, method = nil)
 			@scope = scope
 			@name = name
 			@command = nil
 			@description = nil
+			@types = nil
 			
 			@method = method
 			@arity = nil
@@ -55,7 +60,7 @@ module Bake
 		
 		def options?
 			if parameters = self.parameters
-				type, name = self.parameters.last
+				type, name = parameters.last
 				
 				return type == :keyrest || type == :keyreq || type == :key
 			end
@@ -81,6 +86,8 @@ module Bake
 			offset = 0
 			ordered = []
 			options = {}
+			parameters = method.parameters.dup
+			types = self.types
 			
 			while argument = arguments.first
 				name, value = argument.split('=', 2)
@@ -89,10 +96,21 @@ module Bake
 					# Consume it:
 					arguments.shift
 					
+					if type = types[name]
+						value = types.parse(value)
+					end
+					
 					options[name.to_sym] = value
 				elsif ordered.size < self.arity
+					_, name = parameters.shift
+					value = arguments.shift
+					
+					if type = types[name]
+						value = type.parse(value)
+					end
+					
 					# Consume it:
-					ordered << arguments.shift
+					ordered << value
 				else
 					break
 				end
@@ -122,6 +140,10 @@ module Bake
 			@description ||= read_description
 		end
 		
+		def types
+			@types ||= read_types
+		end
+		
 		private
 		
 		def compute_command
@@ -163,5 +185,17 @@ module Bake
 			
 			return description
 		end
+		
+		def read_types
+			types = {}
+			
+			description.each do |description|
+				if fields = PARAMETER.match(description)
+					types[fields[:name].to_sym] = Types.parse(fields[:type])
+				end
+			end
+			
+			return types
+		end
 	end
 end

data/lib/bake/types.rb

@@ -0,0 +1,37 @@
+# Copyright, 2020, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'types/any'
+require_relative 'types/array'
+require_relative 'types/decimal'
+require_relative 'types/float'
+require_relative 'types/hash'
+require_relative 'types/integer'
+require_relative 'types/string'
+require_relative 'types/symbol'
+require_relative 'types/tuple'
+
+module Bake
+	module Types
+		def self.parse(signature)
+			eval(signature, binding)
+		end
+	end
+end

data/lib/bake/types/any.rb

@@ -0,0 +1,53 @@
+# Copyright, 2020, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module Bake
+	module Types
+		class Any
+			def initialize(types)
+				@types = types
+			end
+			
+			def composite?
+				@types.any?{|type| type.composite?}
+			end
+			
+			def parse(input)
+				@types.each do |type|
+					return type.parse(input)
+				rescue
+					# Ignore
+				end
+			end
+			
+			def self.parse(value)
+				value
+			end
+			
+			def to_s
+				"any of #{@types.join(', ')}"
+			end
+		end
+		
+		def self.Any(types)
+			Any.new(types)
+		end
+	end
+end

data/lib/bake/types/array.rb

@@ -0,0 +1,47 @@
+# Copyright, 2020, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'any'
+
+module Bake
+	module Types
+		class Array
+			def initialize(item_type)
+				@item_type = item_type
+			end
+			
+			def composite?
+				true
+			end
+			
+			def parse(input)
+				input.split(',').map{|value| @item_type.parse(value)}
+			end
+			
+			def to_s
+				"an Array of #{@item_type}"
+			end
+		end
+		
+		def self.Array(item_type = Any)
+			Array.new(item_type)
+		end
+	end
+end

data/lib/bake/types/decimal.rb

@@ -0,0 +1,35 @@
+# Copyright, 2020, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'bigdecimal'
+
+module Bake
+	module Types
+		module Decimal
+			def self.composite?
+				false
+			end
+			
+			def self.parse(value)
+				value.to_d
+			end
+		end
+	end
+end

data/lib/bake/types/float.rb

@@ -0,0 +1,33 @@
+# Copyright, 2020, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module Bake
+	module Types
+		module Integer
+			def self.composite?
+				false
+			end
+			
+			def self.parse(value)
+				value.to_f
+			end
+		end
+	end
+end

data/lib/bake/types/hash.rb

@@ -0,0 +1,53 @@
+# Copyright, 2020, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module Bake
+	module Types
+		class Hash
+			def initialize(key_type, value_type)
+				@key_type = key_type
+				@value_type = value_type
+			end
+			
+			def composite?
+				true
+			end
+			
+			def parse(input)
+				hash = {}
+				
+				input.split(',').each do |pair|
+					key, value = pair.split(':', 2)
+					
+					key = @key_type.parse(key)
+					value = @value_type.parse(value)
+						
+					hash[key] = value
+				end
+				
+				return hash
+			end
+		end
+		
+		def self.Hash(key_type, value_type)
+			Hash.new(key_type, value_type)
+		end
+	end
+end

data/lib/bake/types/integer.rb

@@ -0,0 +1,33 @@
+# Copyright, 2020, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module Bake
+	module Types
+		module Integer
+			def self.composite?
+				false
+			end
+			
+			def self.parse(value)
+				value.to_i
+			end
+		end
+	end
+end

data/lib/bake/types/string.rb

@@ -0,0 +1,33 @@
+# Copyright, 2020, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module Bake
+	module Types
+		module String
+			def self.composite?
+				false
+			end
+			
+			def self.parse(value)
+				value.to_s
+			end
+		end
+	end
+end

data/lib/bake/types/symbol.rb

@@ -0,0 +1,33 @@
+# Copyright, 2020, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module Bake
+	module Types
+		module Symbol
+			def self.composite?
+				false
+			end
+			
+			def self.parse(input)
+				input.to_sym
+			end
+		end
+	end
+end

data/lib/bake/types/tuple.rb

@@ -0,0 +1,45 @@
+# Copyright, 2020, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module Bake
+	module Types
+		class Tuple
+			def initialize(item_types)
+				@item_types = item_types
+			end
+			
+			def composite?
+				true
+			end
+			
+			def parse(input)
+				input.split(',').map{|value| @item_type.parse(value)}
+			end
+			
+			def to_s
+				"a Tuple of (#{@item_types.join(', ')})"
+			end
+		end
+		
+		def self.Tuple(*item_types)
+			Tuple.new(item_types)
+		end
+	end
+end

data/lib/bake/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Bake
-	VERSION = "0.4.4"
+	VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: samovar
@@ -109,6 +109,16 @@ files:
 - lib/bake/loaders.rb
 - lib/bake/recipe.rb
 - lib/bake/scope.rb
+- lib/bake/types.rb
+- lib/bake/types/any.rb
+- lib/bake/types/array.rb
+- lib/bake/types/decimal.rb
+- lib/bake/types/float.rb
+- lib/bake/types/hash.rb
+- lib/bake/types/integer.rb
+- lib/bake/types/string.rb
+- lib/bake/types/symbol.rb
+- lib/bake/types/tuple.rb
 - lib/bake/version.rb
 homepage: https://github.com/ioquatix/bake
 licenses:
@@ -130,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A replacement for rake with a simpler syntax.