teapot 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 621d46ea24f0a67d3233b6670f08b289dc0332b1
-  data.tar.gz: f3d60da9f431d9b1e8456957589b2842bd31a006
+  metadata.gz: 2781cec7cbb0a91a8bc218e3558a61a7b544a58d
+  data.tar.gz: eb9caddc4faa15963973ead759b22e50826bd8bb
 SHA512:
-  metadata.gz: 719882fbd486b5db47a55c0a67c98fabde72501d445b3e5409faebd51de874f674467a2a4a795458587b9abf5b39c00c20551e3493ba1409690abec492edba76
-  data.tar.gz: 276aaa3f2cd367815baf889d23f47202ee25166a57c7512f8cd412f6daa497f9d260b25276f96702a7765727860f90307b81544b60ace2fb79927b9fa8749b23
+  metadata.gz: 1cac72e294ae4d2219e787d5232f8e74fd30e1317bf4c8b74f372c7a86088d961b24a501bb1baa5fe9162879f3da3e629d94dee7a53518ebc075524f522b0be0
+  data.tar.gz: 1bd5b48d84db0f5a502f2bf2c5a8d466272e553e0548be70a476d4198c8cb1e127b6d233919c23cef78b7cf6450eb4f9f9afc7770699aaa9c53dd959dbbefd6f

data/bin/teapot

@@ -23,52 +23,38 @@
 require 'teapot/command'
 require 'time'
 
-def track_time
-	start_time = Time.now
-	
-	yield
-ensure
-	end_time = Time.now
-	elapsed_time = end_time - start_time
-	
-	$stdout.flush
-	$stderr.puts Rainbow("Elapsed Time: %0.3fs" % elapsed_time).magenta
-end
-
 options = Teapot::Command::Top.parse(ARGV)
 
-track_time do
-	begin
-		options.invoke
-	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 1
-	rescue Teapot::Dependency::UnresolvedDependencyError => error
-		$stderr.puts "Unresolved dependencies:"
+begin
+	options.invoke
+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 1
+rescue Teapot::Dependency::UnresolvedDependencyError => error
+	$stderr.puts "Unresolved dependencies:"
 
-		error.chain.unresolved.each do |(name, parent)|
-			$stderr.puts "#{parent} depends on #{name.inspect}".color(:red)
-		
-			conflicts = error.chain.conflicts[name]
-		
-			if conflicts
-				conflicts.each do |conflict|
-					$stderr.puts " - provided by #{conflict.name}".color(:red)
-				end
+	error.chain.unresolved.each do |(name, parent)|
+		$stderr.puts "#{parent} depends on #{name.inspect}".color(:red)
+	
+		conflicts = error.chain.conflicts[name]
+	
+		if conflicts
+			conflicts.each do |conflict|
+				$stderr.puts " - provided by #{conflict.name}".color(:red)
 			end
 		end
-	
-		$stderr.puts "Cannot continue due to unresolved dependencies!".color(:red)
-		
-		exit 2
-	rescue StandardError => error
-		$stderr.puts error.message.color(:red)
-		
-		# Could be nice to have some improved error reporting.
-		$stderr.puts error.backtrace
-		
-		exit 3
 	end
+
+	$stderr.puts "Cannot continue due to unresolved dependencies!".color(:red)
+	
+	exit 2
+rescue StandardError => error
+	$stderr.puts error.message.color(:red)
+	
+	# Could be nice to have some improved error reporting.
+	$stderr.puts error.backtrace
+	
+	exit 3
 end

data/lib/teapot/command.rb

@@ -136,7 +136,6 @@ module Teapot
 		
 		class Top < Samovar::Command
 			self.description = "A decentralised package manager and build tool."
-			#version "1.0.0"
 			
 			options do
 				option '-c/--configuration <name>', "Specify a specific build configuration.", default: ENV['TEAPOT_CONFIGURATION']
@@ -162,13 +161,27 @@ module Teapot
 				Teapot::Controller.new(root || self.root, @options)
 			end
 			
+			def track_time
+				start_time = Time.now
+				
+				yield
+			ensure
+				end_time = Time.now
+				elapsed_time = end_time - start_time
+				
+				$stdout.flush
+				$stderr.puts Rainbow("Elapsed Time: %0.3fs" % elapsed_time).magenta
+			end
+			
 			def invoke(program_name: File.basename($0))
-				if @command.nil? or @options[:help]
-					print_usage(program_name)
-				elsif @options[:version]
+				if @options[:version]
 					puts "teapot v#{Teapot::VERSION}"
+				elsif @options[:help] or @command.nil?
+					print_usage(program_name)
 				else
-					@command.invoke(self)
+					track_time do
+						@command.invoke(self)
+					end
 				end
 			end
 		end

data/lib/teapot/version.rb

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

data/teapot.gemspec

@@ -1,7 +1,5 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'teapot/version'
+
+require_relative 'lib/teapot/version'
 
 Gem::Specification.new do |spec|
 	spec.name          = "teapot"
@@ -33,7 +31,7 @@ Gem::Specification.new do |spec|
 	
 	spec.add_dependency "graphviz", "~> 0.3.0"
 	
-	spec.add_dependency "build", "~> 1.0.7"
+	spec.add_dependency "build", "~> 1.0.8"
 	spec.add_dependency "build-files", "~> 1.0.4"
 	
 	spec.add_dependency "samovar", "~> 1.0.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-23 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.8
 - !ruby/object:Gem::Dependency
   name: build-files
   requirement: !ruby/object:Gem::Requirement