mizuho 0.9.19 → 0.9.20

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJRgSgWAAoJECrHRaUKISqMkckH/1t5KU4rDgkQ1QmsRcdIMLTQ
-M3SAW5nABxs4lPT4iJL0YZmh19oJOcmFQRx/v2dYImv0/R8Q3LLs5gqFWG+Nwow9
-caW87HKLB51KIImXxYMc9rB3Gp6jB+VKgW8uVAdv5ENTaDf72ldJJFNZbzzHrD6F
-6hpuDKhvbHeBIFawjdmYlKMZUACKqglCtXkxGxqhXp78IMrR+X31imAZTDj0TdXO
-qak10qS4OLHBLZtNYIpVj0m5lAD2uiX64/CgaolnbqIYXJLIgT0snUrueaRuPRaH
-ryM7sASE6WYeEdavInfjE98Q7h5qfVThT/bgmB8wMHhWBMfauB6M631ZWrxGuHE=
-=KT1Y
+iQEcBAABAgAGBQJSqu2oAAoJECrHRaUKISqMn08H/39H2vkKwZBwTILuA5mgshAZ
+VjSB4IhQcy+4pyXhRXuArO6363nJgWSWqAVuCFP2/x8rOf91ydnTF5PRRB0ONs1Q
+D5BodSCZ6fya1aSexO4/kWTCJntO+SJ+x9fHdlyPJO6bhxm5N9lxxdvblwf+3T2A
+PZE83Uqqimb/4OP6HqpNvDjpyWffUl6qjQbTRR6ppFexSmDroYWIU8F75a0Z2TF3
+6exS62o4ivDHboHz8ZfzZ05ZaWlEBWMYWWNvlCEfNjW2r2vYlavXjkjV8Gw4C/vl
+bmsxzlRJQ5XMUPYHi0+8o4jci6AXm359cfbeBwEjAIzBAUU88E7VXbxaSoB3EmA=
+=3qVe
 -----END PGP SIGNATURE-----

data/README.markdown

@@ -42,7 +42,7 @@ You can verify the authenticity of the gem by following [The Complete Guide to V
 
 Use our [PPA](https://launchpad.net/~phusion.nl/+archive/misc):
 
-    sudo add-apt-repository ppa:user/ppa-name
+    sudo add-apt-repository ppa:phusion.nl/misc
     sudo apt-get update
     sudo apt-get install mizuho
 
@@ -50,12 +50,29 @@ Use our [PPA](https://launchpad.net/~phusion.nl/+archive/misc):
 
 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 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 mizuho
 
+## 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-mizuho
+
 ## Usage
 
 First, read [the Asciidoc manual](http://www.methods.co.nz/asciidoc/userguide.html)

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 "-Ilib -S rspec -f s -c test/*_spec.rb"
 end
 
 desc "Build, sign & upload gem"
@@ -51,13 +51,15 @@ end
 
 PKG_DIR         = string_option('PKG_DIR', "pkg")
 DEBIAN_NAME     = PACKAGE_NAME
-ALL_DISTRIBUTIONS  = ["raring", "precise", "lucid"]
+DEBIAN_PACKAGE_REVISION = 1
+ALL_DISTRIBUTIONS  = string_option('DEBIAN_DISTROS', 'saucy precise lucid').split(/[ ,]/)
 ORIG_TARBALL_FILES = lambda do
 	require 'mizuho/packaging'
 	Dir[*MIZUHO_FILES] - Dir[*MIZUHO_DEBIAN_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 +70,7 @@ end
 #         is a sad day.
 #     #endif
 #     Let's go walking.
+#     Today is <%= Time.now %>.
 # 
 # When run with...
 # 
@@ -78,6 +81,7 @@ end
 #     Today
 #     is a fine day.
 #     Let's go walking.
+#     Today is 2013-08-11 22:37:06 +0200.
 # 
 # Highlights:
 # 
@@ -85,8 +89,10 @@ 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)
 		@indentation_size = 4
 		@debug = boolean_option('DEBUG')
 	end
@@ -100,10 +106,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 +181,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
@@ -208,7 +217,18 @@ private
 		"precise"  => "12.04",
 		"quantal"  => "12.10",
 		"raring"   => "13.04",
-		"saucy"    => "13.10"
+		"saucy"    => "13.10",
+		"trusty"   => "14.04"
+	}
+	DEBIAN_DISTRIBUTIONS = {
+		"squeeze"  => "20110206",
+		"wheezy"   => "20130504"
+	}
+	REDHAT_ENTERPRISE_DISTRIBUTIONS = {
+		"el6"      => "el6.0"
+	}
+	AMAZON_DISTRIBUTIONS = {
+		"amazon"   => "amazon"
 	}
 
 	# Provides the DSL that's accessible within.
@@ -216,6 +236,12 @@ private
 		def _infer_distro_table(name)
 			if UBUNTU_DISTRIBUTIONS.has_key?(name)
 				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
 
@@ -234,6 +260,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 +284,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 +299,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 +341,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 +369,7 @@ private
 	end
 
 	def terminate(message)
-		abort "*** ERROR: line #{@lineno}: #{message}"
+		abort "*** ERROR: #{@filename} line #{@lineno}: #{message}"
 	end
 end
 
@@ -364,7 +412,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" +
@@ -376,13 +424,14 @@ 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}"
 		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
 
@@ -408,14 +457,24 @@ 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"
 	end
 	ALL_DISTRIBUTIONS.each do |distribution|
-		sh "cd #{PKG_DIR}/#{distribution} && debuild -S -k#{PACKAGE_SIGNING_KEY}"
+		sh "cd #{PKG_DIR}/#{distribution} && debuild -S -sa -k#{PACKAGE_SIGNING_KEY}"
 	end
 end
 
@@ -429,3 +488,93 @@ task 'debian:clean' do
 	end
 	sh "rm -rf #{PKG_DIR}/*.debian.tar.gz"
 end
+
+
+##### RPM packaging support #####
+
+RPM_NAME = "rubygem-mizuho"
+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}-1#{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/debian.template/control.template

@@ -2,21 +2,22 @@ Source: mizuho
 Section: text
 Priority: extra
 Maintainer: Hongli Lai <hongli@phusion.nl>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.0~), sed (>= 1.0.0)
+Build-Depends: debhelper (>= 7.0.50~), sed (>= 1.0.0)
 Standards-Version: 3.9.3
 Homepage: https://github.com/FooBarWidget/mizuho
 Vcs-Git: git://github.com/FooBarWidget/mizuho.git
 Vcs-Browser: https://github.com/FooBarWidget/mizuho
-XS-Ruby-Versions: all
 
 Package: mizuho
 Architecture: all
-XB-Ruby-Versions: ${ruby:Versions}
 #if is_distribution?('>= precise')
-    Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-nokogiri (>= 1.4.0), source-highlight, asciidoc (>= 8.6.0)
+    Depends: ${shlibs:Depends}, ${misc:Depends}, ruby2.0 | ruby1.9.1 | ruby1.8 | ruby-interpreter, ruby-nokogiri (>= 1.4.0), source-highlight, asciidoc (>= 8.6.0)
 #else
-    Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, libnokogiri-ruby (>= 1.4.0), source-highlight
+    Depends: ${shlibs:Depends}, ${misc:Depends}, ruby, libnokogiri-ruby (>= 1.4.0), python, source-highlight
 #endif
+Breaks: ruby-mizuho
+Replaces: ruby-mizuho
+Provides: ruby-mizuho
 Description: Documentation formatting tool
  Converts Asciidoc input files into nicely
  outputted HTML, possibly one file per chapter.

data/debian.template/mizuho.install.template

@@ -1,3 +1,5 @@
+bin/* usr/bin/
+lib/* usr/lib/ruby/vendor_ruby/
 templates/* usr/share/mizuho/templates
 #if is_distribution?('< precise')
     asciidoc/* usr/share/mizuho/asciidoc

data/debian.template/ruby-interpreter

@@ -0,0 +1,14 @@
+#!/bin/sh
+if test -e /usr/bin/ruby; then
+	exec /usr/bin/ruby "$@"
+elif test -e /usr/bin/ruby2.0; then
+	exec /usr/bin/ruby2.0 "$@"
+elif test -e /usr/bin/ruby1.9.3; then
+	exec /usr/bin/ruby1.9.3 "$@"
+elif test -e /usr/bin/ruby1.9.1; then
+	exec /usr/bin/ruby1.9.1 "$@"
+elif test -e /usr/bin/ruby1.8; then
+	exec /usr/bin/ruby1.8 "$@"
+else
+	exec ruby "$@"
+fi

data/debian.template/rules.template

@@ -0,0 +1,26 @@
+#!/usr/bin/make -f
+export DH_VERBOSE=1
+
+%:
+	dh $@
+
+override_dh_auto_configure:
+	# Do nothing
+
+override_dh_auto_build:
+	# Do nothing
+
+override_dh_install:
+	dh_install
+	sed -i 's/NATIVELY_PACKAGED = .*/NATIVELY_PACKAGED = true/' debian/mizuho/usr/lib/ruby/vendor_ruby/mizuho.rb
+#if is_distribution?(">= precise")
+    	cp debian/ruby-interpreter debian/mizuho/usr/share/mizuho/
+    	sed -i 's/\/usr\/bin\/env ruby/\/usr\/share\/mizuho\/ruby-interpreter/' debian/mizuho/usr/bin/mizuho
+    	sed -i 's/\/usr\/bin\/env ruby/\/usr\/share\/mizuho\/ruby-interpreter/' debian/mizuho/usr/bin/mizuho-asciidoc
+#else
+    	sed -i 's/\/usr\/bin\/env ruby/\/usr\/bin\/ruby/' debian/mizuho/usr/bin/mizuho
+    	sed -i 's/\/usr\/bin\/env ruby/\/usr\/bin\/ruby/' debian/mizuho/usr/bin/mizuho-asciidoc
+#endif
+
+override_dh_auto_clean:
+	# Do nothing

data/lib/mizuho.rb

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

data/lib/mizuho/fuzzystringmatch.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # Extracted from https://github.com/kiyoka/fuzzy-string-match
 
 #

data/lib/mizuho/generator.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # Copyright (c) 2008-2013 Hongli Lai
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/mizuho/id_map.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # Copyright (c) 2011-2013 Hongli Lai
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -244,7 +245,7 @@ private
 		# digits from left to right.
 		digit_match_index = 0
 		while matches.size > 1
-			orig_digit = orig_chapter_digits[digit_match_index]
+			orig_digit = orig_chapter_digits[digit_match_index] || 1
 
 			# Find closest digit in all matches.
 			tmp = matches.min do |a, b|

data/lib/mizuho/packaging.rb

@@ -19,10 +19,11 @@
 # THE SOFTWARE.
 
 MIZUHO_FILES = [
-	"README.markdown", "LICENSE.txt", "Rakefile",
+	"README.markdown", "LICENSE.txt", "Rakefile", "mizuho.gemspec",
 	"bin/*",
 	"lib/**/*",
 	"debian.template/**/*",
+	"rpm/**/*",
 	"test/*",
 	"templates/*",
 	"asciidoc/**/*",
@@ -32,5 +33,6 @@ MIZUHO_FILES = [
 MIZUHO_DEBIAN_EXCLUDE_FILES = [
 	"Rakefile",
 	"debian.template/**/*",
+	"rpm/**/*",
 	"source-highlight/**/*",
 ]

data/lib/mizuho/utils.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # Copyright (c) 2013 Hongli Lai
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/mizuho.gemspec

@@ -0,0 +1,17 @@
+require File.expand_path('lib/mizuho')
+require File.expand_path('lib/mizuho/packaging')
+
+Gem::Specification.new do |s|
+	s.name = "mizuho"
+	s.version = Mizuho::VERSION_STRING
+	s.summary = "Mizuho documentation formatting tool"
+	s.email = "software-signing@phusion.nl"
+	s.homepage = "https://github.com/FooBarWidget/mizuho"
+	s.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."
+	s.executables = ["mizuho", "mizuho-asciidoc"]
+	s.license = "MIT"
+	s.authors = ["Hongli Lai"]
+	s.add_dependency("nokogiri", ">= 1.4.0")
+	s.add_dependency("sqlite3")
+	s.files = Dir[*MIZUHO_FILES]
+end

data/rpm/get_distro_id.py

@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+vars = { 'config_opts': {} }
+execfile("/etc/mock/default.cfg", vars)
+print(vars['config_opts']['dist'])

data/rpm/rubygem-mizuho.spec.template

@@ -0,0 +1,123 @@
+%global gem_name     mizuho
+%global gem_version  <%= PACKAGE_VERSION %>
+
+%if 0%{?fc18}
+%global rubyabi 1.9.1
+%endif
+
+%if 0%{?el6}
+%global rubyabi 1.8
+%endif
+
+Name:     rubygem-%{gem_name}
+Version:  %{gem_version}
+Release:  1<%= @distribution %>
+Summary:  Documentation formatting tool
+License:  MIT
+Group:    Applications/Text
+URL:      https://github.com/FooBarWidget/mizuho
+Source0:  https://rubygems.org/gems/%{gem_name}-%{gem_version}.gem
+
+%if 0%{?fedora} >= 19
+Requires: ruby(release)
+%else
+Requires: ruby(abi) = %{rubyabi}
+%endif
+Requires: ruby(rubygems)
+Requires: rubygem-nokogiri
+Requires: rubygem-sqlite3-ruby
+Requires: python
+Requires: source-highlight
+
+%if 0%{?fedora} >= 19
+BuildRequires: ruby(release)
+%else
+BuildRequires: ruby(abi) = %{rubyabi}
+%endif
+%if 0%{?el6}
+BuildRequires: ruby(rubygems)
+%else
+BuildRequires: rubygems-devel
+%endif
+BuildRequires: rubygem-nokogiri
+BuildRequires: rubygem-sqlite3-ruby
+
+BuildArch: noarch
+Provides: rubygem(%{gem_name}) = %{gem_version}-%{release}
+
+# macros for RHEL6 compatibility:
+%{!?gem_dir: %global gem_dir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)}
+%{!?gem_instdir: %global gem_instdir %{gem_dir}/gems/%{gem_name}-%{gem_version}}
+%{!?gem_libdir: %global gem_libdir %{gem_instdir}/lib}
+%{!?gem_cache: %global gem_cache %{gem_dir}/cache/%{gem_name}-%{gem_version}.gem}
+%{!?gem_spec: %global gem_spec %{gem_dir}/specifications/%{gem_name}-%{gem_version}.gemspec}
+%{!?gem_docdir: %global gem_docdir %{gem_dir}/doc/%{gem_name}-%{gem_version}}
+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"]')}
+
+
+%description
+Converts Asciidoc input files into nicely outputted HTML, possibly one file per chapter.
+
+%prep
+%setup -q -c -T
+
+%build
+%if 0%{?el6}
+mkdir -p .%{gem_dir}
+gem install \
+    --local \
+    --install-dir .%{gem_dir} \
+    --bindir .%{_bindir} \
+    --no-rdoc --no-ri \
+    --force \
+    --backtrace \
+    %{SOURCE0}
+%else
+%gem_install -n %{SOURCE0} --no-rdoc --no-ri
+%endif
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{gem_dir}
+cp -a .%{_prefix}/* %{buildroot}%{_prefix}/
+#if is_distribution?(">= amazon")
+    # On Amazon Linux, 'ruby' is a symlink that can point to multiple alternatives.
+    # Lock down to the default Ruby, 1.8.
+    sed -i 's|/usr/bin/ruby$|/usr/bin/ruby1.8|' %{buildroot}%{_bindir}/mizuho
+    sed -i 's|/usr/bin/ruby$|/usr/bin/ruby1.8|' %{buildroot}%{_bindir}/mizuho-asciidoc
+#endif
+# RHEL 5 provides the sqlite3-ruby gem but not the sqlite3 gem, so
+# we modify the spec to depend on sqlite3-ruby instead.
+sed -i 's/sqlite3/sqlite3-ruby/' %{buildroot}%{gem_spec}
+
+%check
+pushd %{buildroot}%{gem_instdir}
+ruby -Ilib ./bin/mizuho --help > /dev/null
+popd
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/mizuho
+%{_bindir}/mizuho-asciidoc
+%dir %{gem_instdir}
+%doc %{gem_instdir}/LICENSE.txt
+%doc %{gem_instdir}/README.markdown
+%{gem_instdir}/mizuho.gemspec
+%{gem_instdir}/bin
+%{gem_instdir}/asciidoc
+%{gem_instdir}/test
+%{gem_instdir}/templates
+%{gem_libdir}
+%exclude %{gem_instdir}/Rakefile
+%exclude %{gem_instdir}/debian.template
+%exclude %{gem_instdir}/rpm
+%exclude %{gem_instdir}/source-highlight
+%exclude %{gem_cache}
+%{gem_spec}
+
+%changelog
+* Wed Dec 11 2013 Hongli Lai <hongli@phusion.nl> - 0.9.19-1<%= @distribution %>
+- Initial packaging

data/templates/topbar.html

@@ -1,7 +1,7 @@
 <div id="topbar" style="display: none">
 	<div class="title">
-		<img src="{INLINE_IMAGE:arrow-up.png}" width="11" height="10" alt="">
-		<a href="javascript:void(Mizuho.smoothlyScrollToToc())">{TITLE}</a>
+		<!-- Don't put a space between the img and a. That will break the hover layout. -->
+		<img src="{INLINE_IMAGE:arrow-up.png}" width="11" height="10" alt=""><a href="javascript:void(Mizuho.smoothlyScrollToToc())">{TITLE}</a>
 	</div>
 	<a href="javascript:void(0)" id="current_section"></a>
 </div>

data/test/id_map_spec.rb

@@ -90,6 +90,15 @@ describe IdMap do
 				@entry2.should_not be_fuzzy
 				@entry3.should_not be_fuzzy
 			end
+
+			specify "bug fix" do
+				@id_map = IdMap.new
+				@entry1 = @id_map.add("2.9.3. Environment variables and sudo", nil, false, false)
+				@entry2 = @id_map.add("2.9.8. Environment variables and sudo", nil, false, false)
+				@id_map.generate_associations(["14.5. Environment variables and sudo"])
+				@id1 = @id_map.associations["14.5. Environment variables and sudo"]
+				@id1.should == @entry1.id
+			end
 		end
 
 		describe "if one or more similar titles exist in the map" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mizuho
 version: !ruby/object:Gem::Version
-  version: 0.9.19
+  version: 0.9.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -56,6 +56,7 @@ files:
 - README.markdown
 - LICENSE.txt
 - Rakefile
+- mizuho.gemspec
 - bin/mizuho
 - bin/mizuho-asciidoc
 - lib/mizuho/fuzzystringmatch.rb
@@ -70,8 +71,11 @@ files:
 - debian.template/control.template
 - debian.template/copyright
 - debian.template/mizuho.install.template
-- debian.template/rules
+- debian.template/ruby-interpreter
+- debian.template/rules.template
 - debian.template/source/format
+- rpm/get_distro_id.py
+- rpm/rubygem-mizuho.spec.template
 - test/generator_spec.rb
 - test/id_map_spec.rb
 - test/parser_spec.rb
@@ -417,7 +421,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Mizuho documentation formatting tool

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJRgSgWAAoJECrHRaUKISqM0KoIALYyey+TmESUUVaI4bANXCmv
-8IEOPmzmzLgddEbEE+4Sgm9neu9lBPCTLTIJQCNxcET2CkmfvhcqCYpWj6ewQIPS
-W49y/TF5iMCeLrbtyehCivE7/IatPKZ5Q+hmcQzb/9k3Vq+Pvxr8KIFrDgaKM8eB
-prQw+g5TBEok4H0Sp0YwkKT3utx4Oj9XpvdlpXzFUlL7sYGylbKeJWGfr8uK/jxC
-XIJzkTiWHRf7fbKEHVn5Wvka4DgLXGqNZiVgPb4/5MZykGQMqrPgdvVmVRb7DCW4
-Xsqk0j0qfaxRVWgEs1rdOwwMtzFpmJ+OkDA9XrIoDHCDyCnFZlao7UjCJC6bwCc=
-=i2ql
+iQEcBAABAgAGBQJSqu2oAAoJECrHRaUKISqM6cwH/3X4yv8+B/ABzJ1/jviSqlYL
+DkpVvFUb8i5UDFwhDZKqwxc6Dw92ZLq5FPrm5rpcKmw8XklIqYPqsPIm61Wyz7Hm
++f3X362IWXGGnr1wHS4buuK9erGLgWICUTbBQeom3Ch1kI3/AJcc2RuZa0ijRMGh
+EqxjqYH1SRTthaTcagRjCLqMoZOQni8/5BfmV6q3k/XcM9M/Jnz/uN+do2qiGoc0
+Kg3E1qbw83gcI7ARxo4PiPFhXhU+XNEH7jcZSb51FHG+xFazSnUkH8b9EZ+50VV/
+HK7aaaQBp4ysoRoGJD4aoCd4Jcf8nKdCH6XhxVUB4LHubRD67BIXEDqagnASpDA=
+=COPA
 -----END PGP SIGNATURE-----

data/debian.template/rules

@@ -1,10 +0,0 @@
-#!/usr/bin/make -f
-export DH_VERBOSE=1
-
-%:
-	dh $@ --buildsystem=ruby
-
-override_dh_install:
-	dh_install
-	sed -i 's/NATIVELY_PACKAGED = .*/NATIVELY_PACKAGED = true/' debian/mizuho/usr/lib/ruby/vendor_ruby/mizuho.rb
-	sed -i 's/\/usr\/bin\/env ruby/\/usr\/bin\/ruby/' debian/mizuho/usr/bin/mizuho