teapot 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82c11fa3631f5f64272f82742fc2e2a605915050
-  data.tar.gz: 482fc59f950b17490993fa10561290beb0963369
+  metadata.gz: a4b9985b5523ab61e6016f73b9d1a7de0a424317
+  data.tar.gz: f699a936b8c6f38b761b80902c628ba054eaa8c1
 SHA512:
-  metadata.gz: c817753effc821940fc78ec441d4534414392e59c34f6d1ce3c8ad28d64941ca25bd257d1095545a965b37b7a8f7b6f470ce8fcaa59e2adcf674a41bd6ec9e8e
-  data.tar.gz: 4fc45e4498e1ac51e42cc9bed6fca53c6629af3dac8c3edb537d8a62faa425a0f9b91030020e76b0347fd16424e2e94aafb4ade7759c3cd57b909f556aa7223f
+  metadata.gz: 5da3b8ebc748e36b9bedc8731c6c42c5e783061bc30dc3f77f003af4001b7f8076ee5b9cebd4154325af554a4125cba6e12c308419a4688935b277bd589ca7a6
+  data.tar.gz: 14f418012735d4e469f919779ed8c5ab4f7048ac33cf0357ae7d8f6f7603e0699b29a41021389a982e6401c8a649a05ded1539bc90954ca9459c2aba8a8211ba

data/.travis.yml

@@ -4,10 +4,14 @@ before_install:
   # For testing purposes:
   - git config --local user.name "Samuel Williams"
 rvm:
-  - 2.0.0
   - 2.1.8
   - 2.2.4
   - 2.3.0
   - ruby-head
   - rbx-2
 env: COVERAGE=true
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: "rbx-2"

data/bin/teapot

@@ -34,23 +34,6 @@ require 'teapot/repository'
 require 'time'
 require 'trollop'
 
-OPTIONS = Trollop::options do
-	version "teapot v#{Teapot::VERSION}"
-	
-	opt :configuration, "Specify a specific build configuration.", :type => :string
-	
-	opt :only, "Only compiled direct dependencies."
-	opt :continuous, "Run the build graph continually.", :type => :boolean, :short => :n
-	
-	opt :in, "Work in the given directory.", :type => :string
-	opt :unlock, "Don't use package lockfile when fetching."
-	
-	opt :force, "Force the operation if it would otherwise be be stopped due to a warning."
-	
-	opt :verbose, "Verbose output and error backtraces.", :type => :boolean
-	opt :version, "Print version and exit", :short => :none
-end
-
 def make_controller(root = nil)
 	root ||= OPTIONS[:in] || Dir.getwd
 	Teapot::Controller.new(root, OPTIONS)
@@ -66,10 +49,14 @@ module Application
 		make_controller.fetch
 	end
 	
-	def self.build(targets = ARGV)
+	def self.build(targets = ARGV.slice!(0..-1))
 		make_controller.build(targets)
 	end
-		
+	
+	def self.exec(target = ARGV.shift)
+		make_controller.build([target])
+	end
+	
 	def self.list(only = ARGV)
 		if only.size > 0
 			make_controller.list(Set.new(only))
@@ -86,7 +73,7 @@ module Application
 		project_name = ARGV.shift
 		project_directory = project_name.gsub(/\s+/, '-').downcase
 		source = ARGV.shift
-		packages = ARGV
+		packages = ARGV.slice!(0..-1)
 		
 		root = Build::Files::Path.join(Dir.getwd, project_directory)
 		
@@ -108,6 +95,10 @@ module Application
 	end
 end
 
+def valid_actions
+	(Application.public_methods - Module.methods).collect(&:to_s)
+end
+
 def track_time
 	start_time = Time.now
 	
@@ -117,10 +108,31 @@ ensure
 	elapsed_time = end_time - start_time
 	
 	$stdout.flush
-	$stderr.puts ("Elapsed Time: %0.3fs" % elapsed_time).color(:magenta)
+	$stderr.puts Rainbow("Elapsed Time: %0.3fs" % elapsed_time).magenta
+end
+
+OPTIONS = Trollop::options do
+	banner Rainbow("Teapot: a decentralised package manager and build tool.").bright.blue
+	version "teapot v#{Teapot::VERSION}"
+	
+	opt :configuration, "Specify a specific build configuration.", :type => :string
+	
+	opt :limit, "Limit build to <i> concurrent processes at once where possible", :type => :integer
+	
+	opt :only, "Only compiled direct dependencies."
+	opt :continuous, "Run the build graph continually (experimental).", :type => :boolean, :short => :n
+	
+	opt :in, "Work in the given directory.", :type => :string
+	opt :unlock, "Don't use package lockfile when fetching."
+	
+	opt :force, "Force the operation if it would otherwise be be stopped due to a warning."
+	
+	opt :verbose, "Verbose output and error backtraces.", :type => :boolean
+	opt :version, "Print version and exit", :short => :none
+	
+	opt :help, "Show this message"
 end
 
-valid_actions = (Application.public_methods - Module.methods).collect(&:to_s)
 action = ARGV.shift
 
 # Check that the command was invoked correctly...

data/lib/teapot/controller/build.rb

@@ -68,7 +68,7 @@ module Teapot
 				ordered = context.direct_targets(ordered)
 			end
 			
-			controller = Build::Controller.new(logger: self.logger) do |controller|
+			controller = Build::Controller.new(logger: self.logger, limit: @options[:limit]) do |controller|
 				ordered.each do |resolution|
 					target = resolution.provider
 					
@@ -85,7 +85,7 @@ module Teapot
 			# We need to catch interrupt here, and exit with the correct exit code:
 			begin
 				controller.run do |walker|
-					show_dependencies(walker)
+					# show_dependencies(walker)
 					
 					# Only run once is asked:
 					unless @options[:continuous]

data/lib/teapot/version.rb

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

data/teapot.gemspec

@@ -26,16 +26,16 @@ Gem::Specification.new do |spec|
 	
 	spec.has_rdoc = 'yard'
 	
-	spec.required_ruby_version = '>= 2.0'
+	spec.required_ruby_version = '>= 2.1'
 	
 	spec.add_dependency "rainbow", "~> 2.0.0"
 	spec.add_dependency "trollop", "~> 2.1"
 	
 	spec.add_dependency "system", "~> 0.1.3"
 	
-	spec.add_dependency "graphviz", "~> 0.2.0"
+	spec.add_dependency "graphviz", "~> 0.3.0"
 	
-	spec.add_dependency "build", "~> 1.0.6"
+	spec.add_dependency "build", "~> 1.0.7"
 	
 	# This could be a good option in the future for teapot fetch:
 	#spec.add_dependency "rugged"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Samuel Williams
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: build
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -197,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Teapot is a tool for managing complex cross-platform builds.