github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #537 from pzgz/master

Browse Source 
Fixed errors when trying to compile examples by rake command. Update reference to the 960 grid plugin.
This commit is contained in:
Chris Eppstein 2011-09-16 16:01:01 -07:00
commit 78c102297b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/downloader.rb
View File

@ -9,8 +9,9 @@ def fetch(uri_str, limit = 10)
url = URI.parse(uri_str) url = URI.parse(uri_str)
http = Net::HTTP.new(url.host, url.port) http = Net::HTTP.new(url.host, url.port)
http.open_timeout = 2 http.open_timeout = 10
http.read_timeout = 30 http.read_timeout = 30
http.use_ssl = true
response = http.start do |http| response = http.start do |http|
puts "getting #{url.path}" puts "getting #{url.path}"
http.request_get(url.path) http.request_get(url.path)
@ -25,7 +26,7 @@ def fetch(uri_str, limit = 10)
end end
def install_from_github(user, project, ext_name, branch = "master", working_directory = Dir.pwd) def install_from_github(user, project, ext_name, branch = "master", working_directory = Dir.pwd)
download_link = "http://github.com/#{user}/#{project}/zipball/#{branch}" download_link = "https://github.com/#{user}/#{project}/zipball/#{branch}"
extdir = File.join(working_directory,'extensions') extdir = File.join(working_directory,'extensions')
if !File.exists?("#{extdir}/#{ext_name}") if !File.exists?("#{extdir}/#{ext_name}")

2
examples/ninesixty/bootstrap.rb
View File

@ -1,4 +1,4 @@
require File.join(File.dirname(__FILE__), '..', 'downloader') require File.join(File.dirname(__FILE__), '..', 'downloader')
install_from_github('chriseppstein', 'compass-960-plugin', 'ninesixty') install_from_github('nextmat', 'compass-960-plugin', 'ninesixty')