mizuho 0.9.14 → 0.9.15

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJRPZdzAAoJECrHRaUKISqM/QQH/jSjn8Fxk2QkNP6S+yAHFph4
-Z0OoJ7WqzieWdWIdou+XK6enUNRjmePBw+QfBVQBxUQdLWL5s88ddTnco6pLF67U
-F5nI5zeKxPzCOJ37nl7FVvk81DC9Uxr2gQfrE0HDnD0gWHhukJxzy7I7+cJhJQ14
-aP/br60bkILq/+ybppUW0fvQmyGtPnB587XMU9BacBQxQUbBf4cDn4P57py+SMko
-Lgiytug+Sv+knFba71yMIRK4ROmrlP5DJZjtLTNQpKP4kcT+i2Q32Ms+JGk0I8lS
-OwEJuGydtBJw86icR9N083ejv1VQeqI4KTikXFPoVGRAvF+jvDHw2bpm8mMj3pE=
-=vkMH
+iQEcBAABAgAGBQJRe61BAAoJECrHRaUKISqMk18H/1cQqhWFg3Xsg54HXDj3ZMg3
+Viaq7IDhPH/XU3Xk2VQ7sJzKfur3vypJymAeq/1qtAWwCJVcQCeYOORYA50jfSM5
+VmFQH/rH3id9f7UPTKTw5GaSvaPxWOQwt8i58GtFxoVIn/Iq7a6eiUkOIgiv8cCg
+WTMjOm9dqXwNLZUIBdaPT1kDV8BZjZSj4zj69RzNxJ0362fxe0O05rPD1UAGIjwA
+2lSshBvJ4QnaY7X9u9PrioXETClftCJcoHbG2nIu0LjgEUNEkn8tO0VO1/MMpIuM
+n407QxD1P2w0We2uDRypnWTNMGcIc/NvAOBKMPDFTgIVF9iRHNpcbN0hcRj7HaE=
+=r3I8
 -----END PGP SIGNATURE-----

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2012 Hongli Lai
+Copyright (c) 2008-2013 Hongli Lai
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -17,4 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-

data/README.markdown

@@ -34,6 +34,10 @@ Run the following command as root:
 
     gem install mizuho
 
+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).
+
 ## Usage
 
 First, read [the Asciidoc manual](http://www.methods.co.nz/asciidoc/userguide.html)

data/Rakefile

@@ -1,6 +1,57 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/lib"))
 require 'mizuho'
 
+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)
+	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)
+			FileUtils.install(filename, "#{destination_dir}/#{filename}")
+		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
+	require 'mizuho/packaging'
+
+	basename = "mizuho_#{Mizuho::VERSION_STRING}"
+	pkg_dir  = string_option('PKG_DIR', "pkg")
+	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"
+
+	recursive_copy_files(Dir["debian/**/*"], "#{pkg_dir}/#{basename}")
+	
+	return [basename, pkg_dir]
+end
+
 desc "Run unit tests"
 task :test do
 	ruby "-S spec -f s -c test/*_spec.rb"
@@ -18,3 +69,15 @@ task 'package:release' do
 		puts "Did not upload the gem."
 	end
 end
+
+task 'package:debian_dir' do
+	create_debian_package_dir
+end
+
+desc "Build Debian package"
+task 'package:debian' do
+	sh "dpkg-checkbuilddeps"
+	basename, pkg_dir = create_debian_package_dir
+	sign_options = boolean_option('SIGN') ? "-us -uc" : "-k0x0A212A8C"
+	sh "cd #{pkg_dir}/#{basename} && debuild #{sign_options}"
+end

data/bin/mizuho

@@ -18,9 +18,13 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-require File.expand_path(File.dirname(__FILE__) + "/../lib/mizuho")
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'optparse'
-require 'rubygems'
+begin
+	require 'rubygems'
+rescue LoadError
+end
+require 'mizuho'
 require 'mizuho/generator'
 
 $KCODE = 'UTF-8' if RUBY_VERSION < '1.9'

data/debian/changelog

@@ -0,0 +1,5 @@
+mizuho (0.9.15-1) precise; urgency=low
+
+  * Initial packaging
+
+ -- Hongli Lai <hongli@phusion.nl>  Fri, 26 Apr 2013 16:39:20 +0200

data/debian/compat

@@ -0,0 +1 @@
+7

data/debian/control

@@ -0,0 +1,18 @@
+Source: mizuho
+Section: text
+Priority: optional
+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
+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}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-nokogiri (>= 1.5.0), source-highlight, asciidoc
+Description: Documentation formatting tool
+ Converts Asciidoc input files into nicely
+ outputted HTML, possibly one file per chapter.

data/debian/copyright

@@ -0,0 +1,24 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: mizuho
+Source: https://github.com/FooBarWidget/mizuho
+
+Files: *
+Copyright: 2008-2013 Hongli Lai
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.

data/debian/mizuho.install

@@ -0,0 +1 @@
+templates/* usr/share/mizuho/templates

data/debian/rules

@@ -0,0 +1,9 @@
+#!/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

data/debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

data/lib/mizuho.rb

@@ -19,15 +19,22 @@
 # THE SOFTWARE.
 
 module Mizuho
-	SOURCE_ROOT   = File.expand_path(File.dirname(__FILE__) + "/..")
-	LIBDIR        = "#{SOURCE_ROOT}/lib"
-	TEMPLATES_DIR = "#{SOURCE_ROOT}/templates"
-	ASCIIDOC      = "#{SOURCE_ROOT}/asciidoc/asciidoc.py"
-	
-	VERSION_STRING = "0.9.14"
-	
-	if $LOAD_PATH.first != LIBDIR
-		$LOAD_PATH.unshift(LIBDIR)
-		$LOAD_PATH.uniq!
+	VERSION_STRING    = "0.9.15"
+	NATIVELY_PACKAGED = false
+
+	if NATIVELY_PACKAGED
+		TEMPLATES_DIR = "/usr/share/mizuho/templates"
+		ASCIIDOC      = "asciidoc"
+	else
+		SOURCE_ROOT   = File.expand_path(File.dirname(__FILE__) + "/..")
+		LIBDIR        = "#{SOURCE_ROOT}/lib"
+		
+		TEMPLATES_DIR = "#{SOURCE_ROOT}/templates"
+		ASCIIDOC      = ["python", "#{SOURCE_ROOT}/asciidoc/asciidoc.py"]
+
+		if $LOAD_PATH.first != LIBDIR
+			$LOAD_PATH.unshift(LIBDIR)
+			$LOAD_PATH.uniq!
+		end
 	end
-end if !defined?(Mizuho::SOURCE_ROOT)
+end if !defined?(Mizuho::VERSION_STRING)

data/lib/mizuho/generator.rb

@@ -76,12 +76,12 @@ class Generator
 	
 	def self.run_asciidoc(input, output, icons_dir = nil, conf_file = nil, attributes = [])
 		args = [
-			"python", ASCIIDOC,
+			ASCIIDOC,
 			"-b", "html5",
 			"-a", "theme=flask",
 			"-a", "icons",
 			"-n"
-		]
+		].flatten
 		if icons_dir
 			args << "-a"
 			args << "iconsdir=#{icons_dir}"
@@ -139,6 +139,9 @@ private
 			headers    = (doc / "#content" / "h1, h2, h3, h4")
 			
 			head.add_child(stylesheet_tag)
+
+			# Remove footer with generation timestamp.
+			(doc / "#footer-text").remove
 			
 			# Add commenting balloons.
 			if @commenting_system

data/lib/mizuho/packaging.rb

@@ -0,0 +1,17 @@
+MIZUHO_FILES = [
+	"README.markdown", "LICENSE.txt", "Rakefile",
+	"bin/*",
+	"lib/**/*",
+	"debian/**/*",
+	"test/*",
+	"templates/*",
+	"asciidoc/**/*",
+	"source-highlight/**/*"
+]
+
+MIZUHO_DEBIAN_EXCLUDE_FILES = [
+	"bin/mizuho-asciidoc",
+	"debian/**/*",
+	"asciidoc/**/*",
+	"source-highlight/**/*",
+]

data/lib/mizuho/source_highlight.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2012 Hongli Lai
+# Copyright (c) 2008-2013 Hongli Lai
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,7 @@
 # THE SOFTWARE.
 
 require 'mizuho'
-ENV['PATH'] += ":" + File.join(Mizuho::SOURCE_ROOT, "source-highlight")
+
+if !Mizuho::NATIVELY_PACKAGED
+	ENV['PATH'] += ":" + File.join(Mizuho::SOURCE_ROOT, "source-highlight")
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mizuho
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 0.9.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -61,9 +61,17 @@ files:
 - lib/mizuho/fuzzystringmatch.rb
 - lib/mizuho/generator.rb
 - lib/mizuho/id_map.rb
+- lib/mizuho/packaging.rb
 - lib/mizuho/source_highlight.rb
 - lib/mizuho/utils.rb
 - lib/mizuho.rb
+- debian/changelog
+- debian/compat
+- debian/control
+- debian/copyright
+- debian/mizuho.install
+- debian/rules
+- debian/source/format
 - test/generator_spec.rb
 - test/id_map_spec.rb
 - test/parser_spec.rb

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJRPZdzAAoJECrHRaUKISqMorEH/jd444Ot4OY52HvMQ5OAhoFe
-vBRAs0mEFYHX8LNGJVky32q97LNCBoZVKFGdlqft7qnDyMiBVtLl8eFD+BPmT8R7
-t8rp+ekbRrn8m8AigWsxBN6iILtKHgNokHKf1QGnKv8/uiIO7ljmDhCyx8dXl5Bs
-qA0FEwAQrEUlEo6ov9COYIQOAAelDY2L+f3ZnxnheguuYdDx25V8PGRugqALxX7G
-g/jiA/EP7OJ4pq8QsMF9liEKSmyO5PW5f2NZVt2bk4lG7clgxrNY+I05BJMqOBzF
-JCmQOZ3QQIDn93oI5gkO5D/u3333fGt0N1TDF/qixfGCgK35ZWcLRIAKDJXbVF0=
-=y9pm
+iQEcBAABAgAGBQJRe61BAAoJECrHRaUKISqMViAH/Agslk77P6Du4Y/rpABgfraz
+8pddWAOVZFk4YbpN7RqypVgqXwTVE6rlZOftcrPdGN3Me2ZXJoWsMO9UDnai6oVY
+cw1oWaRrPBRs9ezQQmwHsIfQ/+OclhlBSq0fF53bMP0hf7Uxlxh2Nw6S+wu4FMzB
+PI0fFI8UBa5tfgoVnFtJJCqZNyB9m22JfMkvr9R2x28ER1ccTV4KX5HzkA5WWitS
+ku8ugQnYwLgC2ucE9uSMiqfTqa23SC6rm6+FLe3dSTOmesPnXMgXAaZCqmLm4ynt
+jY/8qN57bv6HEhnOjTx1R+YfbA1OfMF+UA5BeTFO2uabMEX6ic24iBECwpN3Uvg=
+=Rwbn
 -----END PGP SIGNATURE-----