dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

teach Albino to run on both Windows and *nix

This commit is contained in:
Jon 2010-02-13 09:05:14 -05:00 committed by Tom Preston-Werner
parent 18545ddf71
commit 81971c3342
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jekyll.gemspec
View File

@ -129,14 +129,12 @@ Gem::Specification.new do |s|
s.add_runtime_dependency(%q<classifier>, [">= 1.3.1"]) s.add_runtime_dependency(%q<classifier>, [">= 1.3.1"])
s.add_runtime_dependency(%q<maruku>, [">= 0.5.9"]) s.add_runtime_dependency(%q<maruku>, [">= 0.5.9"])
s.add_runtime_dependency(%q<directory_watcher>, [">= 1.1.1"]) s.add_runtime_dependency(%q<directory_watcher>, [">= 1.1.1"])
s.add_runtime_dependency(%q<open4>, [">= 0.9.6"])
else else
s.add_dependency(%q<RedCloth>, [">= 4.2.1"]) s.add_dependency(%q<RedCloth>, [">= 4.2.1"])
s.add_dependency(%q<liquid>, [">= 1.9.0"]) s.add_dependency(%q<liquid>, [">= 1.9.0"])
s.add_dependency(%q<classifier>, [">= 1.3.1"]) s.add_dependency(%q<classifier>, [">= 1.3.1"])
s.add_dependency(%q<maruku>, [">= 0.5.9"]) s.add_dependency(%q<maruku>, [">= 0.5.9"])
s.add_dependency(%q<directory_watcher>, [">= 1.1.1"]) s.add_dependency(%q<directory_watcher>, [">= 1.1.1"])
s.add_dependency(%q<open4>, [">= 0.9.6"])
end end
else else
s.add_dependency(%q<RedCloth>, [">= 4.2.1"]) s.add_dependency(%q<RedCloth>, [">= 4.2.1"])
@ -144,7 +142,6 @@ Gem::Specification.new do |s|
s.add_dependency(%q<classifier>, [">= 1.3.1"]) s.add_dependency(%q<classifier>, [">= 1.3.1"])
s.add_dependency(%q<maruku>, [">= 0.5.9"]) s.add_dependency(%q<maruku>, [">= 0.5.9"])
s.add_dependency(%q<directory_watcher>, [">= 1.1.1"]) s.add_dependency(%q<directory_watcher>, [">= 1.1.1"])
s.add_dependency(%q<open4>, [">= 0.9.6"])
end end
end end

10
lib/jekyll/albino.rb
View File

@ -41,7 +41,6 @@
# Chris Wanstrath // chris@ozmm.org # Chris Wanstrath // chris@ozmm.org
# GitHub // http://github.com # GitHub // http://github.com
# #
require 'open4'
class Albino class Albino
@@bin = Rails.development? ? 'pygmentize' : '/usr/bin/pygmentize' rescue 'pygmentize' @@bin = Rails.development? ? 'pygmentize' : '/usr/bin/pygmentize' rescue 'pygmentize'
@ -61,11 +60,10 @@ class Albino
def execute(command) def execute(command)
output = '' output = ''
Open4.popen4(command) do |pid, stdin, stdout, stderr| IO.popen(command, mode='r+') do |p|
stdin.puts @target p.write @target
stdin.close p.close_write
output = stdout.read.strip output = p.read.strip
[stdout, stderr].each { |io| io.close }
end end
output output
end end