build 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee861c5692f6b6afec96a8b96060141b8a36d96e
-  data.tar.gz: 7b0ff0dc360903ede211632cd9a0e23d91949c01
+  metadata.gz: 0672d1e74b4a1753f505fe1caaf2f8af65d6852f
+  data.tar.gz: 469d82145d094b22728592dec37206a389eecb55
 SHA512:
-  metadata.gz: bd215999b98b76f04aa2d0fc3388340c7c1d5907971315776e9953845ad06dfca29ff951ee460716356f99f22a407e3029a7e8599842fe0f44b2fac028396022
-  data.tar.gz: 8b447b51fec6f690d596a4a86353463a679e1a0900425bb0ca059e472fd2683d83a091fa1b3b0f582e1bf5741c1b63f2e9bb6b512f7f2185febf55f4a1828e42
+  metadata.gz: 369f70d27a19a9d6baea48c338bab9452969cc1c74d5c358cf270b299be29a7f98e8a6212cd4c9c88e2c6310001b892216a0997814f3fd604badbccba54d65fe
+  data.tar.gz: 34847f234674d9327e337a92bd9e5774fea0ad628a9eb098f4c7b7aafb3facd30497d5d6ae33e43030cebd78c579c3ea89d0805d64f54c8383be8f01e69241b8

data/lib/build/controller.rb

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 require_relative 'rulebook'
+require_relative 'name'
 
 require 'build/files'
 require 'build/graph'
@@ -82,6 +83,20 @@ module Build
 	
 	# This task class serves as the base class for the environment specific task classes genearted when adding targets.
 	class Task < Graph::Task
+		class CommandFailure < StandardError
+			def initialize(task, arguments, status)
+				@task = task
+				@arguments = arguments
+				@status = status
+				
+				super "#{@arguments.first} exited with status #{@status}"
+			end
+			
+			attr :task
+			attr :arguments
+			attr :status
+		end
+		
 		def initialize(walker, node, group, logger: nil)
 			super(walker, node)
 			
@@ -100,7 +115,7 @@ module Build
 				status = @group.spawn(*arguments)
 				
 				if status != 0
-					raise CommandError.new(status)
+					raise CommandFailure.new(self, arguments, status)
 				end
 			end
 		end

data/lib/build/logger.rb

@@ -41,18 +41,24 @@ module Build
 			end
 		end
 		
-		def format_command(args)
-			options = Hash === args.last ? args.pop : {}
-			args = args.flatten.collect &:to_s
+		def format_command(arguments)
+			if arguments.last.is_a? Hash
+				options = arguments.last
+				arguments = arguments[0...-1]
+			else
+				options = {}
+			end
+			
+			arguments = arguments.flatten.collect &:to_s
 			
-			Rainbow(args.join(' ')).blue + chdir_string(options)
+			Rainbow(arguments.join(' ')).blue + chdir_string(options)
 		end
 		
-		def call(severity, datetime, progname, msg)
-			if progname == 'shell' and Array === msg
-				"#{time_offset_string}: #{format_command(msg)}\n"
+		def call(severity, datetime, progname, message)
+			if progname == 'shell' and Array === message
+				"#{time_offset_string}: #{format_command(message)}\n"
 			else
-				"#{time_offset_string}: #{msg}\n"
+				"#{time_offset_string}: #{message}\n"
 			end
 		end
 	end

data/lib/build/version.rb

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

data/spec/build/controller_spec.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env rspec
+
 # Copyright, 2015, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -38,6 +40,30 @@ module Build::ControllerSpec
 	end
 	
 	describe Build::Controller do
+		it "should fail with exception" do
+			environment = Build::Environment.new do
+				define Build::Rule, "make.file" do
+					output :destination
+					
+					apply do |parameters|
+						run "exit -1"
+					end
+				end
+			end
+			
+			target = Target.new('fail')
+			target.build do
+				foo_path = Build::Files::Path['foo']
+				make destination: foo_path
+			end
+			
+			controller = Build::Controller.new do |controller|
+				controller.add_target(target, environment)
+			end
+			
+			expect{controller.update}.to raise_error(Build::Task::CommandFailure)
+		end
+		
 		it "should execute the build graph" do
 			environment = Build::Environment.new do
 				define Build::Rule, "make.file" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-28 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: build-graph