mizuho 0.9.18 → 0.9.19

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJRfZGvAAoJECrHRaUKISqMZA0H/2pCwpt1nTW5DD/1qT36IEmX
-NnRePYM6El9Ccd7ZyhcThTTMpm6yp2Ao3hZMXGNh1UNdLwjvkaAoJBJC8Cvq5ckZ
-rJlvPrVJPoxlT3JSnp8J59siWIBWQwkXqskHUGXWBYJ1sjvoTXw7svNwj0HIvZwP
-d9qV1uOmCxCMiWt6HQjCa+74avVXAPQRzwqBfBBIxVRG2IqhRq+XdeyAWZ2qasVi
-/t6eUR5EamygYbABgYWdSoOmP0E6ZVF3uti+ihiZ/KFr574s9+o7J35DByrZwTj8
-JO167i04pKm1Ot2Unmi+bjTD8BGtom7VqQOZBATS16Z4Hvef52ul6cpxKADHZeM=
-=0j4v
+iQEcBAABAgAGBQJRgSgWAAoJECrHRaUKISqMkckH/1t5KU4rDgkQ1QmsRcdIMLTQ
+M3SAW5nABxs4lPT4iJL0YZmh19oJOcmFQRx/v2dYImv0/R8Q3LLs5gqFWG+Nwow9
+caW87HKLB51KIImXxYMc9rB3Gp6jB+VKgW8uVAdv5ENTaDf72ldJJFNZbzzHrD6F
+6hpuDKhvbHeBIFawjdmYlKMZUACKqglCtXkxGxqhXp78IMrR+X31imAZTDj0TdXO
+qak10qS4OLHBLZtNYIpVj0m5lAD2uiX64/CgaolnbqIYXJLIgT0snUrueaRuPRaH
+ryM7sASE6WYeEdavInfjE98Q7h5qfVThT/bgmB8wMHhWBMfauB6M631ZWrxGuHE=
+=KT1Y
 -----END PGP SIGNATURE-----

data/README.markdown

@@ -28,9 +28,9 @@ that.
    to install this yourself; we've bundled a precompiled source-highlight
    binary for OS X for your convenience.
 
-## Installation
+## Installation with RubyGems
 
-Run the following command as root:
+Run:
 
     gem install mizuho
 
@@ -38,6 +38,24 @@ This gem is signed using PGP with the [Phusion Software Signing key](http://www.
 
 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:user/ppa-name
+    sudo apt-get update
+    sudo apt-get install mizuho
+
+## 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/mizuho.list'
+    sudo sh -c 'echo deb-src http://ppa.launchpad.net/phusion.nl/misc/ubuntu lucid main >> /etc/apt/sources.list.d/mizuho.list'
+    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C324F5BB38EEB5A0
+    sudo apt-get update
+    sudo apt-get install mizuho
+
 ## Usage
 
 First, read [the Asciidoc manual](http://www.methods.co.nz/asciidoc/userguide.html)

data/Rakefile

@@ -1,6 +1,62 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/lib"))
 require 'mizuho'
 
+PACKAGE_NAME    = "mizuho"
+PACKAGE_VERSION = Mizuho::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-#{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-#{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 'mizuho/packaging'
+	Dir[*MIZUHO_FILES] - Dir[*MIZUHO_DEBIAN_EXCLUDE_FILES]
+end
+
 # Implements a simple preprocessor language:
 # 
 #     Today
@@ -155,6 +211,7 @@ private
 		"saucy"    => "13.10"
 	}
 
+	# Provides the DSL that's accessible within.
 	class Evaluator
 		def _infer_distro_table(name)
 			if UBUNTU_DISTRIBUTIONS.has_key?(name)
@@ -268,24 +325,6 @@ private
 	end
 end
 
-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
-
 def recursive_copy_files(files, destination_dir, preprocess = false, variables = {})
 	require 'fileutils' if !defined?(FileUtils)
 	files.each_with_index do |filename, i|
@@ -294,8 +333,8 @@ def recursive_copy_files(files, destination_dir, preprocess = false, variables =
 			FileUtils.mkdir_p("#{destination_dir}/#{dir}")
 		end
 		if !File.directory?(filename)
-			if preprocess && filename =~ /\.pp$/
-				real_filename = filename.sub(/\.pp$/, '')
+			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)
@@ -310,80 +349,55 @@ def recursive_copy_files(files, destination_dir, preprocess = false, variables =
 end
 
 def create_debian_package_dir(distribution)
-	require 'mizuho/packaging'
 	require 'time'
 
 	variables = {
 		:distribution => distribution
 	}
 
-	sh "rm -rf #{PKG_DIR}/#{distribution}"
-	sh "mkdir -p #{PKG_DIR}/#{distribution}"
-	recursive_copy_files(Dir[*MIZUHO_FILES] - Dir[*MIZUHO_DEBIAN_EXCLUDE_FILES],
-		"#{PKG_DIR}/#{distribution}")
-	recursive_copy_files(Dir["debian/**/*"], "#{PKG_DIR}/#{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)
-	changelog = File.read("#{PKG_DIR}/#{distribution}/debian/changelog")
+	sh "mv #{root}/debian.template #{root}/debian"
+	changelog = File.read("#{root}/debian/changelog")
 	changelog =
-		"mizuho (#{Mizuho::VERSION_STRING}-1~#{distribution}1) #{distribution}; urgency=low\n" +
+		"#{DEBIAN_NAME} (#{PACKAGE_VERSION}-1~#{distribution}1) #{distribution}; urgency=low\n" +
 		"\n" +
 		"  * Package built.\n" +
 		"\n" +
-		" -- Hongli Lai <hongli@phusion.nl>  #{Time.now.rfc2822}\n\n" +
+		" -- #{MAINTAINER_NAME} <#{MAINTAINER_EMAIL}>  #{Time.now.rfc2822}\n\n" +
 		changelog
-	File.open("#{PKG_DIR}/#{distribution}/debian/changelog", "w") do |f|
+	File.open("#{root}/debian/changelog", "w") do |f|
 		f.write(changelog)
 	end
 end
 
-PKG_DIR  = string_option('PKG_DIR', "pkg")
-BASENAME = "mizuho_#{Mizuho::VERSION_STRING}"
-DISTRIBUTIONS = ["raring", "precise", "lucid"]
-
-
-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-#{Mizuho::VERSION_STRING}"
-	sh "gem build mizuho.gemspec --sign --key 0x0A212A8C"
-	puts "Proceed with pushing tag to Github and uploading the gem? [y/n]"
-	if STDIN.readline == "y\n"
-		sh "git push origin release-#{Mizuho::VERSION_STRING}"
-		sh "gem push mizuho-#{Mizuho::VERSION_STRING}.gem"
-	else
-		puts "Did not upload the gem."
-	end
-end
-
 task 'debian:orig_tarball' do
-	if File.exist?("#{PKG_DIR}/mizuho_#{Mizuho::VERSION_STRING}.orig.tar.gz")
-		puts "Debian orig tarball #{PKG_DIR}/mizuho_#{Mizuho::VERSION_STRING}.orig.tar.gz already exists."
+	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
-		require 'mizuho/packaging'
-
-		sh "rm -rf #{PKG_DIR}/#{BASENAME}"
-		sh "mkdir -p #{PKG_DIR}/#{BASENAME}"
-		recursive_copy_files(
-			Dir[*MIZUHO_FILES] - Dir[*MIZUHO_DEBIAN_EXCLUDE_FILES],
-			"#{PKG_DIR}/#{BASENAME}"
-		)
-		sh "cd #{PKG_DIR} && tar -c #{BASENAME} | gzip --best > #{BASENAME}.orig.tar.gz"
+		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 a Debian package for local testing"
+desc "Build Debian source and binary package(s) for local testing"
 task 'debian:dev' do
-	sh "rm -f #{PKG_DIR}/mizuho_#{Mizuho::VERSION_STRING}.orig.tar.gz"
+	sh "rm -f #{PKG_DIR}/#{DEBIAN_NAME}_#{PACKAGE_VERSION}.orig.tar.gz"
 	Rake::Task["debian:clean"].invoke
 	Rake::Task["debian:orig_tarball"].invoke
-	if distro = string_option('DISTRO')
-		distributions = [distro]
+	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 = DISTRIBUTIONS
+		distributions = distro.split(',')
 	end
 	distributions.each do |distribution|
 		create_debian_package_dir(distribution)
@@ -394,14 +408,14 @@ task 'debian:dev' do
 	end
 end
 
-desc "Build Debian multiple source packages to be uploaded to repositories"
+desc "Build Debian source packages to be uploaded to repositories"
 task 'debian:production' => 'debian:orig_tarball' do
-	DISTRIBUTIONS.each do |distribution|
+	ALL_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 -S -k0x0A212A8C"
+	ALL_DISTRIBUTIONS.each do |distribution|
+		sh "cd #{PKG_DIR}/#{distribution} && debuild -S -k#{PACKAGE_SIGNING_KEY}"
 	end
 end
 
@@ -410,7 +424,7 @@ task 'debian:clean' do
 	files = Dir["#{PKG_DIR}/*.{changes,build,deb,dsc,upload}"]
 	sh "rm -f #{files.join(' ')}"
 	sh "rm -rf #{PKG_DIR}/dev"
-	DISTRIBUTIONS.each do |distribution|
+	ALL_DISTRIBUTIONS.each do |distribution|
 		sh "rm -rf #{PKG_DIR}/#{distribution}"
 	end
 	sh "rm -rf #{PKG_DIR}/*.debian.tar.gz"

data/{debian/control.pp → debian.template/control.template}

@@ -1,6 +1,6 @@
 Source: mizuho
 Section: text
-Priority: optional
+Priority: extra
 Maintainer: Hongli Lai <hongli@phusion.nl>
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.0~), sed (>= 1.0.0)
 Standards-Version: 3.9.3

data/lib/mizuho.rb

@@ -19,7 +19,7 @@
 # THE SOFTWARE.
 
 module Mizuho
-	VERSION_STRING    = "0.9.18"
+	VERSION_STRING    = "0.9.19"
 	NATIVELY_PACKAGED = false
 
 	if NATIVELY_PACKAGED

data/lib/mizuho/packaging.rb

@@ -22,7 +22,7 @@ MIZUHO_FILES = [
 	"README.markdown", "LICENSE.txt", "Rakefile",
 	"bin/*",
 	"lib/**/*",
-	"debian/**/*",
+	"debian.template/**/*",
 	"test/*",
 	"templates/*",
 	"asciidoc/**/*",
@@ -31,6 +31,6 @@ MIZUHO_FILES = [
 
 MIZUHO_DEBIAN_EXCLUDE_FILES = [
 	"Rakefile",
-	"debian/**/*",
+	"debian.template/**/*",
 	"source-highlight/**/*",
 ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mizuho
 version: !ruby/object:Gem::Version
-  version: 0.9.18
+  version: 0.9.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-28 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -46,7 +46,7 @@ dependencies:
 description: A documentation formatting tool. Mizuho converts Asciidoc input files
   into nicely outputted HTML, possibly one file per chapter. Multiple templates are
   supported, so you can write your own.
-email: hongli@phusion.nl
+email: software-signing@phusion.nl
 executables:
 - mizuho
 - mizuho-asciidoc
@@ -65,13 +65,13 @@ files:
 - lib/mizuho/source_highlight.rb
 - lib/mizuho/utils.rb
 - lib/mizuho.rb
-- debian/changelog
-- debian/compat
-- debian/control.pp
-- debian/copyright
-- debian/mizuho.install.pp
-- debian/rules
-- debian/source/format
+- debian.template/changelog
+- debian.template/compat
+- debian.template/control.template
+- debian.template/copyright
+- debian.template/mizuho.install.template
+- debian.template/rules
+- debian.template/source/format
 - test/generator_spec.rb
 - test/id_map_spec.rb
 - test/parser_spec.rb
@@ -397,7 +397,8 @@ files:
 - source-highlight/xml.lang
 - source-highlight/xorg.lang
 homepage: https://github.com/FooBarWidget/mizuho
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJRfZGvAAoJECrHRaUKISqMbMIH/2nKsOHJx3cpvpm4TDYBu1bH
-/3/JWQl5p7XatzxntKWce7WyGDFk3+lfmYRfu+WDGC8AEqlq4Vo/wctVwgx48HWp
-8GP89+2VUEBaMynFNkxH2Uq4fzs95AZGWUDOq35BN7i1JkcPdjJIt5341ak7UPLr
-x096QNFUwqH5b/Fnd7hVog9eR8zA1pokKWf2FPKNv7XWrsvPr3iTVd9L2Uui2Bzn
-DzbuaRWMkt7naJlHLoahEdUhuZFWmjFRmTVsI+ZsC/y7hHz+KaFL7n++Um3dasSn
-Wl+NKEtqZ5wis0Rgvb7cPeb08Mm6j36qxFCQMFqleTTR+91vzyfiD3HLB4jBHyo=
-=FC1H
+iQEcBAABAgAGBQJRgSgWAAoJECrHRaUKISqM0KoIALYyey+TmESUUVaI4bANXCmv
+8IEOPmzmzLgddEbEE+4Sgm9neu9lBPCTLTIJQCNxcET2CkmfvhcqCYpWj6ewQIPS
+W49y/TF5iMCeLrbtyehCivE7/IatPKZ5Q+hmcQzb/9k3Vq+Pvxr8KIFrDgaKM8eB
+prQw+g5TBEok4H0Sp0YwkKT3utx4Oj9XpvdlpXzFUlL7sYGylbKeJWGfr8uK/jxC
+XIJzkTiWHRf7fbKEHVn5Wvka4DgLXGqNZiVgPb4/5MZykGQMqrPgdvVmVRb7DCW4
+Xsqk0j0qfaxRVWgEs1rdOwwMtzFpmJ+OkDA9XrIoDHCDyCnFZlao7UjCJC6bwCc=
+=i2ql
 -----END PGP SIGNATURE-----