teapot 0.9.10 → 1.0.0.pre.rc1

data/spec/teapot/dependency_spec.rb

@@ -0,0 +1,113 @@
+# 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 'teapot/dependency'
+
+module Teapot::DependencySpec
+	class BasicDependency
+		include Teapot::Dependency
+		
+		def initialize(name = nil)
+			@name = name
+		end
+		
+		attr :name
+	end
+	
+	describe Teapot::Dependency do
+		it "Should resolve dependency chain" do
+			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])
+			expect(chain.ordered.collect(&:first)).to be == [a, b, c]
+			
+			d = BasicDependency.new
+			
+			d.provides 'pie' do
+			end
+			
+			d.depends 'apple'
+			
+			chain = Teapot::Dependency::chain([], ['pie'], [a, b, c, d])
+			
+			expect(chain.unresolved).to be == []
+			expect(chain.ordered.collect(&:first)).to be == [a, d]
+		end
+		
+		it "should report conflicts" do
+			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.new([], ['salad'], [apple, bananna, salad])
+			expect(chain.unresolved.first).to be == ["fruit", salad]
+			expect(chain.conflicts).to be == {"fruit" => [apple, bananna]}
+		
+			chain = Teapot::Dependency::Chain.new(['apple'], ['salad'], [apple, bananna, salad])
+			expect(chain.unresolved).to be == []
+			expect(chain.conflicts).to be == {}
+		end
+		
+		it "should resolve aliases" do
+			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])
+			expect(chain.unresolved).to be == []
+			expect(chain.conflicts).to be == {}
+			expect(chain.ordered).to be == [[apple, "apple"], [salad, "salad"]]
+		end
+	end
+end

data/spec/teapot/environment_spec.rb

@@ -0,0 +1,91 @@
+# 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 'teapot/environment'
+
+module Teapot::EnvironmentSpec
+	describe Teapot::Environment do
+		it "should chain environments together" do
+			a = Teapot::Environment.new
+			a[:cflags] = ["-std=c++11"]
+			
+			b = Teapot::Environment.new(a, {})
+			b[:cflags] = ["-stdlib=libc++"]
+			b[:rcflags] = lambda {cflags.reverse}
+			
+			expect(b.flatten.to_hash).to be == {:cflags => ["-std=c++11", "-stdlib=libc++"], :rcflags => ["-stdlib=libc++", "-std=c++11"]}
+		end
+		
+		it "should resolve nested lambda" do
+			a = Teapot::Environment.new do
+				sdk "bob-2.6"
+				cflags [->{"-sdk=#{sdk}"}]
+			end
+			
+			b = Teapot::Environment.new(a) do
+				sdk "bob-2.8"
+			end
+			
+			c = Teapot::Environment.new(b) do
+				cflags ["-pipe"]
+			end
+			
+			expect(b.flatten.to_hash.keys.sort).to be == [:cflags, :sdk]
+			
+			expect(Teapot::Environment::System::convert_to_shell(b.flatten)).to be == {
+				'SDK' => "bob-2.8",
+				'CFLAGS' => "-sdk=bob-2.8"
+			}
+			
+			expect(c.flatten[:cflags]).to be == %W{-sdk=bob-2.8 -pipe}
+		end
+		
+		it "should combine environments" do
+			a = Teapot::Environment.new(nil, {:name => 'a'})
+			b = Teapot::Environment.new(a, {:name => 'b'})
+			c = Teapot::Environment.new(nil, {:name => 'c'})
+			d = Teapot::Environment.new(c, {:name => 'd'})
+			
+			top = Teapot::Environment.combine(b, d)
+			
+			expect(top.values).to be == d.values
+			expect(top.parent.values).to be == c.values
+			expect(top.parent.parent.values).to be == b.values
+			expect(top.parent.parent.parent.values).to be == a.values
+		end
+		
+		it "should combine defaults" do
+			local = Teapot::Environment.new do
+				architectures ["-m64"]
+			end
+		
+			platform = Teapot::Environment.new do
+				default architectures ["-arch", "i386"]
+			end
+		
+			combined = Teapot::Environment.combine(
+				platform,
+				local
+			)
+		
+			expect(combined[:architectures]).to be == ["-m64"]
+		end
+	end
+end

data/{lib/teapot/build/graph.rb → spec/teapot/name_spec.rb}

@@ -18,33 +18,33 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'pathname'
+require 'teapot/name'
 
-require 'teapot/graph'
-require 'teapot/extractors/preprocessor_extractor'
-
-module Teapot
-	module Build
-		@@graphs = {}
+module Teapot::NameSpec
+	describe Teapot::Name do
+		let(:name) {Teapot::Name.new('Foo Bar')}
+		it "retains the original text" do
+			expect(name.text).to be == 'Foo Bar'
+		end
 		
-		def self.dependency_graph(environment)
-			@@graphs.fetch(environment) do
-				graph = Graph.new
-
-				buildflags = environment[:buildflags]
-				roots = Extractors::PreprocessorExtractor.include_directories(buildflags)
-			
-				# At some point, it would be nice if this process could be driven by environment configuration:
-				patterns = [
-					/\.c(c|pp)?$/,
-					/\.h(pp)?$/,
-					/\.mm?/
-				]
-			
-				graph.extractors << Extractors::PreprocessorExtractor.new(patterns, roots)
-				
-				@@graphs[environment] = graph
-			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(Teapot::Name.from_target(name.target).text).to be == name.text
 		end
 	end
-end
+end

data/{test/test_substitutions.rb → spec/teapot/substitutions_spec.rb}

@@ -18,48 +18,48 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require "minitest/autorun"
-
 require 'teapot/substitutions'
 
-class TestSubstitutions < MiniTest::Test
-	def test_symobolic_substitutions
-		input = <<-EOF
-		$FOO $BAR
-		EOF
+module Teapot::SubstitutionsSpec
+	describe Teapot::Substitutions do
+		it "should substitute symbolic expressions" do
+			input = <<-EOF
+			$FOO $BAR
+			EOF
 		
-		output = <<-EOF
-		baz bar
-		EOF
+			output = <<-EOF
+			baz bar
+			EOF
 		
-		substitutions = Teapot::Substitutions.new
-		substitutions['FOO'] = 'baz'
-		substitutions['BAR'] = 'bar'
+			substitutions = Teapot::Substitutions.new
+			substitutions['FOO'] = 'baz'
+			substitutions['BAR'] = 'bar'
 		
-		assert_equal output, substitutions.apply(input)
-	end
-	
-	def test_nested_substitutions
-		input = <<-EOF
-		<FOO>
-		$BAR
-		</FOO>
-		EOF
+			expect(substitutions.apply(input)).to be == output
+		end
+		
+		it "should indent nestest expressions" do
+			input = <<-EOF
+			<FOO>
+			$BAR
+			</FOO>
+			EOF
 		
-		output = <<-EOF
-		enter
-		{
-			foo
-				Hello World
-			bar
-		}
-		exit
-		EOF
+			output = <<-EOF
+			enter
+			{
+				foo
+					Hello World
+				bar
+			}
+			exit
+			EOF
 		
-		substitutions = Teapot::Substitutions.new
-		substitutions['FOO'] = ["enter\n{\n", "foo\n", "bar\n", "}\nexit\n"]
-		substitutions['BAR'] = 'Hello World'
+			substitutions = Teapot::Substitutions.new
+			substitutions['FOO'] = ["enter\n{\n", "foo\n", "bar\n", "}\nexit\n"]
+			substitutions['BAR'] = 'Hello World'
 		
-		assert_equal output, substitutions.apply(input)
+			expect(substitutions.apply(input)).to be == output
+		end
 	end
-end
+end

data/{test → spec/teapot}/teapot.rb

@@ -3,7 +3,7 @@
 #  This file is part of the "Teapot" project, and is released under the MIT license.
 #
 
-teapot_version "0.8"
+teapot_version "1.0.0"
 
 define_configuration 'test' do |configuration|
 	configuration.public!

data/teapot.gemspec

@@ -23,20 +23,27 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 	spec.require_paths = ["lib"]
-
-	spec.required_ruby_version = '>= 1.9.3'
-
+	
+	spec.required_ruby_version = '>= 2.0'
+	
 	spec.add_dependency "rainbow", "~> 2.0.0"
-	spec.add_dependency "rexec", "~> 1.6.0"
-	spec.add_dependency "trollop"
+	spec.add_dependency "trollop", "~> 2.0"
+	
 	spec.add_dependency "system", "~> 0.1.3"
-
-	spec.add_dependency "graphviz"
-
+	
+	spec.add_dependency "graphviz", "~> 0.0.2"
+	
+	spec.add_dependency "build-files", "~> 0.2.3"
+	spec.add_dependency "build-graph", "~> 0.3.2"
+	spec.add_dependency "build-makefile", "~> 0.2.0"
+	
+	spec.add_dependency "process-daemon", "~> 0.5.5"
+	spec.add_dependency "process-group", "~> 0.2.1"
+	
 	# This could be a good option in the future for teapot fetch:
 	#spec.add_dependency "rugged"
 	
 	spec.add_development_dependency "bundler", "~> 1.3"
-	spec.add_development_dependency "minitest"
+	spec.add_development_dependency "rspec", "~> 3.0.0"
 	spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 1.0.0.pre.rc1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -25,61 +25,117 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: rexec
+  name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: system
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
-  name: system
+  name: graphviz
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
-  name: graphviz
+  name: build-files
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.3
+- !ruby/object:Gem::Dependency
+  name: build-graph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+- !ruby/object:Gem::Dependency
+  name: build-makefile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: process-daemon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.5
+- !ruby/object:Gem::Dependency
+  name: process-group
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -95,19 +151,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -141,19 +197,6 @@ files:
 - bin/teapot
 - lib/teapot.rb
 - lib/teapot/build.rb
-- lib/teapot/build/component.rb
-- lib/teapot/build/file_list.rb
-- lib/teapot/build/graph.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/external.rb
-- lib/teapot/build/targets/files.rb
-- lib/teapot/build/targets/library.rb
-- lib/teapot/commands.rb
 - lib/teapot/configuration.rb
 - lib/teapot/context.rb
 - lib/teapot/controller.rb
@@ -163,7 +206,6 @@ files:
 - lib/teapot/controller/fetch.rb
 - lib/teapot/controller/generate.rb
 - lib/teapot/controller/list.rb
-- lib/teapot/controller/run.rb
 - lib/teapot/controller/visualize.rb
 - lib/teapot/definition.rb
 - lib/teapot/dependency.rb
@@ -176,22 +218,25 @@ files:
 - lib/teapot/extractors/linker_extractor.rb
 - lib/teapot/extractors/preprocessor_extractor.rb
 - lib/teapot/generator.rb
-- lib/teapot/graph.rb
 - lib/teapot/loader.rb
 - lib/teapot/merge.rb
 - lib/teapot/name.rb
 - lib/teapot/package.rb
 - lib/teapot/project.rb
 - lib/teapot/repository.rb
+- lib/teapot/rule.rb
+- lib/teapot/rulebook.rb
 - lib/teapot/substitutions.rb
 - lib/teapot/target.rb
 - lib/teapot/version.rb
+- spec/teapot/build_spec.rb
+- spec/teapot/context_spec.rb
+- spec/teapot/dependency_spec.rb
+- spec/teapot/environment_spec.rb
+- spec/teapot/name_spec.rb
+- spec/teapot/substitutions_spec.rb
+- spec/teapot/teapot.rb
 - teapot.gemspec
-- test/teapot.rb
-- test/test_dependency.rb
-- test/test_environment.rb
-- test/test_substitutions.rb
-- test/test_teapot.rb
 homepage: http://www.kyusu.org
 licenses:
 - MIT
@@ -204,12 +249,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -217,8 +262,10 @@ signing_key:
 specification_version: 4
 summary: Teapot is a tool for managing complex cross-platform builds.
 test_files:
-- test/teapot.rb
-- test/test_dependency.rb
-- test/test_environment.rb
-- test/test_substitutions.rb
-- test/test_teapot.rb
+- spec/teapot/build_spec.rb
+- spec/teapot/context_spec.rb
+- spec/teapot/dependency_spec.rb
+- spec/teapot/environment_spec.rb
+- spec/teapot/name_spec.rb
+- spec/teapot/substitutions_spec.rb
+- spec/teapot/teapot.rb