crash-watch 1.1.9 → 1.1.10

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJRoN3dAAoJECrHRaUKISqMtOUH/R3vYMTrTqNcqd02b9UJPERb
-G+kYMIND2e4zoGbsIUL+WcFohf3PphAyh0VQLW71T6e1k9O1mBNaleuU95ephruQ
-gfzA/dzcKk3dHD7xQTRm1MKJZS5b/zCowq1DSw9oPYl60tcTDELzw6G6DF1Kgq10
-Df8jXKzzbrRW/RQHbpAB1HItjTpXcy50FLiPGA1svMk4nUY0ssBtGX3yi0PDPGK3
-Mn5YqbVx/Q+rgJ9kBIBtqrn2/BPRN8et7SgWoy1nebVJNipf+0lbTk7daqVT55cb
-mNbNryT8oZFmC/1OICygSKT8aiwc7EsGptkXfRfO01Dfc5cTjgtEY/8VdF7ZUvU=
-=4hv1
+iQEcBAABAgAGBQJSOVUqAAoJECrHRaUKISqMvdgH/iDoUNTq++b6Li7HaiXdhRV/
+6+EaBghhauYYxoUNAxsJTETbNKt0Hluw3acpkxCWJG8FAkmgHH0QzQYLAg4sDKQ3
+I1V0ej0U8NeVm0eFbcATaZzBaj9fKKI+isWlx8JtBFWdaiRd6pLopPIR2F4YLYou
+4KTyQlqNzPE/arCLbzcqAMUxx6BchB1pbrp1iBNCKIhJnYIMrp9KKTd6KoEn0gto
+7tZlP+2gdEZgKq1bLfrjMDAc3SXR36rHVDQz7KC2//YgheLCEfl6CPJQpF1lc+7o
+R0oCrV/7x3DSTV5WRg4xrWkllqnHMzfWqI+xI+e5CVm7dJ9TVcILY8RWfca0m+Q=
+=yvSC
 -----END PGP SIGNATURE-----

data/Rakefile

@@ -51,7 +51,7 @@ end
 
 PKG_DIR         = string_option('PKG_DIR', "pkg")
 DEBIAN_NAME     = PACKAGE_NAME
-ALL_DISTRIBUTIONS  = ["raring", "precise", "lucid"]
+ALL_DISTRIBUTIONS  = string_option('DEBIAN_DISTROS', 'raring precise lucid').split(/[ ,]/)
 ORIG_TARBALL_FILES = lambda do
 	require 'crash_watch/packaging'
 	Dir[*CRASH_WATCH_FILES] - Dir[*CRASH_WATCH_EXCLUDE_FILES]
@@ -87,6 +87,7 @@ end
 #  * Text inside #if/#elif/#else are automatically unindented.
 class Preprocessor
 	def initialize
+		require 'erb' if !defined?(ERB)
 		@indentation_size = 4
 		@debug = boolean_option('DEBUG')
 	end
@@ -100,10 +101,11 @@ class Preprocessor
 		end
 		the_binding  = create_binding(variables)
 		context      = []
+		@filename    = filename
 		@lineno      = 1
 		@indentation = 0
 
-		each_line(filename) do |line|
+		each_line(filename, the_binding) do |line|
 			debug("context=#{context.inspect}, line=#{line.inspect}")
 
 			name, args_string, cmd_indentation = recognize_command(line)
@@ -174,6 +176,8 @@ class Preprocessor
 				else
 					terminate "#endif is not allowed outside #if block"
 				end
+			when "DEBHELPER"
+				output.puts(line)
 			when "", nil
 				# Either a comment or not a preprocessor command.
 				case context.last
@@ -210,12 +214,18 @@ private
 		"raring"   => "13.04",
 		"saucy"    => "13.10"
 	}
+	DEBIAN_DISTRIBUTIONS = {
+		"squeeze"  => "20110206",
+		"wheezy"   => "20130504"
+	}
 
 	# Provides the DSL that's accessible within.
 	class Evaluator
 		def _infer_distro_table(name)
 			if UBUNTU_DISTRIBUTIONS.has_key?(name)
 				return UBUNTU_DISTRIBUTIONS
+			elsif DEBIAN_DISTRIBUTIONS.has_key?(name)
+				return DEBIAN_DISTRIBUTIONS
 			end
 		end
 
@@ -234,6 +244,7 @@ private
 				table2 = _infer_distro_table(name)
 				raise "Distribution name #{@distribution.inspect} not recognized" if !table1
 				raise "Distribution name #{name.inspect} not recognized" if !table2
+				return false if table1 != table2
 				v1 = table1[@distribution]
 				v2 = table2[name]
 				
@@ -257,16 +268,14 @@ private
 		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
+	def each_line(filename, the_binding)
+		data = File.open(filename, 'r') do |f|
+			erb = ERB.new(f.read, nil, "-")
+			erb.filename = filename
+			erb.result(the_binding)
+		end
+		data.each_line do |line|
+			yield line.chomp
 		end
 	end
 	
@@ -274,7 +283,15 @@ private
 		if line =~ /^([\s\t]*)#(.+)/
 			indentation_str = $1
 			command = $2
+
+			# Declare tabs as equivalent to 4 spaces. This is necessary for
+			# Makefiles in which the use of tabs is required.
+			indentation_str.gsub!("\t", "    ")
+
 			name = command.scan(/^\w+/).first
+			# Ignore shebangs and comments.
+			return if name.nil?
+
 			args_string = command.sub(/^#{Regexp.escape(name)}[\s\t]*/, '')
 			return [name, args_string, indentation_str.to_s.size]
 		else
@@ -308,9 +325,24 @@ private
 
 	def unindent(line)
 		line =~ /^([\s\t]*)/
-		found = $1.to_s.size
+		# Declare tabs as equivalent to 4 spaces. This is necessary for
+		# Makefiles in which the use of tabs is required.
+		found = $1.to_s.gsub("\t", "    ").size
+		
 		if found >= @indentation
-			return line[@indentation .. -1]
+			# Tab-friendly way to remove indentation.
+			remaining = @indentation
+			line = line.dup
+			while remaining > 0
+				if line[0..0] == " "
+					remaining -= 1
+				else
+					# This is a tab.
+					remaining -= 4
+				end
+				line.slice!(0, 1)
+			end
+			return line
 		else
 			terminate "wrong indentation: found #{found} characters, should be at least #{@indentation}"
 		end
@@ -321,7 +353,7 @@ private
 	end
 
 	def terminate(message)
-		abort "*** ERROR: line #{@lineno}: #{message}"
+		abort "*** ERROR: #{@filename} line #{@lineno}: #{message}"
 	end
 end
 
@@ -376,7 +408,7 @@ def create_debian_package_dir(distribution)
 end
 
 task 'debian:orig_tarball' do
-	if File.exist?("#{PKG_DIR}/#{DEBIAN_NAME}.orig.tar.gz")
+	if File.exist?("#{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}.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}"
@@ -408,8 +440,18 @@ task 'debian:dev' do
 	end
 end
 
-desc "Build Debian source packages to be uploaded to repositories"
-task 'debian:production' => 'debian:orig_tarball' do
+desc "Build Debian source packages"
+task 'debian:source_packages' => 'debian:orig_tarball' do
+	ALL_DISTRIBUTIONS.each do |distribution|
+		create_debian_package_dir(distribution)
+	end
+	ALL_DISTRIBUTIONS.each do |distribution|
+		sh "cd #{PKG_DIR}/#{distribution} && debuild -S -us -uc"
+	end
+end
+
+desc "Build Debian source packages to be uploaded to Launchpad"
+task 'debian:launchpad' => 'debian:orig_tarball' do
 	ALL_DISTRIBUTIONS.each do |distribution|
 		create_debian_package_dir(distribution)
 		sh "cd #{PKG_DIR}/#{distribution} && dpkg-checkbuilddeps"

data/bin/crash-watch

@@ -46,7 +46,7 @@ $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'crash_watch/gdb_controller'
 begin
 	gdb = CrashWatch::GdbController.new
-rescue GdbWatch::Error => e
+rescue CrashWatch::Error => e
 	abort e.message
 end
 begin

data/lib/crash_watch/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crash-watch
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-25 00:00:00.000000000 Z
+date: 2013-09-18 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
 
-iQEcBAABAgAGBQJRoN3dAAoJECrHRaUKISqMrRAH/0UTheexryuP9bNSJUEwzhra
-AONBxRrOkHS+LCVIhCMQuoGUearG+m1gFUAP3DCtqUtWC+0MAy6/8U+ncxvr7bwk
-/qqksKofHQPNCzuixjy7tY+uY4Dg/llXZd0PnzI2N/o8/N7epX8cud7Sw4/FUCS6
-Eia8sIu6LjvxVeWiX9dOepkTZGikmBhiE0m/LsTpeKPxs5qMq3ZSuNub0vqDNjhD
-n0SSOMTiFRWAnsmV3ldDLicoY9pB25eSYWshgbwBPky+rhsk4EO6EMFiwc1KsH6C
-vtgb5OCAFmEMpgITae8YMFcKQTZ/Jn6AznYMlQiY5Uh7cQdjpmX9HQJzrwfhDgo=
-=IW9j
+iQEcBAABAgAGBQJSOVUqAAoJECrHRaUKISqMAksH/2xeLbe3E8gxUoPHNKu8xjFS
+PIRCFVLleZMYmNNS6PsGmU+1zoqdT2jSIkM+ABDhTrrm0PsK62SnY+DNi1F61rH0
+ECTHXbW34qd0nmQTVzxLFrjFdXoVavexqyXMW0DnFj3BJxNrb9Lud08oZRhQoxLu
+2bYHAvj0TNEBSQiQbLX/vo/ayQoY8UVDl68rhbyhAmdoDSbs3lqZSUzRzcJugtIC
+eMxiHR9iTaUV02QBYrWwBOuK2vo+bJtePuGadxVCRGj0KY0KWVcbqlHQpfuh+cwU
+jjSjBT/AnnusrGg3CtET7edDCmSRGIvRjojbIxa/t9bkHW+ZlcWdF3OmdNWTDUY=
+=vLgH
 -----END PGP SIGNATURE-----