build 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cf5613f93850130355cc50e62df0c8dddc93f4c297d71170f57a45cb37519ff
-  data.tar.gz: 14521dbf2a1231e8fa6e9837c22b0560284b1ce2de00d0b03c0650c1d848ac4d
+  metadata.gz: 3b19e67cd76f4bd488029dcb8135bcc850eb615159844e944d2fb681b3c9b7b8
+  data.tar.gz: cdc7dd22f324d150f6e01c4d44f0669ba1cdc86d8d0933559c1fc3d07209d2df
 SHA512:
-  metadata.gz: c708de2260aa75d700ab9a7d55a137cd327055f6d477949d70f1f8647eade97d3be64ca3ec2cd0ebb42f34a9072105d96fbfa97dbe35211b0b23077f3233bf34
-  data.tar.gz: 5adfdde18fddfb66ceb987b7969a40b6a7ee0fdc144a6f61653c22c88eaa949958625528388f799e4e958e1c4da9cfc8fdb05943e1350f40e73c923affbb35dc
+  metadata.gz: 541389b0145a378284f6b97ade7b1956dee8dde448d9039d2ce6f907195ae2db64c42af24b714f00f8d05ab09626b82b2dcd72dd8434278099366edea1de71e9
+  data.tar.gz: 821824ac2ec275383fe3d4a47d571145daf70d1017642d3722dcfddc8a487bfa26563c38fb5751c80dffdec8be2f9fde57d84bf8a91d58652c694a1ea053d2ca

data/README.md

@@ -10,15 +10,15 @@ Build is a ruby gem providing systems for building task driven build systems sim
 
 Add this line to your application's Gemfile:
 
-    gem 'build'
+	gem 'build'
 
 And then execute:
 
-    $ bundle
+	$ bundle
 
 Or install it yourself as:
 
-    $ gem install build
+	$ gem install build
 
 ## Usage
 

data/build.gemspec

@@ -17,12 +17,13 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0'
 	
-	spec.add_dependency "build-graph", "~> 1.2"
+	spec.add_dependency "build-graph", "~> 1.3"
 	spec.add_dependency "build-environment", "~> 1.3"
 	spec.add_dependency "build-dependency", "~> 1.4"
 	spec.add_dependency "build-makefile", "~> 1.0"
 	
-	spec.add_dependency "graphviz"
+	spec.add_dependency "graphviz", "~> 1.0"
+	spec.add_dependency "event", "~> 1.0"
 	
 	spec.add_development_dependency "covered"
 	spec.add_development_dependency "bundler"

data/lib/build/controller.rb

@@ -30,17 +30,14 @@ require_relative 'rule_node'
 require_relative 'chain_node'
 require_relative 'task'
 
-require_relative 'logger'
+require 'event/console'
 
 module Build
 	class Controller
-		def initialize(logger: nil, limit: nil)
+		def initialize(logger: Event::Console.logger, limit: nil)
 			@module = Module.new
 			
-			@logger = logger || Logger.new($stdout).tap do |logger|
-				logger.level = Logger::INFO
-				logger.formatter = CompactFormatter.new
-			end
+			@logger = logger
 			
 			# Top level nodes, for sanity this is a static list.
 			@nodes = []

data/lib/build/task.rb

@@ -21,6 +21,8 @@
 require 'fileutils'
 require 'build/graph'
 
+require 'event/shell'
+
 module Build
 	# This task class serves as the base class for the environment specific task classes genearted when adding targets.
 	class Task < Graph::Task
@@ -62,7 +64,7 @@ module Build
 		
 		def spawn(*arguments)
 			if wet?
-				@logger&.info(:shell) {arguments}
+				@logger&.info(self) {Event::Shell.for(*arguments)}
 				status = @group.spawn(*arguments)
 				
 				if status != 0
@@ -82,21 +84,21 @@ module Build
 		def touch(path)
 			return unless wet?
 			
-			@logger&.info(:shell) {['touch', path]}
+			@logger&.info(self) {Event::Shell.for('touch', path)}
 			FileUtils.touch(path)
 		end
 		
 		def cp(source_path, destination_path)
 			return unless wet?
 			
-			@logger&.info(:shell) {['cp', source_path, destination_path]}
+			@logger&.info(self) {Event::Shell.for('cp', source_path, destination_path)}
 			FileUtils.copy(source_path, destination_path)
 		end
 		
 		def rm(path)
 			return unless wet?
 			
-			@logger&.info(:shell) {['rm -rf', path]}
+			@logger&.info(self) {Event::Shell.for('rm -rf', path)}
 			FileUtils.rm_rf(path)
 		end
 		
@@ -104,7 +106,7 @@ module Build
 			return unless wet?
 			
 			unless File.exist?(path)
-				@logger&.info(:shell) {['mkpath', path]}
+				@logger&.info(self) {Event::Shell.for('mkpath', path)}
 				FileUtils.mkpath(path)
 			end
 		end
@@ -112,14 +114,14 @@ module Build
 		def install(source_path, destination_path)
 			return unless wet?
 			
-			@logger&.info(:shell) {['install', source_path, destination_path]}
+			@logger&.info(self) {Event::Shell.for('install', source_path, destination_path)}
 			FileUtils.install(source_path, destination_path)
 		end
 		
 		def write(path, data, mode = "w")
 			return unless wet?
 			
-			@logger&.info(:shell) {["write", path, "#{data.size}bytes"]}
+			@logger&.info(self) {Event::Shell.for("write", path, "#{data.size}bytes")}
 			File.open(path, mode) do |file|
 				file.write(data)
 			end
@@ -132,13 +134,13 @@ module Build
 		def invoke_rule(rule, arguments, &block)
 			arguments = rule.normalize(arguments, self)
 			
-			@logger&.debug(:invoke) {"-> #{rule}(#{arguments.inspect})"}
+			@logger&.debug(self) {"-> #{rule}(#{arguments.inspect})"}
 			
 			invoke(
 				RuleNode.new(rule, arguments, &block)
 			)
 			
-			@logger&.debug(:invoke) {"<- #{rule}(...) -> #{rule.result(arguments)}"}
+			@logger&.debug(self) {"<- #{rule}(...) -> #{rule.result(arguments)}"}
 			
 			return rule.result(arguments)
 		end

data/lib/build/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Build
-	VERSION = "2.2.0"
+	VERSION = "2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: build-graph
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: build-environment
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,30 @@ dependencies:
   name: graphviz
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: event
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: covered
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +169,6 @@ files:
 - lib/build/chain_node.rb
 - lib/build/controller.rb
 - lib/build/graphviz.rb
-- lib/build/logger.rb
 - lib/build/name.rb
 - lib/build/rule.rb
 - lib/build/rule_node.rb

data/lib/build/logger.rb

@@ -1,109 +0,0 @@
-# Copyright, 2015, 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 'logger'
-require 'rainbow'
-
-module Build
-	class CompactFormatter
-		def initialize(verbose: true)
-			@start = Time.now
-			@verbose = verbose
-		end
-		
-		def time_offset_prefix
-			offset = Time.now - @start
-			minutes = (offset/60).floor
-			seconds = (offset - (minutes*60))
-			
-			if minutes > 0
-				"#{minutes}m#{seconds.floor}s"
-			else
-				"#{seconds.round(2)}s"
-			end.rjust(6)
-		end
-		
-		def chdir_string(options)
-			if options[:chdir]
-				" in #{options[:chdir]}"
-			else
-				""
-			end
-		end
-		
-		def format_command(arguments, buffer)
-			arguments = arguments.dup
-			
-			environment = arguments.first.is_a?(Hash) ? arguments.shift : nil
-			options = arguments.last.is_a?(Hash) ? arguments.pop : nil
-			
-			arguments = arguments.flatten.collect(&:to_s)
-			
-			buffer << Rainbow(arguments.join(' ')).bright.blue
-			
-			if options
-				buffer << chdir_string(options)
-			end
-			
-			buffer << "\n"
-			
-			if @verbose
-				if environment
-					environment.each do |key, value|
-						buffer << "\texport #{key}=#{value.dump}\n"
-					end
-				end
-			end
-		end
-		
-		def format_exception(exception, buffer)
-			buffer << Rainbow("#{exception.class}: #{exception}").bright.red << "\n"
-			exception.backtrace.each do |line|
-				buffer << "\t" << Rainbow(line).red << "\n"
-			end
-		end
-		
-		def call(severity, datetime, progname, message)
-			buffer = []
-			prefix = ""
-			
-			if @verbose
-				prefix = time_offset_prefix
-				buffer << Rainbow(prefix).cyan + ": "
-				prefix = " " * (prefix.size) + "| " 
-			end
-			
-			if progname == :shell and message.kind_of? Array
-				format_command(message, buffer)
-			elsif message.kind_of? Exception
-				format_exception(message, buffer)
-			else
-				buffer << message << "\n"
-			end
-			
-			result = buffer.join
-			
-			# This fancy regex indents lines correctly depending on the prefix:
-			result.gsub!(/\n(?!$)/, "\n#{prefix}") unless prefix.empty?
-			
-			return result
-		end
-	end
-end