bake 0.14.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b596d8fcdd2daa879fedc00f65aac1696b04b40ab1a727d7617566411557c730
-  data.tar.gz: 8281d5f3337188820811cb3ecf4a4b735fb517e90222c8a2c82e0fb3ce8d59de
+  metadata.gz: e9aacfa1d30a7a1c8c888d399ea3d24c9f8039b5a58d3c6e6444be9bdaa39910
+  data.tar.gz: e3b8d501ac13f9346d1bf07fcee7314bde74eeccd9bb7cfe119819913dd568da
 SHA512:
-  metadata.gz: 9419bc5577aa2765bd15232d5bd2340b6b92584f795480d874800b4d163b25623a96291fbfa853317079e7de0e481b8b960bf5ecae0cd653c6743369a4f8fdda
-  data.tar.gz: 96b4996147f6c8a3fe4408c8027f2a407d431de472445a1739e096d08353117ced32bf02e9a07470f50248011d7fc506f20bb5e886e26dc6a0ab4b09efb0f5cd
+  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/command/call.rb

@@ -34,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/recipe.rb

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 require_relative 'types'
+require_relative 'arguments'
 require_relative 'documentation'
 
 module Bake
@@ -105,40 +106,7 @@ module Bake
 		# @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.
@@ -171,6 +139,19 @@ module Bake
 		
 		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/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/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.14.2"
+	VERSION = "0.15.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: samovar
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - bin/bake
 - lib/bake.rb
+- lib/bake/arguments.rb
 - lib/bake/base.rb
 - lib/bake/command.rb
 - lib/bake/command/call.rb