github-markup 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2bf28c5515feafd037786383c67ce40e482f3f3
-  data.tar.gz: 99c65eb34485a76969611064d7202612c89535e6
+  metadata.gz: 9c8a09a747ae3f717bd9e710c3725217419f7bd1
+  data.tar.gz: b741c9f19985f3bcc8384dbde99ee3c74bb0fbc6
 SHA512:
-  metadata.gz: 82cc2f19d92b7301d6593fb67056ef5a450cc64cacd11572671fa7acb25dce036c1f4765d8202f0fffa7717a714a2cc349c91c23a56dd638574a9c9cc85b3d39
-  data.tar.gz: a40f9887214699a9fc58b9596763c4788bbf72431711c66cad40ab2a7d566b91c5969bb71d31058c090befac3fafffc93ed6acf5c5a62aea1e4b66ac9c7cbb4e
+  metadata.gz: 924b42c03f352f31e81e5abdd3d2905f420b4010417ac59186553b2aa6354e779c3c1c6cd105b86a3a8119fb2853c74e8f24a69dfad7c7461c325b5079699264
+  data.tar.gz: 94ec8a1a48a890b4fdd2472d433c1f3a7cf30d15bc2b158015e975776ef096dbacbd021555a6fa2bda8001bd2e3286a672ff391f40b302575bf28ee954f1e79f

data/Gemfile

@@ -5,7 +5,6 @@ gem "rdoc", "~>3.6"
 gem "org-ruby", ">= 0.8.1"
 gem "creole", "~>0.3.6"
 gem "wikicloth", "=0.6.0"
-gem "literati", "= 0.0.3"
 gem "asciidoctor", "= 0.1.4"
 gem "rake"
 gem "posix-spawn"

data/HISTORY.md

@@ -1,3 +1,8 @@
+## 1.1.0 (2014-03-10)
+
+* Raise GitHub::Markup::CommandError if external command exits with a non-zero status.
+* Remove support for literate Haskell (see #266)
+
 ## 0.5.1 (2010-09-30)
 
 * Support relative path links in rdoc

data/github-markup.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   ## the sub! line in the Rakefile
   s.name              = 'github-markup'
   s.version           = GitHub::Markup::VERSION
-  s.date              = '2014-02-25'
+  s.date              = '2014-03-10'
   s.executables       = ['github-markup']
 
   ## Make sure your summary is short. The description may be as long
@@ -79,8 +79,6 @@ desc
     test/markups/README.asciidoc.html
     test/markups/README.creole
     test/markups/README.creole.html
-    test/markups/README.lhs
-    test/markups/README.lhs.html
     test/markups/README.litcoffee
     test/markups/README.litcoffee.html
     test/markups/README.markdown

data/lib/github-markup.rb

@@ -1,6 +1,6 @@
 module GitHub
   module Markup
-    VERSION = '1.0.3'
+    VERSION = '1.1.0'
     Version = VERSION
   end
 end

data/lib/github/markup/command_implementation.rb

@@ -3,6 +3,9 @@ require "github/markup/implementation"
 
 module GitHub
   module Markup
+    class CommandError < RuntimeError
+    end
+
     class CommandImplementation < Implementation
       attr_reader :command, :block
 
@@ -31,11 +34,11 @@ module GitHub
 
       def execute(command, target)
         spawn = POSIX::Spawn::Child.new(*command, :input => target)
-        spawn.out.gsub("\r", '')
-      rescue Errno::EPIPE
-        ""
-      rescue Errno::ENOENT
-        ""
+        if spawn.status.success?
+          spawn.out.gsub("\r", '')
+        else
+          raise CommandError.new(spawn.err.strip)
+        end
       end
     end
   end

data/lib/github/markups.rb

@@ -22,10 +22,6 @@ markup(:wikicloth, /mediawiki|wiki/) do |content|
   WikiCloth::WikiCloth.new(:data => content).to_html(:noedit => true)
 end
 
-markup(:literati, /lhs/) do |content|
-  Literati.render(content)
-end
-
 markup(:asciidoctor, /adoc|asc(iidoc)?/) do |content|
   Asciidoctor.render(content, :safe => :secure, :attributes => %w(showtitle idprefix idseparator=- env=github env-github source-highlighter=html-pipeline))
 end

data/test/markup_test.rb

@@ -39,19 +39,15 @@ message
     assert_equal true, GitHub::Markup.can_render?('README.litcoffee')
   end
 
-  def test_fails_gracefully_on_missing_commands
-    GitHub::Markup.command(:i_made_it_up, /mde/)
-    text = 'hi there'
-    assert GitHub::Markup.can_render?('README.mde')
-    actual = GitHub::Markup.render('README.mde', text)
-    assert_equal text, actual
-  end
-
-  def test_fails_gracefully_on_missing_env_commands
-    GitHub::Markup.command('/usr/bin/env totally_fake', /tf/)
-    text = 'hey mang'
-    assert GitHub::Markup.can_render?('README.tf')
-    actual = GitHub::Markup.render('README.tf', text)
-    assert_equal text, actual
+  def test_raises_error_if_command_exits_non_zero
+    GitHub::Markup.command('echo "failure message">&2 && false', /fail/)
+    assert GitHub::Markup.can_render?('README.fail')
+    begin
+      GitHub::Markup.render('README.fail', "stop swallowing errors")
+    rescue GitHub::Markup::CommandError => e
+      assert_equal "failure message", e.message
+    else
+      fail "an exception was expected but was not raised"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-markup
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Chris Wanstrath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies: []
 description: |2
     This gem is used by GitHub to render any fancy markup such as
@@ -44,8 +44,6 @@ files:
 - test/markups/README.asciidoc.html
 - test/markups/README.creole
 - test/markups/README.creole.html
-- test/markups/README.lhs
-- test/markups/README.lhs.html
 - test/markups/README.litcoffee
 - test/markups/README.litcoffee.html
 - test/markups/README.markdown
@@ -93,3 +91,4 @@ signing_key:
 specification_version: 2
 summary: The code GitHub uses to render README.markup
 test_files: []
+has_rdoc: 

data/test/markups/README.lhs

@@ -1,10 +0,0 @@
-# Markdown
-
-Except with more magic added.
-
-> isPrefixOf              :: (Eq a) => [a] -> [a] -> Bool
-> isPrefixOf [] _         =  True
-> isPrefixOf _  []        =  False
-> isPrefixOf (x:xs) (y:ys)=  x == y && isPrefixOf xs ys
-
-And Haskell.  A lot of Haskell.

data/test/markups/README.lhs.html

@@ -1,11 +0,0 @@
-<h1>Markdown</h1>
-
-<p>Except with more magic added.</p>
-
-<pre><code class="haskell">isPrefixOf              :: (Eq a) =&gt; [a] -&gt; [a] -&gt; Bool
-isPrefixOf [] _         =  True
-isPrefixOf _  []        =  False
-isPrefixOf (x:xs) (y:ys)=  x == y &amp;&amp; isPrefixOf xs ys
-</code></pre>
-
-<p>And Haskell.  A lot of Haskell.</p>