Forked from jonforums/0001-albino-windows-refactor.patch
Created
September 1, 2011 07:34
-
-
Save madhur/1185645 to your computer and use it in GitHub Desktop.
Make Jekyll play nice with Windows again post Albino + posix-spawn refactor
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lib/albino.rb b/lib/albino.rb | |
index 387c8e9..b77d55e 100644 | |
--- a/lib/albino.rb | |
+++ b/lib/albino.rb | |
@@ -1,4 +1,5 @@ | |
require 'posix-spawn' | |
+require 'rbconfig' | |
## | |
# Wrapper for the Pygments command line tool, pygmentize. | |
@@ -84,11 +85,21 @@ class Albino | |
proc_options[:timeout] = options.delete(:timeout) || self.class.timeout_threshold | |
command = convert_options(options) | |
command.unshift(bin) | |
- Child.new(*(command + [proc_options.merge(:input => write_target)])) | |
+ if RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/ | |
+ output = '' | |
+ IO.popen(command, mode='r+') do |p| | |
+ p.write @target | |
+ p.close_write | |
+ output = p.read.strip | |
+ end | |
+ output | |
+ else | |
+ Child.new(*(command + [proc_options.merge(:input => write_target)])) | |
+ end | |
end | |
def colorize(options = {}) | |
- out = execute(options).out | |
+ out = RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/ ? execute(options) : execute(options).out | |
# markdown requires block elements on their own line | |
out.sub!(%r{</pre></div>\Z}, "</pre>\n</div>") | |
@madhur thanks for posting this up here, patch worked perfectly. Shame that albino seems to be abandoned though.
thanks,but if i have not albino-1.3.3,。。。
thanks,but if i have not albino-1.3.3,。。。
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
I reported the bug that this patch fixes in Albino github/albino#14
Hopefully the patch will be accepted