crash-watch 1.1.11 → 1.1.12

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSYaVYAAoJECrHRaUKISqMXFIH/2gLr4zxOAm9CVutT2Jk+sHe
-/2TVvKDYP/UUzVpiiD4tUYeIl9C8x3kDbIAf31EeJCk0oSAeOiCsm3UCVvw6WNSK
-dGSdLrAcZJZTIS9jx0FAF/M5rMjpKa2MyMODp+afY3jci/EoB70xrh2pcmpOBnNm
-GuJ6/MaLidTjSZjrrHLaMBggbCxGWFW6Vd6hNJr7hTngIr0DAYhU2iH1blEFnkY0
-69niH8VaBQwPMtdmjYJNI22Iv77o9/XCesSJ19zXQDyWc/SLtpaNY1FyWXpIW3XB
-BVeJ8jpGgEfQF3JhWr/DJ7ahc9Yiu5Ak8+LPjBNEJcVh+GJ9R4n8ySMNMMYMnUA=
-=r3dS
+iQEcBAABAgAGBQJSquFeAAoJECrHRaUKISqMjVAH/3vmRFJcHZ46nJxbEYA7G/oA
+E+5pfLBk56jGN8aZG2Sbpcs8hlFv1f2wZY58rJc3NgzcFNci4nW/Ej9EkYqIKTz4
+9Q1ucCNH1muiyMMMhxcVnkYFXibWM+0h3Fu62LuCmHl80IdMB4xVpR+TBvUN3yBE
+lLFhQjISPBg6pTwAa6YYt0YASmBGIjg1064EHXfsEUKkCYp+SZS69GJThNyFrBdb
+ydzEmoelWA7R7h4EAS1dDZVwpUk2S2P6Lw8WNCx/JnRZXI8V5b3XRxLmrE0LUICy
+uCUlIqRa7tRMDpM8wVXrLY+9pVX505aCIiPeeGFHphg8/qlEAUHE4CPElwo1JbA=
+=BJQc
 -----END PGP SIGNATURE-----

data/README.markdown

@@ -40,6 +40,23 @@ Our Ubuntu Lucid packages are compatible with Debian 6.
     sudo apt-get update
     sudo apt-get install crash-watch
 
+## Installation on RHEL, CentOS and Amazon Linux
+
+ 1. Enable EPEL: [RHEL](https://fedoraproject.org/wiki/EPEL), [CentOS](http://www.centosblog.com/enable-epel-repo-on-centos-5-and-centos-6/), [Amazon Linux](http://aws.amazon.com/amazon-linux-ami/faqs/#epel).
+ 2. Enable our YUM repository:
+
+        # RHEL 6, CentOS 6
+        curl -L https://oss-binaries.phusionpassenger.com/yumgems/phusion-misc/el.repo | \
+          sudo tee /etc/yum.repos.d/phusion-misc.repo
+        
+        # Amazon Linux
+        curl -L https://oss-binaries.phusionpassenger.com/yumgems/phusion-misc/amazon.repo | \
+          sudo tee /etc/yum.repos.d/phusion-misc.repo
+
+ 3. Install our package:
+
+        sudo yum install rubygem-crash-watch
+
 ## Sample usage
 
     $ crash-watch <PID>

data/Rakefile

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/lib"))
 require 'crash_watch/version'
+require 'tmpdir'
 
 PACKAGE_NAME    = "crash-watch"
 PACKAGE_VERSION = CrashWatch::VERSION_STRING
@@ -51,13 +52,15 @@ end
 
 PKG_DIR         = string_option('PKG_DIR', "pkg")
 DEBIAN_NAME     = PACKAGE_NAME
-ALL_DISTRIBUTIONS  = string_option('DEBIAN_DISTROS', 'raring precise lucid').split(/[ ,]/)
+DEBIAN_PACKAGE_REVISION = 2
+ALL_DISTRIBUTIONS  = string_option('DEBIAN_DISTROS', 'saucy precise lucid').split(/[ ,]/)
 ORIG_TARBALL_FILES = lambda do
 	require 'crash_watch/packaging'
 	Dir[*CRASH_WATCH_FILES] - Dir[*CRASH_WATCH_EXCLUDE_FILES]
 end
 
-# Implements a simple preprocessor language:
+# Implements a simple preprocessor language which combines elements in the C
+# preprocessor with ERB:
 # 
 #     Today
 #     #if @today == :fine
@@ -68,6 +71,7 @@ end
 #         is a sad day.
 #     #endif
 #     Let's go walking.
+#     Today is <%= Time.now %>.
 # 
 # When run with...
 # 
@@ -78,6 +82,7 @@ end
 #     Today
 #     is a fine day.
 #     Let's go walking.
+#     Today is 2013-08-11 22:37:06 +0200.
 # 
 # Highlights:
 # 
@@ -85,6 +90,7 @@ end
 #  * Expressions are Ruby expressions, evaluated within the binding of a
 #    Preprocessor::Evaluator object.
 #  * Text inside #if/#elif/#else are automatically unindented.
+#  * ERB compatible.
 class Preprocessor
 	def initialize
 		require 'erb' if !defined?(ERB)
@@ -219,6 +225,12 @@ private
 		"squeeze"  => "20110206",
 		"wheezy"   => "20130504"
 	}
+	REDHAT_ENTERPRISE_DISTRIBUTIONS = {
+		"el6"      => "el6.0"
+	}
+	AMAZON_DISTRIBUTIONS = {
+		"amazon"   => "amazon"
+	}
 
 	# Provides the DSL that's accessible within.
 	class Evaluator
@@ -227,6 +239,10 @@ private
 				return UBUNTU_DISTRIBUTIONS
 			elsif DEBIAN_DISTRIBUTIONS.has_key?(name)
 				return DEBIAN_DISTRIBUTIONS
+			elsif REDHAT_ENTERPRISE_DISTRIBUTIONS.has_key?(name)
+				return REDHAT_ENTERPRISE_DISTRIBUTIONS
+			elsif AMAZON_DISTRIBUTIONS.has_key?(name)
+				return AMAZON_DISTRIBUTIONS
 			end
 		end
 
@@ -397,7 +413,7 @@ def create_debian_package_dir(distribution)
 	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" +
+		"#{DEBIAN_NAME} (#{PACKAGE_VERSION}-#{DEBIAN_PACKAGE_REVISION}~#{distribution}1) #{distribution}; urgency=low\n" +
 		"\n" +
 		"  * Package built.\n" +
 		"\n" +
@@ -415,7 +431,8 @@ task 'debian:orig_tarball' do
 		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"
+		sh "cd #{PKG_DIR} && find #{DEBIAN_NAME}_#{PACKAGE_VERSION} -print0 | xargs -0 touch -d '2013-10-27 00:00:00 UTC'"
+		sh "cd #{PKG_DIR} && tar -c #{DEBIAN_NAME}_#{PACKAGE_VERSION} | gzip --no-name --best > #{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz"
 	end
 end
 
@@ -472,3 +489,94 @@ task 'debian:clean' do
 	end
 	sh "rm -rf #{PKG_DIR}/*.debian.tar.gz"
 end
+
+
+##### RPM packaging support #####
+
+RPM_NAME = "rubygem-crash-watch"
+RPM_PACKAGE_REVISION = 1
+RPMBUILD_ROOT = File.expand_path("~/rpmbuild")
+MOCK_OFFLINE = boolean_option('MOCK_OFFLINE', false)
+ALL_RPM_DISTROS = {
+	"el6" => { :mock_chroot_name => "epel-6", :distro_name => "Enterprise Linux 6" },
+	"amazon" => { :mock_chroot_name => "epel-6", :distro_name => "Amazon Linux" }
+}
+
+desc "Build gem for use in RPM building"
+task 'rpm:gem' do
+	rpm_source_dir = "#{RPMBUILD_ROOT}/SOURCES"
+	sh "gem build #{PACKAGE_NAME}.gemspec"
+	sh "cp #{PACKAGE_NAME}-#{PACKAGE_VERSION}.gem #{rpm_source_dir}/"
+end
+
+desc "Build RPM for local machine"
+task 'rpm:local' => 'rpm:gem' do
+	distro_id = `./rpm/get_distro_id.py`.strip
+	rpm_spec_dir = "#{RPMBUILD_ROOT}/SPECS"
+	spec_target_dir = "#{rpm_spec_dir}/#{distro_id}"
+	spec_target_file = "#{spec_target_dir}/#{RPM_NAME}.spec"
+
+	sh "mkdir -p #{spec_target_dir}"
+	puts "Generating #{spec_target_file}"
+	Preprocessor.new.start("rpm/#{RPM_NAME}.spec.template",
+		spec_target_file,
+		:distribution => distro_id)
+
+	sh "rpmbuild -ba #{spec_target_file}"
+end
+
+def create_rpm_build_task(distro_id, mock_chroot_name, distro_name)
+	desc "Build RPM for #{distro_name}"
+	task "rpm:#{distro_id}" => 'rpm:gem' do
+		rpm_spec_dir = "#{RPMBUILD_ROOT}/SPECS"
+		spec_target_dir = "#{rpm_spec_dir}/#{distro_id}"
+		spec_target_file = "#{spec_target_dir}/#{RPM_NAME}.spec"
+		maybe_offline = MOCK_OFFLINE ? "--offline" : nil
+
+		sh "mkdir -p #{spec_target_dir}"
+		puts "Generating #{spec_target_file}"
+		Preprocessor.new.start("rpm/#{RPM_NAME}.spec.template",
+			spec_target_file,
+			:distribution => distro_id)
+
+		sh "rpmbuild -bs #{spec_target_file}"
+		sh "mock --verbose #{maybe_offline} " +
+			"-r #{mock_chroot_name}-x86_64 " +
+			"--resultdir '#{PKG_DIR}/#{distro_id}' " +
+			"rebuild #{RPMBUILD_ROOT}/SRPMS/#{RPM_NAME}-#{PACKAGE_VERSION}-#{RPM_PACKAGE_REVISION}#{distro_id}.src.rpm"
+	end
+end
+
+ALL_RPM_DISTROS.each_pair do |distro_id, info|
+	create_rpm_build_task(distro_id, info[:mock_chroot_name], info[:distro_name])
+end
+
+desc "Build RPMs for all distributions"
+task "rpm:all" => ALL_RPM_DISTROS.keys.map { |x| "rpm:#{x}" }
+
+desc "Publish RPMs for all distributions"
+task "rpm:publish" do
+	server = "juvia-helper.phusion.nl"
+	remote_dir = "/srv/oss_binaries_passenger/yumgems/phusion-misc"
+	rsync = "rsync -z -r --delete --progress"
+
+	ALL_RPM_DISTROS.each_key do |distro_id|
+		if !File.exist?("#{PKG_DIR}/#{distro_id}")
+			abort "No packages built for #{distro_id}. Please run 'rake rpm:all' first."
+		end
+	end
+	ALL_RPM_DISTROS.each_key do |distro_id|
+		sh "rpm --resign --define '%_signature gpg' --define '%_gpg_name #{PACKAGE_SIGNING_KEY}' #{PKG_DIR}/#{distro_id}/*.rpm"
+	end
+	sh "#{rsync} #{server}:#{remote_dir}/latest/ #{PKG_DIR}/yumgems/"
+	ALL_RPM_DISTROS.each_key do |distro_id|
+		distro_dir = "#{PKG_DIR}/#{distro_id}"
+		repo_dir = "#{PKG_DIR}/yumgems/#{distro_id}"
+		sh "mkdir -p #{repo_dir}"
+		sh "cp #{distro_dir}/#{RPM_NAME}*.rpm #{repo_dir}/"
+		sh "createrepo #{repo_dir}"
+	end
+	sh "ssh #{server} 'rm -rf #{remote_dir}/new && cp -dpR #{remote_dir}/latest #{remote_dir}/new'"
+	sh "#{rsync} #{PKG_DIR}/yumgems/ #{server}:#{remote_dir}/new/"
+	sh "ssh #{server} 'rm -rf #{remote_dir}/previous && mv #{remote_dir}/latest #{remote_dir}/previous && mv #{remote_dir}/new #{remote_dir}/latest'"
+end

data/lib/crash_watch/packaging.rb

@@ -10,5 +10,6 @@ CRASH_WATCH_FILES = [
 
 CRASH_WATCH_EXCLUDE_FILES = [
 	"Rakefile",
-	"debian.template/**/*"
+	"debian.template/**/*",
+	"rpm/**/*"
 ]

data/lib/crash_watch/version.rb

@@ -1,3 +1,3 @@
 module CrashWatch
-	VERSION_STRING = '1.1.11'
+	VERSION_STRING = '1.1.12'
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: crash-watch
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.12
+  prerelease: 
 platform: ruby
 authors:
 - Hongli Lai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -56,26 +61,27 @@ files:
 - test/gdb_controller_spec.rb
 homepage: https://github.com/FooBarWidget/crash-watch
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Monitor processes and display useful information when they crash
 test_files: []

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSYaVYAAoJECrHRaUKISqMuUsIAJuW1tQ38dwfrPMBplWArorP
-3pnuLvFiAmGCTQ1Pi+B6/+VRYB/Kvu3BSF+/I823subnGThBNIAMMKbozB7FJjtR
-8jHCaqwXKW32EJ5f792QU2kG+ZNqzIL99LcdkHJgWFnPtbQAZQGO4gIu2xJN2X12
-z2gYr66343cbYOBn7/BtMsd2IE3+ExAhNkTFfI05iXejr+2j5Q4w+XZ6aL4Y5alF
-O0Y6eXpsO21VgrDSfRve7BS0zDd6jmet5rY84U9jF9OWltLaIXoiWBZZNgfy4Ulq
-9f27tb8D7ugY8q1r4LiWJpoACB4L7qOcH/ns38vlv38+ybXCcmGsVhl2fcURy8A=
-=CkKA
+iQEcBAABAgAGBQJSquFeAAoJECrHRaUKISqMhOkIAKHs19u1vHGpJzjL1+basgb1
+D5qpD8D7VMm/xT3l8bkU/OLGaGyH+S1LDvJKBsMXmckI97k9/zRkxMOJ/GhCbZlX
+7nbPaSVOmy2OOfoaLfhlB/8XYmOGoQFUIKb37TdLuLLUBW4vWFn1yG+/1IBgeQXh
+qsGMXqYA2PDirpDBBvhmASq/HTmG+N/U/8uygvdTl9kldqPM7qdMEdUaD7/cs+5J
+dMJGMxOHWa2SUiz4/KfEWjF4VcthWcC1WT/nHJf/bMplbG6ChTvq5YtOtDmwHAaB
+SYCIVboO5mcnfpxYONPoPD8D/TWBKvF71Lso3FO9mYTDBu/srNYNeq6ulkqNJEA=
+=bOL7
 -----END PGP SIGNATURE-----

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTVjMGZiZDJhOGUxMGMwZGQxODc1OWM4YWU4MGMzYmI0NjFhMjJmMg==
-  data.tar.gz: !binary |-
-    NDk4YTJjYzdiMjVkYTliYzFhYmFmNWU2MzMyMjNkODE1ZDgyOTJlYw==
-SHA512:
-  metadata.gz: !binary |-
-    ZTY5M2QxOGJhZTRlOGY1YTRlYTg1MWQwYzVhMGI1YzhmMzRlZDQ2NmNkNzY5
-    MTY0ZjIzYmIwMjRiY2MwMzZiOTJhZmM5NTFjMjJiZmZlNDNjNjBiNjY2MzUx
-    NGIxOWM3ZTAyYmNlNTVhZGZjMTgzNTcwNDQwMGQyZDY0ODEyMTY=
-  data.tar.gz: !binary |-
-    MTQzNDFhM2NlYmI4NTFkNjM4ZWVhZGMwN2U3M2MzNGM1YWM5YmZlNjUzZDI3
-    MTQ5OWRiMGI4MjY3YzU4YzY4ODNiNDNlODFhYTA0MDhlMmIxODBlZjBiNzlh
-    MjRjY2QxYTkwYWZkMWJmOTIxOGJjY2RlZWZlZTAwY2IzOGZkMWI=

checksums.yaml.gz.asc

@@ -1,12 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
-Comment: GPGTools - http://gpgtools.org
-
-iQEcBAABAgAGBQJSYaVYAAoJECrHRaUKISqMousH/2KagJxy+3OMF+xj/HJF2rx4
-5ztOYkRThgLQRNcL/wybY7THNoG9tlxIrEidnIWL+y+jUKct0zkLcTXEKzlD22yT
-tCHC6FIx1hm6yj6ZvXtq7rS+RfQoS8FUOI2lcZdwcW/ouBzBGQ1cAKlyO7DiDzaD
-QyJEI6JGgfOrUZSj4IbjsOH/i8hnD3hY0b0ZUmb4mBK/eB1WPWiMOQXQbUtsrGAY
-Fg40+QWS+tqz87ztW/aBYo5Zg/94bj4nJsMLU+u3uuifK3HtixzRUvse1sx3VoEj
-04blj1BLBxf2O5A522NhkmnoB8clwq2eM97bYAqnPtxomsvfAje78BBc6v2xaeM=
-=EMtZ
------END PGP SIGNATURE-----