teapot 0.3.2 → 0.5.0

data/test/test_dependency.rb

@@ -0,0 +1,114 @@
+# 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 'pathname'
+require 'test/unit'
+require 'stringio'
+
+require 'teapot/dependency'
+
+class TestDependency < Test::Unit::TestCase
+	class BasicDependency
+		include Teapot::Dependency
+		
+		def initialize(name = nil)
+			@name = name
+		end
+		
+		attr :name
+	end
+	
+	def test_chains
+		a = BasicDependency.new
+		
+		a.provides 'apple' do
+			fruit ['apple']
+		end
+		
+		b = BasicDependency.new
+		
+		b.provides 'orange' do
+			fruit ['orange']
+		end
+		
+		c = BasicDependency.new
+		
+		c.provides 'fruit-juice' do
+			juice ['ice', 'cold']
+		end
+		
+		c.depends 'apple'
+		c.depends 'orange'
+		
+		chain = Teapot::Dependency::chain([], ['fruit-juice'], [a, b, c])
+		assert_equal [a, b, c], chain.ordered.collect(&:first)
+		
+		d = BasicDependency.new
+		
+		d.provides 'pie' do
+		end
+		
+		d.depends 'apple'
+		
+		chain = Teapot::Dependency::chain([], ['pie'], [a, b, c, d])
+		assert_equal [], chain.unresolved
+		assert_equal [a, d], chain.ordered.collect(&:first)
+	end
+	
+	def test_conflicts
+		apple = BasicDependency.new('apple')
+		apple.provides 'apple'
+		apple.provides 'fruit'
+		
+		bananna = BasicDependency.new('bananna')
+		bananna.provides 'fruit'
+		
+		salad = BasicDependency.new('salad')
+		salad.depends 'fruit'
+		salad.provides 'salad'
+		
+		chain = Teapot::Dependency::chain([], ['salad'], [apple, bananna, salad])
+		assert_equal ["fruit", salad], chain.unresolved.first
+		assert_equal({"fruit" => [apple, bananna]}, chain.conflicts)
+		
+		chain = Teapot::Dependency::chain(['apple'], ['salad'], [apple, bananna, salad])
+		assert_equal([], chain.unresolved)
+		assert_equal({}, chain.conflicts)
+	end
+	
+	def test_aliases
+		apple = BasicDependency.new('apple')
+		apple.provides 'apple'
+		apple.provides :fruit => 'apple'
+		
+		bananna = BasicDependency.new('bananna')
+		bananna.provides 'bananna'
+		bananna.provides :fruit => 'bananna'
+		
+		salad = BasicDependency.new('salad')
+		salad.depends :fruit
+		salad.provides 'salad'
+		
+		chain = Teapot::Dependency::chain(['apple'], ['salad'], [apple, bananna, salad])
+		assert_equal([], chain.unresolved)
+		assert_equal({}, chain.conflicts)
+		assert_equal([[apple, "apple"], [salad, "salad"]], chain.ordered)
+	end
+end

data/test/test_environment.rb

@@ -51,12 +51,12 @@ class TestEnvironment < Test::Unit::TestCase
 			cflags ["-pipe"]
 		end
 		
-		expected = {'SDK' => "bob-2.8", 'CCFLAGS' => "-sdk=bob-2.8"}
+		expected = {'SDK' => "bob-2.8", 'CFLAGS' => "-sdk=bob-2.8"}
 		
 		assert_equal [:cflags, :sdk], b.flatten.to_hash.keys.sort
-		assert_equal expected, b.flatten.to_system_environment_hash
+		assert_equal expected, Teapot::Environment::System::convert_to_shell(b.flatten)
 		
-		assert_equal "-sdk=bob-2.8 -pipe", c.flatten.to_string_hash[:cflags]
+		assert_equal %W{-sdk=bob-2.8 -pipe}, c.flatten[:cflags]
 	end
 	
 	def test_environment_nested_lambda

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: rexec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rexec
+  name: trollop
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -77,20 +77,31 @@ files:
 - bin/teapot
 - lib/teapot.rb
 - lib/teapot/build.rb
+- lib/teapot/build/component.rb
+- lib/teapot/build/file_list.rb
 - lib/teapot/build/linker.rb
+- lib/teapot/build/target.rb
+- lib/teapot/build/targets/application.rb
+- lib/teapot/build/targets/compiler.rb
+- lib/teapot/build/targets/directory.rb
+- lib/teapot/build/targets/executable.rb
+- lib/teapot/build/targets/files.rb
+- lib/teapot/build/targets/library.rb
 - lib/teapot/commands.rb
 - lib/teapot/config.rb
 - lib/teapot/context.rb
+- lib/teapot/dependency.rb
 - lib/teapot/environment.rb
 - lib/teapot/environment/base.rb
 - lib/teapot/environment/constructor.rb
 - lib/teapot/environment/evaluator.rb
 - lib/teapot/environment/flatten.rb
 - lib/teapot/environment/system.rb
-- lib/teapot/package.rb
-- lib/teapot/platform.rb
+- lib/teapot/target.rb
 - lib/teapot/version.rb
 - teapot.gemspec
+- test/test_config.rb
+- test/test_dependency.rb
 - test/test_environment.rb
 homepage: ''
 licenses: []
@@ -106,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4295501369315822730
+      hash: -1731715330087988580
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4295501369315822730
+      hash: -1731715330087988580
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -123,4 +134,6 @@ signing_key:
 specification_version: 3
 summary: Teapot is a tool for managing complex cross-platform builds.
 test_files:
+- test/test_config.rb
+- test/test_dependency.rb
 - test/test_environment.rb

data/lib/teapot/package.rb

@@ -1,164 +0,0 @@
-# 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 'pathname'
-
-module Teapot
-	class BuildError < StandardError
-	end
-	
-	class Task
-		def initialize
-			@callbacks = {}
-		end
-			
-		def define(name, &callback)
-			@callbacks[name] = callback
-		end
-			
-		def [](name)
-			@callbacks[name] || @callbacks[:all]
-		end
-	end
-	
-	class FakePackage
-		def initialize(context, record, name)
-			@context = context
-			@record = record
-			@name = name
-			@version = nil
-			@path = nil
-		end
-		
-		attr :context
-		attr :record
-		
-		attr :name
-		attr :version
-		
-		attr :path
-
-		def depends
-			@record.options.fetch(:depends, [])
-		end
-		
-		def build!(platform = :all, config = {})
-		end
-		
-		def to_s
-			"<FakePackage: #{@name}>"
-		end
-	end
-	
-	class Package
-		def initialize(context, record, name)
-			@context = context
-			@record = record
-
-			parts = name.split('-')
-			@name = parts[0..-2].join('-')
-			@version = parts[-1]
-
-			@build = Task.new
-
-			@depends = []
-
-			@path = @record.destination_path
-			@source_path = @path + name
-		end
-
-		attr :context
-		attr :record
-		
-		attr :name
-		attr :version
-		
-		attr :path
-
-		attr :depends, true
-		attr :source_path, true
-
-		def build(platform, &block)
-			@build.define(platform, &block)
-		end
-
-		def build!(platform = :all, config = {})
-			task = @build[platform.name]
-			
-			if task
-				environment = Environment.combine(
-					@record.options[:environment],
-					platform.environment,
-					config,
-				)
-				
-				local_build = environment.merge do
-					default build_prefix Pathname.new("build/cache/#{platform.name}-#{config[:variant]}")
-					default install_prefix platform.prefix
-			
-					buildflags [
-						->{"-I" + (platform.prefix + "include").to_s},
-					]
-					
-					linkflags [
-						->{"-L" + (platform.prefix + "lib").to_s},
-					]
-				end
-				
-				Dir.chdir(@path) do
-					task.call(platform, local_build)
-				end
-			else
-				raise BuildError.new("Could not find build task for #{platform.name}!")
-			end
-		end
-
-		def to_s
-			"<Package: #{@name}>"
-		end
-
-		def self.build_order(available, packages)
-			ordered = []
-			unresolved = []
-
-			expand = lambda do |name, parent|
-				package = available[name]
-
-				unless package
-					unresolved << [name, parent]
-				else
-					package.depends.each do |dependency|
-						expand.call(dependency, package)
-					end
-
-					unless ordered.include? package
-						ordered << package
-					end
-				end
-			end
-
-			packages.each do |package|
-				expand.call(package.name, nil)
-			end
-
-			return {:ordered => ordered, :unresolved => unresolved}
-		end
-	end
-end