bake 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a957f57bf8396c2e06cb82745bf11c87ac287097c77b28500dc14a0abd9accf5
-  data.tar.gz: a4292acbdecb68e4d77b926c01347f09564b59db01d88e8705696ad5d2baab92
+  metadata.gz: 190cf7469e9cbb8f4db68447334aa9797050e06da5b351755b6d8580e70a8b71
+  data.tar.gz: b0ccbec0d89acf14fdd81a503736d0a66242deb4a18f07601c2bcf92fb25c4a6
 SHA512:
-  metadata.gz: 3f1af90dd73b4f104f09d8594ff3a36a84ddfbe24038c84207a3e714d850cae0b9d719bb6fc6875ede1cf3908f4b26ab02ec1562ae518e3dd2ab7fed1f0a9c2c
-  data.tar.gz: d1639bd8ca01c56450406055f51a22a70d46bffc8b999a04ea35e80180ed672a6ae7ab5bc37046359c563c1989e5a82aa04932521ad1b4f4ca119d8a8ad63883
+  metadata.gz: 78493f41f9267d11ff32e5280fff448fdd0541f6527d2cf59059f2650ca60c3e1436f40388721c2e9d3263b8ada72b5f2b49fd30cc36853723208c7c93e88506
+  data.tar.gz: d922e66e49de98e5c01f5504f42e80064e435ffe9f357b4d900a8dbe6d4d942be9dc2d661b0a8d5c54e84ef73e42288aaf3fce4843916b11aef2fd4dd1344dfc

data/lib/bake/command/call.rb

@@ -33,29 +33,11 @@ module Bake
 				@parent.bakefile
 			end
 			
-			def update_working_directory
-				if bakefile = self.bakefile
-					current_directory = Dir.pwd
-					working_directory = File.dirname(bakefile)
-					
-					if working_directory != current_directory
-						Console.logger.debug(self) {"Changing working directory to #{working_directory.inspect}."}
-						Dir.chdir(working_directory)
-						
-						return current_directory
-					end
-				end
-				
-				return nil
-			end
-			
 			many :commands, "The commands & arguments to invoke.", default: ["default"]
 			
 			def call
 				context = @parent.context
 				
-				self.update_working_directory
-				
 				context.call(*@commands)
 			end
 		end

data/lib/bake/command/list.rb

@@ -24,6 +24,8 @@ require 'set'
 module Bake
 	module Command
 		class List < Samovar::Command
+			PARAMETER = /@param\s+(?<name>.*?)\s+\[(?<type>.*?)\]\s+(?<details>.*?)\Z/
+			
 			def format_parameters(parameters, terminal)
 				parameters.each do |type, name|
 					case type
@@ -53,16 +55,22 @@ module Bake
 			def print_scope(terminal, scope)
 				format_recipe = self.method(:format_recipe).curry
 				
-				scope.recipes do |recipe|
+				scope.recipes.sort_by(&:command).each do |recipe|
 					terminal.print_line
 					terminal.print_line("\t", format_recipe[recipe])
 					
 					recipe.description.each do |line|
-						terminal.print_line("\t\t", :description, line)
+						if match = line.match(PARAMETER)
+							terminal.print_line("\t\t",
+								:parameter, match[:name], :reset, " [",
+								:type, match[:type], :reset, "] ",
+								:description, match[:details]
+							)
+						else
+							terminal.print_line("\t\t", :description, line)
+						end
 					end
 				end
-				
-				terminal.print_line
 			end
 			
 			def call
@@ -70,7 +78,9 @@ module Bake
 				terminal = @parent.terminal
 				context = @parent.context
 				
-				print_scope(terminal, context.scope)
+				if scope = context.scope
+					print_scope(terminal, context.scope)
+				end
 				
 				context.loaders.each do |loader|
 					terminal.print_line(:loader, loader)

data/lib/bake/command/top.rb

@@ -29,27 +29,9 @@ module Bake
 		class Top < Samovar::Command
 			self.description = "Execute tasks using Ruby."
 			
-			def self.bakefile_path(current = Dir.pwd)
-				while current
-					bakefile_path = File.join(current, "bake.rb")
-					
-					if File.exist?(bakefile_path)
-						return bakefile_path
-					end
-					
-					parent = File.dirname(current)
-					
-					if current == parent
-						break
-					else
-						current = parent
-					end
-				end
-			end
-			
 			options do
 				option '-h/--help', 'Show help.'
-				option '-b/--bakefile <path>', 'Path to the bakefile to use.', default: Top.bakefile_path
+				option '-b/--bakefile <path>', 'Override the path to the bakefile to use.'
 			end
 			
 			nested :command, {
@@ -69,29 +51,17 @@ module Bake
 				terminal[:keyreq] = terminal.style(:red, nil, :bold)
 				terminal[:keyrest] = terminal.style(:green)
 				
+				terminal[:parameter] = terminal[:opt]
+				
 				return terminal
 			end
 			
 			def bakefile
-				@options[:bakefile]
-			end
-			
-			def working_directory
-				if bakefile = self.bakefile
-					File.dirname(self.bakefile)
-				else
-					Dir.pwd
-				end
+				@options[:bakefile] || Dir.pwd
 			end
 			
 			def context
-				if bakefile = self.bakefile
-					return Context.load(self.bakefile)
-				else
-					raise "Cannot find `bake.rb` file."
-				end
-				
-				return context
+				Context.load(self.bakefile)
 			end
 			
 			def call

data/lib/bake/context.rb

@@ -21,36 +21,71 @@
 require_relative 'base'
 
 module Bake
+	BAKEFILE = "bake.rb"
+	
 	class Context
-		def self.load(file_path, loaders = nil)
-			scope = Scope.load(file_path)
+		# If path points to a file, assume it's a `bake.rb` file. Otherwise, recursively search up the directory tree starting from `path` to find the specified bakefile.
+		# @return [String, nil] the path to the bakefile if it could be found.
+		def self.bakefile_path(path, bakefile: BAKEFILE)
+			if File.file?(path)
+				return path
+			end
+			
+			current = path
 			
-			unless loaders
-				if scope.respond_to?(:loaders)
-					loaders = scope.loaders
+			while current
+				bakefile_path = File.join(current, BAKEFILE)
+				
+				if File.exist?(bakefile_path)
+					return bakefile_path
+				end
+				
+				parent = File.dirname(current)
+				
+				if current == parent
+					break
 				else
-					working_directory = File.dirname(file_path)
-					loaders = Loaders.default(working_directory)
+					current = parent
 				end
 			end
 			
-			self.new(scope, loaders)
+			return nil
 		end
 		
-		def initialize(scope, loaders, **options)
-			base = Base.derive
-			base.prepend(scope)
+		def self.load(path)
+			if bakefile_path = self.bakefile_path(path)
+				scope = Scope.load(bakefile_path)
+				
+				working_directory = File.dirname(bakefile_path)
+				loaders = Loaders.default(working_directory)
+			else
+				scope = nil
+				
+				working_directory = path
+				loaders = Loaders.default(working_directory)
+			end
 			
+			return self.new(loaders, scope, working_directory)
+		end
+		
+		def initialize(loaders, scope = nil, root = nil)
 			@loaders = loaders
 			
 			@stack = []
 			
-			@scopes = Hash.new do |hash, key|
-				hash[key] = scope_for(key)
+			@instances = Hash.new do |hash, key|
+				hash[key] = instance_for(key)
 			end
 			
-			@scope = base.new(self)
-			@scopes[[]] = @scope
+			@scope = scope
+			@root = root
+			
+			if @scope
+				base = Base.derive
+				base.prepend(@scope)
+				
+				@instances[[]] = base.new(self)
+			end
 			
 			@recipes = Hash.new do |hash, key|
 				hash[key] = recipe_for(key)
@@ -58,6 +93,7 @@ module Bake
 		end
 		
 		attr :scope
+		attr :root
 		attr :loaders
 		
 		def call(*commands)
@@ -80,20 +116,20 @@ module Bake
 		def recipe_for(command)
 			path = command.split(":")
 			
-			if scope = @scopes[path]
-				return scope.recipe_for(path.last)
+			if instance = @instances[path]
+				return instance.recipe_for(path.last)
 			else
 				*path, name = *path
 				
-				if scope = @scopes[path]
-					return scope.recipe_for(name)
+				if instance = @instances[path]
+					return instance.recipe_for(name)
 				end
 			end
 			
 			return nil
 		end
 		
-		def scope_for(path)
+		def instance_for(path)
 			if base = base_for(path)
 				return base.new(self)
 			end
@@ -113,13 +149,5 @@ module Bake
 			
 			return base
 		end
-		
-		def with!(scope)
-			@stack << scope
-			
-			yield
-		ensure
-			@scope.pop
-		end
 	end
 end

data/lib/bake/recipe.rb

@@ -23,6 +23,7 @@ module Bake
 		def initialize(scope, name, method = nil)
 			@scope = scope
 			@name = name
+			@command = nil
 			@description = nil
 			
 			@method = method
@@ -52,15 +53,7 @@ module Bake
 		end
 		
 		def command
-			path = @scope.path
-			
-			if path.empty?
-				@name.to_s
-			elsif path.last.to_sym == @name
-				path.join(':')
-			else
-				(path + [@name]).join(':')
-			end
+			@command ||= compute_command
 		end
 		
 		def to_s
@@ -118,6 +111,18 @@ module Bake
 		
 		private
 		
+		def compute_command
+			path = @scope.path
+			
+			if path.empty?
+				@name.to_s
+			elsif path.last.to_sym == @name
+				path.join(':')
+			else
+				(path + [@name]).join(':')
+			end
+		end
+		
 		def read_description
 			file, line_number = self.method.source_location
 			

data/lib/bake/scope.rb

@@ -43,6 +43,8 @@ module Bake
 		end
 		
 		def recipes
+			return to_enum(:recipes) unless block_given?
+			
 			names = self.instance_methods
 			
 			names.each do |name|

data/lib/bake/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Bake
-	VERSION = "0.3.0"
+	VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-16 00:00:00.000000000 Z
+date: 2020-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: samovar