teapot 1.3.1 → 2.0.0.pre.rc1

data/lib/teapot/command/status.rb

@@ -0,0 +1,74 @@
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'samovar'
+require 'rugged'
+
+module Teapot
+	module Command
+		class Status < Samovar::Command
+			self.description = "List the git status of the specified package(s)."
+			
+			many :packages, "Limit the listing to only these packages, or all packages if none specified."
+			
+			def only
+				if @packages.any?
+					Set.new(@packages)
+				end
+			end
+			
+			def invoke(parent)
+				context = parent.context
+				logger = parent.logger
+				
+				# Should this somehow consider context.root_package?
+				context.configuration.packages.each do |package|
+					# The root package is the local package for this context:
+					next unless only == nil or only.include?(package.name)
+					
+					repository = Rugged::Repository.new(package.path.to_s)
+					
+					changes = {}
+					repository.status do |file, status|
+						unless status == [:ignored]
+							changes[file] = status
+						end
+					end
+					
+					next if changes.empty?
+					
+					logger.info "Package #{package.name} (from #{package.path}):".bright
+					
+					changes.each do |file, status|
+						if status == [:worktree_new]
+							logger.info "\t#{file}".color(:blue)
+						elsif status == [:worktree_modified]
+							logger.info "\t#{file}".color(:orange)
+						elsif status == [:worktree_deleted]
+							logger.info "\t#{file}".color(:red)
+						else
+							logger.info "\t#{file} #{status.inspect}"
+						end
+					end
+				end
+			end
+		end
+	end
+end

data/lib/teapot/command/visualize.rb

@@ -0,0 +1,70 @@
+# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'samovar'
+require 'graphviz'
+
+module Teapot
+	module Command
+		class Visualize < Samovar::Command
+			self.description = "Generate a picture of the dependency graph."
+			
+			options do
+				option '-o/--output-path <path>', "The output path for the visualization.", default: "dependency.svg"
+				option '-d/--dependency-name <name>', "Show the partial chain for the given named dependency."
+			end
+			
+			many :targets, "Visualize these targets, or use them to help the dependency resolution process."
+			
+			def dependency_names
+				@targets || []
+			end
+			
+			def dependency_name
+				@options[:dependency_name]
+			end
+			
+			def invoke(parent)
+				context = parent.context
+				
+				configuration = context.configuration
+
+				chain = context.dependency_chain(dependency_names, context.configuration)
+
+				if dependency_name
+					provider = context.dependencies[dependency_name]
+					
+					# TODO The visualisation generated isn't quite right. It's introspecting too much from the packages and not reflecting #ordered and #provisions.
+					chain = chain.partial(provider)
+				end
+
+				visualization = ::Build::Dependency::Visualization.new
+
+				graph = visualization.generate(chain)
+
+				if output_path = @options[:output_path]
+					Graphviz::output(graph, :path => output_path)
+				end
+
+				return graph
+			end
+		end
+	end
+end

data/lib/teapot/command.rb

@@ -18,138 +18,31 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'controller'
-require_relative 'controller/build'
-require_relative 'controller/clean'
-require_relative 'controller/create'
-require_relative 'controller/fetch'
-require_relative 'controller/generate'
-require_relative 'controller/list'
-require_relative 'controller/visualize'
-
-require_relative 'repository'
-
-# For IncompatibleTeapotError
-require_relative 'loader'
-
 require 'samovar'
 
-module Teapot
-	module Command
-		class Create < Samovar::Command
-			self.description = "Create a new teapot package using the specified repository."
-			
-			one :project_name, "The name of the new project in title-case, e.g. 'My Project'."
-			one :source, "The source repository to use for fetching packages, e.g. https://github.com/kurocha."
-			many :packages, "Any additional packages you'd like to include in the project."
-			
-			def invoke(parent)
-				project_path = parent.root || project_name.gsub(/\s+/, '-').downcase
-				root = ::Build::Files::Path.expand(project_path)
-				
-				if root.exist?
-					raise ArgumentError.new("#{root} already exists!")
-				end
-				
-				# Make the path:
-				root.create
-				
-				Teapot::Repository.new(root).init!
-				
-				parent.controller(root).create(@project_name, @source, @packages)
-			end
-		end
+require_relative 'command/build'
+require_relative 'command/clean'
+require_relative 'command/create'
+require_relative 'command/fetch'
+require_relative 'command/list'
+require_relative 'command/status'
+require_relative 'command/visualize'
 
-		class Generate < Samovar::Command
-			self.description = "Run a generator to create files in your project."
-			
-			options do
-				option '-f/--force', "Force the generator to run even if the current work-tree is dirty."
-			end
-			
-			one :generator_name, "The name of the generator to be invoked."
-			many :arguments, "The arguments that will be passed to the generator."
-			
-			def invoke(parent)
-				generator_name, *arguments = @arguments
-				
-				parent.controller.generate(@generator_name, @arguments, @options[:force])
-			end
-		end
+require_relative 'context'
+require_relative 'configuration'
+require_relative 'version'
 
-		class Fetch < Samovar::Command
-			self.description = "Fetch remote packages according to the specified configuration."
-			
-			# 3 typical use cases:
-			# - fetch current packages according to lockfile
-			# - write current pacakges into lockfile
-			# - update packages and update lockfile
-			
-			options do
-				option '--update', "Update dependencies to the latest versions."
-				option '--local', "Don't update from source, assume updated local packages."
-			end
-			
-			def invoke(parent)
-				parent.controller.fetch(**@options)
-			end
-		end
+require 'uri'
+require 'rainbow'
+require 'rainbow/ext/string'
+require 'fileutils'
 
-		class List < Samovar::Command
-			self.description = "List provisions and dependencies of the specified package."
-			
-			many :packages, "Limit the listing to only these packages, or all packages if none specified."
-			
-			def invoke(parent)
-				if @packages.any?
-					only = Set.new(@packages)
-				end
-				
-				parent.controller.list(only)
-			end
-		end
+require 'build/logger'
 
-		class Build < Samovar::Command
-			self.description = "Build the specified target."
-			
-			options do
-				option '-j/-l/--limit <n>', "Limit the build to <n> concurrent processes."
-				option '--only', "Only compile direct dependencies."
-				option '-c/--continuous', "Run the build graph continually (experimental)."
-			end
-			
-			many :targets, "Build these targets, or use them to help the dependency resolution process."
-			split :argv, "Arguments passed to child process(es) of build if any."
-			
-			def invoke(parent)
-				# TODO: This is a bit of a hack, figure out a way to pass it directly through to build subsystem.
-				ARGV.replace(@argv) if @argv
-				
-				parent.controller.build(@targets)
-			end
-		end
-
-		class Visualize < Samovar::Command
-			self.description = "Generate a picture of the dependency graph."
-			
-			options do
-				option '-o/--output-path <path>', "The output path for the visualization.", default: "dependency.svg"
-				option '-d/--dependency-name <name>', "Show the partial chain for the given named dependency."
-			end
-			
-			many :targets, "Visualize these targets, or use them to help the dependency resolution process."
-			
-			def invoke(parent)
-				parent.controller.visualize(@targets, **@options)
-			end
-		end
-
-		class Clean < Samovar::Command
-			self.description = "Delete everything in the teapot directory."
-			
-			def invoke(parent)
-				parent.controller.clean
-			end
+module Teapot
+	module Command
+		def self.parse(*args)
+			Top.parse(*args)
 		end
 		
 		class Top < Samovar::Command
@@ -157,7 +50,7 @@ module Teapot
 			
 			options do
 				option '-c/--configuration <name>', "Specify a specific build configuration.", default: ENV['TEAPOT_CONFIGURATION']
-				option '-i/--in/--root <path>', "Work in the given root directory."
+				option '--root <path>', "Work in the given root directory.", default: Dir.getwd
 				option '--verbose | --quiet', "Verbosity of output for debugging.", key: :logging
 				option '-h/--help', "Print out help information."
 				option '-v/--version', "Print out the application version."
@@ -165,19 +58,46 @@ module Teapot
 			
 			nested '<command>',
 				'create' => Create,
-				'generate' => Generate,
 				'fetch' => Fetch,
 				'list' => List,
+				'status' => Status,
 				'build' => Build,
 				'visualize' => Visualize,
-				'clean' => Clean
+				'clean' => Clean,
+				default: 'build'
 			
 			def root
-				@options[:root]
+				::Build::Files::Path.expand(@options[:root])
+			end
+			
+			def verbose?
+				@options[:logging] == :verbose
+			end
+			
+			def quiet?
+				@options[:logging] == :quiet
+			end
+			
+			def logger
+				@logger ||= Logger.new($stderr).tap do |logger|
+					logger.formatter = ::Build::CompactFormatter.new(verbose: verbose?)
+					
+					if verbose?
+						logger.level = Logger::DEBUG
+					elsif quiet?
+						logger.level = Logger::WARN
+					else
+						logger.level = Logger::INFO
+					end
+				end
+			end
+			
+			def configuration
+				@options[:configuration]
 			end
 			
-			def controller(root = nil, **options)
-				Teapot::Controller.new(root || self.root || Dir.getwd, @options)
+			def context(root = self.root)
+				Context.new(root, configuration: configuration)
 			end
 			
 			def invoke(program_name: File.basename($0))

data/lib/teapot/context.rb

@@ -20,9 +20,10 @@
 
 require_relative 'loader'
 require_relative 'package'
-require_relative 'metadata'
 
 require 'build/rulebook'
+require 'build/text/substitutions'
+require 'build/text/merge'
 
 module Teapot
 	TEAPOT_FILE = 'teapot.rb'.freeze
@@ -47,10 +48,7 @@ module Teapot
 			@root = Path[root]
 			@options = options
 
-			@metadata = Metadata.new(self)
-
 			@targets = {}
-			@generators = {}
 			@configurations = {}
 			@projects = {}
 			@rules = Build::Rulebook.new
@@ -69,7 +67,6 @@ module Teapot
 		attr :options
 
 		attr :targets
-		attr :generators
 		attr :projects
 
 		# Context metadata
@@ -89,6 +86,29 @@ module Teapot
 		attr :dependencies
 		attr :selection
 
+		def repository
+			@repository ||= Rugged::Repository.new(@root.to_s)
+		end
+
+		def substitutions
+			substitutions = Build::Text::Substitutions.new
+
+			if @project
+				substitutions['PROJECT_NAME'] = @project.name
+				substitutions['LICENSE'] = @project.license
+			end
+
+			# The user's current name:
+			substitutions['AUTHOR_NAME'] = repository.config['user.name']
+			substitutions['AUTHOR_EMAIL'] = repository.config['user.email']
+
+			current_date = Time.new
+			substitutions['DATE'] = current_date.strftime("%-d/%-m/%Y")
+			substitutions['YEAR'] = current_date.strftime("%Y")
+
+			return substitutions
+		end
+
 		def select(names)
 			names.each do |name|
 				if @targets.key? name
@@ -104,7 +124,7 @@ module Teapot
 			
 			select(dependency_names)
 			
-			Dependency::Chain.expand(@dependencies, @targets.values, @selection)
+			Build::Dependency::Chain.expand(@dependencies, @targets.values, @selection)
 		end
 
 		def direct_targets(ordered)
@@ -120,10 +140,6 @@ module Teapot
 				AlreadyDefinedError.check(definition, @targets)
 
 				@targets[definition.name] = definition
-			when Generator
-				AlreadyDefinedError.check(definition, @generators)
-
-				@generators[definition.name] = definition
 			when Configuration
 				# We define configurations in two cases, if they are public, or if they are part of the root package of this context.
 				if definition.public? or definition.package == @root_package
@@ -202,7 +218,7 @@ module Teapot
 			end
 			
 			if @configuration.nil?
-				raise ArgumentError.new("Could not load configuration: #{configuration_name}")
+				raise ArgumentError.new("Could not load configuration: #{configuration_name.inspect}")
 			end
 			
 			# Materialize the configuration:

data/lib/teapot/loader.rb

@@ -20,7 +20,6 @@
 
 require_relative 'project'
 require_relative 'target'
-require_relative 'generator'
 require_relative 'configuration'
 
 require 'build/rule'
@@ -30,7 +29,8 @@ require 'build/files'
 module Teapot
 	# Cannot load packages newer than this.
 	# Version 1.3: Added support for build-dependency library which allows options for `#depends`. The primary use case is private dependencies.
-	LOADER_VERSION = "1.3"
+	# Version 2.0: Generators removed and refactored into build.
+	LOADER_VERSION = "2.0"
 	
 	# Cannot load packages older than this.
 	MINIMUM_LOADER_VERSION = "1.0"
@@ -51,18 +51,6 @@ module Teapot
 		attr :path
 	end
 	
-	# This is a quick hack so that we can avoid using the system gem.. it's used in build-make package.
-	# TODO Remove this and also the dependency on facets, or fix facets.
-	module System
-		module CPU
-			def self.count
-				require 'etc'
-				
-				Etc.nprocessors rescue 4
-			end
-		end
-	end
-	
 	class Loader
 		Files = Build::Files
 		Rule = Build::Rule
@@ -114,14 +102,6 @@ module Teapot
 			@defined << target
 		end
 
-		def define_generator(*args)
-			generator = Generator.new(@context, @package, *args)
-
-			yield generator
-
-			@defined << generator
-		end
-
 		def define_configuration(*args)
 			configuration = Configuration.new(@context, @package, *args)
 
@@ -131,6 +111,10 @@ module Teapot
 
 			@defined << configuration
 		end
+		
+		def define_generator(*args)
+			warn "define_generator(#{args.inspect}) is deprecated and will have no effect. Please use define_target."
+		end
 
 		# Checks the host patterns and executes the block if they match.
 		def host(*args, &block)

data/lib/teapot/target.rb

@@ -19,7 +19,7 @@
 # THE SOFTWARE.
 
 require 'pathname'
-require_relative 'dependency'
+require 'build/dependency'
 require_relative 'definition'
 
 require 'build/environment'
@@ -30,7 +30,7 @@ module Teapot
 	end
 	
 	class Target < Definition
-		include Dependency
+		include Build::Dependency
 		
 		def initialize(context, package, name)
 			super context, package, name

data/lib/teapot/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Teapot
-	VERSION = "1.3.1"
+	VERSION = "2.0.0-rc1"
 end

data/spec/teapot/command_spec.rb

@@ -20,22 +20,30 @@
 
 require 'teapot/command'
 
-module Teapot::CommandSpec
-	ROOT = Build::Files::Path.new(__dir__) + "command_spec"
-	PROJECT_PATH = ROOT + 'test-project'
+RSpec.describe Teapot::Command, order: :defined do
+	let!(:source) {"https://github.com/kurocha"}
+	let!(:root) {Build::Files::Path.new(__dir__) + "command_spec"}
+	let!(:project_name) {"Test Project"}
+	let!(:project_path) {root + 'test-project'}
 	
-	describe Teapot::Command::Top.parse(["--in", PROJECT_PATH.to_s, "create", "test-project", "https://github.com/kurocha", "project"]) do
-		before do
-			ROOT.mkpath
-		end
-		
-		after do
-			PROJECT_PATH.delete
-		end
+	let(:top) {Teapot::Command::Top["--root", project_path.to_s]}
+	
+	context Teapot::Command::Create do
+		subject {top["create", project_name, source.to_s, "project"]}
 		
 		it "should create a new project" do
+			root.delete
+			
+			expect{subject.invoke}.to_not raise_error
+			expect(project_path + "teapot.rb").to be_exist
+		end
+	end
+	
+	context Teapot::Command::Build do
+		subject {top["build", "Run/TestProject"]}
+	
+		it "should build project" do
 			expect{subject.invoke}.to_not raise_error
-			expect(PROJECT_PATH + "teapot.rb").to be_exist
 		end
 	end
 end

data/spec/teapot/context_spec.rb

@@ -20,22 +20,19 @@
 
 require 'teapot/context'
 
-module Teapot::ContextSpec
-	ROOT = Build::Files::Path.new(__dir__) + "context_spec"
+RSpec.describe Teapot::Context do
+	let(:root) {Build::Files::Path.new(__dir__) + "context_spec"}
+	let(:context) {Teapot::Context.new(root)}
 	
-	describe Teapot::Context do
-		it "should load teapot.rb file" do
-			context = Teapot::Context.new(ROOT)
-		
-			# There is one configuration:
-			expect(context.configurations.count).to be == 1
-		
-			expect(context.targets.count).to be == 1
-		
-			default_configuration = context.configuration
-		
-			# 13 defined packages + 1 implicit package.
-			expect(default_configuration.packages.count).to be == 14
-		end
+	it "should load teapot.rb file" do
+		# There is one configuration:
+		expect(context.configurations.count).to be == 1
+	
+		expect(context.targets.count).to be == 1
+	
+		default_configuration = context.configuration
+	
+		# 13 defined packages + 1 implicit package.
+		expect(default_configuration.packages.count).to be == 14
 	end
 end

data/teapot.gemspec

@@ -30,18 +30,20 @@ Gem::Specification.new do |spec|
 	
 	spec.add_dependency "graphviz", "~> 0.4"
 	
-	spec.add_dependency "build", "~> 1.0"
+	spec.add_dependency "rugged"
+	
+	spec.add_dependency "build", "~> 1.1"
 	spec.add_dependency "build-files", "~> 1.0"
 	spec.add_dependency "build-dependency", "~> 1.1"
 	spec.add_dependency "build-uri", "~> 1.0"
+	spec.add_dependency "build-text", "~> 1.0"
 	
-	spec.add_dependency "facets", "~> 3.1"
-	spec.add_dependency "samovar", "~> 1.2"
+	spec.add_dependency "samovar", "~> 1.6"
 	
 	# This could be a good option in the future for teapot fetch:
 	#spec.add_dependency "rugged"
 	
 	spec.add_development_dependency "bundler", "~> 1.3"
-	spec.add_development_dependency "rspec", "~> 3.4.0"
+	spec.add_development_dependency "rspec", "~> 3.6"
 	spec.add_development_dependency "rake"
 end