teapot 1.0.0.pre.rc9 → 1.0.0.pre.rc10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c85e14574b10f98c7393860c30732ba0ce291322
-  data.tar.gz: 7800be07e0609957751fcdd79bdd3f454b2e9042
+  metadata.gz: a24978c48e16ae8ae1dcf5e330149396f08cf233
+  data.tar.gz: b197ab21f377f556d084d06c2e2a88cfe275a2d0
 SHA512:
-  metadata.gz: dc81b95ae0929cc0a7f6c1b387e8b71276b1db78b3f9e8948b7ec72053be173f9279a56c2bb9a6ef6b1f9a6a7de3fa300edd44400e14e64146b828333bcac9a6
-  data.tar.gz: d097232b756dc542314069a3f464da5ed8ad7d456db959a6fe5c6c93b9bb8dc25056b0d0a8b3903ced6e33fcd308e480336735e5f6f898f25c13b0b8e738cad0
+  metadata.gz: 9f460908b58d31f2683656d2f68087176f63698018f36ae3a29ae121a7c0d1a393929e31cf49e241b6e52e637b9ecc0d1178f4d9a86f557eb3cab0e3e5bfc28c
+  data.tar.gz: 23a8accc88acb6436fdfb54f8e8db448c24a982918fe212a43fce96965098174605ff1784db255cdb1bae3058fb46a47f6c7b0f4c6b7b32ac3b18fc4976946fa

data/.simplecov

@@ -0,0 +1,9 @@
+
+SimpleCov.start do
+	add_filter "/spec/"
+end
+
+if ENV['TRAVIS']
+	require 'coveralls'
+	Coveralls.wear!
+end

data/.travis.yml

@@ -1,4 +1,8 @@
 language: ruby
+before_install:
+  # For testing purposes:
+  - git config --local user.name "Samuel Williams"
 rvm:
   - "2.0"
   - "2.1"
+env: COVERAGE=true

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in teapot.gemspec
 gemspec
+
+group :test do
+	gem 'simplecov'
+	gem 'coveralls', require: false
+end

data/README.md

@@ -9,6 +9,7 @@ Teapot is a decentralised build tool for managing complex cross-platform project
 
 [![Build Status](https://secure.travis-ci.org/ioquatix/teapot.png)](http://travis-ci.org/ioquatix/teapot)
 [![Code Climate](https://codeclimate.com/github/ioquatix/teapot.png)](https://codeclimate.com/github/ioquatix/teapot)
+[![Coverage Status](https://coveralls.io/repos/ioquatix/teapot/badge.svg)](https://coveralls.io/r/ioquatix/teapot)
 
 ## Installation
 
@@ -33,7 +34,7 @@ In the resulting project directory that has been created, you can see the list o
 
 To build your project:
 
-	$ teapot build Application/MyProject variant-debug
+	$ teapot build Application/MyProject
 
 When you build, you need to specify dependencies. If you haven't specified all dependencies, they will be suggested to you.
 
@@ -63,6 +64,7 @@ You need to make sure any basic tools, e.g. compilers, system libraries, are ins
 - Should packages be built into a shared prefix or should they be built into unique prefixes and joined together either via install or `-L` and `-I`?
 	- Relative include paths might fail to work correctly if headers are not installed into same directory.
 - Should packages expose the tools required to build themselves as dependencies? e.g. should `build-cmake` as required by, say, `OpenCV`, be exposed to all who depend on `OpenCV`? Should there be a mechanism for non-public dependencies, i.e. dependencies which are not exposed to dependants?
+- Should packages have some way to expose system requirements, e.g. installed compiler, libraries, etc. Perhaps some kind of `Package#valid?` which allows custom logic?
 
 ## Contributing
 

data/Rakefile

@@ -1,6 +1,8 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |task|
+	task.rspec_opts = ["--require", "simplecov"] if ENV['COVERAGE']
+end
 
 task :default => :spec

data/bin/teapot

@@ -95,7 +95,7 @@ module Application
 		end
 		
 		# Make the path:
-		root.mkpath
+		root.create
 		
 		Teapot::Repository.new(root).init!
 		

data/lib/teapot/configuration.rb

@@ -24,7 +24,6 @@ require 'set'
 require 'yaml/store'
 
 require 'teapot/context'
-require 'teapot/environment'
 
 require 'teapot/definition'
 

data/lib/teapot/context.rb

@@ -21,7 +21,8 @@
 require 'teapot/loader'
 require 'teapot/package'
 
-require 'teapot/rulebook'
+require 'teapot/metadata'
+require 'build/rulebook'
 
 module Teapot
 	TEAPOT_FILE = 'teapot.rb'.freeze
@@ -44,11 +45,13 @@ module Teapot
 			@root = Path[root]
 			@options = options
 
+			@metadata = Metadata.new(self)
+
 			@targets = {}
 			@generators = {}
 			@configurations = {}
 			@projects = {}
-			@rules = Rulebook.new
+			@rules = Build::Rulebook.new
 
 			@dependencies = []
 			@selection = Set.new
@@ -67,6 +70,9 @@ module Teapot
 		attr :generators
 		attr :projects
 
+		# Context metadata
+		attr :metadata
+
 		# All public configurations.
 		attr :configurations
 

data/lib/teapot/controller/build.rb

@@ -19,7 +19,7 @@
 # THE SOFTWARE.
 
 require 'teapot/controller'
-require 'teapot/build'
+require 'build/controller'
 
 $TEAPOT_DEBUG_GRAPH = false
 
@@ -37,7 +37,7 @@ module Teapot
 				ordered = context.direct_targets(ordered)
 			end
 			
-			controller = Teapot::Build::Controller.new do |controller|
+			controller = Build::Controller.new do |controller|
 				ordered.each do |(target, dependency)|
 					environment = target.environment_for_configuration(context.configuration)
 					
@@ -51,10 +51,7 @@ module Teapot
 			
 			# We need to catch interrupt here, and exit with the correct exit code:
 			begin
-				controller.run do
-					# The graph has been dirtied because files have changed, traverse and update it:
-					walker = controller.update_with_log
-					
+				controller.run do |walker|
 					if $TEAPOT_DEBUG_GRAPH
 						controller.nodes.each do |key, node|
 							puts "#{node.status} #{node.inspect}" unless node.clean?

data/lib/teapot/controller/create.rb

@@ -21,12 +21,12 @@
 require 'teapot/controller'
 require 'teapot/controller/fetch'
 
-require 'teapot/name'
+require 'build/name'
 
 module Teapot
 	class Controller
 		def create(project_name, source, packages)
-			name = Name.new(project_name)
+			name = Build::Name.new(project_name)
 			
 			log "Creating project named #{project_name} at path #{@root}...".color(:cyan)
 			

data/lib/teapot/controller/fetch.rb

@@ -81,7 +81,7 @@ module Teapot
 				local_path = context.root + package.options[:local]
 	
 				# Make the top level directory if required:
-				destination_path.dirname.mkpath
+				destination_path.dirname.create
 	
 				unless destination_path.exist?
 					destination_path.make_symlink(local_path)

data/lib/teapot/dependency.rb

@@ -20,8 +20,6 @@
 
 require 'set'
 
-require 'teapot/environment'
-
 module Teapot
 	module Dependency
 		class UnresolvedDependencyError < StandardError

data/lib/teapot/generator.rb

@@ -66,7 +66,7 @@ module Teapot
 			source_path = Pathname(path) + source
 			destination_path = Pathname(context.root) + destination
 
-			destination_path.dirname.mkpath
+			destination_path.dirname.create
 
 			File.open(destination_path, mode) do |file|
 				text = File.read(source_path)
@@ -113,7 +113,7 @@ module Teapot
 		end
 
 		def copy_binary(source_path, destination_path)
-			destination_path.dirname.mkpath
+			destination_path.dirname.create
 			FileUtils.cp source_path, destination_path
 		end
 

data/lib/teapot/loader.rb

@@ -22,10 +22,9 @@ require 'teapot/project'
 require 'teapot/target'
 require 'teapot/generator'
 require 'teapot/configuration'
-require 'teapot/rule'
-
-require 'teapot/name'
 
+require 'build/rule'
+require 'build/name'
 require 'build/files'
 
 module Teapot
@@ -49,7 +48,8 @@ module Teapot
 	end
 	
 	class Loader
-		Files = ::Build::Files
+		Files = Build::Files
+		Rule = Build::Rule
 		
 		class Definitions < Array
 			def default_configuration

data/lib/teapot/{name.rb → metadata.rb}

@@ -1,4 +1,4 @@
-# Copyright, 2013, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 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
@@ -19,31 +19,24 @@
 # THE SOFTWARE.
 
 module Teapot
-	class Name
-		def initialize(text)
-			@text = text
+	# This is a very basic class for accessing metadata from a repository. In the future I expect this will be fleshed out a bit more.
+	class Metadata
+		class Section
+			def initialize(name)
+				@name = name
+			end
+			
+			def method_missing(parameter_name)
+				`git config #{@name}.#{parameter_name}`.chomp!
+			end
 		end
 		
-		def self.from_target(string)
-			self.new(string.gsub(/(^|[ \-_])(.)/){" " + $2.upcase}.strip)
+		def initialize(context)
+			@context = context
 		end
 		
-		attr :text
-		
-		def identifier
-			@identifier ||= @text.gsub(/\s+/, '')
-		end
-		
-		def target
-			@target ||= @text.gsub(/\s+/, '-').downcase
-		end
-		
-		def macro(prefix = [])
-			(Array(prefix) + [@text]).collect{|name| name.upcase.gsub(/\s+/, '_')}.join('_')
-		end
-		
-		def header_guard(path)
-			macro(path) + '_H'
+		def method_missing(name)
+			Section.new(name)
 		end
 	end
 end

data/lib/teapot/package.rb

@@ -21,8 +21,6 @@
 require 'build/files'
 
 require 'teapot/context'
-require 'teapot/environment'
-
 require 'teapot/definition'
 
 module Teapot

data/lib/teapot/repository.rb

@@ -62,7 +62,7 @@ module Teapot
 			def clone!(remote_url, branch = nil, commit = nil)
 				branch_args = branch ? ["--branch", branch] : []
 
-				@root.mkpath
+				@root.create
 
 				run!("clone", remote_url, @root, *branch_args)
 

data/lib/teapot/target.rb

@@ -22,7 +22,8 @@ require 'pathname'
 require 'teapot/dependency'
 require 'teapot/definition'
 
-require 'teapot/rulebook'
+require 'build/environment'
+require 'build/rulebook'
 
 module Teapot
 	class BuildError < StandardError
@@ -36,7 +37,7 @@ module Teapot
 			
 			@build = nil
 			
-			@rulebook = Rulebook.new
+			@rulebook = Build::Rulebook.new
 		end
 		
 		attr :rulebook
@@ -55,14 +56,14 @@ module Teapot
 			
 			# Calculate the dependency chain's ordered environments:
 			environments += chain.provisions.collect do |provision|
-				Environment.new(&provision.value)
+				Build::Environment.new(&provision.value)
 			end
 			
 			# Per-configuration package package environment:
 			environments << @package.options[:environment]
 			
 			# Merge all the environments together:
-			environment = Environment.combine(*environments)
+			environment = Build::Environment.combine(*environments)
 				
 			environment.merge do
 				default platforms_path configuration.platforms_path

data/lib/teapot/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Teapot
-	VERSION = "1.0.0-rc9"
+	VERSION = "1.0.0-rc10"
 end

data/{lib/teapot/environment.rb → spec/teapot/metadata_spec.rb}

@@ -18,8 +18,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'teapot/environment/base'
-require 'teapot/environment/constructor'
-require 'teapot/environment/evaluator'
-require 'teapot/environment/flatten'
-require 'teapot/environment/system'
+require 'teapot/metadata'
+
+module Teapot::MetadataSpec
+	describe Teapot::Metadata do
+		let(:metadata) {Teapot::Metadata.new(nil)}
+		it "can provide user name" do
+			expect(metadata.user.name).to_not be nil
+			expect(metadata.user.name.length).to be > 0
+		end
+	end
+end

data/teapot.gemspec

@@ -35,9 +35,7 @@ Gem::Specification.new do |spec|
 	
 	spec.add_dependency "graphviz", "~> 0.1.0"
 	
-	spec.add_dependency "build-files", "~> 0.2.9"
-	spec.add_dependency "build-graph", "~> 0.3.5"
-	spec.add_dependency "build-makefile", "~> 0.2.0"
+	spec.add_dependency "build", "~> 1.0.0"
 	
 	spec.add_dependency "process-daemon", "~> 0.5.5"
 	spec.add_dependency "process-group", "~> 0.2.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.rc9
+  version: 1.0.0.pre.rc10
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2015-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -67,47 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: build-files
+  name: build
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.9
-- !ruby/object:Gem::Dependency
-  name: build-graph
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.5
-- !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
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: process-daemon
   requirement: !ruby/object:Gem::Requirement
@@ -190,13 +162,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".simplecov"
 - ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
 - bin/teapot
 - lib/teapot.rb
-- lib/teapot/build.rb
 - lib/teapot/configuration.rb
 - lib/teapot/context.rb
 - lib/teapot/controller.rb
@@ -209,29 +181,19 @@ files:
 - lib/teapot/controller/visualize.rb
 - lib/teapot/definition.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/generator.rb
 - lib/teapot/loader.rb
 - lib/teapot/merge.rb
-- lib/teapot/name.rb
+- lib/teapot/metadata.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/metadata_spec.rb
 - spec/teapot/substitutions_spec.rb
 - spec/teapot/teapot.rb
 - teapot.gemspec
@@ -260,10 +222,8 @@ signing_key:
 specification_version: 4
 summary: Teapot is a tool for managing complex cross-platform builds.
 test_files:
-- 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/metadata_spec.rb
 - spec/teapot/substitutions_spec.rb
 - spec/teapot/teapot.rb