crash-watch 1.1.8 → 1.1.9

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJRnnRBAAoJECrHRaUKISqMN28H/3ScjJga1Aqi/5EONbkGd9p0
-LN43oEbYL5Y1dhSfVK+bV9a5oGKFStTPmHcWkUontQjzHJMoT/LlcXd7QLYnfYga
-7wWC/wv5ro9tybNQm20T2RLcGijkH2UHo5Cod8nolPcBf13IBlcuL2JjOsbS63Z5
-spGky9E43K0nVG61zHN5DVX8R1XhtI7yVZ9B77y3hNezpM0jac5LfVSUL/5+cz9O
-lpe3roWqAzSV8h2kKvm9297qMb0v8rVwxO4nqsgp9xsz3YiDppjLq1w6qdy/CZvc
-N78ijnXnJum7pG0muNoexTD/5Yvwa7Df8fLjEAj5GO9vJ7v31lMfaW9ZEar+XLE=
-=QiiL
+iQEcBAABAgAGBQJRoN3dAAoJECrHRaUKISqMtOUH/R3vYMTrTqNcqd02b9UJPERb
+G+kYMIND2e4zoGbsIUL+WcFohf3PphAyh0VQLW71T6e1k9O1mBNaleuU95ephruQ
+gfzA/dzcKk3dHD7xQTRm1MKJZS5b/zCowq1DSw9oPYl60tcTDELzw6G6DF1Kgq10
+Df8jXKzzbrRW/RQHbpAB1HItjTpXcy50FLiPGA1svMk4nUY0ssBtGX3yi0PDPGK3
+Mn5YqbVx/Q+rgJ9kBIBtqrn2/BPRN8et7SgWoy1nebVJNipf+0lbTk7daqVT55cb
+mNbNryT8oZFmC/1OICygSKT8aiwc7EsGptkXfRfO01Dfc5cTjgtEY/8VdF7ZUvU=
+=4hv1
 -----END PGP SIGNATURE-----

data/Rakefile

@@ -9,7 +9,7 @@ MAINTAINER_EMAIL = "hongli@phusion.nl"
 
 desc "Run unit tests"
 task :test do
-	ruby "-S spec -f s -c test/*_spec.rb"
+	ruby "-S rspec -f s -c test/*_spec.rb"
 end
 
 desc "Build, sign & upload gem"

data/bin/crash-watch

@@ -42,14 +42,13 @@ elsif ARGV.size != 1
 	exit 1
 end
 
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'crash_watch/gdb_controller'
-if !CrashWatch::GdbController.gdb_installed?
-	abort "*** ERROR ***: 'gdb' isn't installed. Please install it first.\n" +
-		"       Debian/Ubuntu: sudo apt-get install gdb\n" +
-		"RedHat/CentOS/Fedora: sudo yum install gdb\n" +
-		"            Mac OS X: please install the Developer Tools or XCode\n"
+begin
+	gdb = CrashWatch::GdbController.new
+rescue GdbWatch::Error => e
+	abort e.message
 end
-gdb = CrashWatch::GdbController.new
 begin
 	gdb.debug = options[:debug]
 	

data/lib/crash_watch/gdb_controller.rb

@@ -1,6 +1,17 @@
 # encoding: binary
+require 'rbconfig'
+
 module CrashWatch
 
+class Error < StandardError
+end
+
+class GdbNotFound < Error
+end
+
+class GdbBroken < Error
+end
+
 class GdbController
 	class ExitInfo
 		attr_reader :exit_code, :signal, :backtrace, :snapshot
@@ -20,19 +31,9 @@ class GdbController
 	END_OF_RESPONSE_MARKER = '--------END_OF_RESPONSE--------'
 	
 	attr_accessor :debug
-	
-	def self.gdb_installed?
-		ENV['PATH'].to_s.split(/:+/).each do |path|
-			filename = "#{path}/gdb"
-			if File.file?(filename) && File.executable?(filename)
-				return true
-			end
-		end
-		return false
-	end
-	
+
 	def initialize
-		@pid, @in, @out = popen_command("gdb", "-n", "-q")
+		@pid, @in, @out = popen_command(find_gdb, "-n", "-q")
 		execute("set prompt ")
 	end
 	
@@ -264,6 +265,57 @@ private
 		c.binmode
 		return [pid, b, c]
 	end
+
+	def find_gdb
+		result = nil
+		if ENV['GDB'] && File.executable?(ENV['GDB'])
+			result = ENV['GDB']
+		else
+			ENV['PATH'].to_s.split(/:+/).each do |path|
+				filename = "#{path}/gdb"
+				if File.file?(filename) && File.executable?(filename)
+					result = filename
+					break
+				end
+			end
+		end
+
+		puts "Found gdb at: #{result}" if result
+
+		config = defined?(RbConfig) ? RbConfig::CONFIG : Config::CONFIG
+		if config['target_os'] =~ /freebsd/ && result == "/usr/bin/gdb"
+			# /usr/bin/gdb on FreeBSD is broken:
+			# https://github.com/FooBarWidget/crash-watch/issues/1
+			# Look for a newer one that's installed from ports.
+			puts "#{result} is broken on FreeBSD. Looking for an alternative..."
+			result = nil
+			["/usr/local/bin/gdb76", "/usr/local/bin/gdb66"].each do |candidate|
+				if File.executable?(candidate)
+					result = candidate
+					break
+				end
+			end
+
+			if result.nil?
+				raise GdbBroken,
+					"*** ERROR ***: '/usr/bin/gdb' is broken on FreeBSD. " +
+					"Please install the one from the devel/gdb port instead. " +
+					"If you want to use another gdb"
+			else
+				puts "Found gdb at: #{result}" if result
+				return result
+			end
+		elsif result.nil?
+			raise GdbNotFound,
+				"*** ERROR ***: 'gdb' isn't installed. Please install it first.\n" +
+				"       Debian/Ubuntu: sudo apt-get install gdb\n" +
+				"RedHat/CentOS/Fedora: sudo yum install gdb\n" +
+				"            Mac OS X: please install the Developer Tools or XCode\n" +
+				"             FreeBSD: use the devel/gdb port\n"
+		else
+			return result
+		end
+	end
 end
 
 end

data/lib/crash_watch/version.rb

@@ -1,3 +1,3 @@
 module CrashWatch
-	VERSION_STRING = '1.1.8'
+	VERSION_STRING = '1.1.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crash-watch
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJRnnRBAAoJECrHRaUKISqM2kAIAJuFG1kFUVcJ4e34c+lshduf
-Ntb3Urm5ygDBYUGM8BaW/9W9ncpIyrlB2QFZl/T4RHTCaseQ/gYAQ37xOKoN9aZf
-8FIpmpL980nbixThjZmEVnMQDCM8GICW8loHtSDmY++vcnyxmMeSTZQMSIis+8SR
-ko5HoG2bAoyVaqFlkDvw871Qyz9yDqvVX5OQ5cqgzdfi6tGszwB9FvEOwK2W6Wkt
-D95hfBqrH6JQrRD3+9nZjcnNcHvCnEhvGZtRQyrUs9gk4mRtZXXPOWmQuoalbiL5
-m1uEy7eyF8qM2e/PCsiJgTwgVSl+MG+NVixsDkcBx14HuwzWaBCAMDrA2is8OG8=
-=R2yM
+iQEcBAABAgAGBQJRoN3dAAoJECrHRaUKISqMrRAH/0UTheexryuP9bNSJUEwzhra
+AONBxRrOkHS+LCVIhCMQuoGUearG+m1gFUAP3DCtqUtWC+0MAy6/8U+ncxvr7bwk
+/qqksKofHQPNCzuixjy7tY+uY4Dg/llXZd0PnzI2N/o8/N7epX8cud7Sw4/FUCS6
+Eia8sIu6LjvxVeWiX9dOepkTZGikmBhiE0m/LsTpeKPxs5qMq3ZSuNub0vqDNjhD
+n0SSOMTiFRWAnsmV3ldDLicoY9pB25eSYWshgbwBPky+rhsk4EO6EMFiwc1KsH6C
+vtgb5OCAFmEMpgITae8YMFcKQTZ/Jn6AznYMlQiY5Uh7cQdjpmX9HQJzrwfhDgo=
+=IW9j
 -----END PGP SIGNATURE-----