crash-watch 1.1.5 → 1.1.8

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJRRcODAAoJECrHRaUKISqMHBwH/3abEoPCgpwaimUouSume8gv
-nmmrcgtCk9gdbHS3TYczVSmbKEmQEE2rJluzqSovNA9l4HNn5KrovAWescB4kDDu
-E6otc8Esw0CgTL/1q0yR6jwA4u2TqIqNcXuX8nC3lP6G11wev/67lDMkv4eRsgdy
-9L9VnOj2q/0uXLaXeIcGGCIizC/vi0zW4iN9w0qbA48XArfWjPimrftH8/bTNE15
-Y+BJ6QDhNcrqurDpbGMRgq6BSTWpe58+EYLNT47Qdw8qAt6mh+tUEAIRfvwUCdAf
-0DKosswqDXKAmBS3dAZEyr2ZwlERJlzYgQdW7DecKPESrJRQWX8uFE6aBbvZszQ=
-=MriR
+iQEcBAABAgAGBQJRnnRBAAoJECrHRaUKISqMN28H/3ScjJga1Aqi/5EONbkGd9p0
+LN43oEbYL5Y1dhSfVK+bV9a5oGKFStTPmHcWkUontQjzHJMoT/LlcXd7QLYnfYga
+7wWC/wv5ro9tybNQm20T2RLcGijkH2UHo5Cod8nolPcBf13IBlcuL2JjOsbS63Z5
+spGky9E43K0nVG61zHN5DVX8R1XhtI7yVZ9B77y3hNezpM0jac5LfVSUL/5+cz9O
+lpe3roWqAzSV8h2kKvm9297qMb0v8rVwxO4nqsgp9xsz3YiDppjLq1w6qdy/CZvc
+N78ijnXnJum7pG0muNoexTD/5Yvwa7Df8fLjEAj5GO9vJ7v31lMfaW9ZEar+XLE=
+=QiiL
 -----END PGP SIGNATURE-----

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Phusion
+Copyright (c) 2010-2013 Phusion
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -7,7 +7,9 @@
 
 `crash-watch` to the rescue! This little program will monitor a specified process and wait until it crashes. It will then print useful information such as its exit status, what signal caused it to abort, and its backtrace.
 
-## Installation
+## Installation with RubyGems
+
+Run:
 
     gem install crash-watch
 
@@ -16,12 +18,28 @@ You must also have GDB installed. Mac OS X already has it by default. If you're
     apt-get install gdb
     yum install gdb
 
-## Cryptographic verification
-
-Our gem is signed using PGP with the [Phusion Software Signing key](http://www.phusion.nl/about/gpg). That key in turn is signed by [the rubygems-openpgp Certificate Authority](http://www.rubygems-openpgp-ca.org/).
+This gem is signed using PGP with the [Phusion Software Signing key](http://www.phusion.nl/about/gpg). That key in turn is signed by [the rubygems-openpgp Certificate Authority](http://www.rubygems-openpgp-ca.org/).
 
 You can verify the authenticity of the gem by following [The Complete Guide to Verifying Gems with rubygems-openpgp](http://www.rubygems-openpgp-ca.org/blog/the-complete-guide-to-verifying-gems-with-rubygems-openpgp.html).
 
+## Installation on Ubuntu
+
+Use our [PPA](https://launchpad.net/~phusion.nl/+archive/misc):
+
+    sudo add-apt-repository ppa:phusion.nl/misc
+    sudo apt-get update
+    sudo apt-get install crash-watch
+
+## Installation on Debian
+
+Our Ubuntu Lucid packages are compatible with Debian 6.
+
+    sudo sh -c 'echo deb http://ppa.launchpad.net/phusion.nl/misc/ubuntu lucid main > /etc/apt/sources.list.d/phusion-misc.list'
+    sudo sh -c 'echo deb-src http://ppa.launchpad.net/phusion.nl/misc/ubuntu lucid main >> /etc/apt/sources.list.d/phusion-misc.list'
+    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 2AC745A50A212A8C
+    sudo apt-get update
+    sudo apt-get install crash-watch
+
 ## Sample usage
 
     $ crash-watch <PID>

data/Rakefile

@@ -1,15 +1,431 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/lib"))
 require 'crash_watch/version'
 
+PACKAGE_NAME    = "crash-watch"
+PACKAGE_VERSION = CrashWatch::VERSION_STRING
+PACKAGE_SIGNING_KEY = "0x0A212A8C"
+MAINTAINER_NAME  = "Hongli Lai"
+MAINTAINER_EMAIL = "hongli@phusion.nl"
+
+desc "Run unit tests"
+task :test do
+	ruby "-S spec -f s -c test/*_spec.rb"
+end
+
 desc "Build, sign & upload gem"
 task 'package:release' do
-	sh "git tag -s release-#{CrashWatch::VERSION_STRING}"
-	sh "gem build crash-watch.gemspec --sign --key 0x0A212A8C"
+	sh "git tag -s release-#{PACKAGE_VERSION}"
+	sh "gem build #{PACKAGE_NAME}.gemspec --sign --key #{PACKAGE_SIGNING_KEY}"
 	puts "Proceed with pushing tag to Github and uploading the gem? [y/n]"
 	if STDIN.readline == "y\n"
-		sh "git push origin release-#{CrashWatch::VERSION_STRING}"
-		sh "gem push crash-watch-#{CrashWatch::VERSION_STRING}.gem"
+		sh "git push origin release-#{PACKAGE_VERSION}"
+		sh "gem push #{PACKAGE_NAME}-#{PACKAGE_VERSION}.gem"
 	else
 		puts "Did not upload the gem."
 	end
 end
+
+
+##### Utilities #####
+
+def string_option(name, default_value = nil)
+	value = ENV[name]
+	if value.nil? || value.empty?
+		return default_value
+	else
+		return value
+	end
+end
+
+def boolean_option(name, default_value = false)
+	value = ENV[name]
+	if value.nil? || value.empty?
+		return default_value
+	else
+		return value == "yes" || value == "on" || value == "true" || value == "1"
+	end
+end
+
+
+##### Debian packaging support #####
+
+PKG_DIR         = string_option('PKG_DIR', "pkg")
+DEBIAN_NAME     = PACKAGE_NAME
+ALL_DISTRIBUTIONS  = ["raring", "precise", "lucid"]
+ORIG_TARBALL_FILES = lambda do
+	require 'crash_watch/packaging'
+	Dir[*CRASH_WATCH_FILES] - Dir[*CRASH_WATCH_EXCLUDE_FILES]
+end
+
+# Implements a simple preprocessor language:
+# 
+#     Today
+#     #if @today == :fine
+#         is a fine day.
+#     #elif @today == :good
+#         is a good day.
+#     #else
+#         is a sad day.
+#     #endif
+#     Let's go walking.
+# 
+# When run with...
+# 
+#     Preprocessor.new.start('input.txt', 'output.txt', :today => :fine)
+# 
+# ...will produce:
+# 
+#     Today
+#     is a fine day.
+#     Let's go walking.
+# 
+# Highlights:
+# 
+#  * #if blocks can be nested.
+#  * Expressions are Ruby expressions, evaluated within the binding of a
+#    Preprocessor::Evaluator object.
+#  * Text inside #if/#elif/#else are automatically unindented.
+class Preprocessor
+	def initialize
+		@indentation_size = 4
+		@debug = boolean_option('DEBUG')
+	end
+
+	def start(filename, output_filename, variables = {})
+		if output_filename
+			temp_output_filename = "#{output_filename}._new"
+			output = File.open(temp_output_filename, 'w')
+		else
+			output = STDOUT
+		end
+		the_binding  = create_binding(variables)
+		context      = []
+		@lineno      = 1
+		@indentation = 0
+
+		each_line(filename) do |line|
+			debug("context=#{context.inspect}, line=#{line.inspect}")
+
+			name, args_string, cmd_indentation = recognize_command(line)
+			case name
+			when "if"
+				case context.last
+				when nil, :if_true, :else_true
+					check_indentation(cmd_indentation)
+					result = the_binding.eval(args_string, filename, @lineno)
+					context.push(result ? :if_true : :if_false)
+					inc_indentation
+				when :if_false, :else_false, :if_ignore
+					check_indentation(cmd_indentation)
+					inc_indentation
+					context.push(:if_ignore)
+				else
+					terminate "#if is not allowed in this context"
+				end
+			when "elif"
+				case context.last
+				when :if_true
+					dec_indentation
+					check_indentation(cmd_indentation)
+					inc_indentation
+					context[-1] = :if_false
+				when :if_false
+					dec_indentation
+					check_indentation(cmd_indentation)
+					inc_indentation
+					result = the_binding.eval(args_string, filename, @lineno)
+					context[-1] = result ? :if_true : :if_false
+				when :else_true, :else_false
+					terminate "#elif is not allowed after #else"
+				when :if_ignore
+					dec_indentation
+					check_indentation(cmd_indentation)
+					inc_indentation
+				else
+					terminate "#elif is not allowed outside #if block"
+				end
+			when "else"
+				case context.last
+				when :if_true
+					dec_indentation
+					check_indentation(cmd_indentation)
+					inc_indentation
+					context[-1] = :else_false
+				when :if_false
+					dec_indentation
+					check_indentation(cmd_indentation)
+					inc_indentation
+					context[-1] = :else_true
+				when :else_true, :else_false
+					terminate "it is not allowed to have multiple #else clauses in one #if block"
+				when :if_ignore
+					dec_indentation
+					check_indentation(cmd_indentation)
+					inc_indentation
+				else
+					terminate "#else is not allowed outside #if block"
+				end
+			when "endif"
+				case context.last
+				when :if_true, :if_false, :else_true, :else_false, :if_ignore
+					dec_indentation
+					check_indentation(cmd_indentation)
+					context.pop
+				else
+					terminate "#endif is not allowed outside #if block"
+				end
+			when "", nil
+				# Either a comment or not a preprocessor command.
+				case context.last
+				when nil, :if_true, :else_true
+					output.puts(unindent(line))
+				else
+					# Check indentation but do not output.
+					unindent(line)
+				end
+			else
+				terminate "Unrecognized preprocessor command ##{name.inspect}"
+			end
+
+			@lineno += 1
+		end
+	ensure
+		if output_filename && output
+			output.close
+			stat = File.stat(filename)
+			File.chmod(stat.mode, temp_output_filename)
+			File.chown(stat.uid, stat.gid, temp_output_filename) rescue nil
+			File.rename(temp_output_filename, output_filename)
+		end
+	end
+
+private
+	UBUNTU_DISTRIBUTIONS = {
+		"lucid"    => "10.04",
+		"maverick" => "10.10",
+		"natty"    => "11.04",
+		"oneiric"  => "11.10",
+		"precise"  => "12.04",
+		"quantal"  => "12.10",
+		"raring"   => "13.04",
+		"saucy"    => "13.10"
+	}
+
+	# Provides the DSL that's accessible within.
+	class Evaluator
+		def _infer_distro_table(name)
+			if UBUNTU_DISTRIBUTIONS.has_key?(name)
+				return UBUNTU_DISTRIBUTIONS
+			end
+		end
+
+		def is_distribution?(expr)
+			if @distribution.nil?
+				raise "The :distribution variable must be set"
+			else
+				if expr =~ /^(>=|>|<=|<|==|\!=)[\s]*(.+)/
+					comparator = $1
+					name = $2
+				else
+					raise "Invalid expression #{expr.inspect}"
+				end
+
+				table1 = _infer_distro_table(@distribution)
+				table2 = _infer_distro_table(name)
+				raise "Distribution name #{@distribution.inspect} not recognized" if !table1
+				raise "Distribution name #{name.inspect} not recognized" if !table2
+				v1 = table1[@distribution]
+				v2 = table2[name]
+				
+				case comparator
+				when ">"
+					return v1 > v2
+				when ">="
+					return v1 >= v2
+				when "<"
+					return v1 < v2
+				when "<="
+					return v1 <= v2
+				when "=="
+					return v1 == v2
+				when "!="
+					return v1 != v2
+				else
+					raise "BUG"
+				end
+			end
+		end
+	end
+
+	def each_line(filename)
+		File.open(filename, 'r') do |f|
+			while true
+				begin
+					line = f.readline.chomp
+				rescue EOFError
+					break
+				end
+				yield line
+			end
+		end
+	end
+	
+	def recognize_command(line)
+		if line =~ /^([\s\t]*)#(.+)/
+			indentation_str = $1
+			command = $2
+			name = command.scan(/^\w+/).first
+			args_string = command.sub(/^#{Regexp.escape(name)}[\s\t]*/, '')
+			return [name, args_string, indentation_str.to_s.size]
+		else
+			return nil
+		end
+	end
+
+	def create_binding(variables)
+		object = Evaluator.new
+		variables.each_pair do |key, val|
+			object.send(:instance_variable_set, "@#{key}", val)
+		end
+		return object.instance_eval do
+			binding
+		end
+	end
+
+	def inc_indentation
+		@indentation += @indentation_size
+	end
+
+	def dec_indentation
+		@indentation -= @indentation_size
+	end
+
+	def check_indentation(expected)
+		if expected != @indentation
+			terminate "wrong indentation: found #{expected} characters, should be #{@indentation}"
+		end
+	end
+
+	def unindent(line)
+		line =~ /^([\s\t]*)/
+		found = $1.to_s.size
+		if found >= @indentation
+			return line[@indentation .. -1]
+		else
+			terminate "wrong indentation: found #{found} characters, should be at least #{@indentation}"
+		end
+	end
+
+	def debug(message)
+		puts "DEBUG:#{@lineno}: #{message}" if @debug
+	end
+
+	def terminate(message)
+		abort "*** ERROR: line #{@lineno}: #{message}"
+	end
+end
+
+def recursive_copy_files(files, destination_dir, preprocess = false, variables = {})
+	require 'fileutils' if !defined?(FileUtils)
+	files.each_with_index do |filename, i|
+		dir = File.dirname(filename)
+		if !File.exist?("#{destination_dir}/#{dir}")
+			FileUtils.mkdir_p("#{destination_dir}/#{dir}")
+		end
+		if !File.directory?(filename)
+			if preprocess && filename =~ /\.template$/
+				real_filename = filename.sub(/\.template$/, '')
+				FileUtils.install(filename, "#{destination_dir}/#{real_filename}")
+				Preprocessor.new.start(filename, "#{destination_dir}/#{real_filename}",
+					variables)
+			else
+				FileUtils.install(filename, "#{destination_dir}/#{filename}")
+			end
+		end
+		printf "\r[%5d/%5d] [%3.0f%%] Copying files...", i + 1, files.size, i * 100.0 / files.size
+		STDOUT.flush
+	end
+	printf "\r[%5d/%5d] [%3.0f%%] Copying files...\n", files.size, files.size, 100
+end
+
+def create_debian_package_dir(distribution)
+	require 'time'
+
+	variables = {
+		:distribution => distribution
+	}
+
+	root = "#{PKG_DIR}/#{distribution}"
+	sh "rm -rf #{root}"
+	sh "mkdir -p #{root}"
+	recursive_copy_files(ORIG_TARBALL_FILES.call, root)
+	recursive_copy_files(Dir["debian.template/**/*"], root,
+		true, variables)
+	sh "mv #{root}/debian.template #{root}/debian"
+	changelog = File.read("#{root}/debian/changelog")
+	changelog =
+		"#{DEBIAN_NAME} (#{PACKAGE_VERSION}-1~#{distribution}1) #{distribution}; urgency=low\n" +
+		"\n" +
+		"  * Package built.\n" +
+		"\n" +
+		" -- #{MAINTAINER_NAME} <#{MAINTAINER_EMAIL}>  #{Time.now.rfc2822}\n\n" +
+		changelog
+	File.open("#{root}/debian/changelog", "w") do |f|
+		f.write(changelog)
+	end
+end
+
+task 'debian:orig_tarball' do
+	if File.exist?("#{PKG_DIR}/#{DEBIAN_NAME}.orig.tar.gz")
+		puts "Debian orig tarball #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz already exists."
+	else
+		sh "rm -rf #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}"
+		sh "mkdir -p #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}"
+		recursive_copy_files(ORIG_TARBALL_FILES.call, "#{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}")
+		sh "cd #{PKG_DIR} && tar -c #{DEBIAN_NAME}_#{PACKAGE_VERSION} | gzip --best > #{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz"
+	end
+end
+
+desc "Build Debian source and binary package(s) for local testing"
+task 'debian:dev' do
+	sh "rm -f #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz"
+	Rake::Task["debian:clean"].invoke
+	Rake::Task["debian:orig_tarball"].invoke
+	case distro = string_option('DISTRO', 'current')
+	when 'current'
+		distributions = [File.read("/etc/lsb-release").scan(/^DISTRIB_CODENAME=(.+)/).first.first]
+	when 'all'
+		distributions = ALL_DISTRIBUTIONS
+	else
+		distributions = distro.split(',')
+	end
+	distributions.each do |distribution|
+		create_debian_package_dir(distribution)
+		sh "cd #{PKG_DIR}/#{distribution} && dpkg-checkbuilddeps"
+	end
+	distributions.each do |distribution|
+		sh "cd #{PKG_DIR}/#{distribution} && debuild -F -us -uc"
+	end
+end
+
+desc "Build Debian source packages to be uploaded to repositories"
+task 'debian:production' => 'debian:orig_tarball' do
+	ALL_DISTRIBUTIONS.each do |distribution|
+		create_debian_package_dir(distribution)
+		sh "cd #{PKG_DIR}/#{distribution} && dpkg-checkbuilddeps"
+	end
+	ALL_DISTRIBUTIONS.each do |distribution|
+		sh "cd #{PKG_DIR}/#{distribution} && debuild -S -sa -k#{PACKAGE_SIGNING_KEY}"
+	end
+end
+
+desc "Clean Debian packaging products, except for orig tarball"
+task 'debian:clean' do
+	files = Dir["#{PKG_DIR}/*.{changes,build,deb,dsc,upload}"]
+	sh "rm -f #{files.join(' ')}"
+	sh "rm -rf #{PKG_DIR}/dev"
+	ALL_DISTRIBUTIONS.each do |distribution|
+		sh "rm -rf #{PKG_DIR}/#{distribution}"
+	end
+	sh "rm -rf #{PKG_DIR}/*.debian.tar.gz"
+end

data/bin/crash-watch

@@ -75,7 +75,13 @@ begin
 			end
 		end
 	else
-		puts "Cannot attach to process."
+		puts "ERROR: Cannot attach to process."
+		if File.exist?("/proc/sys/kernel/yama/ptrace_scope")
+			puts
+			puts "This may be the result of kernel ptrace() hardening. Try disabling it with:"
+			puts "  sudo sh -c 'echo 0 > /proc/sys/kernel/yama/ptrace_scope'"
+			puts "See http://askubuntu.com/questions/41629/after-upgrade-gdb-wont-attach-to-process for more information."
+		end
 		exit 2
 	end
 ensure

data/crash-watch.gemspec

@@ -1,22 +1,14 @@
 require File.expand_path('lib/crash_watch/version', File.dirname(__FILE__))
+require File.expand_path('lib/crash_watch/packaging', File.dirname(__FILE__))
 
 Gem::Specification.new do |s|
 	s.name = "crash-watch"
 	s.version = CrashWatch::VERSION_STRING
 	s.authors = ["Hongli Lai"]
-	s.date = "2013-03-17"
 	s.description = "Monitor processes and display useful information when they crash."
 	s.summary = "Monitor processes and display useful information when they crash"
 	s.email = "software-signing@phusion.nl"
-	s.files = Dir[
-		"README.markdown",
-		"LICENSE.txt",
-		"Rakefile",
-		"crash-watch.gemspec",
-		"bin/**/*",
-		"lib/**/*",
-		"test/**/*"
-	]
+	s.files = Dir[*CRASH_WATCH_FILES]
 	s.homepage = "https://github.com/FooBarWidget/crash-watch"
 	s.rdoc_options = ["--charset=UTF-8"]
 	s.executables = ["crash-watch"]

data/lib/crash_watch/packaging.rb

@@ -0,0 +1,14 @@
+CRASH_WATCH_FILES = [
+	"README.markdown",
+	"LICENSE.txt",
+	"Rakefile",
+	"crash-watch.gemspec",
+	"bin/**/*",
+	"lib/**/*",
+	"test/**/*"
+]
+
+CRASH_WATCH_EXCLUDE_FILES = [
+	"Rakefile",
+	"debian.template/**/*"
+]

data/lib/crash_watch/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crash-watch
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -56,6 +56,7 @@ files:
 - crash-watch.gemspec
 - bin/crash-watch
 - lib/crash_watch/gdb_controller.rb
+- lib/crash_watch/packaging.rb
 - lib/crash_watch/version.rb
 - test/gdb_controller_spec.rb
 homepage: https://github.com/FooBarWidget/crash-watch

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJRRcODAAoJECrHRaUKISqMEO0IAJuhELVa6QwpJnlBZb1PBvV4
-abh+UMrEIy+1o1+seosi80/ve95UAQM580zqNed2GBqoPwMNaHuBhpzi97FYavOh
-XStm+BPTkL2yPK5TtsgjLrGJOcn4IAWasGpbnzMbf+R+YamLl7CIrr3cSLO5ybfC
-9r3SNvwwEO4gZwYS6vKetZy5Q01lo2M7zFzfYrsWjxQpZ4Szl/UviTTR3kR+58Md
-uzs+dRcaX4S0FNc15+v24JkAJj2ydyVt6X6lV+ByCLCajrMxY2XxwynHZYCT/prM
-VIYbEf1AssnhSdiW3tQkR2wIP+NHSQhdivVIQCNWFbPvjUmSf8u+jJt0d0wsfSM=
-=4mEW
+iQEcBAABAgAGBQJRnnRBAAoJECrHRaUKISqM2kAIAJuFG1kFUVcJ4e34c+lshduf
+Ntb3Urm5ygDBYUGM8BaW/9W9ncpIyrlB2QFZl/T4RHTCaseQ/gYAQ37xOKoN9aZf
+8FIpmpL980nbixThjZmEVnMQDCM8GICW8loHtSDmY++vcnyxmMeSTZQMSIis+8SR
+ko5HoG2bAoyVaqFlkDvw871Qyz9yDqvVX5OQ5cqgzdfi6tGszwB9FvEOwK2W6Wkt
+D95hfBqrH6JQrRD3+9nZjcnNcHvCnEhvGZtRQyrUs9gk4mRtZXXPOWmQuoalbiL5
+m1uEy7eyF8qM2e/PCsiJgTwgVSl+MG+NVixsDkcBx14HuwzWaBCAMDrA2is8OG8=
+=R2yM
 -----END PGP SIGNATURE-----