teapot 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cab59314fe9ef8f78a0342da3cea677294caa817
-  data.tar.gz: e090a7424c81f028f0a0cff3c00e2df46f4954a2
+  metadata.gz: 95704463becbd754a4675c065b8356d434318711
+  data.tar.gz: 143691ea31e27c14477ed2c9186491c192770d2b
 SHA512:
-  metadata.gz: d9ed28c25903c8022883c51615f8149eefa6991656c50227925a7dada50a7d6018cefb19dbc1845942f7607ed7c2e148303553e780fc2299c3ef75cc990a3527
-  data.tar.gz: 4b360e8e17eba0528656203aa386cfa909dd51ae8c8d5a0862034331646128776c31be316e1aa181e881351f07a74ca130f25bf9fb99082fd280ed60fa634beb
+  metadata.gz: 916ab1935e2807fe66590fbecaa66adfb0298051d8c7024b43621b9f6fdab0ad5e3adcee2ba9ee765ceb9970b7ec03020058a00b148f66d4917b3c6688ec4965
+  data.tar.gz: de110634be9ebb0413a83ac7a50817894d1f6fc8c2cc86038e58d36acea5ee7b212d798d33c63bfa50bafb36013cf421b3b192fab8fb96885975e2e3ee32241d

data/bin/teapot

@@ -43,6 +43,8 @@ OPTIONS = Trollop::options do
 	opt :force, "Force the operation if it would otherwise be be stopped due to a warning."
 	
 	opt :configuration, "Specify a specific build configuration.", :type => :string
+	
+	opt :verbose, "Verbose output and error backtraces."
 end
 
 def make_controller(root = nil)
@@ -124,19 +126,11 @@ end
 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:"
 
@@ -155,5 +149,16 @@ track_time do
 		$stderr.puts "Cannot continue due to unresolved dependencies!".color(:red)
 		
 		exit -5
+	rescue StandardError => error
+		$stderr.puts error.message.color(:red)
+		
+		# Could be nice to have some improved error reporting.
+		if OPTIONS[:verbose]
+			$stderr.puts error.backtrace
+		else
+			$stderr.puts "Run with --verbose for more details."
+		end
+		
+		exit -10
 	end
 end

data/lib/teapot/generator.rb

@@ -26,6 +26,13 @@ require 'tempfile'
 
 module Teapot
 	class GeneratorError < StandardError
+		def initialize(message, generator = nil)
+			super(message)
+			
+			@generator = generator
+		end
+		
+		attr :generator
 	end
 	
 	class Generator < Definition

data/lib/teapot/version.rb

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

data/teapot.gemspec

@@ -3,31 +3,32 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'teapot/version'
 
-Gem::Specification.new do |gem|
-	gem.name          = "teapot"
-	gem.version       = Teapot::VERSION
-	gem.authors       = ["Samuel Williams"]
-	gem.email         = ["samuel.williams@oriontransfer.co.nz"]
-	gem.description   = <<-EOF
+Gem::Specification.new do |spec|
+	spec.name          = "teapot"
+	spec.version       = Teapot::VERSION
+	spec.authors       = ["Samuel Williams"]
+	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.
 	EOF
-	gem.summary       = %q{Teapot is a tool for managing complex cross-platform builds.}
-	gem.homepage      = "http://www.kyusu.org"
+	spec.summary       = %q{Teapot is a tool for managing complex cross-platform builds.}
+	spec.homepage      = "http://www.kyusu.org"
+	spec.license       = "MIT"
 
-	gem.files         = `git ls-files`.split($/)
-	gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-	gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-	gem.require_paths = ["lib"]
+	spec.files         = `git ls-files`.split($/)
+	spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+	spec.require_paths = ["lib"]
 
-	gem.required_ruby_version = '>= 1.9.3'
+	spec.required_ruby_version = '>= 1.9.3'
 
-	gem.add_dependency "rainbow"
-	gem.add_dependency "rexec"
-	gem.add_dependency "trollop"
-	gem.add_dependency "facter"
+	spec.add_dependency "rainbow"
+	spec.add_dependency "rexec"
+	spec.add_dependency "trollop"
+	spec.add_dependency "facter"
 
 	# This could be a good option in the future for teapot fetch:
-	#gem.add_dependency "rugged"
+	#spec.add_dependency "rugged"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -135,7 +135,8 @@ files:
 - test/test_substitutions.rb
 - test/test_teapot.rb
 homepage: http://www.kyusu.org
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []