bake 0.16.1 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9398b0b75e437ea872787489f7fc88c9d41bb82c1d1e5b27d8720f1dcf69b10e
-  data.tar.gz: 6efb23e691587de655204520e348c0d37d0a84fc6242bfbc42d92c8edee25ffa
+  metadata.gz: 45dc14db128a03b0d45937817bbbf8b2d74d1762c5eb09706334113b1bcf2102
+  data.tar.gz: 6ecb1fe731b1440fc73a831d182b00d134d5b8572ac8d37a2f4b7ec188b5af46
 SHA512:
-  metadata.gz: bb01a8f42b358b3b71bdeca12504db247cfef27051841fe99b410c85276d42fb76c3ceb2158df90767b4b58f2ab693fc8ed668b2edfc375df9239a5b2e486143
-  data.tar.gz: 84fd70f0c123d2cb78c3cf66f6eed516011aca117f3663871bbb854995da4cb5e3e3d1a49cccd270684bf8f9c5591aab12db653c796b22825273fd8232078ac7
+  metadata.gz: 75621544ab473d069454794226b840adfb5e670eb3c7ccecd0cc197122b9a3d06e6541d16ab4819ee4037c284eac91da8defd2a45ef747ccfac2e285368f5681
+  data.tar.gz: '068df1863a48a29cacc02d5ad64b98b8f5af0d6c03b82334699894932fa8aee26e258e8bcf27aab3929680b6c46aa01ba24a5512fe161d226eede9d87c73350f'

data/bake/input.rb

@@ -0,0 +1,26 @@
+
+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 (defaulting to JSON).
+# @parameter file [Input] The input file.
+# @parameter format [Symbol] The input format, e.g. json, yaml.
+def input(file: $stdin, format: :json)
+	format_for(format).call(file)
+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)
+	format_for(format).call(file)
+end
+
+private
+
+def format_for(name)
+	FORMATS[name]
+end

data/bake/output.rb

@@ -0,0 +1,24 @@
+
+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 input [Array(Integer)]
+# @parameter file [Output] The input file.
+# @parameter format [Symbol] The output format.
+def output(input:, file: $stdout, format: :pp)
+	format_for(format).call(file, input)
+	
+	# Allow chaining of output processing:
+	return input
+end
+
+private
+
+def format_for(name)
+	FORMATS[name]
+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

@@ -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/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.16.1"
+	VERSION = "0.18.1"
 end

metadata

@@ -1,14 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: bake
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.18.1
 platform: ruby
 authors:
 - Samuel Williams
+- Olle Jonsson
 autorequire:
 bindir: bin
-cert_chain: []
-date: 2021-08-12 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
@@ -73,6 +102,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bake/input.rb
+- bake/output.rb
 - bin/bake
 - lib/bake.rb
 - lib/bake/arguments.rb
@@ -122,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.

metadata.gz.sig

@@ -0,0 +1,2 @@
+F⏧�Z�
+�wS���pl���Jt	g���{,l]�񄖷�����R�%ahy�����]�Aa	� m���y���U�U]W���װĔP5�co{��&k!e�cո��s#���4k[7����H0�&�s#?7��dz%����kSSzy�6�G�H^աn���(!���)��dW�Z�	�+�6�ƛ=Vn,�M�QLϮ�A��˜���=LYN(������c=F־��ⲫo$�}�:�P�|p�@����8A��dQ�D�wO[���	 �_�wπ�1rOG��IQl������T�Ƿ����7UI���3�A���=ww����l�+!�U��W�KJ�+�y����()5}��=�wG����Ia�.