build-graph 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b75e42193ea41f6a0d0e03133368edc9b07d264c68fb969b5c92efd2e28db32
-  data.tar.gz: 6b26953d62482339e1762915618b0d4a3946d282004a6adaa896abb9db70e65b
+  metadata.gz: 2660012c78eab9ed19ce99d5ba59be689e5a25f86c3dc376d8ea11ac86290275
+  data.tar.gz: bbae16e2bfaa322b26e521a319ce2431d636e263ee42685706c893e02011eebf
 SHA512:
-  metadata.gz: b61a58f2aa3daff22b1727bd0b0eb86b0d8ede3ee126d0fde39071b165f21edd6de52a7c75a4c9032c9ad460eb249a8f464950a93b7257ad49dd25e94e2e6ceb
-  data.tar.gz: '095cd63881f370fe454e36f5dc3cb09ae8356a094d80fd60a33dcc9214add66be63338f865d4c0a1e2821dee8a58fea89c790a8b84aa20256d2a34d42b656aab'
+  metadata.gz: da7be812b70a047264c5950de7ee69d4b82d5ec06ec2fd5ef636b68ecad77dcb8271ab82dfe4f749571db5c11dfe00295ebf235a15605a4483db103d8bae1f3d
+  data.tar.gz: 1e0fe54dde3ac23a375884e8bc1a8abb0635d7bcf0a8e21864e6dde9d2a144549612f119cfd6e089f2a6c8a2e51fe7bd76f6c1db753b00a8fffb3602c5d0c259

data/.travis.yml

@@ -1,21 +1,19 @@
 language: ruby
-sudo: false
-rvm:
-  - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
-  - ruby-head
-  - rbx-2
-env: COVERAGE=true
-matrix:
-  fast_finish: true
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: "rbx-2"
+dist: xenial
+cache: bundler
+
 addons:
   apt:
     sources:
     - ubuntu-toolchain-r-test
     packages:
-    - libstdc++-4.8-dev
+    - libstdc++-4.8-dev
+
+matrix:
+  include:
+    - rvm: 2.3
+    - rvm: 2.4
+    - rvm: 2.5
+    - rvm: 2.6
+    - rvm: 2.6
+      env: COVERAGE=BriefSummary,Coveralls

data/lib/build/graph/task.rb

@@ -105,8 +105,8 @@ module Build
 				return self
 			end
 			
-			def invoke(node, **options)
-				child_task = @walker.call(node, **options)
+			def invoke(node)
+				child_task = @walker.call(node, self)
 				
 				raise ArgumentError.new("Invalid child task") unless child_task
 				

data/lib/build/graph/version.rb

@@ -20,6 +20,6 @@
 
 module Build
 	module Graph
-		VERSION = "1.1.0"
+		VERSION = "1.2.0"
 	end
 end

data/lib/build/graph/walker.rb

@@ -25,14 +25,12 @@ require_relative 'task'
 require_relative 'node'
 require_relative 'edge'
 
-require_relative 'call_stack'
-
 module Build
 	module Graph
 		# A walker walks over a graph and applies a task to each node.
 		class Walker
 			def self.for(task_class, *args, **options)
-				self.new(**options) do |walker, node|
+				self.new(**options) do |walker, node, parent_task = nil|
 					task = task_class.new(walker, node, *args)
 					
 					task.visit do
@@ -58,8 +56,6 @@ module Build
 				
 				@logger = logger || Logger.new(nil)
 				@monitor = Files::Monitor.new(logger: @logger)
-				
-				@call_stack = CallStack.new
 			end
 			
 			# Primarily for debugging from within Task
@@ -87,23 +83,16 @@ module Build
 				end
 			end
 			
-			def with(**state)
-				@call_stack.with(**state) do
-					yield
-				end
-			end
-			
-			def call(node, **state)
-				@call_stack.with(**state) do
-					# We try to fetch the task if it has already been invoked, otherwise we create a new task.
-					@tasks.fetch(node) do
-						@logger.debug{"Update: #{node}"}
-						
-						@update.call(self, node, @call_stack.last)
-						
-						# This should now be defined:
-						return @tasks[node]
-					end
+			def call(node, parent_task = nil)
+				# We try to fetch the task if it has already been invoked, otherwise we create a new task.
+				@tasks.fetch(node) do
+					@logger.debug{"Update: #{node} #{parent_task.inspect}"}
+					
+					# This method should add the node
+					@update.call(self, node, parent_task)
+					
+					# This should now be defined:
+					return @tasks[node]
 				end
 			end
 			

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-graph
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: process-group
@@ -139,14 +139,12 @@ files:
 - Rakefile
 - build-graph.gemspec
 - lib/build/graph.rb
-- lib/build/graph/call_stack.rb
 - lib/build/graph/edge.rb
 - lib/build/graph/node.rb
 - lib/build/graph/task.rb
 - lib/build/graph/version.rb
 - lib/build/graph/walker.rb
 - spec/build/graph/build_test.rb
-- spec/build/graph/call_stack_spec.rb
 - spec/build/graph/edge_spec.rb
 - spec/build/graph/graph_spec.rb
 - spec/build/graph/inherit_spec.rb
@@ -186,7 +184,6 @@ summary: Build::Graph is a framework for build systems, with specific functional
   for dealing with file based processes.
 test_files:
 - spec/build/graph/build_test.rb
-- spec/build/graph/call_stack_spec.rb
 - spec/build/graph/edge_spec.rb
 - spec/build/graph/graph_spec.rb
 - spec/build/graph/inherit_spec.rb

data/lib/build/graph/call_stack.rb

@@ -1,51 +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.
-
-module Build
-	module Graph
-		# A call stack contains frames to track state during nested invocations.
-		class CallStack
-			def initialize
-				# Saves state if supplied to #call, which is useful for top level state:
-				@frames = [{}.freeze]
-			end
-			
-			# All stack frames which had state associated with them.
-			attr :frames
-			
-			# Yield with the given state, merged with any prior state.
-			def with(**state)
-				if state and !state.empty?
-					@frames << @frames.last.merge(state).freeze
-					yield
-					@frames.pop
-				else
-					yield
-				end
-			end
-			
-			# The current stack frame state.
-			def last
-				@frames.last
-			end
-		end
-	end
-end
-

data/spec/build/graph/call_stack_spec.rb

@@ -1,40 +0,0 @@
-#!/usr/bin/env rspec
-# 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 'build/graph/call_stack'
-
-RSpec.describe Build::Graph::CallStack do
-	it "should merge state" do
-		outer_state = nil
-		inner_state = nil
-		
-		subject.with(x: 10) do
-			outer_state = subject.last
-			
-			subject.with(x: 20, y: 30) do
-				inner_state = subject.last
-			end
-		end
-		
-		expect(outer_state).to include(:x)
-		expect(inner_state).to include(:x, :y)
-	end
-end