From 5ac83d7612a7256f638a528a76524876b6b6f31a Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Sat, 19 Jan 2013 15:40:50 -0700 Subject: [PATCH] update for 0.0.9 release --- README.asciidoc | 4 +- .../asciidoctor-disable-use-of-pending.patch | 69 ++++--------------- patches/asciidoctor-modify-mocha-import.patch | 13 ---- rubygem-asciidoctor.spec | 29 ++++---- test-install | 2 +- 5 files changed, 29 insertions(+), 88 deletions(-) delete mode 100644 patches/asciidoctor-modify-mocha-import.patch diff --git a/README.asciidoc b/README.asciidoc index 405c6e2..043d4ac 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -35,7 +35,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.0.8.gem http://rubygems.org/gems/asciidoctor-0.0.8.gem + wget -O $HOME/rpmbuild/SOURCES/asciidoctor-0.0.9.gem http://rubygems.org/gems/asciidoctor-0.0.9.gem Finally, copy the `.patch` files from this repository to the same directory: @@ -55,7 +55,7 @@ If all goes well, both the binary and source RPMs will emerge in the `$HOME/rpmb 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.0.8.rpm + yum localinstall $HOME/rpmbuild/RPMS/noarch/rubygem-asciidoctor-0.0.9.rpm Now, it's time to start using Asciidoctor! diff --git a/patches/asciidoctor-disable-use-of-pending.patch b/patches/asciidoctor-disable-use-of-pending.patch index bd0ea89..730dfce 100644 --- a/patches/asciidoctor-disable-use-of-pending.patch +++ b/patches/asciidoctor-disable-use-of-pending.patch @@ -1,54 +1,22 @@ diff --git a/test/attributes_test.rb b/test/attributes_test.rb -index ac2d6a5..ae28d9c 100644 +index 3e15eac..b683667 100644 --- a/test/attributes_test.rb +++ b/test/attributes_test.rb -@@ -67,7 +67,7 @@ context "Attributes" do - end +@@ -177,7 +177,7 @@ To use {gem_name}, the first thing to do is to import it in your Ruby source fil + end - test "renders attribute until it's deleted" do -- pending "Not working yet (will require adding element-specific attributes or early attr substitution during parsing)" -+ #pending "Not working yet (will require adding element-specific attributes or early attr substitution during parsing)" - # html = render_string(":foo: bar\nCrossing the {foo}\n\n:foo!:\nBelly up to the {foo}") - # result = Nokogiri::HTML(html) - # assert_match /Crossing the bar/, result.css("p").first.content.strip -@@ -84,15 +84,15 @@ context "Attributes" do - html = render_string(":foo: bar\nThis is a +++{foo}+++ day.") - result = Nokogiri::HTML(html) - #assert_equal 'This is a {foo} day.', result.css('p').first.content.strip -- pending "Don't yet have inline passthrough working" -+ #pending "Don't yet have inline passthrough working" - end - - test "doesn't substitute attributes inside code blocks" do -- pending "whut?" -+ #pending "whut?" - end - - test "doesn't substitute attributes inside literal blocks" do -- pending "whut?" -+ #pending "whut?" - end - - context "Block attributes" do -diff --git a/test/reader_test.rb b/test/reader_test.rb -index 095d98f..af3912f 100644 ---- a/test/reader_test.rb -+++ b/test/reader_test.rb -@@ -45,7 +45,7 @@ class ReaderTest < Test::Unit::TestCase - end - - def test_grab_lines_until -- pending "Not tested yet" -+ #pending "Not tested yet" - end - - def test_sanitize_attribute_name + test 'renders attribute until it is deleted' do +- pending 'This requires that we consume attributes as the document is being lexed, not up front' ++ #pending 'This requires that we consume attributes as the document is being lexed, not up front' + #output = render_string(":foo: bar\n\nCrossing the {foo}\n\n:foo!:\nBelly up to the {foo}") + # result = Nokogiri::HTML(html) + # assert_match /Crossing the bar/, result.css("p").first.content.strip diff --git a/test/test_helper.rb b/test/test_helper.rb -index b9cad90..f7b099b 100644 +index 3b27218..964ff59 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb -@@ -6,7 +6,7 @@ require "#{File.expand_path(File.dirname(__FILE__))}/../lib/asciidoctor.rb" - require 'mocha' +@@ -10,7 +10,7 @@ rescue LoadError + end require 'htmlentities' require 'nokogiri' -require 'pending' @@ -56,16 +24,3 @@ index b9cad90..f7b099b 100644 ENV['SUPPRESS_DEBUG'] ||= 'true' -diff --git a/test/text_test.rb b/test/text_test.rb -index f892398..ca1e955 100644 ---- a/test/text_test.rb -+++ b/test/text_test.rb -@@ -2,7 +2,7 @@ require 'test_helper' - - context "Text" do - test 'escaped text markup' do -- pending "Not done yet" -+ #pending "Not done yet" - end - - test "line breaks" do diff --git a/patches/asciidoctor-modify-mocha-import.patch b/patches/asciidoctor-modify-mocha-import.patch deleted file mode 100644 index 088fa0c..0000000 --- a/patches/asciidoctor-modify-mocha-import.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test/test_helper.rb b/test/test_helper.rb -index a6577e8..b9cad90 100644 ---- a/test/test_helper.rb -+++ b/test/test_helper.rb -@@ -3,7 +3,7 @@ require 'test/unit' - - require "#{File.expand_path(File.dirname(__FILE__))}/../lib/asciidoctor.rb" - --require 'mocha/setup' -+require 'mocha' - require 'htmlentities' - require 'nokogiri' - require 'pending' diff --git a/rubygem-asciidoctor.spec b/rubygem-asciidoctor.spec index 4c4b9f8..6499a01 100644 --- a/rubygem-asciidoctor.spec +++ b/rubygem-asciidoctor.spec @@ -1,35 +1,35 @@ %global gem_name asciidoctor %global rubyabi 1.9.1 -Summary: AsciiDoc implementation in Ruby that uses Tilt-supported templates to generate output +Summary: AsciiDoc implementation in Ruby Name: rubygem-%{gem_name} -Version: 0.0.8 +Version: 0.0.9 Release: 1%{?dist} Group: Development/Languages License: MIT URL: http://github.com/erebor/asciidoctor Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem -Patch0: asciidoctor-modify-mocha-import.patch -Patch1: asciidoctor-disable-use-of-pending.patch +Patch0: asciidoctor-disable-use-of-pending.patch Requires: ruby(abi) = %{rubyabi} -Requires: ruby(rubygems) -Requires: ruby -Requires: rubygem(tilt) +Requires: ruby(rubygems) +Requires: ruby BuildRequires: ruby(abi) = %{rubyabi} -BuildRequires: rubygems-devel -BuildRequires: ruby -BuildRequires: rubygem(tilt) +BuildRequires: rubygems-devel +BuildRequires: ruby +BuildRequires: rubygem(coderay) +BuildRequires: rubygem(erubis) +BuildRequires: rubygem(htmlentities) BuildRequires: rubygem(mocha) BuildRequires: rubygem(nokogiri) -BuildRequires: rubygem(htmlentities) # using patch to comment lines where pending is used #BuildRequires: rubygem(pending) BuildArch: noarch Provides: rubygem(%{gem_name}) = %{version} %description -A pure-Ruby processor for parsing AsciiDoc documents or strings and rendering -them as HTML and other formats using Tilt-based templates. +A pure AsciiDoc implementation in Ruby that can parse AsciiDoc files or strings +and render them as HTML, DocBook and other output formats using Tilt-supported +templates. %package doc Summary: Documentation for %{name} @@ -44,7 +44,6 @@ Documentation for %{name} gem unpack -V %{SOURCE0} %setup -q -D -T -n %{gem_name}-%{version} %patch0 -p1 -%patch1 -p1 %build rdoc -o rdoc --charset=UTF-8 @@ -93,5 +92,5 @@ cp -a rdoc/* \ %doc %{gem_docdir} %changelog -* Wed Dec 19 2012 Dan Allen - 0.0.8-1 +* Wed Jan 20 2013 Dan Allen - 0.0.9-1 - Initial package diff --git a/test-install b/test-install index d98785f..8529d98 100755 --- a/test-install +++ b/test-install @@ -4,4 +4,4 @@ require 'asciidoctor' -puts Asciidoctor::Document.new("= Asciidoctor\n\nI'm **alive**!".lines.entries).render +puts Asciidoctor::Document.new("= Asciidoctor\n\nI'm **alive**!".lines.entries, :compact => true).render