build-graph 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93ccee936d5902138b3cd45b565d8dfa20a477d6
-  data.tar.gz: 221ef37fa2440af4b5b12be9cc209402c741096d
+  metadata.gz: 77b51e210994a3c93e59ddebf8b3aead06b84c07
+  data.tar.gz: 5a9ece86c313dbbf9a0ddd462cd18b10eed49ff5
 SHA512:
-  metadata.gz: 3bebcf37fa8a68d1f602317d39af3fbe778687baea8cd9fc1fdbe93df20ea1964402183aa052b166557293fea0eeefb183c27735e46dd7a5261a2b8fb7483b16
-  data.tar.gz: cb91ae793eaa9ae002060d3bc407255376a4a5a3a7592fb0912d306a4a972ef872c77b9ac9a4ca0f192503ee926e1f1c7a0e868cf3a31514ae73e39af669b6fe
+  metadata.gz: afb78262e92072da8e29dce01898447246e7f718a65b4c5f25a79f049fb9474a0fa21a1685758c11720d0f7cbc1b4c7ee328845da1adaf52a67b860da261c69d
+  data.tar.gz: 4395c36481c93ada46363d602f34e136d9a8759e1022a3f669e97abe05f957ec7b2cab09fe81b06c38f7b796c5baf3a3261b5cb4ebca9e55d9e134f837479e4d

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - "2.0"
+  - "2.1"

data/README.md

@@ -2,6 +2,9 @@
 
 Build::Graph is a framework for build systems, with specific functionality for dealing with file based processes.
 
+[![Build Status](https://secure.travis-ci.org/ioquatix/build-graph.png)](http://travis-ci.org/ioquatix/build-graph)
+[![Code Climate](https://codeclimate.com/github/ioquatix/build-graph.png)](https://codeclimate.com/github/ioquatix/build-graph)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -16,6 +19,10 @@ Or install it yourself as:
 
     $ gem install build-graph
 
+### Naming
+
+I'd like to call this gem, simply, `build`, but this name is not available.
+
 ## Usage
 
 TODO: Write usage instructions here

data/build-graph.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |spec|
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 	spec.require_paths = ["lib"]
 
+	spec.add_dependency "process-group", "~> 0.1.0"
+
 	spec.add_dependency "system"
 	spec.add_dependency "rainbow"
 

data/lib/build/files.rb

@@ -25,27 +25,15 @@ module Build
 	module Files
 		class List
 			include Enumerable
-		
+			
 			def +(list)
 				Composite.new([self, list])
 			end
-		
+			
 			def intersects? other
 				other.any?{|path| include?(path)}
 			end
-		
-			def rebase(root)
-				raise NotImplementedError
-			end
-		
-			def to_paths
-				relative_paths = self.each do |path|
-					path.relative_path
-				end
 			
-				return Paths.new(@root, relative_paths)
-			end
-		
 			def match(pattern)
 				all? {|path| path.match(pattern)}
 			end
@@ -68,13 +56,48 @@ module Build
 			end
 		end
 	
-		class Directory < List
-			def initialize(root, path = "")
+		# A list which has a single root directory.
+		class DirectoryList < List
+			def initialize(root)
 				@root = root.to_s
+			end
+			
+			attr :root
+			
+			def roots
+				[@root]
+			end
+			
+			def rebase(root)
+				raise NotImplementedError
+			end
+			
+			def to_paths(root=@root)
+				relative_paths = self.each do |path|
+					path.relative_path
+				end
+			
+				return Paths.new(root, relative_paths)
+			end
+			
+			def process(root=@root)
+				self.collect do |path|
+					basename, _, filename = path.relative_path.rpartition(File::SEPARATOR)
+					
+					File.join(basename, yield(filename))
+				end
+				
+				Paths.new(root, self.collect)
+			end
+		end
+	
+		class Directory < DirectoryList
+			def initialize(root, path = "")
+				super(root)
+				
 				@path = path
 			end
 		
-			attr :root
 			attr :path
 		
 			def full_path
@@ -82,15 +105,11 @@ module Build
 			end
 		
 			def each(&block)
-				Dir.glob(full_path + "**/*").each do |path|
+				Dir.glob(full_path + "**/*") do |path|
 					yield RelativePath.new(path, @root)
 				end
 			end
 		
-			def roots
-				[full_path]
-			end
-		
 			def eql?(other)
 				other.kind_of?(self.class) and @root.eql?(other.root) and @path.eql?(other.path)
 			end
@@ -109,9 +128,10 @@ module Build
 			end
 		end
 	
-		class Glob < List
+		class Glob < DirectoryList
 			def initialize(root, pattern)
-				@root = root.to_s
+				super(root)
+				
 				@pattern = pattern
 			end
 	
@@ -124,15 +144,11 @@ module Build
 		
 			# Enumerate all paths matching the pattern.
 			def each(&block)
-				Dir.glob(full_pattern).each do |path|
+				Dir.glob(full_pattern) do |path|
 					yield RelativePath.new(path, @root)
 				end
 			end
-	
-			def roots
-				[@root]
-			end
-		
+			
 			def eql?(other)
 				other.kind_of?(self.class) and @root.eql?(other.root) and @pattern.eql?(other.pattern)
 			end
@@ -150,9 +166,10 @@ module Build
 			end
 		end
 	
-		class Paths < List
+		class Paths < DirectoryList
 			def initialize(root, paths)
-				@root = root.to_s
+				super(root)
+				
 				@paths = Array(paths)
 			end
 	
@@ -165,10 +182,6 @@ module Build
 				end
 			end
 	
-			def roots
-				[@root]
-			end
-		
 			def eql? other
 				other.kind_of?(self.class) and @paths.eql?(other.paths)
 			end

data/lib/build/{system → files}/monitor.rb

@@ -20,102 +20,102 @@
 
 require 'set'
 
-require 'build/system/state'
+require 'build/files/state'
 
 module Build
-	module System
+	module Files
 		class Monitor
 			def initialize
 				@directories = Hash.new { |hash, key| hash[key] = Set.new }
-			
+		
 				@updated = false
 			end
-		
+	
 			attr :updated
-		
+	
 			# Notify the monitor that files in these directories have changed.
 			def update(directories, *args)
 				directories.each do |directory|
 					# directory = File.realpath(directory)
-				
+					
 					@directories[directory].each do |handle|
 						handle.changed!(*args)
 					end
 				end
 			end
-		
+	
 			def roots
 				@directories.keys
 			end
-		
+	
 			def delete(handle)
 				handle.directories.each do |directory|
 					@directories[directory].delete(handle)
-				
+			
 					# Remove the entire record if there are no handles:
 					if @directories[directory].size == 0
 						@directories.delete(directory)
-					
+				
 						@updated = true
 					end
 				end
 			end
-		
+	
 			def track_changes(files, &block)
 				handle = Handle.new(self, files, &block)
-			
+		
 				add(handle)
 			end
-		
+	
 			def add(handle)
 				handle.directories.each do |directory|
 					@directories[directory] << handle
-				
+			
 					# We just added the first handle:
 					if @directories[directory].size == 1
 						# If the handle already existed, this might trigger unnecessarily.
 						@updated = true
 					end
 				end
-			
+		
 				handle
 			end
 		end
-	
+
 		def self.run_with_fsevent(monitor, options = {}, &block)
 			require 'rb-fsevent'
-		
+	
 			fsevent ||= FSEvent.new
-		
+	
 			catch(:interrupt) do
 				while true
 					fsevent.watch monitor.roots do |directories|
 						monitor.update(directories)
-					
+				
 						yield
-					
+				
 						if monitor.updated
 							fsevent.stop
 						end
 					end
-				
+			
 					fsevent.run
 				end
 			end
 		end
-	
+
 		def self.run_with_polling(monitor, options = {}, &block)
 			catch(:interrupt) do
 				while true
 					monitor.update(monitor.roots)
-				
+			
 					yield
-				
+			
 					sleep(options[:latency] || 5.0)
 				end
 			end
 		end
-	
+
 		def self.run(monitor, options = {}, &block)
 			run_with_polling(monitor, options, &block)
 		end

data/lib/build/{system → files}/state.rb

@@ -19,7 +19,7 @@
 # THE SOFTWARE.
 
 module Build
-	module System
+	module Files
 		# Represents a specific file on disk with a specific mtime.
 		class FileTime
 			include Comparable
@@ -36,7 +36,7 @@ module Build
 				@time <=> other.time
 			end
 		end
-	
+		
 		class State
 			def initialize(files)
 				raise ArgumentError.new("Invalid files list: #{files}") unless Files::List === files

data/lib/build/graph.rb

@@ -1,6 +1,5 @@
 
-require 'build/system/monitor'
-require 'build/system/pool'
+require 'build/files/monitor'
 
 require 'build/error'
 require 'build/node'
@@ -8,7 +7,7 @@ require 'build/walker'
 require 'build/edge'
 
 module Build
-	class Graph < System::Monitor
+	class Graph < Files::Monitor
 		def initialize
 			super
 			

data/lib/build/node.rb

@@ -1,12 +1,12 @@
 
-require 'build/system/state'
+require 'build/files/state'
 
 module Build
 	class Node
 		def initialize(graph, inputs, outputs)
 			@graph = graph
 			
-			@state = System::IOState.new(inputs, outputs)
+			@state = Files::IOState.new(inputs, outputs)
 			
 			@status = :unknown
 			@fiber = nil

data/lib/build/version.rb

@@ -1,3 +1,3 @@
 module Build
-	VERSION = "0.0.1"
+	VERSION = "0.1.0"
 end

data/test/program/main.cpp

@@ -0,0 +1,18 @@
+
+#include <iostream>
+#include <vector>
+
+std::vector<int> get_numbers() {
+	return {10, 20, 30, 40, 50, 60, 80};
+}
+
+int main (int argc, char ** argv)
+{
+	auto numbers = get_numbers();
+	std::sort(numbers.begin(), numbers.end());
+	
+	for (auto & number : numbers)
+		std::cerr << number << "?" << std::endl;
+	
+	return 0;
+}

data/test/test_files.rb

@@ -60,4 +60,15 @@ class TestFiles < Test::Unit::TestCase
 		# We actually return a subclass which includes the root portion:
 		assert_equal __dir__, test_glob.first.root
 	end
+	
+	def test_renaming
+		program_root = File.join(__dir__, "program")
+		program_glob = Build::Files::Glob.new(program_root, "*.cpp")
+		
+		paths = program_glob.process do |path|
+			path + ".o"
+		end
+		
+		puts "object paths: #{paths} from program paths: #{program_glob.to_a}"
+	end
 end

data/test/test_graph.rb

@@ -22,7 +22,9 @@ require 'test/unit'
 
 require 'build/graph'
 require 'build/files'
-require 'build/system/pool'
+
+require 'process/group'
+require 'fileutils'
 
 class TestGraph < Test::Unit::TestCase
 	# The graph node is created once, so a graph has a fixed number of nodes, which store per-vertex state and connectivity.
@@ -49,14 +51,14 @@ class TestGraph < Test::Unit::TestCase
 	
 	# The task is the context in which a vertex is updated. Because nodes may initially create other nodes, it is also responsible for looking up and creating new nodes.
 	class Task < Build::Task
-		def initialize(graph, walker, node, pool = nil)
+		def initialize(graph, walker, node, group = nil)
 			super(graph, walker, node)
 			
-			@pool = pool
+			@group = group
 		end
 		
 		def wet?
-			@pool# and @node.dirty?
+			@group# and @node.dirty?
 		end
 		
 		def process(inputs, outputs, &block)
@@ -72,10 +74,10 @@ class TestGraph < Test::Unit::TestCase
 		
 		def run(*arguments)
 			if wet?
-				status = @pool.run(*arguments)
+				status = @group.spawn(*arguments)
 				
 				if status != 0
-					raise CommandFailure.new(arguments, status)
+					raise RuntimeError.new(status)
 				end
 			end
 		end
@@ -88,8 +90,8 @@ class TestGraph < Test::Unit::TestCase
 	end
 	
 	class Graph < Build::Graph
-		def initialize
-			yield self
+		def initialize(&block)
+			@top = Node.new(self, Build::Files::NONE, Build::Files::NONE, &block)
 			
 			super()
 		end
@@ -101,23 +103,19 @@ class TestGraph < Test::Unit::TestCase
 		end
 		
 		def build_graph!
-			puts "Building graph..."
-			
 			super do |walker, node|
 				Task.new(self, walker, node)
 			end
 		end
 		
 		def update!
-			puts "Updating graph..."
-			
-			pool = Build::System::Pool.new
+			group = Process::Group.new
 			
 			super do |walker, node|
-				Task.new(self, walker, node, pool)
+				Task.new(self, walker, node, group)
 			end
 			
-			pool.wait
+			group.wait
 		end
 	end
 	
@@ -127,11 +125,9 @@ class TestGraph < Test::Unit::TestCase
 		
 		FileUtils.rm_f output_paths.to_a
 		
-		graph = Graph.new do |graph|
-			graph.top = Node.new(graph, Build::Files::NONE, Build::Files::NONE) do
-				process test_glob, output_paths do
-					run("ls", "-la", *test_glob, :out => output_paths.first)
-				end
+		graph = Graph.new do
+			process test_glob, output_paths do
+				run("ls", "-la", *test_glob, :out => output_paths.first)
 			end
 		end
 		
@@ -144,5 +140,9 @@ class TestGraph < Test::Unit::TestCase
 		assert_equal mtime, File.mtime(output_paths.first)
 		
 		FileUtils.rm_f output_paths.to_a
+		
+		#graph.nodes.each do |key, node|
+		#	puts "#{node.status} #{node.inspect}"
+		#end
 	end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: build-graph
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: process-group
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: system
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +90,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -84,13 +99,13 @@ files:
 - lib/build/edge.rb
 - lib/build/error.rb
 - lib/build/files.rb
+- lib/build/files/monitor.rb
+- lib/build/files/state.rb
 - lib/build/graph.rb
 - lib/build/node.rb
-- lib/build/system/monitor.rb
-- lib/build/system/pool.rb
-- lib/build/system/state.rb
 - lib/build/version.rb
 - lib/build/walker.rb
+- test/program/main.cpp
 - test/test_files.rb
 - test/test_graph.rb
 homepage: ''
@@ -119,5 +134,6 @@ specification_version: 4
 summary: Build::Graph is a framework for build systems, with specific functionality
   for dealing with file based processes.
 test_files:
+- test/program/main.cpp
 - test/test_files.rb
 - test/test_graph.rb

data/lib/build/system/pool.rb

@@ -1,116 +0,0 @@
-# Copyright, 2014, 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 'rainbow'
-require 'system'
-require 'fiber'
-
-module Build
-	module System
-		# A pool is a group of tasks which can be run asynchrnously using fibers. Someone must call #wait to ensure that all fibers eventuall resume.
-		class Pool
-			def self.processor_count
-				::System::CPU.count
-			end
-	
-			class Command
-				def initialize(arguments, options, fiber = Fiber.current)
-					@arguments = arguments
-					@options = options
-				
-					@fiber = fiber
-				end
-			
-				attr :arguments
-				attr :options
-			
-				def run(options = {})
-					puts Rainbow("Running #{@arguments.inspect} options: #{@options.merge(options).inspect}").blue
-				
-					Process.spawn(*@arguments, @options.merge(options))
-				end
-			
-				def resume(*arguments)
-					@fiber.resume(*arguments)
-				end
-			end
-	
-			def initialize(options = {})
-				@commands = []
-				@limit = options[:limit] || Pool.processor_count
-			
-				@running = {}
-				@fiber = nil
-			
-				@pgid = true
-			end
-		
-			attr :running
-		
-			def run(*arguments)
-				options = Hash === arguments.last ? arguments.pop : {}
-				arguments = arguments.flatten.collect &:to_s
-			
-				@commands << Command.new(arguments, options)
-			
-				schedule!
-			
-				Fiber.yield
-			end
-		
-			def schedule!
-				while @running.size < @limit and @commands.size > 0
-					command = @commands.shift
-				
-					if @running.size == 0
-						pid = command.run(:pgroup => true)
-						@pgid = Process.getpgid(pid)
-					else
-						pid = command.run(:pgroup => @pgid)
-					end
-				
-					@running[pid] = command
-				end
-			end
-	
-			def wait
-				while @running.size > 0
-					# Wait for processes in this group:
-					pid, status = Process.wait2(-@pgid)
-				
-					command = @running.delete(pid)
-				
-					schedule!
-				
-					command.resume(status)
-				end
-			end
-		end
-	
-		module FakePool
-			def self.wait
-			end
-		
-			def self.run(*arguments)
-				0
-			end
-		end
-	end
-end