diff --git a/.gitignore b/.gitignore index 6084b50..895d98e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/asciidoctor-0.1.3.gem +/asciidoctor-0.1.4.gem diff --git a/README.adoc b/README.adoc index 90c8493..aa40f66 100644 --- a/README.adoc +++ b/README.adoc @@ -1,9 +1,10 @@ = rubygem-asciidoctor: Asciidoctor RPM package spec Dan Allen :idprefix: +:idseparator: - :gem_title: Asciidoctor :gem_name: asciidoctor -:gem_version: 0.1.3 +:gem_version: 0.1.4 :gem_gem: {gem_name}-{gem_version}.gem :gem_url: https://github.com/asciidoctor/asciidoctor :rpm_name: rubygem-{gem_name} @@ -11,9 +12,9 @@ Dan Allen :rpm_repo: git://github.com/asciidoctor/rubygem-asciidoctor-rpm.git This repository is the official host of the build materials to create the Fedora RPM package for the https://github.com/asciidoctor/asciidoctor[Asciidoctor] RubyGem. -The package is named +rubygem-asciidoctor+. +The RPM package is named +rubygem-asciidoctor+. -While this RPM spec was developed specifically for Fedora 17 and above, it may be useful for other RPM-based systems. +While this RPM spec was developed specifically for Fedora 18 and above, it may be useful for other RPM-based systems. == Build the Asciidoctor RPM @@ -51,7 +52,7 @@ You'll also need to create all the required folders: Next, grab the Asciidoctor gem (the sources) and put it into the +$HOME/rpmbuild/SOURCES+ directory: - wget -O $HOME/rpmbuild/SOURCES/asciidoctor-0.1.3.gem http://rubygems.org/gems/asciidoctor-0.1.3.gem + wget -O $HOME/rpmbuild/SOURCES/asciidoctor-0.1.4.gem http://rubygems.org/gems/asciidoctor-0.1.4.gem Finally, copy the +.patch+ files from this repository to the same directory: @@ -67,12 +68,19 @@ With everything in place, building the RPM is easy! If all goes well, both the binary and source RPMs will emerge in the +$HOME/rpmbuild/RPMS/noarch+ and +$HOME/rpmbuild/SRPMS+ directories, respectively. +Alternatively, you can build directly from the SRPM. + + wget -P srpms http://kojipkgs.fedoraproject.org/packages/rubygem-asciidoctor/0.1.4/1.fc19/src/rubygem-asciidoctor-0.1.4-1.fc19.src.rpm + rpmbuild --rebuild srpms/rubygem-asciidoctor-0.1.4-1.fc19.src.rpm + +The SPRMs are stored with the builds in the http://koji.fedoraproject.org/koji/packageinfo?packageID=15660[koji build system]. + === Installing the RPM There's nothing special about installing this RPM. I recommend using +yum+ because it will install any dependencies that the package requires (though you should already have them if you built the RPM). - yum localinstall $HOME/rpmbuild/RPMS/noarch/rubygem-asciidoctor-0.1.3.rpm + yum localinstall $HOME/rpmbuild/RPMS/noarch/rubygem-asciidoctor-0.1.4.rpm Now, it's time to start using Asciidoctor! @@ -98,7 +106,7 @@ First, let's test using Asciidoctor as a Ruby library. require 'asciidoctor' content = "= My First Document\n\nRender me some **HTML**!" - puts Asciidoctor.render(content, :header_footer => true, :compact => true) + puts Asciidoctor.render content, :header_footer => true . Save the file. . In a terminal, navigate to the directory where you saved +asciidoctor-test.rb+ and type the following command to execute the file with Ruby: @@ -109,30 +117,32 @@ You should see this output in your terminal. - - - - My First Document - - - -
+ + + + + My First Document + + + + +
-
+
-

Render me some HTML!

+

Render me some HTML!

-
-
- - +
+
+ + . You can render the output as HTML using: diff --git a/asciidoctor-disable-use-of-pending.patch b/asciidoctor-disable-use-of-pending.patch deleted file mode 100644 index 0c57e81..0000000 --- a/asciidoctor-disable-use-of-pending.patch +++ /dev/null @@ -1,16 +0,0 @@ -# disables use of pending statement in the test suite The required gem, -# pending, is not packaged in Fedora and since the statement is merely a task -# note, it's safe to disable it's usage for the purpose of packaging. -diff --git a/test/test_helper.rb b/test/test_helper.rb -index 3b27218..964ff59 100644 ---- a/test/test_helper.rb -+++ b/test/test_helper.rb -@@ -5,7 +5,7 @@ require 'test/unit' - require "#{File.expand_path(File.dirname(__FILE__))}/../lib/asciidoctor.rb" - - require 'nokogiri' --require 'pending' -+#require 'pending' - - ENV['SUPPRESS_DEBUG'] ||= 'true' - diff --git a/asciidoctor-remove-include-uri-test.patch b/asciidoctor-remove-include-uri-test.patch new file mode 100644 index 0000000..bf76cdd --- /dev/null +++ b/asciidoctor-remove-include-uri-test.patch @@ -0,0 +1,22 @@ +diff --git a/test/reader_test.rb b/test/reader_test.rb +index abc708a..5750437 100644 +--- a/test/reader_test.rb ++++ b/test/reader_test.rb +@@ -499,17 +499,6 @@ include::fixtures/no-such-file.ad[] + end + end + +- test 'include macro can retrieve data from uri' do +- input = <<-EOS +-.... +-include::https://raw.github.com/asciidoctor/asciidoctor/master/LICENSE[] +-.... +- EOS +- +- output = render_embedded_string input, :safe => :safe, :attributes => {'allow-uri-read' => ''} +- assert_match(/MIT/, output) +- end +- + test 'inaccessible uri referenced by include macro does not crash processor' do + input = <<-EOS + .... diff --git a/rubygem-asciidoctor.spec b/rubygem-asciidoctor.spec index 94410ed..8d03bfd 100644 --- a/rubygem-asciidoctor.spec +++ b/rubygem-asciidoctor.spec @@ -1,18 +1,17 @@ %global gem_name asciidoctor %global mandir %{_mandir}/man1 -Summary: AsciiDoc implementation in Ruby +Summary: A fast, open source AsciiDoc implementation in Ruby Name: rubygem-%{gem_name} -Version: 0.1.3 +Version: 0.1.4 Release: 1%{?dist} Group: Development/Languages License: MIT URL: http://github.com/asciidoctor/asciidoctor Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem -# Patch0: disables use of pending statement in the test suite The required gem, -# pending, is not packaged in Fedora and since the statement is merely a task -# note, it's safe to disable it's usage for the purpose of packaging. -Patch0: asciidoctor-disable-use-of-pending.patch +# Patch0: disable the test for including content from a URI +# since it does not work when the network is unavailable +Patch0: asciidoctor-remove-include-uri-test.patch %if 0%{?rhel} > 6 || 0%{?fedora} > 18 Requires: ruby(release) BuildRequires: ruby(release) @@ -27,14 +26,18 @@ BuildRequires: rubygem(coderay) BuildRequires: rubygem(erubis) BuildRequires: rubygem(minitest) BuildRequires: rubygem(nokogiri) +BuildRequires: rubygem(tilt) +BuildRequires: rubygem(haml) +BuildRequires: rubygem(slim) BuildArch: noarch Provides: rubygem(%{gem_name}) = %{version} %description -An open source text processor and publishing toolchain written in Ruby for -converting AsciiDoc markup into HTML 5, DocBook 4.5 and custom formats. Export -to custom formats is performed by running the nodes of the parsed tree through -a collection of Tilt-supported templates. +A fast, open source text processor and publishing toolchain, written in Ruby, +for transforming AsciiDoc markup into HTML 5, DocBook 4.5, DocBook 5.0 and +custom output formats. The transformation from AsciiDoc to custom output +formats is performed by running the nodes in the parsed document tree through a +collection of templates written in a template language supported by Tilt. %package doc Summary: Documentation for %{name} @@ -85,6 +88,7 @@ cp -pa .%{gem_instdir}/compat/* \ %exclude %{gem_instdir}/compat %exclude %{gem_instdir}/man %exclude %{gem_instdir}/test +%{gem_instdir}/CHANGELOG.adoc %{gem_instdir}/LICENSE %{gem_instdir}/README.* %{_bindir}/* @@ -98,6 +102,8 @@ cp -pa .%{gem_instdir}/compat/* \ %doc %{gem_docdir} %changelog +* Sun Sep 22 2013 Dan Allen - 0.1.4-1 +- Update to Asciidoctor 0.1.4 * Sat Jun 08 2013 Dan Allen - 0.1.3-1 - Update to Asciidoctor 0.1.3 * Fri Mar 01 2013 Dan Allen - 0.1.1-1 diff --git a/sources b/sources index 9af1fae..5aa0452 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -e5a9d0015ea477589d5da1765df0d834 asciidoctor-0.1.1.gem -e64350b7d08006984fa99be6cb3aa808 asciidoctor-0.1.3.gem +1ec84e6ad442791f1ef9300026927ba1 asciidoctor-0.1.4.gem diff --git a/srpms/rubygem-asciidoctor-0.1.3-1.fc19.src.rpm b/srpms/rubygem-asciidoctor-0.1.3-1.fc19.src.rpm deleted file mode 100644 index c76b4d2..0000000 Binary files a/srpms/rubygem-asciidoctor-0.1.3-1.fc19.src.rpm and /dev/null differ diff --git a/test-install b/test-install index 527fcf0..9dc3ff2 100755 --- a/test-install +++ b/test-install @@ -6,10 +6,14 @@ require 'asciidoctor' source = < http://asciidoctor.org[Asciidoctor] is an _open source_ implementation of -http://asciidoc.org[AsciiDoc] in [red]*Ruby*. +http://asciidoc.org[AsciiDoc] in [.red]*Ruby*. + +== Sample section + +Sample section content EOS -puts Asciidoctor.render(source, :backend => :html5, :header_footer => true, :compact => true, :safe => :safe, :attributes => 'linkcss!') +puts Asciidoctor.render(source, :backend => :html5, :header_footer => true, :safe => :safe, :attributes => 'idprefix= idseparator=-')