bake 0.15.2 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47bcbd5bbd0350ae6032bbf639684489b8a28ce5e41956a8a4f2f979c7ac4f3b
-  data.tar.gz: afe8e3084738e450520d2bc82c2ae122be8503b14014f0ad6ed94f72ee70f88f
+  metadata.gz: 10135085caa64994c79251726699d674223c0e4441d937cc548f56893b8ba331
+  data.tar.gz: ca1a86f96716c5a7e1827b49b3eefd06164295f0ab5621b007d5bd727bbba76a
 SHA512:
-  metadata.gz: 5ed9a70c290a1757433b1d8db2cb78103d7790192b2149a4ce89948c66123d9ae35726b3f05665968c71434ab879c15eafd29eb3e77559b4b444a768a586d64b
-  data.tar.gz: fbf2ad74fa227ce1c5be308f0f7c35f8198cae0414f8ca3092eb813de129a31c7c613297af50a65a7676af0d66cefd483249b032bcc6086cf71589301e063694
+  metadata.gz: d3db37001328e050c50adb89d6d2cd7e0cdef54f3b54ae2225d676b05e7ff735be19ba2056912e571ce5185f7a7336e334809b66c5312da1e0dbd798b4d87b3a
+  data.tar.gz: feb7ea189a4841a2b08ab43aa4a683ada9b19bb5fe8a189ba888b945bc8e1c85501e564030b883cf28eb24d9348e1fdbbf93a605ea1111245f29e4bb5469109d

data/lib/bake/arguments.rb

@@ -54,7 +54,7 @@ module Bake
 						break
 					end
 					
-					name = name.to_sym
+					name = normalize(name)
 					
 					# Extract the trailing arguments:
 					@options[name] = extract_arguments(name, arguments)
@@ -82,6 +82,10 @@ module Bake
 		
 		private
 		
+		def normalize(name)
+			name.tr('-', '_').to_sym
+		end
+		
 		def delimiter_index(arguments)
 			arguments.index{|argument| argument =~ /\A(--|;\z)/}
 		end

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

@@ -32,16 +32,37 @@ 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
 			
 			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
 				
-				context.call(*@commands)
+				last_result = context.call(*@commands)
+				
+				if output = @options[:output]
+					format(output, last_result)
+				end
 			end
 		end
 	end

data/lib/bake/command/top.rb

@@ -35,6 +35,10 @@ module Bake
 			options do
 				option '-h/--help', 'Show help.'
 				option '-b/--bakefile <path>', 'Override the path to the bakefile to use.'
+				
+				option '-g/--gem <name>', 'Load the specified gem, e.g. "bake ~> 1.0".' do |value|
+					gem(*value.split(/\s+/))
+				end
 			end
 			
 			nested :command, {

data/lib/bake/context.rb

@@ -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,7 @@ module Bake
 		
 		# Enumerate all loaded gems and add them.
 		def append_from_gems
-			Gem.loaded_specs.each do |name, spec|
+			::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/version.rb

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

data.tar.gz.sig

@@ -0,0 +1,2 @@
+�h��Y�|
+�E��b���0g[.�|���v�k���
�O �i�R�໣S[�j�8N�U#e!�e��Fi��gR��>�꫺xډ�q$��}z����T/�
yR�[o"�|n+r��.;�G��e��E7���-@C�CJl�)׏h��$~�f�q	I��I[e�Y�/�I��GLa�<�-�H�������fy�F�Ґ$Ҫ��4�5��h G�j��
��W݄��w�FA�b�o�F,4%#L���z�:�7�,�	�M��D�ka�4<g4K��#Z�Z���o�S"S�2v���.^�)�%��M�w��s#�\�Wu��[��N���q)A�z�fo�6�i��u�����S�f����Y)E�,�N�^�5�H��G

metadata

@@ -1,14 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: bake
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.17.0
 platform: ruby
 authors:
 - Samuel Williams
+- Olle Jonsson
 autorequire:
 bindir: bin
-cert_chain: []
-date: 2021-06-04 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-21 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.1.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A replacement for rake with a simpler syntax.