Skip to content

Commit

Permalink
Say hi to the doctor
Browse files Browse the repository at this point in the history
  • Loading branch information
@vmg
vmg committed Dec 17, 2012
1 parent 609c3b1 commit 320e6e0
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 366 deletions.
1 change: 1 addition & 0 deletions Gemfile
View file
Expand Up @@ -6,4 +6,5 @@ gem "org-ruby", ">= 0.7.0"
gem "creole", "~>0.3.6" gem "creole", "~>0.3.6"
gem "wikicloth", "=0.6.0" gem "wikicloth", "=0.6.0"
gem "literati", "= 0.0.3" gem "literati", "= 0.0.3"
gem "asciidoctor", ">= 0.0.5"
gem "rake" gem "rake"
8 changes: 4 additions & 4 deletions github-markup.gemspec
View file
Expand Up @@ -13,8 +13,8 @@ Gem::Specification.new do |s|
## If your rubyforge_project name is different, then edit it and comment out ## If your rubyforge_project name is different, then edit it and comment out
## the sub! line in the Rakefile ## the sub! line in the Rakefile
s.name = 'github-markup' s.name = 'github-markup'
s.version = '0.7.4' s.version = '0.7.5'
s.date = '2012-07-19' s.date = '2012-12-17'
s.executables = ['github-markup'] s.executables = ['github-markup']


## Make sure your summary is short. The description may be as long ## Make sure your summary is short. The description may be as long
Expand Down Expand Up @@ -62,8 +62,6 @@ desc
bin/github-markup bin/github-markup
github-markup.gemspec github-markup.gemspec
lib/github-markup.rb lib/github-markup.rb
lib/github/commands/asciidoc2html
lib/github/commands/asciidocapi.py
lib/github/commands/rest2html lib/github/commands/rest2html
lib/github/markup.rb lib/github/markup.rb
lib/github/markup/rdoc.rb lib/github/markup/rdoc.rb
Expand All @@ -73,6 +71,8 @@ desc
test/markups/README.asciidoc.html test/markups/README.asciidoc.html
test/markups/README.creole test/markups/README.creole
test/markups/README.creole.html test/markups/README.creole.html
test/markups/README.lhs
test/markups/README.lhs.html
test/markups/README.markdown test/markups/README.markdown
test/markups/README.markdown.html test/markups/README.markdown.html
test/markups/README.mediawiki test/markups/README.mediawiki
Expand Down
2 changes: 1 addition & 1 deletion lib/github-markup.rb
View file
@@ -1,6 +1,6 @@
module GitHub module GitHub
module Markup module Markup
VERSION = '0.7.4' VERSION = '0.7.5'
Version = VERSION Version = VERSION
end end
end end
119 changes: 0 additions & 119 deletions lib/github/commands/asciidoc2html
View file

This file was deleted.

10 comments on commit 320e6e0

@herve-quiroz
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not 100% sure it is related to this commit but it seems like the line breaks from code block in asciidoc-generated files are broken again. And I seem to recall they were fine yesterday.

See #108 for the previous line break issue (that was fixed).

See https://github.com/herve-quiroz/tc-opts for an example of an asciidoc README where there should be line breaks in most of the code blocks.

@jakoch
Copy link

@jakoch jakoch commented on 320e6e0 Dec 23, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems, that this breaks the AsciiDoc rendering.
For instance tables are not rendered: http://i.imgur.com/b57fu.png
https://github.com/jakoch/asciidoc-cheatsheet/blob/master/asciidoc-866_tables.asciidoc

@herve-quiroz
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case anyone cares, I created an issue for this: #175

@haad
Copy link

@haad haad commented on 320e6e0 Dec 31, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Afaik asciidoctor is not full replacement for asciidoc and it doest support all features yet.

@herve-quiroz
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The issue has been fixed in asciidoctor: erebor/asciidoctor#36

@mojavelinux
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Asciidoctor now supports nearly every feature of AsciiDoc, including tables (as soon as pull request https://github.com/erebor/asciidoctor/pull/73 is merged).

@herve-quiroz
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well in any case the Asciidoc rendering is currently not happening at all (i.e. it's not just an issue with tables or code blocks). It's been broken for more than a week now. Strange that it hasn't been fixed earlier. See #180 for the related issue.

@jakoch
Copy link

@jakoch jakoch commented on 320e6e0 Jan 14, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very good work, Dan! 👍

Regarding the broken rendering, i guess, Github needs to update their Asciidoctor package.
Also setting up some WebTestCases for testing features, like "Asciidoc Rendering" or "Markdown Rendering" would be good.
But that's another story and not related to Asciidoctor at all.

@herve-quiroz
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe the tests are already there:
https://github.com/github/markup/blob/master/test/markups/README.asciidoc
https://github.com/github/markup/blob/master/test/markups/README.asciidoc.html

So if the tests still pass it means the current issue is more related to Website itself, not the markup library.

@mojavelinux
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIK, the current issue is that the Asciidoctor code needed to be carefully reviewed and audited before it could be used in production at GitHub (as you would expect any organization would do with a library going into production, totally understandable). For some reason, though--perhaps because there were concerns about the original AsciiDoc integration code--we got stuck with no AsciiDoc rendering in the interim.

When it comes back, and it's using Asciidoctor, I'm confident it's going to be please :)

Please sign in to comment.