teapot 0.8.0 → 0.8.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmVkOTU2MGZiOTZlZThlMWI2NzkzNzFhNDRjNzQ1YWUwMThiMmQ0Mw==
+    YjBiNDRhMDhhMjJiYzRhYmZlMDg3ZTM0ZTIwOTY0MmViNzllODA3Mg==
   data.tar.gz: !binary |-
-    ZWI3ZjVhZTQ2Nzk1NDlkNDgzNzM4YTVmMjc2YTFkOTEwMzgxOGQ1ZA==
+    NTBhNjgxOTg4OWRiYTY5ZjA5Y2ZhZmQwYTI5YTQzYTEzYzY1ZDkxOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmZjOWRhYWU0OTlkYjg5Y2U0Y2Q2NWY4NDZmMzIyODEyMjNjNGJmZGJlM2Vj
-    MGM2ZWI3ZWZlM2Y3NWU2YWNmYmJkNDExMDFhMDQ1ZjhkOWJmYjgyMGJhZjE3
-    MDUyMjMxN2VlNGE5MTIwZDU0NmZlZmIyZTJlZGM0YjJmYTI4Nzg=
+    YmFlN2NmMjRjYmMwZGYyNzJlZWI4MjVjNDZiNjVkOTc2NmI4OTA1MzdmNWFj
+    MzkzYjE3ZjY4NjRlNjNlZGIwOTYxYmFhZTJmYmNhNDU0NjYzZGY0ZGM2OTRl
+    NGIwYjA1MWVlY2YyODgwMGJkNWMzZDNkZjUyZDJhY2E3YjBlMTk=
   data.tar.gz: !binary |-
-    OWU0OTIzYTc4YmRkN2M2OTE2NmU4ZmRkMWMxYWFiYThjMTg0OTA0ZGJlYWNi
-    NmQ3NDQzNDdiNzE3NjMxY2IyNDEyYzM3NDdlNmJjOTc0MWFhNGIwZjcyNjlj
-    ZmQxZDM4NzJmY2FkMjhjODBkYzI0MjVhZWMyYzgxNTI3MTMwZDA=
+    YWU4YjJhZjE5NWRlZjRmZTAxNjVlOWIzMmMxMGMzZDgxNzQ5YWJhZGM2MzRm
+    N2Q4YmUyY2QyNGM3MWRkM2UwOTdlM2ZlYjEwODI0NTQ4NjBlNGE4ODczNzEy
+    ZmU3YmM4NTNmMjYxN2YxZThiNjVkZWZlZmM2YTA0ZTYxNDliYTQ=

data/bin/teapot

@@ -29,12 +29,13 @@ require 'teapot/controller/generate'
 require 'teapot/controller/list'
 require 'teapot/controller/run'
 
-require 'benchmark'
+require 'time'
 require 'trollop'
 
 OPTIONS = Trollop::options do
 	opt :only, "Only compiled direct dependencies."
 	opt :in, "Work in the given directory.", :type => :string
+	opt :unlock, "Don't use package lockfile when fetching."
 	
 	opt :configuration, "Specify a specific build configuration.", :type => :string
 end
@@ -94,24 +95,45 @@ module Application
 	end
 end
 
+def track_time
+	start_time = Time.now
+	
+	yield
+	
+ensure
+	end_time = Time.now
+	elapsed_time = end_time - start_time
+	
+	$stdout.flush
+	$stderr.puts ("Elapsed Time: %0.3fs" % elapsed_time).color(:magenta)
+end
+
 valid_actions = (Application.public_methods - Module.methods).collect(&:to_s)
 action = ARGV.shift
 
 # Check that the command was invoked correctly...
 unless action and valid_actions.include?(action)
 	puts "You must specify an action from: #{valid_actions.join(', ')}".color(:red)
+	
 	exit -1
 end
 
-time = Benchmark.measure do
+track_time do
 	begin
 		Application.send(action.to_sym)
 	rescue Teapot::NonexistantTeapotError => error
 		$stderr.puts error.message.color(:red)
+		
+		exit -2
 	rescue Teapot::IncompatibleTeapotError => error
 		$stderr.puts error.message.color(:red)
+		$stderr.puts "Supported minimum version #{Teapot::MINIMUM_LOADER_VERSION.dump} to #{Teapot::LOADER_VERSION.dump}."
+		
+		exit -3
 	rescue Teapot::Commands::CommandError => error
 		$stderr.puts error.message.color(:red)
+		
+		exit -4
 	rescue Teapot::Dependency::UnresolvedDependencyError => error
 		$stderr.puts "Unresolved dependencies:"
 
@@ -128,8 +150,7 @@ time = Benchmark.measure do
 		end
 	
 		$stderr.puts "Cannot continue due to unresolved dependencies!".color(:red)
+		
+		exit -5
 	end
 end
-
-$stdout.flush
-$stderr.puts time.format("Elapsed Time: %r").color(:magenta)

data/lib/teapot/context.rb

@@ -154,7 +154,8 @@ module Teapot
 			packages.collect do |package|
 				begin
 					definitions = load(package)
-				rescue NonexistantTeapotError
+				rescue NonexistantTeapotError, IncompatibleTeapotError
+					# If the package doesn't exist or the teapot version is too old, it failed:
 					failed_to_load << package
 				end
 			end

data/lib/teapot/controller/fetch.rb

@@ -86,7 +86,11 @@ module Teapot
 					destination_path.make_symlink(local_path)
 				end
 			elsif package.external?
-				package_lock = lock_store.transaction(true){|store| store[package.name]}
+				package_lock = nil
+				
+				unless @options[:unlock]
+					package_lock = lock_store.transaction(true){|store| store[package.name]}
+				end
 
 				log "Fetching #{package}...".color(:cyan)
 

data/lib/teapot/controller/list.rb

@@ -70,6 +70,8 @@ module Teapot
 					end
 				rescue NonexistantTeapotError => error
 					log "\t#{error.message}".color(:red)
+				rescue IncompatibleTeapotError => error
+					log "\t#{error.message}".color(:red)
 				end
 			end
 		end

data/lib/teapot/controller/run.rb

@@ -22,7 +22,7 @@ require 'teapot/controller'
 
 module Teapot
 	class Controller
-		def run(dependency_names)
+		def run(dependency_names = [])
 			configuration = context.configuration
 			
 			log "Running configuration #{configuration[:run].inspect}"

data/lib/teapot/loader.rb

@@ -30,8 +30,8 @@ module Teapot
 	MINIMUM_LOADER_VERSION = "0.8"
 	
 	class IncompatibleTeapotError < StandardError
-		def initialize(version)
-			super "Version #{version} isn't compatible with current loader! Minimum supported version: #{MINIMUM_LOADER_VERSION}; Current version: #{LOADER_VERSION}."
+		def initialize(package, version)
+			super "Unsupported teapot_version #{version} in #{package.path}!"
 		end
 		
 		attr :version
@@ -39,7 +39,7 @@ module Teapot
 	
 	class NonexistantTeapotError < StandardError
 		def initialize(path)
-			super "Could not load #{path}!"
+			super "Could not read file at #{path}!"
 		end
 		
 		attr :path
@@ -74,7 +74,7 @@ module Teapot
 			if version >= MINIMUM_LOADER_VERSION && version <= LOADER_VERSION
 				@version = version
 			else
-				raise IncompatibleTeapotError.new(version)
+				raise IncompatibleTeapotError.new(package, version)
 			end
 		end
 
@@ -128,7 +128,7 @@ module Teapot
 			self.instance_eval(absolute_path.read, absolute_path.to_s)
 			
 			if @version == nil
-				raise IncompatibleTeapotError.new("<unspecified>")
+				raise IncompatibleTeapotError.new(@package, "<unspecified>")
 			end
 		end
 	end

data/lib/teapot/version.rb

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

data/test/teapot.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow