bake 0.12.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5451e66cf2062b167b8b9983bb0308612b6234de8f99af360ddb1098e74d973e
-  data.tar.gz: feb9f86818d18175eab079b7875c3b3810d1017dcb82f717aaab2f02d04d44ed
+  metadata.gz: e9aacfa1d30a7a1c8c888d399ea3d24c9f8039b5a58d3c6e6444be9bdaa39910
+  data.tar.gz: e3b8d501ac13f9346d1bf07fcee7314bde74eeccd9bb7cfe119819913dd568da
 SHA512:
-  metadata.gz: 6043f4715eafdb780fea3c09ad50fe262d3e2a80234c4c76884b887bf0460e96f652bca576f5f5215d1d0aada420f33a0c8894fbc45ef2b10e716a075890e97c
-  data.tar.gz: dd58f182d931c1844d5b50794e55d0dd4ec5933fa201e2206adb6abf879b2aff19ab6030c0b2035186e748d5ef1070c34c518573d5fc3c4b7c8f679687ffe5af
+  metadata.gz: dc423bf25a37828f28fe9a508976d54c6913223e1507b46ae19e9ffd5e8d9a8254a37bc174e9025425acdc3b847d1929389bc799c5154801e28d96b4e8d8e352
+  data.tar.gz: 816410e988ba73a4f6ca130ab27cce179ea18d791ed8811e20ebad9e036f5a486c9a1f3e8122d057e3f253c5700ef1ed6bfc502a0bbbf1a5e77d24a00156581a

data/lib/bake/arguments.rb

@@ -0,0 +1,120 @@
+# 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'
+require_relative 'documentation'
+
+module Bake
+	# Structured access to arguments.
+	class Arguments
+		def self.extract(recipe, arguments)
+			self.new(recipe).extract(arguments)
+		end
+		
+		def initialize(recipe)
+			@recipe = recipe
+			
+			@types = recipe.types
+			@parameters = recipe.parameters
+			@arity = recipe.arity
+			
+			@ordered = []
+			@options = {}
+		end
+		
+		attr :ordered
+		attr :options
+		
+		def extract(arguments)
+			while argument = arguments.first
+				if /^--(?<name>.*)$/ =~ argument
+					# Consume the argument:
+					arguments.shift
+					
+					if name.empty?
+						break
+					end
+					
+					name = name.to_sym
+					
+					# Extract the trailing arguments:
+					@options[name] = extract_arguments(name, arguments)
+				elsif /^(?<name>.*?)=(?<value>.*)$/ =~ argument
+					# Consume the argument:
+					arguments.shift
+					
+					name = name.to_sym
+					
+					# Extract the single argument:
+					@options[name] = extract_argument(name, value)
+				elsif @ordered.size < @arity
+					_, name = @parameters.shift
+					value = arguments.shift
+					
+					# Consume it:
+					@ordered << extract_argument(name, value)
+				else
+					break
+				end
+			end
+			
+			return @ordered, @options
+		end
+		
+		private
+		
+		def delimiter_index(arguments)
+			arguments.index{|argument| argument =~ /\A(--|;\z)/}
+		end
+		
+		def extract_arguments(name, arguments)
+			value = nil
+			type = @types[name]
+			
+			# Can this named parameter accept more than one input argument?
+			if type&.composite?
+				if count = delimiter_index(arguments)
+					value = arguments.shift(count)
+					arguments.shift if arguments.first == ';'
+				else
+					value = arguments.dup
+					arguments.clear
+				end
+			else
+				# Otherwise we just take one item:
+				value = arguments.shift
+			end
+			
+			if type
+				value = type.parse(value)
+			end
+			
+			return value
+		end
+		
+		def extract_argument(name, value)
+			if type = @types[name]
+				value = type.parse(value)
+			end
+			
+			return value
+		end
+	end
+end

data/lib/bake/base.rb

@@ -22,7 +22,10 @@ require_relative 'recipe'
 require_relative 'scope'
 
 module Bake
+	# The base class for including {Scope} instances which define {Recipe} instances.
 	class Base < Struct.new(:context)
+		# Generate a base class for the specified path.
+		# @parameter path [Array(String)] The command path.
 		def self.derive(path = [])
 			klass = Class.new(self)
 			
@@ -31,6 +34,8 @@ module Bake
 			return klass
 		end
 		
+		# Format the class as a command.
+		# @returns [String]
 		def self.to_s
 			if path = self.path
 				path.join(':')
@@ -47,20 +52,31 @@ module Bake
 			end
 		end
 		
+		# The path of this derived base class.
+		# @returns [Array(String)]
 		def self.path
 			self.const_get(:PATH)
 		rescue
 			nil
 		end
 		
+		# The path for this derived base class.
+		# @returns [Array(String)]
 		def path
 			self.class.path
 		end
 		
+		# Proxy a method call using command line arguments through to the {Context} instance.
+		# @parameter arguments [Array(String)]
 		def call(*arguments)
 			self.context.call(*arguments)
 		end
 		
+		# Recipes defined in this scope.
+		#
+		# @yields {|recipe| ...}
+		# 	@parameter recipe [Recipe]
+		# @returns [Enumerable]
 		def recipes
 			return to_enum(:recipes) unless block_given?
 			
@@ -71,6 +87,9 @@ module Bake
 			end
 		end
 		
+		# Look up a recipe with a specific name.
+		#
+		# @parameter name [String] The instance method to look up.
 		def recipe_for(name)
 			Recipe.new(self, name)
 		end

data/lib/bake/command.rb

@@ -21,6 +21,7 @@
 require_relative 'command/top'
 
 module Bake
+	# The command line interface.
 	module Command
 		def self.call(*arguments)
 			Top.call(*arguments)

data/lib/bake/command/call.rb

@@ -26,6 +26,7 @@ require_relative '../context'
 
 module Bake
 	module Command
+		# Execute one or more commands.
 		class Call < Samovar::Command
 			self.description = "Execute one or more commands."
 			
@@ -33,7 +34,7 @@ module Bake
 				@parent.bakefile
 			end
 			
-			many :commands, "The commands & arguments to invoke.", default: ["default"]
+			many :commands, "The commands & arguments to invoke.", default: ["default"], stop: false
 			
 			def call
 				context = @parent.context

data/lib/bake/command/list.rb

@@ -23,7 +23,10 @@ require 'set'
 
 module Bake
 	module Command
+		# List all available commands.
 		class List < Samovar::Command
+			self.description = "List all available commands."
+			
 			one :pattern, "The pattern to filter tasks by."
 			
 			def format_parameters(parameters, terminal)

data/lib/bake/command/top.rb

@@ -26,6 +26,7 @@ require_relative 'list'
 
 module Bake
 	module Command
+		# The top level command line application.
 		class Top < Samovar::Command
 			self.description = "Execute tasks using Ruby."
 			
@@ -56,12 +57,12 @@ module Bake
 				return terminal
 			end
 			
-			def bakefile
+			def bakefile_path
 				@options[:bakefile] || Dir.pwd
 			end
 			
 			def context
-				Context.load(self.bakefile)
+				Context.load(self.bakefile_path)
 			end
 			
 			def call

data/lib/bake/context.rb

@@ -21,11 +21,14 @@
 require_relative 'base'
 
 module Bake
+	# The default file name for the top level bakefile.
 	BAKEFILE = "bake.rb"
 	
+	# Represents a context of task execution, containing all relevant state.
 	class Context
+		# Search upwards from the specified path for a {BAKEFILE}.
 		# If path points to a file, assume it's a `bake.rb` file. Otherwise, recursively search up the directory tree starting from `path` to find the specified bakefile.
-		# @return [String, nil] the path to the bakefile if it could be found.
+		# @returns [String | Nil] The path to the bakefile if it could be found.
 		def self.bakefile_path(path, bakefile: BAKEFILE)
 			if File.file?(path)
 				return path
@@ -52,6 +55,8 @@ module Bake
 			return nil
 		end
 		
+		# Load a context from the specified path.
+		# @path [String] A file-system path.
 		def self.load(path = Dir.pwd)
 			if bakefile_path = self.bakefile_path(path)
 				scope = Scope.load(bakefile_path)
@@ -68,6 +73,8 @@ module Bake
 			return self.new(loaders, scope, working_directory)
 		end
 		
+		# Initialize the context with the specified loaders.
+		# @parameter loaders [Loaders]
 		def initialize(loaders, scope = nil, root = nil)
 			@loaders = loaders
 			
@@ -92,10 +99,18 @@ module Bake
 			end
 		end
 		
+		# The loaders which will be used to resolve recipes in this context.
+		attr :loaders
+		
+		# The scope for the root {BAKEFILE}.
 		attr :scope
+		
+		# The root path of this context.
+		# @returns [String | Nil]
 		attr :root
-		attr :loaders
 		
+		# Invoke recipes on the context using command line arguments.
+		# @parameter commands [Array(String)]
 		def call(*commands)
 			last_result = nil
 			
@@ -111,6 +126,8 @@ module Bake
 			return last_result
 		end
 		
+		# Lookup a recipe for the given command name.
+		# @parameter command [String] The command name, e.g. `bundler:release`.
 		def lookup(command)
 			@recipes[command]
 		end
@@ -147,7 +164,7 @@ module Bake
 			end
 		end
 		
-		# @param path [Array<String>] the path for the scope.
+		# @parameter path [Array<String>] the path for the scope.
 		def base_for(path)
 			base = nil
 			

data/lib/bake/documentation.rb

@@ -21,14 +21,22 @@
 require_relative 'scope'
 
 module Bake
+	# Structured access to a set of comment lines.
 	class Documentation
-		
+		# Initialize the documentation with an array of comments.
+		#
+		# @parameter comments [Array(String)] An array of comment lines.
 		def initialize(comments)
 			@comments = comments
 		end
 		
 		DESCRIPTION = /\A\s*([^@\s].*)?\z/
 		
+		# The text-only lines of the comment block.
+		#
+		# @yields {|match| ...}
+		# 	@parameter match [MatchData] The regular expression match for each line of documentation.
+		# @returns [Enumerable] If no block given.
 		def description
 			return to_enum(:description) unless block_given?
 			
@@ -55,6 +63,12 @@ module Bake
 		
 		ATTRIBUTE = /\A\s*@(?<name>.*?)\s+(?<value>.*?)\z/
 		
+		# The attribute lines of the comment block.
+		# e.g. `@returns [String]`.
+		#
+		# @yields {|match| ...}
+		# 	@parameter match [MatchData] The regular expression match with `name` and `value` keys.
+		# @returns [Enumerable] If no block given.
 		def attributes
 			return to_enum(:attributes) unless block_given?
 			
@@ -65,8 +79,14 @@ module Bake
 			end
 		end
 		
-		PARAMETER = /\A\s*@param\s+(?<name>.*?)\s+\[(?<type>.*?)\]\s+(?<details>.*?)\z/
+		PARAMETER = /\A\s*@param(eter)?\s+(?<name>.*?)\s+\[(?<type>.*?)\](\s+(?<details>.*?))?\z/
 		
+		# The parameter lines of the comment block.
+		# e.g. `@parameter value [String] The value.`
+		#
+		# @yields {|match| ...}
+		# 	@parameter match [MatchData] The regular expression match with `name`, `type` and `details` keys.
+		# @returns [Enumerable] If no block given.
 		def parameters
 			return to_enum(:parameters) unless block_given?
 			

data/lib/bake/loader.rb

@@ -21,7 +21,10 @@
 require_relative 'scope'
 
 module Bake
+	# Represents a directory which contains bakefiles.
 	class Loader
+		# Initialize the loader with the specified root path.
+		# @parameter root [String] A file-system path.
 		def initialize(root, name: nil)
 			@root = root
 			@name = name
@@ -31,8 +34,12 @@ module Bake
 			"#{self.class} #{@name || @root}"
 		end
 		
+		# The root path for this loader.
 		attr :root
 		
+		# Enumerate all bakefiles within the loaders root directory.
+		# @yields {|path| ...}
+		# 	@parameter path [String] The Ruby source file path.
 		def each
 			return to_enum unless block_given?
 			
@@ -41,18 +48,8 @@ module Bake
 			end
 		end
 		
-		def recipe_for(path)
-			if book = lookup(path)
-				return book.lookup(path.last)
-			else
-				*path, name = *path
-				
-				if book = lookup(path)
-					return book.lookup(name)
-				end
-			end
-		end
-		
+		# Load the {Scope} for the specified relative path within this loader, if it exists.
+		# @parameter path [Array(String)] A relative path.
 		def scope_for(path)
 			*directory, file = *path
 			

data/lib/bake/loaders.rb

@@ -23,9 +23,12 @@ require 'console'
 require_relative 'loader'
 
 module Bake
+	# Structured access to the working directory and loaded gems for loading bakefiles.
 	class Loaders
 		include Enumerable
 		
+		# Create a loader using the specified working directory.
+		# @parameter working_directory [String]
 		def self.default(working_directory)
 			loaders = self.new
 			
@@ -34,15 +37,20 @@ module Bake
 			return loaders
 		end
 		
+		# Initialize an empty array of loaders.
 		def initialize
 			@roots = {}
 			@ordered = Array.new
 		end
 		
+		# Whether any loaders are defined.
+		# @returns [Boolean]
 		def empty?
 			@ordered.empty?
 		end
 		
+		# Add loaders according to the current working directory and loaded gems.
+		# @parameter working_directory [String]
 		def append_defaults(working_directory)
 			# Load recipes from working directory:
 			self.append_path(working_directory)
@@ -51,32 +59,26 @@ module Bake
 			self.append_from_gems
 		end
 		
+		# Enumerate the loaders in order.
 		def each(&block)
-			return to_enum unless block_given?
-			
 			@ordered.each(&block)
 		end
 		
+		# Append a specific project path to the search path for recipes.
+		# The computed path will have `bake` appended to it.
+		# @parameter current [String] The path to add.
 		def append_path(current = Dir.pwd, **options)
-			recipes_path = File.join(current, "recipes")
 			bake_path = File.join(current, "bake")
 			
 			if File.directory?(bake_path)
 				return insert(bake_path, **options)
 			end
 			
-			if File.directory?(recipes_path)
-				Console.logger.warn(self) do |buffer|
-					buffer.puts "Recipes path: #{recipes_path.inspect} is deprecated."
-					buffer.puts "Please use #{bake_path.inspect} instead."
-				end
-				
-				return insert(recipes_path, **options)
-			end
-			
 			return false
 		end
 		
+		# Search from the current working directory until a suitable bakefile is found and add it.
+		# @parameter current [String] The path to start searching from.
 		def append_from_root(current = Dir.pwd, **options)
 			while current
 				append_path(current, **options)
@@ -91,6 +93,7 @@ module Bake
 			end
 		end
 		
+		# Enumerate all loaded gems and add them.
 		def append_from_gems
 			Gem.loaded_specs.each do |name, spec|
 				Console.logger.debug(self) {"Checking gem #{name}: #{spec.full_gem_path}..."}
@@ -101,12 +104,6 @@ module Bake
 			end
 		end
 		
-		def append_from_paths(paths, **options)
-			paths.each do |path|
-				append_path(path, **options)
-			end
-		end
-		
 		protected
 		
 		def insert(directory, **options)

data/lib/bake/recipe.rb

@@ -19,10 +19,17 @@
 # THE SOFTWARE.
 
 require_relative 'types'
+require_relative 'arguments'
 require_relative 'documentation'
 
 module Bake
+	# Structured access to an instance method in a bakefile.
 	class Recipe
+		# Initialize the recipe.
+		#
+		# @parameter instance [Base] The instance this recipe is attached to.
+		# @parameter name [String] The method name.
+		# @parameter method [Method | Nil] The method if already known.
 		def initialize(instance, name, method = nil)
 			@instance = instance
 			@name = name
@@ -35,21 +42,29 @@ module Bake
 			@arity = nil
 		end
 		
+		# The {Base} instance that this recipe is attached to.
 		attr :instance
+		
+		# The name of this recipe.
 		attr :name
 		
+		# Sort by location in source file.
 		def <=> other
 			self.source_location <=> other.source_location
 		end
 		
+		# The method implementation.
 		def method
 			@method ||= @instance.method(@name)
 		end
 		
+		# The source location of this recipe.
 		def source_location
 			self.method.source_location
 		end
 		
+		# The recipe's formal parameters, if any.
+		# @returns [Array | Nil]
 		def parameters
 			parameters = method.parameters
 			
@@ -58,6 +73,8 @@ module Bake
 			end
 		end
 		
+		# Whether this recipe has optional arguments.
+		# @returns [Boolean]
 		def options?
 			if parameters = self.parameters
 				type, name = parameters.last
@@ -66,6 +83,7 @@ module Bake
 			end
 		end
 		
+		# The command name for this recipe.
 		def command
 			@command ||= compute_command
 		end
@@ -74,6 +92,7 @@ module Bake
 			self.command
 		end
 		
+		# The method's arity, the required number of positional arguments.
 		def arity
 			if @arity.nil?
 				@arity = method.parameters.count{|type, name| type == :req}
@@ -82,43 +101,15 @@ module Bake
 			return @arity
 		end
 		
+		# Process command line arguments into the ordered and optional arguments.
+		# @parameter arguments [Array(String)] The command line arguments
+		# @returns ordered [Array]
+		# @returns options [Hash]
 		def prepare(arguments)
-			offset = 0
-			ordered = []
-			options = {}
-			parameters = method.parameters.dup
-			types = self.types
-			
-			while argument = arguments.first
-				name, value = argument.split('=', 2)
-				
-				if name and value
-					# Consume it:
-					arguments.shift
-					
-					if type = types[name.to_sym]
-						value = type.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 << value
-				else
-					break
-				end
-			end
-			
-			return ordered, options
+			Arguments.extract(self, arguments)
 		end
 		
+		# Call the recipe with the specified arguments and options.
 		def call(*arguments, **options)
 			if options?
 				@instance.send(@name, *arguments, **options)
@@ -128,28 +119,39 @@ module Bake
 			end
 		end
 		
-		def explain(context, *arguments, **options)
-			if options?
-				puts "#{self}(#{arguments.join(", ")}, #{options.inspect})"
-			else
-				puts "#{self}(#{arguments.join(", ")})"
-			end
-		end
-		
+		# Any comments associated with the source code which defined the method.
+		# @returns [Array(String)] The comment lines.
 		def comments
 			@comments ||= read_comments
 		end
 		
+		# The documentation object which provides structured access to the {comments}.
+		# @returns [Documentation]
 		def documentation
 			@documentation ||= Documentation.new(self.comments)
 		end
 		
+		# The documented type signature of the recipe.
+		# @returns [Array] An array of {Types} instances.
 		def types
 			@types ||= read_types
 		end
 		
 		private
 		
+		def parse(name, value, arguments, types)
+			if count = arguments.index(';')
+				value = arguments.shift(count)
+				arguments.shift
+			end
+			
+			if type = types[name]
+				value = type.parse(value)
+			end
+			
+			return value
+		end
+		
 		def compute_command
 			path = @instance.path
 			

data/lib/bake/scope.rb

@@ -21,7 +21,9 @@
 require_relative 'recipe'
 
 module Bake
+	# Used for containing all methods defined in a bakefile.
 	module Scope
+		# Load the specified file into a unique scope module, which can then be included into a {Base} instance.
 		def self.load(file_path, path = [])
 			scope = Module.new
 			scope.extend(self)
@@ -38,10 +40,11 @@ module Bake
 			"Bake::Scope<#{self.const_get(:FILE_PATH)}>"
 		end
 		
-		def recipe(name, **options, &block)
-			define_method(name, &block)
-		end
-		
+		# Recipes defined in this scope.
+		#
+		# @yields {|recipe| ...}
+		# 	@parameter recipe [Recipe]
+		# @returns [Enumerable]
 		def recipes
 			return to_enum(:recipes) unless block_given?
 			
@@ -52,10 +55,14 @@ module Bake
 			end
 		end
 		
+		# The path of the file that was used to {load} this scope.
 		def path
 			self.const_get(:PATH)
 		end
 		
+		# Look up a recipe with a specific name.
+		#
+		# @parameter name [String] The instance method to look up.
 		def recipe_for(name)
 			Recipe.new(self, name, self.instance_method(name))
 		end

data/lib/bake/types/any.rb

@@ -20,43 +20,70 @@
 
 module Bake
 	module Types
-		module Type
-			def | other
-				Any.new([self, other])
-			end
-		end
-		
+		# An ordered list of types. The first type to match the input is used.
+		#
+		#	```ruby
+		#	type = Bake::Types::Any(Bake::Types::String, Bake::Types::Integer)
+		#	```
+		#
 		class Any
+			# Initialize the instance with an array of types.
+			# @parameter types [Array] the array of types.
 			def initialize(types)
 				@types = types
 			end
 			
+			# Create a copy of the current instance with the other type appended.
+			# @parameter other [Type] the type instance to append.
 			def | other
 				self.class.new([*@types, other])
 			end
 			
+			# Whether any of the listed types is a composite type.
+			# @returns [Boolean] true if any of the listed types is `composite?`.
 			def composite?
 				@types.any?{|type| type.composite?}
 			end
 			
+			# Parse an input string, trying the listed types in order, returning the first one which doesn't raise an exception.
+			# @parameter input [String] the input to parse, e.g. `"5"`.
 			def parse(input)
 				@types.each do |type|
 					return type.parse(input)
 				rescue
-					# Ignore
+					# Ignore.
 				end
 			end
 			
+			# As a class type, accepts any value.
 			def self.parse(value)
 				value
 			end
 			
+			# Generate a readable string representation of the listed types.
 			def to_s
 				"any of #{@types.join(', ')}"
 			end
 		end
 		
-		def self.Any(types)
+		# An extension module which allows constructing `Any` types using the `|` operator.
+		module Type
+			# Create an instance of `Any` with the arguments as types.
+			# @parameter other [Type] the alternative type to match.
+			def | other
+				Any.new([self, other])
+			end
+		end
+		
+		# A type constructor.
+		#
+		#	```ruby
+		#	Any(Integer, String)
+		#	```
+		#
+		# See [Any.initialize](#Bake::Types::Any::initialize).
+		#
+		def self.Any(*types)
 			Any.new(types)
 		end
 	end

data/lib/bake/types/array.rb

@@ -33,8 +33,19 @@ module Bake
 				true
 			end
 			
+			def map(values)
+				values.map{|value| @item_type.parse(value)}
+			end
+			
 			def parse(input)
-				input.split(',').map{|value| @item_type.parse(value)}
+				case input
+				when ::String
+					return input.split(',').map{|value| @item_type.parse(value)}
+				when ::Array
+					return input.map{|value| @item_type.parse(value)}
+				else
+					raise ArgumentError, "Cannot coerce #{input.inspect} into array!"
+				end
 			end
 			
 			def to_s

data/lib/bake/types/boolean.rb

@@ -32,6 +32,10 @@ module Bake
 			def self.parse(input)
 				if input =~ /t(rue)?|y(es)?/i
 					return true
+				elsif input =~ /f(alse)?|n(o)?/i
+					return false
+				else
+					raise ArgumentError, "Cannot coerce #{input.inspect} into boolean!"
 				end
 			end
 		end

data/lib/bake/types/nil.rb

@@ -33,7 +33,7 @@ module Bake
 				if input =~ /nil|null/i
 					return nil
 				else
-					raise ArgumentError, "Cannot coerce #{input} into nil!"
+					raise ArgumentError, "Cannot coerce #{input.inspect} into nil!"
 				end
 			end
 		end

data/lib/bake/types/tuple.rb

@@ -34,7 +34,14 @@ module Bake
 			end
 			
 			def parse(input)
-				input.split(',').map{|value| @item_type.parse(value)}
+				case input
+				when ::String
+					return input.split(',').map{|value| @item_type.parse(value)}
+				when ::Array
+					return input.map{|value| @item_type.parse(value)}
+				else
+					raise ArgumentError, "Cannot coerce #{input.inspect} into tuple!"
+				end
 			end
 			
 			def to_s

data/lib/bake/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: samovar
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: bake-bundler
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,38 +66,16 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: 
+description:
 email:
-- samuel.williams@oriontransfer.co.nz
 executables:
 - bake
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/development.yml"
-- ".gitignore"
-- ".rspec"
-- README.md
-- bake.gemspec
-- bake.rb
 - bin/bake
-- example.png
-- gems.rb
 - lib/bake.rb
+- lib/bake/arguments.rb
 - lib/bake/base.rb
 - lib/bake/command.rb
 - lib/bake/command/call.rb
@@ -142,8 +106,8 @@ homepage: https://github.com/ioquatix/bake
 licenses:
 - MIT
 metadata:
-  donation_uri: https://github.com/sponsors/ioquatix
-post_install_message: 
+  funding_uri: https://github.com/sponsors/ioquatix/
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -159,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A replacement for rake with a simpler syntax.
 test_files: []

data/.github/workflows/development.yml

@@ -1,35 +0,0 @@
-name: Development
-
-on: [push]
-
-jobs:
-  test:
-    strategy:
-      matrix:
-        os:
-          - ubuntu
-          - macos
-        
-        ruby:
-          - 2.5
-          - 2.6
-          - 2.7
-        
-        include:
-          - os: 'ubuntu'
-            ruby: '2.6'
-            env: COVERAGE=PartialSummary,Coveralls
-    
-    runs-on: ${{matrix.os}}-latest
-    
-    steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-ruby@v1
-      with:
-        ruby-version: ${{matrix.ruby}}
-    - name: Install dependencies
-      run: |
-        command -v bundler || gem install bundler
-        bundle install
-    - name: Run tests
-      run: ${{matrix.env}} bundle exec rspec

data/.gitignore

@@ -1,13 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-gems.locked
-
-# rspec failure tracking
-.rspec_status

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/README.md

@@ -1,138 +0,0 @@
-# Bake
-
-Bake is a task execution tool, inspired by Rake, but codifying many of the use cases which are typically implemented in an ad-hoc manner.
-
-[![Actions Status](https://github.com/ioquatix/bake/workflows/Development/badge.svg)](https://github.com/ioquatix/bake/actions?workflow=Development)
-
-## Motivation
-
-Rake is an awesome tool and loved by the community. So, why reinvent it? Bake provides the following features that Rake does not:
-
-- On demand loading of files following a standard convention. This avoid loading all your rake tasks just to execute a single command.
-- Better argument handling including support for positional and optional arguments.
-- Focused on task execution not dependency resolution. Implementation is simpler and a bit more predictable.
-- Canonical structure for integration with gems.
-
-That being said, Rake and Bake can exist side by side in the same project.
-
-## Installation
-
-Execute the following in your project:
-
-	bundle add bake
-
-## Usage
-
-Bake follows similar patterns to Rake.
-
-![Example](example.png)
-
-## Bakefile
-
-There is a root level `bake.rb` e.g.:
-
-```ruby
-def cake
-	ingredients = call 'supermarket:shop', 'flour,sugar,cocoa'
-	lookup('mixer:add').call(ingredients)
-end
-```
-
-This file is project specific and is the only file which can expose top level tasks (i.e. without a defined namespace). When used in a gem, these tasks are not exposed to other gems/projects.
-
-## Recipes
-
-Alongside the `bake.rb`, there is a `bake/` directory which contains files like `supermarket.rb`. These files contain recipes, e.g.:
-
-```ruby
-# @param ingredients [Array(Any)] the ingredients to purchase.
-def shop(ingredients)
-	supermarket = Supermarket.best
-	
-	return supermarket.purchase(ingredients)
-end
-```
-
-These methods are automatically scoped according to the file name, e.g. `bake/supermarket.rb` will define `supermarket:shop`.
-
-## Gems
-
-Adding a `bake/` directory to your gem will allow other gems and projects to consume those recipes. In order to prevent collisions, you *should* prefix your commands with the name of the gem, e.g. in `mygem/bake/mygem.rb`:
-
-```ruby
-def setup
-	# ...
-end
-```
-
-Then, in your project `myproject` which depends on `mygem`:
-
-```
-bake mygem:setup
-```
-
-## Arguments
-
-Arguments work as normal. Documented types are used to parse strings from the command line. Both positional and optional parameters are supported.
-
-### Positional Parameters
-
-```ruby
-# @param x [Integer]
-# @param y [Integer]
-def add(x, y)
-	puts x + y
-end
-```
-
-Which is invoked by `bake add 1 2`.
-
-### Optional Parameters
-
-```ruby
-# @param x [Integer]
-# @param y [Integer]
-def add(x:, y:)
-	puts x + y
-end
-```
-
-Which is invoked by `bake add x=1 y=2`.
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-## See Also
-
-- [Console](https://github.com/socketry/console) — A logging framework which integrates with bake.
-- [Variant](https://github.com/socketry/variant) — A framework for selecting different environments, including bake tasks.
-- [Utopia](https://github.com/socketry/utopia) — A website framework which uses bake for maintenance tasks.
-
-## License
-
-Released under the MIT license.
-
-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.

data/bake.gemspec

@@ -1,32 +0,0 @@
-require_relative 'lib/bake/version'
-
-Gem::Specification.new do |spec|
-	spec.name = "bake"
-	spec.version = Bake::VERSION
-	spec.authors = ["Samuel Williams"]
-	spec.email = ["samuel.williams@oriontransfer.co.nz"]
-	
-	spec.summary = "A replacement for rake with a simpler syntax."
-	spec.homepage = "https://github.com/ioquatix/bake"
-	spec.license = "MIT"
-	spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
-	
-	spec.metadata["donation_uri"] = "https://github.com/sponsors/ioquatix"
-	
-	spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-		`git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-	end
-	
-	spec.bindir = "bin"
-	spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-	spec.require_paths = ["lib"]
-	
-	spec.add_dependency 'samovar', '~> 2.1'
-	
-	spec.add_development_dependency 'bake-bundler'
-	
-	spec.add_development_dependency 'covered'
-	spec.add_development_dependency 'bundler'
-	spec.add_development_dependency 'rspec'
-	spec.add_development_dependency 'rake'
-end

data/gems.rb

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in bake.gemspec
-gemspec
-