bake 0.17.0 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10135085caa64994c79251726699d674223c0e4441d937cc548f56893b8ba331
-  data.tar.gz: ca1a86f96716c5a7e1827b49b3eefd06164295f0ab5621b007d5bd727bbba76a
+  metadata.gz: a3bcf5cd8672eaa2a698d0df26ac16b853d574ff386f2134e2540b6a601cfaa1
+  data.tar.gz: d06efeba9bd097c2f5bad7adf529a970a8fe9e010540a6b1d8449d1d3897b005
 SHA512:
-  metadata.gz: d3db37001328e050c50adb89d6d2cd7e0cdef54f3b54ae2225d676b05e7ff735be19ba2056912e571ce5185f7a7336e334809b66c5312da1e0dbd798b4d87b3a
-  data.tar.gz: feb7ea189a4841a2b08ab43aa4a683ada9b19bb5fe8a189ba888b945bc8e1c85501e564030b883cf28eb24d9348e1fdbbf93a605ea1111245f29e4bb5469109d
+  metadata.gz: 8fa7311b0fd77dc5388801f2aeca08395ad9499df10008b087b1bbc172ec131cf57827aceb19dff1d1365d4cbce58975f9cb9addbed830971546297e35411e41
+  data.tar.gz: 7ca9417bfb9d2659113c517e4f8ef530bd4fd7d54617e6ea1931694ab2b036dba4d18f092d3403a6cd76ea930b67cc0dc2112c8058cc947bcd67a7f240d27356

data/bake/input.rb

@@ -0,0 +1,47 @@
+
+FORMATS = {
+	json: ->(file){require 'json'; JSON.parse(file.read)},
+	yaml: ->(file){require 'yaml'; YAML.load(file.read)},
+}
+
+# Parse an input file (defaulting to stdin) in the specified format. The format can be extracted from the file extension if left unspecified.
+# @parameter file [Input] The input file.
+# @parameter format [Symbol] The input format, e.g. json, yaml.
+def input(file: $stdin, format: nil)
+	if format = format_for(file, format)
+		format.call(file)
+	else
+		raise "Unable to determine input format of #{file}!"
+	end
+end
+
+# Parse some input text in the specified format (defaulting to JSON).
+# @parameter text [String] The input text.
+# @parameter format [Symbol] The input format, e.g. json, yaml.
+def parse(text, format: :json)
+	file = StringIO.new(text)
+	
+	if format = format_for(nil, format)
+		format.call(file)
+	else
+		raise "Unable to determine input format!"
+	end
+end
+
+private
+
+def format_for(file, name)
+	if file.respond_to?(:path) and path = file.path
+		name ||= file_type(path)
+	end
+	
+	FORMATS[name]
+end
+
+def file_type(path)
+	if extension = File.extname(path)
+		extension.sub!(/\A\./, '')
+		return if extension.empty?
+		return extension.to_sym
+	end
+end

data/bake/output.rb

@@ -0,0 +1,42 @@
+
+FORMATS = {
+	json: ->(file, value){require 'json'; file.puts(JSON.pretty_generate(value))},
+	pp: ->(file, value){require 'pp'; PP.pp(value, file)},
+	raw: ->(file, value){file.puts(value)},
+	yaml: ->(file, value){require 'yaml'; file.puts(YAML.dump(value))},
+}
+
+# Dump the last result to the specified file (defaulting to stdout) in the specified format (defaulting to Ruby's pretty print).
+# @parameter file [Output] The input file.
+# @parameter format [Symbol] The output format.
+def output(input:, file: $stdout, format: nil)
+	if format = format_for(file, format)
+		format.call(file, input)
+	else
+		raise "Unable to determine output format!"
+	end
+	
+	# Allow chaining of output processing:
+	return input
+end
+
+private
+
+def format_for(file, name)
+	if file.respond_to?(:path) and path = file.path
+		name ||= file_type(path)
+	end
+	
+	# Default to pretty print:
+	name ||= :pp
+	
+	FORMATS[name]
+end
+
+def file_type(path)
+	if extension = File.extname(path)
+		extension.sub!(/\A\./, '')
+		return if extension.empty?
+		return extension.to_sym
+	end
+end

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/documentation.rb

@@ -81,7 +81,7 @@ module Bake
 			end
 		end
 		
-		PARAMETER = /\A\s*@param(eter)?\s+(?<name>.*?)\s+\[(?<type>.*?)\](\s+(?<details>.*?))?\z/
+		PARAMETER = /\A@param(eter)?\s+(?<name>.*?)\s+\[(?<type>.*?)\](\s+(?<details>.*?))?\z/
 		
 		# The parameter lines of the comment block.
 		# e.g. `@parameter value [String] The value.`

data/lib/bake/loaders.rb

@@ -83,6 +83,8 @@ module Bake
 		# @parameter current [String] The path to start searching from.
 		def append_from_root(current = Dir.pwd, **options)
 			while current
+				Console.logger.debug(self) {"Checking current #{current}..."}
+				
 				append_path(current, **options)
 				
 				parent = File.dirname(current)

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.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bake
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.2
 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
@@ -102,6 +102,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bake/input.rb
+- bake/output.rb
 - bin/bake
 - lib/bake.rb
 - lib/bake/arguments.rb
@@ -151,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A replacement for rake with a simpler syntax.