teapot 0.7.5 → 0.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmNjNzk5MTgwZmJlNDE4NzEwY2I2MTdkY2U1M2M5MjRlNGUzYjM1Yw==
+    MmVkOTU2MGZiOTZlZThlMWI2NzkzNzFhNDRjNzQ1YWUwMThiMmQ0Mw==
   data.tar.gz: !binary |-
-    NTQ4MTAyMTJjMzk4ZjgzYzEwMDhlYWE2ZjMwNjMxM2FlZjdiMDg2OA==
+    ZWI3ZjVhZTQ2Nzk1NDlkNDgzNzM4YTVmMjc2YTFkOTEwMzgxOGQ1ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjFjZTI5YjJiY2JmMjk3NGQxMzkwMTg0YjUxMTQ0YjJhYzI2YTUxNDA3ZGI5
-    OWM1MzNmNDRiODNkODJiNzU4NTIyOWYyOWVhMmM3NzE5MDRhZDA4NTFhNzMw
-    ZjliYWE5MGZhZWIyMzAyYmQyOWE4MmI1NGE0ZWU3MjZlZTk2N2M=
+    MmZjOWRhYWU0OTlkYjg5Y2U0Y2Q2NWY4NDZmMzIyODEyMjNjNGJmZGJlM2Vj
+    MGM2ZWI3ZWZlM2Y3NWU2YWNmYmJkNDExMDFhMDQ1ZjhkOWJmYjgyMGJhZjE3
+    MDUyMjMxN2VlNGE5MTIwZDU0NmZlZmIyZTJlZGM0YjJmYTI4Nzg=
   data.tar.gz: !binary |-
-    Yzk0YWZlNDU1ODQ1OGZjNWI2YzAzYmQ5MzgxZTc3YWE2YWM1N2RjNTg1YTI1
-    N2Q5MWNlZGY5NzFlODczZmVhZmM1YTNkMzRkOTZjYTlkMTJlMGE0OGJiZDM2
-    YjhmMDFkOWVkODIzYjJlOGViMTI3NjlmOWZhNjc2NDdiMzRlNDc=
+    OWU0OTIzYTc4YmRkN2M2OTE2NmU4ZmRkMWMxYWFiYThjMTg0OTA0ZGJlYWNi
+    NmQ3NDQzNDdiNzE3NjMxY2IyNDEyYzM3NDdlNmJjOTc0MWFhNGIwZjcyNjlj
+    ZmQxZDM4NzJmY2FkMjhjODBkYzI0MjVhZWMyYzgxNTI3MTMwZDA=

data/bin/teapot

@@ -27,6 +27,7 @@ require 'teapot/controller/create'
 require 'teapot/controller/fetch'
 require 'teapot/controller/generate'
 require 'teapot/controller/list'
+require 'teapot/controller/run'
 
 require 'benchmark'
 require 'trollop'
@@ -53,12 +54,14 @@ module Application
 		make_controller.fetch
 	end
 	
-	def self.build
-		targets = ARGV
-		
+	def self.build(targets = ARGV)
 		make_controller.build(targets)
 	end
 	
+	def self.run(targets = ARGV)
+		make_controller.run(targets)
+	end
+	
 	def self.list
 		make_controller.list
 	end

data/lib/teapot/configuration.rb

@@ -33,10 +33,10 @@ module Teapot
 	class Configuration < Definition
 		Import = Struct.new(:name, :options)
 		
-		def initialize(context, package, name, packages = Set.new)
+		def initialize(context, package, name, packages = Set.new, options = {})
 			super context, package, name
 
-			@options = {}
+			@options = options
 
 			@packages = packages
 			@imports = []
@@ -140,7 +140,7 @@ module Teapot
 			@packages.each{|package| @context.load(package) rescue nil}
 			
 			# Create a new configuration which will represent the materialised version:
-			configuration = self.class.new(@context, @package, @name, @packages.dup)
+			configuration = self.class.new(@context, @package, @name, @packages.dup, @options.dup)
 			
 			# Enumerate all imports and attempt to resolve the packages:
 			@imports.each do |import|

data/lib/teapot/controller/build.rb

@@ -32,14 +32,16 @@ module Teapot
 			end
 		
 			ordered.each do |(target, dependency)|
-				log "Building #{target.name} for dependency #{dependency}...".color(:cyan)
-		
 				if target.respond_to?(:build!) and !@options[:dry]
+					log "Building #{target.name} for dependency #{dependency}...".color(:cyan)
+					
 					target.build!(context.configuration)
 				end
 			end
 	
 			log "Completed build successfully.".color(:green)
+			
+			return chain, ordered
 		end
 	end
 end

data/lib/teapot/controller/fetch.rb

@@ -114,12 +114,12 @@ module Teapot
 
 						Commands.run("git", "clone", external_url, destination_path, "--branch", branch)
 
-						# Checkout the specific version if it was given:
-						if package_lock
-							Commands.run("git", "reset", "--hard", package_lock[:commit])
-						end
-
 						Dir.chdir(destination_path) do
+							# Checkout the specific version if it was given:
+							if package_lock
+								Commands.run("git", "reset", "--hard", package_lock[:commit])
+							end
+
 							Commands.run("git", "submodule", "update", "--init", "--recursive")
 						end
 					rescue

data/lib/teapot/controller/run.rb

@@ -0,0 +1,49 @@
+# 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/controller'
+
+module Teapot
+	class Controller
+		def run(dependency_names)
+			configuration = context.configuration
+			
+			log "Running configuration #{configuration[:run].inspect}"
+			
+			chain, ordered = build(configuration[:run] + dependency_names)
+			
+			ordered.each do |(target, dependency)|
+				if target.respond_to?(:run!) and !@options[:dry]
+					log "Running #{target.name} for dependency #{dependency}...".color(:cyan)
+					
+					target.run!(configuration)
+				end
+			end
+		end
+		
+		def invoke(environment, command)
+			binary_path = environment[:install_prefix]
+			
+			Dir.chdir(binary_path.to_s) do
+				Commands.run(*command)
+			end
+		end
+	end
+end

data/lib/teapot/loader.rb

@@ -26,8 +26,8 @@ require 'teapot/name'
 require 'teapot/build'
 
 module Teapot
-	LOADER_VERSION = "0.7"
-	MINIMUM_LOADER_VERSION = "0.7"
+	LOADER_VERSION = "0.8"
+	MINIMUM_LOADER_VERSION = "0.8"
 	
 	class IncompatibleTeapotError < StandardError
 		def initialize(version)

data/lib/teapot/target.rb

@@ -40,11 +40,7 @@ module Teapot
 			Build.top(@path)
 		end
 
-		def build(&block)
-			@build = Proc.new(&block)
-		end
-
-		def build_environment(configuration)
+		def environment_for_configuration(configuration)
 			# Reduce the number of keystrokes for good health:
 			context = configuration.context
 			
@@ -73,12 +69,39 @@ module Teapot
 			end
 		end
 
+		def build(&block)
+			if block_given?
+				@build = Proc.new(&block)
+			end
+			
+			return @build
+		end
+
 		def build!(configuration)
 			return unless @build
 			
-			local_environment = build_environment(configuration)
+			local_environment = environment_for_configuration(configuration)
 			
 			@build.call(local_environment)
 		end
+		
+		# Specify a default block which is used to run the configuration.
+		def run(&block)
+			if block_given?
+				@run = block
+			end
+			
+			return @run
+		end
+
+		def run!(configuration)
+			return unless @run
+			
+			local_environment = environment_for_configuration(configuration)
+			
+			if @run
+				@run.call(local_environment)
+			end
+		end
 	end
 end

data/lib/teapot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -106,6 +106,7 @@ files:
 - lib/teapot/controller/fetch.rb
 - lib/teapot/controller/generate.rb
 - lib/teapot/controller/list.rb
+- lib/teapot/controller/run.rb
 - lib/teapot/definition.rb
 - lib/teapot/dependency.rb
 - lib/teapot/environment.rb