bake 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10135085caa64994c79251726699d674223c0e4441d937cc548f56893b8ba331
-  data.tar.gz: ca1a86f96716c5a7e1827b49b3eefd06164295f0ab5621b007d5bd727bbba76a
+  metadata.gz: f661b25836e9a41dd7e626297a8102f5096ba16fc56819f0c1a5ae9ce9e42ed4
+  data.tar.gz: 521eba8cc86affdbdda37a1a8753107e04fb0903a481b0aed031e18c3699e229
 SHA512:
-  metadata.gz: d3db37001328e050c50adb89d6d2cd7e0cdef54f3b54ae2225d676b05e7ff735be19ba2056912e571ce5185f7a7336e334809b66c5312da1e0dbd798b4d87b3a
-  data.tar.gz: feb7ea189a4841a2b08ab43aa4a683ada9b19bb5fe8a189ba888b945bc8e1c85501e564030b883cf28eb24d9348e1fdbbf93a605ea1111245f29e4bb5469109d
+  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/command/call.rb

@@ -32,17 +32,6 @@ module Bake
 		class Call < Samovar::Command
 			self.description = "Execute one or more commands."
 			
-			OUTPUT = {
-				json: ->(value){require 'json'; $stdout.puts(JSON.pretty_generate(value))},
-				pp: ->(value){require 'pp'; PP.pp(value, $stdout)},
-				raw: ->(value){$stdout.puts(value)},
-				yaml: ->(value){require 'yaml'; $stdout.puts(YAML.dump(value))},
-			}
-			
-			options do
-				option "-o/--output <format>", "Output the result of the last task in the given format: #{OUTPUT.keys.join(", ")}.", type: Symbol
-			end
-			
 			def bakefile
 				@parent.bakefile
 			end
@@ -58,11 +47,7 @@ module Bake
 			def call
 				context = @parent.context
 				
-				last_result = context.call(*@commands)
-				
-				if output = @options[:output]
-					format(output, last_result)
-				end
+				context.call(*@commands)
 			end
 		end
 	end

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}!"

data/lib/bake/loaders.rb

@@ -97,6 +97,8 @@ module Bake
 		
 		# Enumerate all loaded gems and add them.
 		def append_from_gems
+			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}..."}
 				

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.17.0"
+	VERSION = "0.18.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bake
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
   HiLJ8VOFx6w=
   -----END CERTIFICATE-----
-date: 2022-05-21 00:00:00.000000000 Z
+date: 2022-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: samovar
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.8
 signing_key:
 specification_version: 4
 summary: A replacement for rake with a simpler syntax.