teapot 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09184fb53086c06b569d1d5bdb3467f279213cfe
-  data.tar.gz: c279be319f6eef1eabc954c201b5f2f2f7eee777
+  metadata.gz: 878219ed331477566d41ce4f34e5342bd20d3b54
+  data.tar.gz: fb855b6abbc1225ea619a4ba4e17e821a8c37b62
 SHA512:
-  metadata.gz: acecea7259829609c6507a2d2d095d6d838c307846be48e41b824153b02861ce943451ecaaa844364045c429c957aa096d3bfb04887a3a3c0255b2af0251b5dc
-  data.tar.gz: 446c2438293e98666bf2a6c59094c2fa1b747f8107c218a9672387eca40d07f52d2d547262f2f213dbb24cfe2fe5fdafcee2081d26e65020310491ce4e224444
+  metadata.gz: d12945e3ba6e0aa7debca0ebbe7642e4edad9b412df3d538f0aa7c4c1195afabad9204c5c9954d52d9563d690c0a8918795e0382c8324c55a86be7f1d6e6195d
+  data.tar.gz: b2faf14aa6e156a92e041b082ce790de98425cab5f606f81c0705afea8327f1064540f14d24df84468189f5c6c375ddeef2ab29c5d93df244d730abac09fec08

data/Gemfile

@@ -2,7 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in teapot.gemspec
 gemspec
-
-group :test do
-	gem "rake"
-end

data/bin/teapot

@@ -72,8 +72,12 @@ module Application
 		make_controller.run(targets)
 	end
 	
-	def self.list
-		make_controller.list
+	def self.list(only = ARGV)
+		if only.size > 0
+			make_controller.list(Set.new(only))
+		else
+			make_controller.list
+		end
 	end
 	
 	def self.visualize(targets = ARGV)

data/lib/teapot/build/target.rb

@@ -22,7 +22,6 @@ require 'teapot/commands'
 require 'teapot/environment'
 
 require 'pathname'
-require 'rainbow'
 require 'fileutils'
 
 require 'teapot/build/linker'

data/lib/teapot/commands.rb

@@ -21,7 +21,8 @@
 require 'set'
 require 'rainbow'
 require 'shellwords'
-require 'facter'
+
+require 'system'
 require 'rexec/task'
 
 module Teapot
@@ -36,14 +37,6 @@ module Teapot
 			end
 		end
 		
-		def self.processor_count
-			# Get the number of virtual/physical processors
-			count = Facter.processorcount.to_i rescue 1
-			
-			# Make sure we always return at least 1:
-			count < 1 ? 1 : count
-		end
-		
 		class CommandError < StandardError
 		end
 		
@@ -55,7 +48,7 @@ module Teapot
 			options = Hash === args.last ? args.pop : {}
 			options[:passthrough] ||= :all
 			
-			args = args.flatten.collect &:to_s
+			args = args.flatten.compact.collect &:to_s
 			
 			puts args.join(' ').color(:blue) + " in #{options[:chdir] || Dir.getwd}"
 			
@@ -79,7 +72,7 @@ module Teapot
 		end
 		
 		def self.make(*args)
-			run("make", *args, "-j", processor_count)
+			run("make", args, "-j", System::CPU.count)
 		end
 		
 		def self.make_install
@@ -87,15 +80,20 @@ module Teapot
 		end
 		
 		class Pool
+			def self.concurrent_process_count
+				System::CPU.count * 2
+			end
+			
 			def initialize(options = {})
 				@commands = []
-				@limit = options[:limit] || Commands.processor_count
+				
+				@limit = options[:limit] || Pool.concurrent_process_count
 				
 				@running = Set.new
 			end
 			
 			def run(*args)
-				args = args.flatten.collect &:to_s
+				args = args.flatten.compact.collect &:to_s
 				
 				@commands << args
 				

data/lib/teapot/controller/list.rb

@@ -22,9 +22,12 @@ require 'teapot/controller'
 
 module Teapot
 	class Controller
-		def list
+		def list(only = nil)
 			# Should this somehow consider context.root_package?
 			context.configuration.packages.each do |package|
+				# The root package is the local package for this context:
+				next unless only == nil or only.include?(package.name)
+				
 				log "Package #{package.name} (from #{package.path}):".bright
 			
 				begin

data/lib/teapot/environment/system.rb

@@ -19,7 +19,9 @@
 # THE SOFTWARE.
 
 require 'rexec/environment'
+
 require 'rainbow'
+require 'rainbow/ext/string'
 
 module Teapot
 	class Environment

data/lib/teapot/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Teapot
-	VERSION = "0.9.9"
+	VERSION = "0.9.10"
 end

data/teapot.gemspec

@@ -10,8 +10,10 @@ Gem::Specification.new do |spec|
 	spec.email         = ["samuel.williams@oriontransfer.co.nz"]
 	spec.description   = <<-EOF
 	Teapot is a tool for managing complex cross-platform builds. It provides
-	advanced dependency management via the Teapot file and is supported by
-	the infusions ecosystem of packages and platform tooling.
+	advanced package-based dependency management with a single configuration file
+	per project. It can fetch, list, build, visualise and create projects, and
+	has been designed from the ground up to support collaborative decentralised
+	development.
 	EOF
 	spec.summary       = %q{Teapot is a tool for managing complex cross-platform builds.}
 	spec.homepage      = "http://www.kyusu.org"
@@ -24,13 +26,17 @@ Gem::Specification.new do |spec|
 
 	spec.required_ruby_version = '>= 1.9.3'
 
-	spec.add_dependency "rainbow"
+	spec.add_dependency "rainbow", "~> 2.0.0"
 	spec.add_dependency "rexec", "~> 1.6.0"
 	spec.add_dependency "trollop"
-	spec.add_dependency "facter"
+	spec.add_dependency "system", "~> 0.1.3"
 
 	spec.add_dependency "graphviz"
 
 	# 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 "rake"
 end

data/test/test_dependency.rb

@@ -18,13 +18,11 @@
 # 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 "minitest/autorun"
 
 require 'teapot/dependency'
 
-class TestDependency < Test::Unit::TestCase
+class TestDependency < MiniTest::Test
 	class BasicDependency
 		include Teapot::Dependency
 		

data/test/test_environment.rb

@@ -18,13 +18,11 @@
 # 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 "minitest/autorun"
 
 require 'teapot/environment'
 
-class TestEnvironment < Test::Unit::TestCase
+class TestEnvironment < MiniTest::Test
 	def test_environment_chaining
 		a = Teapot::Environment.new
 		a[:cflags] = ["-std=c++11"]

data/test/test_substitutions.rb

@@ -18,13 +18,11 @@
 # 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 "minitest/autorun"
 
 require 'teapot/substitutions'
 
-class TestSubstitutions < Test::Unit::TestCase
+class TestSubstitutions < MiniTest::Test
 	def test_symobolic_substitutions
 		input = <<-EOF
 		$FOO $BAR

data/test/test_teapot.rb

@@ -18,13 +18,11 @@
 # 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 "minitest/autorun"
 
 require 'teapot/context'
 
-class TestConfig < Test::Unit::TestCase
+class TestConfig < MiniTest::Test
 	ROOT = Pathname.new(__FILE__).dirname
 	
 	def test_context

metadata

@@ -1,88 +1,131 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rexec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: facter
+  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: graphviz
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: "\tTeapot is a tool for managing complex cross-platform builds. It provides\n\tadvanced
-  dependency management via the Teapot file and is supported by\n\tthe infusions ecosystem
-  of packages and platform tooling.\n"
+  package-based dependency management with a single configuration file\n\tper project.
+  It can fetch, list, build, visualise and create projects, and\n\thas been designed
+  from the ground up to support collaborative decentralised\n\tdevelopment.\n"
 email:
 - samuel.williams@oriontransfer.co.nz
 executables:
@@ -90,8 +133,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -159,17 +202,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Teapot is a tool for managing complex cross-platform builds.