build 1.0.10 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a3384e47b1e9c9dc2419491b1d8bab595215c7f
-  data.tar.gz: f1948300302a3260040a79df577fac46a1f98155
+  metadata.gz: c59b2e49cb23e01f0ce4729b592c3d91e84e0c7c
+  data.tar.gz: c9d16ef4c2b0d1d868d28857ddd7fdc6d0eb0f22
 SHA512:
-  metadata.gz: 85801d07d2795ffa201e68cf0aa247dbb5915490848b89f11abc0b658a27aef4bde12fee5a6f2a2f0a59ab192b4bd745ab7df4e3f524debcca9d7b4e35acbcd1
-  data.tar.gz: 6b16ab6afd93b4bc72eac04b960504395b44805f65b553b0ec11673ce03a73c97797997ed2ef0d245898f40b084451b5d11ca90f9549ebf99f104485ad5935c2
+  metadata.gz: d013e5ed507dc6ff3ed70c11f1d1fc2c3c4c4a7fa0997c2ee3ba72b89a2dd34f22fdc17dd7f046d6f0d2fd5764ae27798bc9896e866c8c8e8061623bd2ef86de
+  data.tar.gz: 546ca321ef164736ac482e346e518e278dd95cdd21d311fb84432508e2cb5d8719962621a0a87e8c4dfa57b12f1174635e91c066c8c9c2d7c84d13799c69a127

data/.gitignore

@@ -20,3 +20,5 @@ tmp
 *.o
 *.a
 mkmf.log
+.rspec_status
+

data/.rspec

@@ -1,4 +1,4 @@
---color
 --format documentation
 --backtrace
 --warnings
+--require spec_helper

data/Rakefile

@@ -1,8 +1,9 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec) do |task|
-	task.rspec_opts = ["--require", "simplecov"] if ENV['COVERAGE']
-end
+# Load all rake tasks:
+import(*Dir.glob('tasks/**/*.rake'))
 
-task :default => :spec
+RSpec::Core::RakeTask.new(:test)
+
+task :default => :test

data/build.gemspec

@@ -17,13 +17,13 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0'
 	
-	spec.add_dependency "build-graph", "~> 1.0.5"
-	spec.add_dependency "build-environment", "~> 1.1.3"
-	spec.add_dependency "build-makefile", "~> 1.0.0"
+	spec.add_dependency "build-graph", "~> 1.0"
+	spec.add_dependency "build-environment", "~> 1.1"
+	spec.add_dependency "build-makefile", "~> 1.0"
 	
 	spec.add_dependency "graphviz"
 	
 	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

data/lib/build/controller.rb

@@ -73,14 +73,14 @@ module Build
 		end
 		
 		# Add a build target to the controller.
-		def add_target(target, environment)
+		def add_target(target, environment, arguments = [])
 			task_class = Rulebook.for(environment).with(Task, environment: environment, target: target)
 			
 			# Not sure if this is a good idea - makes debugging slightly easier.
 			Object.const_set("TaskClassFor#{Name.from_target(target.name).identifier}_#{task_class.object_id}", task_class)
 			
 			# A target node will invoke the build callback on target.
-			@nodes << TargetNode.new(task_class, target)
+			@nodes << TargetNode.new(task_class, target, arguments)
 			
 			return @nodes.last
 		end

data/lib/build/target_node.rb

@@ -23,9 +23,10 @@ require 'build/graph'
 
 module Build	
 	class TargetNode < Graph::Node
-		def initialize(task_class, target)
+		def initialize(task_class, target, arguments)
 			@target = target
 			@task_class = task_class
+			@arguments = arguments
 			
 			# Wait here, for all dependent targets, to be done:
 			super(Files::List::NONE, :inherit, target)
@@ -38,7 +39,7 @@ module Build
 		end
 		
 		def apply!(scope)
-			scope.instance_exec(&@target.build)
+			scope.instance_exec(*@arguments, &@target.build)
 		end
 		
 		def inspect

data/lib/build/task.rb

@@ -80,21 +80,21 @@ module Build
 		def touch(path)
 			return unless wet?
 			
-			@logger.info(:shell){ ['touch', path] }
+			@logger.info(:shell) {['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(:shell) {['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(:shell) {['rm -rf', path]}
 			FileUtils.rm_rf(path)
 		end
 		
@@ -102,8 +102,7 @@ module Build
 			return unless wet?
 			
 			unless File.exist?(path)
-				@logger.info(:shell){ ['mkpath', path] }
-				
+				@logger.info(:shell) {['mkpath', path]}
 				FileUtils.mkpath(path)
 			end
 		end
@@ -111,11 +110,20 @@ module Build
 		def install(source_path, destination_path)
 			return unless wet?
 			
-			@logger.info(:shell){ ['install', source_path, destination_path]}
+			@logger.info(:shell) {['install', source_path, destination_path]}
 			FileUtils.install(source_path, destination_path)
 		end
 		
-		# Legacy FileUtils access, replaced with direct function calls.
+		def write(path, data, mode = "w")
+			return unless wet?
+			
+			@logger.info(:shell) {["write", path, "#{data.size}bytes"]}
+			File.open(path, mode) do |file|
+				file.write(data)
+			end
+		end
+		
+		# @deprecated Please use {#self} instead.
 		def fs
 			self
 		end

data/lib/build/version.rb

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

data/spec/build/controller_spec.rb

@@ -23,92 +23,92 @@
 require 'build/rulebook'
 require 'build/controller'
 
-module Build::ControllerSpec
-	class Target
-		def initialize(name)
-			@name = name
-		end
-		
-		attr :name
-		
-		def build(&block)
-			@build = block if block_given?
+RSpec.describe Build::Controller do
+	let(:target_class) do
+		Class.new do
+			def initialize(name)
+				@name = name
+			end
+			
+			attr :name
 			
-			return @build
+			def build(&block)
+				@build = block if block_given?
+				
+				return @build
+			end
 		end
 	end
 	
-	RSpec.describe Build::Controller do
-		it "build graph should fail" do
-			environment = Build::Environment.new do
-				define Build::Rule, "make.file" do
-					output :destination
-					
-					apply do |parameters|
-						run! "exit -1"
-					end
+	it "build graph should fail" do
+		environment = Build::Environment.new do
+			define Build::Rule, "make.file" do
+				output :destination
+				
+				apply do |parameters|
+					run! "exit -1"
 				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
-			
-			controller.logger.level = Logger::DEBUG
-			
-			controller.update
-			
-			expect(controller.failed?).to be_truthy
 		end
 		
-		it "should execute the build graph" do
-			environment = Build::Environment.new do
-				define Build::Rule, "make.file" do
-					output :destination
-					
-					apply do |parameters|
-						touch parameters[:destination]
-					end
-				end
+		target = target_class.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
+		
+		controller.logger.level = Logger::DEBUG
+		
+		controller.update
+		
+		expect(controller.failed?).to be_truthy
+	end
+	
+	it "should execute the build graph" do
+		environment = Build::Environment.new do
+			define Build::Rule, "make.file" do
+				output :destination
 				
-				define Build::Rule, "copy.file" do
-					input :source
-					output :destination
-					
-					apply do |parameters|
-						cp parameters[:source], parameters[:destination]
-					end
+				apply do |parameters|
+					touch parameters[:destination]
 				end
 			end
 			
-			target = Target.new('copy')
-			target.build do
-				foo_path = Build::Files::Path['foo']
-				bar_path = Build::Files::Path['bar']
+			define Build::Rule, "copy.file" do
+				input :source
+				output :destination
 				
-				make destination: foo_path
-				
-				copy source: foo_path, destination: bar_path
-			end
-			
-			controller = Build::Controller.new do |controller|
-				controller.add_target(target, environment)
+				apply do |parameters|
+					cp parameters[:source], parameters[:destination]
+				end
 			end
+		end
+		
+		target = target_class.new('copy')
+		target.build do
+			foo_path = Build::Files::Path['foo']
+			bar_path = Build::Files::Path['bar']
 			
-			expect(controller.nodes.size).to be 1
-			
-			controller.update
-			
-			expect(File).to be_exist('foo')
-			expect(File).to be_exist('bar')
+			make destination: foo_path
 			
-			FileUtils.rm ['foo', 'bar']
+			copy source: foo_path, destination: bar_path
+		end
+		
+		controller = Build::Controller.new do |controller|
+			controller.add_target(target, environment)
 		end
+		
+		expect(controller.nodes.size).to be 1
+		
+		controller.update
+		
+		expect(File).to be_exist('foo')
+		expect(File).to be_exist('bar')
+		
+		FileUtils.rm ['foo', 'bar']
 	end
 end

data/spec/build/name_spec.rb

@@ -20,31 +20,29 @@
 
 require 'build/name'
 
-module Build::NameSpec
-	RSpec.describe Build::Name do
-		let(:name) {Build::Name.new('Foo Bar')}
-		it "retains the original text" do
-			expect(name.text).to be == 'Foo Bar'
-		end
-		
-		it "should generate useful identifiers" do
-			expect(name.identifier).to be == 'FooBar'
-		end
-		
-		it "should generate useful target names" do
-			expect(name.target).to be == 'foo-bar'
-		end
-		
-		it "should generate useful macro names" do
-			expect(name.macro).to be == 'FOO_BAR'
-		end
-		
-		it "should generate useful macro names" do
-			expect(name.macro).to be == 'FOO_BAR'
-		end
-		
-		it "can be constructed from target name" do
-			expect(Build::Name.from_target(name.target).text).to be == name.text
-		end
+RSpec.describe Build::Name do
+	let(:name) {Build::Name.new('Foo Bar')}
+	it "retains the original text" do
+		expect(name.text).to be == 'Foo Bar'
+	end
+	
+	it "should generate useful identifiers" do
+		expect(name.identifier).to be == 'FooBar'
+	end
+	
+	it "should generate useful target names" do
+		expect(name.target).to be == 'foo-bar'
+	end
+	
+	it "should generate useful macro names" do
+		expect(name.macro).to be == 'FOO_BAR'
+	end
+	
+	it "should generate useful macro names" do
+		expect(name.macro).to be == 'FOO_BAR'
+	end
+	
+	it "can be constructed from target name" do
+		expect(Build::Name.from_target(name.target).text).to be == name.text
 	end
 end

data/spec/build/rule_spec.rb

@@ -20,18 +20,16 @@
 
 require 'build/rule'
 
-module Build::RuleSpec
-	describe Build::Rule do
-		it "should validate input and output parameters" do
-			rule = Build::Rule.new("compile", "cpp")
-			
-			rule.input :source
-			rule.output :destination
-			
-			expect(rule.parameters.size).to be 2
-			
-			expect(rule.applicable?(source: 'foo', destination: 'bar')).to be_truthy
-			expect(rule.applicable?(source: 'foo')).to be_falsey
-		end
+RSpec.describe Build::Rule do
+	it "should validate input and output parameters" do
+		rule = Build::Rule.new("compile", "cpp")
+		
+		rule.input :source
+		rule.output :destination
+		
+		expect(rule.parameters.size).to be 2
+		
+		expect(rule.applicable?(source: 'foo', destination: 'bar')).to be_truthy
+		expect(rule.applicable?(source: 'foo')).to be_falsey
 	end
 end

data/spec/build/rulebook_spec.rb

@@ -21,34 +21,32 @@
 require 'build/environment'
 require 'build/rulebook'
 
-module Build::RulebookSpec
-	describe Build::Rulebook do
-		it "should generate a valid rulebook" do
-			environment = Build::Environment.new do
-				define Build::Rule, "copy.file" do
-					input :source
-					output :destination
-					
-					apply do |parameters|
-						cp parameters[:source], parameters[:destination]
-					end
-				end
+RSpec.describe Build::Rulebook do
+	it "should generate a valid rulebook" do
+		environment = Build::Environment.new do
+			define Build::Rule, "copy.file" do
+				input :source
+				output :destination
 				
-				define Build::Rule, "delete.file" do
-					input :target
-					
-					apply do |parameters|
-						rm parameters[:target]
-					end
+				apply do |parameters|
+					cp parameters[:source], parameters[:destination]
 				end
 			end
 			
-			rulebook = Build::Rulebook.for(environment)
-			
-			expect(rulebook.rules.size).to be 2
-			
-			expect(rulebook.rules).to be_include 'copy.file'
-			expect(rulebook.rules).to be_include 'delete.file'
+			define Build::Rule, "delete.file" do
+				input :target
+				
+				apply do |parameters|
+					rm parameters[:target]
+				end
+			end
 		end
+		
+		rulebook = Build::Rulebook.for(environment)
+		
+		expect(rulebook.rules.size).to be 2
+		
+		expect(rulebook.rules).to be_include 'copy.file'
+		expect(rulebook.rules).to be_include 'delete.file'
 	end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,29 @@
+
+if ENV['COVERAGE'] || ENV['TRAVIS']
+	begin
+		require 'simplecov'
+		
+		SimpleCov.start do
+			add_filter "/spec/"
+		end
+		
+		if ENV['TRAVIS']
+			require 'coveralls'
+			Coveralls.wear!
+		end
+	rescue LoadError
+		warn "Could not load simplecov: #{$!}"
+	end
+end
+
+require "bundler/setup"
+require "build"
+
+RSpec.configure do |config|
+	# Enable flags like --only-failures and --next-failure
+	config.example_status_persistence_file_path = ".rspec_status"
+
+	config.expect_with :rspec do |c|
+		c.syntax = :expect
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: '1.1'
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: build-graph
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: build-environment
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: build-makefile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: graphviz
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +117,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".simplecov"
 - ".travis.yml"
 - Gemfile
 - Gemfile.local
@@ -139,6 +138,7 @@ files:
 - spec/build/name_spec.rb
 - spec/build/rule_spec.rb
 - spec/build/rulebook_spec.rb
+- spec/spec_helper.rb
 homepage: ''
 licenses:
 - MIT
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Build is a framework for working with task based build systems.
@@ -168,3 +168,4 @@ test_files:
 - spec/build/name_spec.rb
 - spec/build/rule_spec.rb
 - spec/build/rulebook_spec.rb
+- spec/spec_helper.rb

data/.simplecov

@@ -1,9 +0,0 @@
-
-SimpleCov.start do
-	add_filter "/spec/"
-end
-
-if ENV['TRAVIS']
-	require 'coveralls'
-	Coveralls.wear!
-end