build-dependency 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d91dfd64e537d8898ffdd3c1202e3f6a7a28ecd
-  data.tar.gz: 9da62e2d3c498ff5f3ddceb353bd4b988ffad174
+  metadata.gz: 6cb795ff1a6fb70f25f646a916bbdb307bc56646
+  data.tar.gz: 54665a26d16a62df4161e21d6a8ad32c31101a7a
 SHA512:
-  metadata.gz: 871cc55a5997ab29148b52f2df6fa6f56c2ed1c495f5653a338bd62f0307790e54e8545969b3878f40f87e481910da7bce7f258713529d4c7c998edc51ab99dc
-  data.tar.gz: a5a62b09a6592e0f44017c53e0fb4560f68a06d2d4613e16657272fc8bb71a4cf80faba2612afc1ca2685a9b40a450fa195a5a3435e05f03ae5a7d59bc3519f0
+  metadata.gz: a86ff842300e174fe0eb00696a0c8ffee6141e28b9777009901c088004fe92c668ba391c3f3166eb07451c108bc5090cbf8028beb12ea67d3a41aa8bf25b2090
+  data.tar.gz: 9c0e120c21cd393dd9f647e6e7b98206ec76ea43f573a5db6d6965ae3bd206988058321a061fdf7c93a0170c12da95d000ee956502180832354ddab1dc5b1aab

data/.travis.yml

@@ -3,10 +3,10 @@ sudo: false
 dist: trusty
 cache: bundler
 rvm:
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
-  - 2.4.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
   - ruby-head
   - jruby-head
 matrix:

data/build-dependency.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
 	spec.version       = Build::Dependency::VERSION
 	spec.authors       = ["Samuel Williams"]
 	spec.email         = ["samuel.williams@oriontransfer.co.nz"]
-	spec.summary       = %q{A nested hash data structure for controlling build dependencys.}
+	spec.summary       = %q{A set of data structures and algorithms for dependency resolution.}
 	spec.homepage      = ""
 	spec.license       = "MIT"
 

data/lib/build/dependency.rb

@@ -20,7 +20,9 @@
 
 require_relative 'dependency/version'
 
-require_relative 'dependency/unit'
+require_relative 'dependency/provider'
+
 require_relative 'dependency/chain'
 require_relative 'dependency/partial_chain'
+
 require_relative 'dependency/visualization'

data/lib/build/dependency/{unit.rb → provider.rb}

@@ -23,7 +23,7 @@ require 'set'
 module Build
 	module Dependency
 		def self.included(klass)
-			klass.include(Unit)
+			klass.include(Provider)
 		end
 		
 		# A provision is a thing which satisfies a dependency.
@@ -31,18 +31,30 @@ module Build
 			def alias?
 				false
 			end
+			
+			def to_s
+				"provides #{name.inspect}"
+			end
 		end
 		
 		Alias = Struct.new(:name, :provider, :dependencies) do
 			def alias?
 				true
 			end
+			
+			def to_s
+				"provides #{name.inspect} -> #{dependencies.collect(&:inspect).join(', ')}"
+			end
 		end
 		
 		Resolution = Struct.new(:provider, :dependency) do
 			def name
 				dependency.name
 			end
+			
+			def to_s
+				"resolution #{provider.name.inspect} -> #{dependency.name.inspect}"
+			end
 		end
 		
 		Depends = Struct.new(:name) do
@@ -54,6 +66,14 @@ module Build
 			
 			attr :options
 			
+			def to_s
+				if @options.any?
+					"depends on #{name.inspect} #{@options.inspect}"
+				else
+					"depends on #{name.inspect}"
+				end
+			end
+			
 			def private?
 				@options[:private]
 			end
@@ -62,12 +82,12 @@ module Build
 				name.is_a?(Symbol)
 			end
 			
-			def self.[] name_or_dependency
+			def self.[](name_or_dependency)
 				name_or_dependency.is_a?(self) ? name_or_dependency : self.new(name_or_dependency)
 			end
 		end
 		
-		module Unit
+		module Provider
 			def freeze
 				return unless frozen?
 				

data/lib/build/dependency/version.rb

@@ -20,6 +20,6 @@
 
 module Build
 	module Dependency
-		VERSION = "1.0.0"
+		VERSION = "1.1.0"
 	end
 end

data/spec/build/dependency/chain_spec.rb

@@ -21,7 +21,7 @@
 RSpec.describe Build::Dependency do
 	describe "valid dependency resolution" do
 		let(:a) do
-			Package.new.tap do |package|
+			Package.new('apple-tree').tap do |package|
 				package.provides 'apple' do
 					fruit ['apple']
 				end
@@ -29,7 +29,7 @@ RSpec.describe Build::Dependency do
 		end
 		
 		let(:b) do
-			Package.new.tap do |package|
+			Package.new('orange-tree').tap do |package|
 				package.provides 'orange' do
 					fruit ['orange']
 				end
@@ -37,7 +37,7 @@ RSpec.describe Build::Dependency do
 		end
 		
 		let(:c) do
-			Package.new.tap do |package|
+			Package.new('blender').tap do |package|
 				package.provides 'fruit-juice' do
 					juice ['ice', 'cold']
 				end
@@ -54,7 +54,7 @@ RSpec.describe Build::Dependency do
 		end
 		
 		let(:d) do
-			Package.new.tap do |package|
+			Package.new('bakery').tap do |package|
 				package.provides 'pie'
 				package.depends 'apple'
 			end
@@ -66,6 +66,12 @@ RSpec.describe Build::Dependency do
 			expect(chain.unresolved).to be == []
 			expect(chain.ordered.collect(&:first)).to be == [a, d]
 		end
+		
+		it "should format nicely" do
+			chain = Build::Dependency::Chain.expand(['fruit-juice'], [a, b, c])
+			resolution = chain.ordered.first
+			expect(resolution.to_s).to be == 'resolution "apple-tree" -> "apple"'
+		end
 	end
 	
 	describe "incomplete dependency resolution" do

data/spec/build/dependency/partial_chain_spec.rb

@@ -36,11 +36,11 @@ RSpec.describe Build::Dependency::PartialChain do
 		
 		it "should generate a full list of provisions" do
 			expect(chain.provisions).to be == [
-				variant.provision_for(Build::Dependency::Depends['Variant/debug']),
-				platform.provision_for(Build::Dependency::Depends['Platform/linux']),
-				compiler.provision_for(Build::Dependency::Depends['Language/C++17']),
+				variant.provision_for(Build::Dependency::Depends.new('Variant/debug')),
+				platform.provision_for(Build::Dependency::Depends.new('Platform/linux')),
+				compiler.provision_for(Build::Dependency::Depends.new('Language/C++17')),
 				lib.provision_for(Build::Dependency::Depends.new('lib')),
-				compiler.provision_for(Build::Dependency::Depends['Language/C++14']),
+				compiler.provision_for(Build::Dependency::Depends.new('Language/C++14')),
 				app.provision_for(Build::Dependency::Depends.new('app')),
 			]
 			

data/spec/build/dependency/provider_spec.rb

@@ -0,0 +1,89 @@
+# Copyright, 2017, 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.
+
+RSpec.describe Build::Dependency::Provider do
+	include_context "app packages"
+	
+	let(:provider) do
+		Package.new("test").tap do |package|
+			package.depends "a", private: true
+			package.depends "b"
+			package.depends :variant
+			
+			package.provides "c" do
+				puts "Hello World"
+			end
+			
+			package.provides platform: "linux"
+		end
+	end
+	
+	it "should have specified dependencies" do
+		expect(provider.dependencies.count).to be == 3
+	end
+	
+	it "should have specified provisions" do
+		expect(provider.provisions.count).to be == 2
+	end
+	
+	describe Build::Dependency::Provision do
+		subject {provider.provisions["c"]}
+		
+		it "should have name" do
+			expect(subject.name).to be == "c"
+		end
+		
+		it "should not be an alias" do
+			is_expected.to_not be_alias
+		end
+		
+		it "should format nicely" do
+			expect(subject.to_s).to be == 'provision "c"'
+		end
+	end
+	
+	describe Build::Dependency::Depends do
+		subject {provider.dependencies.first}
+		
+		it "should have a name" do
+			expect(subject.name).to be == "a"
+		end
+		
+		it "should not be an alias" do
+			is_expected.to_not be_alias
+		end
+		
+		it "should format nicely" do
+			expect(subject.to_s).to be == 'depends on "a" {:private=>true}'
+		end
+	end
+	
+	describe Build::Dependency::Alias do
+		subject {provider.provisions[:platform]}
+		
+		it "should be an alias" do
+			is_expected.to be_alias
+		end
+		
+		it "should format nicely" do
+			expect(subject.to_s).to be == 'alias :platform -> "linux"'
+		end
+	end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 
-if ENV['COVERAGE']
+if ENV['COVERAGE'] || ENV['TRAVIS']
 	begin
 		require 'simplecov'
 		

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-dependency
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphviz
@@ -85,12 +85,13 @@ files:
 - lib/build/dependency.rb
 - lib/build/dependency/chain.rb
 - lib/build/dependency/partial_chain.rb
-- lib/build/dependency/unit.rb
+- lib/build/dependency/provider.rb
 - lib/build/dependency/version.rb
 - lib/build/dependency/visualization.rb
 - partial.svg
 - spec/build/dependency/chain_spec.rb
 - spec/build/dependency/partial_chain_spec.rb
+- spec/build/dependency/provider_spec.rb
 - spec/build/dependency/visualization_spec.rb
 - spec/spec_helper.rb
 - visualization.svg
@@ -117,9 +118,10 @@ rubyforge_project:
 rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
-summary: A nested hash data structure for controlling build dependencys.
+summary: A set of data structures and algorithms for dependency resolution.
 test_files:
 - spec/build/dependency/chain_spec.rb
 - spec/build/dependency/partial_chain_spec.rb
+- spec/build/dependency/provider_spec.rb
 - spec/build/dependency/visualization_spec.rb
 - spec/spec_helper.rb