bake 0.16.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 492a3039647b5dfb430f1d22b0c2bc691531e3bd06fa8adbb87f04cf53f06e49
-  data.tar.gz: f9c4aa8b76fc5dec8dd23ca65fa62123e24b37edc5bac909f7e4f3021f4a174f
+  metadata.gz: f661b25836e9a41dd7e626297a8102f5096ba16fc56819f0c1a5ae9ce9e42ed4
+  data.tar.gz: 521eba8cc86affdbdda37a1a8753107e04fb0903a481b0aed031e18c3699e229
 SHA512:
-  metadata.gz: 91146cbe9150339a51041896ac55b27c0d0791b0a1ebb20b6c3b0220c69f651f359d9e0f2f09c04db870f1e2501c773f7a6e25155550e0b3957eea3e8cd54825
-  data.tar.gz: 5df776825366bd19352085a97b5eba5eba6e5c18da9aa24bbe15dc5387789f20cf40836e4f3664c76e0911c458f274c5eccb02502ebb23650b9b97771f1a0e46
+  metadata.gz: 7b7138456ea6b2753a9c78d9f0df5ea3a7b789b6f1d6c75946ee2c896139c87627ad6c0429fc612fb30fd6958c475d670b9b9044dbf72d35a51223598d2c4775
+  data.tar.gz: 593d60a3b0c6cae127a71e8af68c4b4c16088d82b033b307c509f500e219a3716f804dc7df01ed93a762dea54c849b5a0b6206cf009d491c29fbe8bd524d8b4f

data/lib/bake/arguments.rb

@@ -26,11 +26,14 @@ require_relative 'documentation'
 module Bake
 	# Structured access to arguments.
 	class Arguments
-		def self.extract(recipe, arguments)
-			self.new(recipe).extract(arguments)
+		def self.extract(recipe, arguments, **defaults)
+			# Only supply defaults that match the recipe option names:
+			defaults = defaults.slice(*recipe.required_options)
+			
+			self.new(recipe, defaults).extract(arguments)
 		end
 		
-		def initialize(recipe)
+		def initialize(recipe, defaults)
 			@recipe = recipe
 			
 			@types = recipe.types
@@ -38,7 +41,7 @@ module Bake
 			@arity = recipe.arity
 			
 			@ordered = []
-			@options = {}
+			@options = defaults
 		end
 		
 		attr :ordered

data/lib/bake/base.rb

@@ -95,5 +95,9 @@ module Bake
 		def recipe_for(name)
 			Recipe.new(self, name)
 		end
+		
+		def to_s
+			"\#<#{self.class}>"
+		end
 	end
 end

data/lib/bake/command/call.rb

@@ -38,6 +38,12 @@ module Bake
 			
 			many :commands, "The commands & arguments to invoke.", default: ["default"], stop: false
 			
+			def format(output, value)
+				if formatter = OUTPUT[output]
+					formatter.call(value)
+				end
+			end
+			
 			def call
 				context = @parent.context
 				

data/lib/bake/context.rb

@@ -118,7 +118,7 @@ module Bake
 			
 			while command = commands.shift
 				if recipe = @recipes[command]
-					arguments, options = recipe.prepare(commands)
+					arguments, options = recipe.prepare(commands, last_result)
 					last_result = recipe.call(*arguments, **options)
 				else
 					raise ArgumentError, "Could not find recipe for #{command}!"
@@ -170,7 +170,7 @@ module Bake
 			end
 		end
 		
-		# @parameter 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/loaders.rb

@@ -97,7 +97,9 @@ module Bake
 		
 		# Enumerate all loaded gems and add them.
 		def append_from_gems
-			Gem.loaded_specs.each do |name, spec|
+			Console.logger.debug(self) {::Gem.loaded_specs.keys.grep(/bake/)}
+			
+			::Gem.loaded_specs.each do |name, spec|
 				Console.logger.debug(self) {"Checking gem #{name}: #{spec.full_gem_path}..."}
 				
 				if path = spec.full_gem_path and File.directory?(path)

data/lib/bake/recipe.rb

@@ -85,6 +85,16 @@ module Bake
 			end
 		end
 		
+		def required_options
+			if parameters = self.parameters
+				parameters.map do |(type, name)|
+					if type == :keyreq
+						name
+					end
+				end.compact
+			end
+		end
+		
 		# The command name for this recipe.
 		def command
 			@command ||= compute_command
@@ -107,8 +117,8 @@ module Bake
 		# @parameter arguments [Array(String)] The command line arguments
 		# @returns ordered [Array]
 		# @returns options [Hash]
-		def prepare(arguments)
-			Arguments.extract(self, arguments)
+		def prepare(arguments, last_result = nil)
+			Arguments.extract(self, arguments, input: last_result)
 		end
 		
 		# Call the recipe with the specified arguments and options.

data/lib/bake/types/decimal.rb

@@ -33,8 +33,8 @@ module Bake
 				false
 			end
 			
-			def self.parse(value)
-				BigDecimal(value)
+			def self.parse(input)
+				BigDecimal(input)
 			end
 		end
 	end

data/lib/bake/types/float.rb

@@ -31,8 +31,8 @@ module Bake
 				false
 			end
 			
-			def self.parse(value)
-				value.to_f
+			def self.parse(input)
+				input.to_f
 			end
 		end
 	end

data/lib/bake/types/integer.rb

@@ -31,8 +31,8 @@ module Bake
 				false
 			end
 			
-			def self.parse(value)
-				Integer(value)
+			def self.parse(input)
+				Integer(input)
 			end
 		end
 	end

data/lib/bake/types/string.rb

@@ -31,8 +31,8 @@ module Bake
 				false
 			end
 			
-			def self.parse(value)
-				value.to_s
+			def self.parse(input)
+				input.to_s
 			end
 		end
 	end

data/lib/bake/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module Bake
-	VERSION = "0.16.0"
+	VERSION = "0.18.0"
 end

metadata

@@ -1,14 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: bake
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Samuel Williams
+- Olle Jonsson
 autorequire:
 bindir: bin
-cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEhDCCAuygAwIBAgIBATANBgkqhkiG9w0BAQsFADA3MTUwMwYDVQQDDCxzYW11
+  ZWwud2lsbGlhbXMvREM9b3Jpb250cmFuc2Zlci9EQz1jby9EQz1uejAeFw0yMTA4
+  MTYwNjMzNDRaFw0yMjA4MTYwNjMzNDRaMDcxNTAzBgNVBAMMLHNhbXVlbC53aWxs
+  aWFtcy9EQz1vcmlvbnRyYW5zZmVyL0RDPWNvL0RDPW56MIIBojANBgkqhkiG9w0B
+  AQEFAAOCAY8AMIIBigKCAYEAyXLSS/cw+fXJ5e7hi+U/TeChPWeYdwJojDsFY1xr
+  xvtqbTTL8gbLHz5LW3QD2nfwCv3qTlw0qI3Ie7a9VMJMbSvgVEGEfQirqIgJXWMj
+  eNMDgKsMJtC7u/43abRKx7TCURW3iWyR19NRngsJJmaR51yGGGm2Kfsr+JtKKLtL
+  L188Wm3f13KAx7QJU8qyuBnj1/gWem076hzdA7xi1DbrZrch9GCRz62xymJlrJHn
+  9iZEZ7AxrS7vokhMlzSr/XMUihx/8aFKtk+tMLClqxZSmBWIErWdicCGTULXCBNb
+  E/mljo4zEVKhlTWpJklMIhr55ZRrSarKFuW7en0+tpJrfsYiAmXMJNi4XAYJH7uL
+  rgJuJwSaa/dMz+VmUoo7VKtSfCoOI+6v5/z0sK3oT6sG6ZwyI47DBq2XqNC6tnAj
+  w+XmCywiTQrFzMMAvcA7rPI4F0nU1rZId51rOvvfxaONp+wgTi4P8owZLw0/j0m4
+  8C20DYi6EYx4AHDXiLpElWh3AgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8E
+  BAMCBLAwHQYDVR0OBBYEFB6ZaeWKxQjGTI+pmz7cKRmMIywwMC4GA1UdEQQnMCWB
+  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWB
+  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEB
+  CwUAA4IBgQBVoM+pu3dpdUhZM1w051iw5GfiqclAr1Psypf16Tiod/ho//4oAu6T
+  9fj3DPX/acWV9P/FScvqo4Qgv6g4VWO5ZU7z2JmPoTXZtYMunRAmQPFL/gSUc6aK
+  vszMHIyhtyzRc6DnfW2AiVOjMBjaYv8xXZc9bduniRVPrLR4J7ozmGLh4o4uJp7w
+  x9KCFaR8Lvn/r0oJWJOqb/DMAYI83YeN2Dlt3jpwrsmsONrtC5S3gOUle5afSGos
+  bYt5ocnEpKSomR9ZtnCGljds/aeO1Xgpn2r9HHcjwnH346iNrnHmMlC7BtHUFPDg
+  Ts92S47PTOXzwPBDsrFiq3VLbRjHSwf8rpqybQBH9MfzxGGxTaETQYOd6b4e4Ag6
+  y92abGna0bmIEb4+Tx9rQ10Uijh1POzvr/VTH4bbIPy9FbKrRsIQ24qDbNJRtOpE
+  RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
+  HiLJ8VOFx6w=
+  -----END CERTIFICATE-----
+date: 2022-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: samovar
@@ -122,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.8
 signing_key:
 specification_version: 4
 summary: A replacement for rake with a simpler syntax.