Permalink
Browse files

irrisponsibly massive commit

  • Loading branch information...
1 parent 4db81a9 commit e4c2d5790bac6a74037638fde049c374fc44cc7b @imathis imathis committed Apr 18, 2011
Showing with 16,694 additions and 2,447 deletions.
  1. +2 −1 .gitignore
  2. +1 −0 .rvmrc
  3. +10 −9 Gemfile
  4. +74 −0 Gemfile.lock
  5. +9 −0 Guardfile
  6. +35 −94 Rakefile
  7. +24 −7 _config.yml
  8. +46 −0 _plugins/custom_filters.rb
  9. +132 −0 _plugins/generate_sitemap.rb
  10. +83 −0 _plugins/gist_tag.rb
  11. +24 −0 _plugins/haml.rb
  12. +36 −0 _plugins/titlecase.rb
  13. +8 −5 config.rb
  14. +123 −0 public/2009/11/13/hello-world/index.html
  15. +114 −0 public/2011/03/14/test-post/index.html
  16. +164 −0 public/2011/04/07/test-of-typography/index.html
  17. +103 −0 public/about/index.html
  18. +103 −0 public/atom.xml
  19. BIN public/fonts/adellebasic_bold-webfont.eot
  20. +139 −0 public/fonts/adellebasic_bold-webfont.svg
  21. BIN public/fonts/adellebasic_bold-webfont.ttf
  22. BIN public/fonts/adellebasic_bold-webfont.woff
  23. BIN public/images/code_bg.png
  24. BIN public/images/rss.png
  25. BIN public/images/search_bg.png
  26. +177 −0 public/index.html
  27. +100 −0 public/javascripts/mootools-1.2.4.2-more.js
  28. +1,322 −0 public/javascripts/mootools-more-1.3.1.1.js
  29. +5,492 −0 public/javascripts/mootools-yui-compressed.js
  30. +76 −0 public/javascripts/octopress.js
  31. +52 −0 public/javascripts/pinboard.js
  32. +52 −0 public/javascripts/twitter.js
  33. +35 −0 public/sitemap.xml
  34. +3 −0 public/stylesheets/screen.css
  35. +0 −483 rubypants.rb
  36. +0 −219 source/_helpers.rb
  37. +18 −0 source/_includes/article.html
  38. +0 −3 source/_includes/delicious.haml
  39. +3 −0 source/_includes/delicious.html
  40. +0 −11 source/_includes/disqus_hook.haml
  41. +0 −5 source/_includes/disqus_thread.haml
  42. +7 −0 source/_includes/disqus_thread.html
  43. +0 −7 source/_includes/footer.haml
  44. +11 −0 source/_includes/footer.html
  45. +4 −2 source/_includes/{google_analytics.haml → google_analytics.html}
  46. +0 −22 source/_includes/head.haml
  47. +28 −0 source/_includes/head.html
  48. +0 −9 source/_includes/header.haml
  49. +10 −0 source/_includes/header.html
  50. +0 −8 source/_includes/navigation.haml
  51. +5 −0 source/_includes/navigation.html
  52. +3 −0 source/_includes/pinboard.html
  53. +0 −8 source/_includes/post.haml
  54. +0 −2 source/_includes/sidebar.haml
  55. +24 −0 source/_includes/sidebar.html
  56. +0 −4 source/_includes/twitter.haml
  57. +5 −0 source/_includes/twitter.html
  58. +0 −32 source/_layouts/blog_post.haml
  59. +0 −32 source/_layouts/default.haml
  60. +15 −0 source/_layouts/default.html
  61. +10 −0 source/_layouts/post.html
  62. +6 −4 source/_posts/2009-11-13-hello-world.markdown
  63. +6 −0 source/_posts/2011-03-14-test-post.markdown
  64. +50 −0 source/_posts/2011-04-07-test-of-typography.markdown
  65. +0 −14 source/archives.haml
  66. +0 −25 source/atom.haml
  67. +28 −0 source/atom.xml
  68. BIN source/fonts/adellebasic_bold-webfont.eot
  69. +139 −0 source/fonts/adellebasic_bold-webfont.svg
  70. BIN source/fonts/adellebasic_bold-webfont.ttf
  71. BIN source/fonts/adellebasic_bold-webfont.woff
  72. +0 −22 source/index.haml
  73. +12 −0 source/index.html
  74. +1,322 −0 source/javascripts/mootools-more-1.3.1.1.js
  75. +5,492 −356 source/javascripts/mootools-yui-compressed.js
  76. +30 −1 source/javascripts/octopress.js
  77. +52 −0 source/javascripts/pinboard.js
  78. +49 −148 source/javascripts/twitter.js
  79. +17 −0 source/sass/screen.scss
  80. +13 −0 source/sass/themes/classic/_partials.scss
  81. +4 −0 source/sass/themes/classic/_style.scss
  82. +91 −0 source/sass/themes/classic/core/_layout.scss
  83. +45 −0 source/sass/themes/classic/core/_theme.scss
  84. +159 −0 source/sass/themes/classic/core/_typography.scss
  85. +23 −0 source/sass/themes/classic/partials/_blog.scss
  86. +11 −0 source/sass/themes/classic/partials/_footer.scss
  87. +11 −0 source/sass/themes/classic/partials/_header.scss
  88. +30 −0 source/sass/themes/classic/partials/_navigation.scss
  89. +8 −0 source/sass/themes/classic/partials/_page.scss
  90. +19 −0 source/sass/themes/classic/partials/_search.scss
  91. +12 −0 source/sass/themes/classic/partials/_shared.scss
  92. +38 −0 source/sass/themes/classic/partials/_sidebar.scss
  93. +279 −0 source/sass/themes/classic/partials/_syntax.scss
  94. +15 −0 source/sass/themes/classic/partials/_twitter.scss
  95. +0 −3 stylesheets/_base.sass
  96. +0 −51 stylesheets/_layout.sass
  97. +0 −7 stylesheets/_library.sass
  98. +0 −13 stylesheets/_partials.sass
  99. +0 −47 stylesheets/_theme.sass
  100. +0 −45 stylesheets/_typography.sass
  101. 0 stylesheets/ie.sass
  102. +0 −16 stylesheets/library/_float.sass
  103. +0 −24 stylesheets/library/_link_colors.sass
  104. +0 −7 stylesheets/library/_list_borders.sass
  105. +0 −58 stylesheets/library/_reset.sass
  106. +0 −171 stylesheets/library/_typography.sass
  107. +0 −26 stylesheets/partials/_blog.sass
  108. +0 −12 stylesheets/partials/_footer.sass
  109. +0 −11 stylesheets/partials/_header.sass
  110. +0 −38 stylesheets/partials/_navigation.sass
  111. +0 −8 stylesheets/partials/_page.sass
  112. +0 −20 stylesheets/partials/_search.sass
  113. +0 −13 stylesheets/partials/_shared.sass
  114. +0 −37 stylesheets/partials/_sidebar.sass
  115. +0 −281 stylesheets/partials/_syntax.sass
  116. +0 −15 stylesheets/partials/_twitter.sass
  117. 0 stylesheets/print.sass
  118. +0 −11 stylesheets/screen.sass
  119. +51 −0 upgrading.markdown
View
@@ -1,7 +1,8 @@
site
.bundle
.DS_Store
-.rvmrc
.sass-cache
test
source/_stash
+vendor/ruby
+vendor/ruby
View
1 .rvmrc
@@ -0,0 +1 @@
+rvm 1.9.2
View
19 Gemfile
@@ -1,12 +1,13 @@
-source "http://rubygems.org"
-source "http://gems.github.com"
+source :rubygems
-gem 'activesupport', "2.3.5"
-gem 'henrik-jekyll'
-gem 'compass'
-gem 'compass-colors'
+gem 'jekyll'
gem 'rdiscount'
-gem 'fssm'
+gem 'RedCloth'
+gem "haml", "3.1.0.alpha.147"
+gem 'compass', '0.11.beta.5'
+gem 'rubypants'
+gem 'rb-fsevent'
+gem 'guard-shell'
+gem 'guard-livereload'
gem 'serve'
-gem 'mongrel'
-gem 'rake'
+gem 'rake'
View
@@ -0,0 +1,74 @@
+GEM
+ remote: http://rubygems.org/
+ specs:
+ RedCloth (4.2.3)
+ activesupport (3.0.5)
+ addressable (2.2.4)
+ chunky_png (1.1.0)
+ classifier (1.3.3)
+ fast-stemmer (>= 1.0.0)
+ compass (0.11.beta.5)
+ chunky_png (~> 1.1.0)
+ sass (>= 3.1.0.alpha.249)
+ configuration (1.2.0)
+ directory_watcher (1.3.2)
+ em-websocket (0.2.1)
+ addressable (>= 2.1.1)
+ eventmachine (>= 0.12.9)
+ eventmachine (0.12.10)
+ fast-stemmer (1.0.0)
+ guard (0.3.0)
+ open_gem (~> 1.4.2)
+ thor (~> 0.14.6)
+ guard-livereload (0.1.9)
+ em-websocket (~> 0.2.0)
+ guard (>= 0.2.2)
+ json (~> 1.4.6)
+ guard-shell (0.1.1)
+ guard (>= 0.2.0)
+ haml (3.1.0.alpha.147)
+ i18n (0.4.2)
+ jekyll (0.10.0)
+ classifier (>= 1.3.1)
+ directory_watcher (>= 1.1.1)
+ liquid (>= 1.9.0)
+ maruku (>= 0.5.9)
+ json (1.4.6)
+ launchy (0.3.7)
+ configuration (>= 0.0.5)
+ rake (>= 0.8.1)
+ liquid (2.2.2)
+ maruku (0.6.0)
+ syntax (>= 1.0.0)
+ open_gem (1.4.2)
+ launchy (~> 0.3.5)
+ rack (1.2.1)
+ rake (0.8.7)
+ rb-fsevent (0.4.0)
+ rdiscount (1.6.8)
+ rubypants (0.2.0)
+ sass (3.1.0.alpha.252)
+ serve (1.0.0)
+ activesupport (~> 3.0.1)
+ i18n (~> 0.4.1)
+ rack (~> 1.2.1)
+ tzinfo (~> 0.3.23)
+ syntax (1.0.0)
+ thor (0.14.6)
+ tzinfo (0.3.24)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ RedCloth
+ compass (= 0.11.beta.5)
+ guard-livereload
+ guard-shell
+ haml (= 3.1.0.alpha.147)
+ jekyll
+ rake
+ rb-fsevent
+ rdiscount
+ rubypants
+ serve
View
@@ -0,0 +1,9 @@
+guard 'shell' do
+ watch(/source\/sass\/(.*)\.s[ac]ss/) {|m| `compass compile` }
+ watch(%r{public/.+\.(js|html)}) {|m| `compass compile` }
+end
+
+guard 'livereload', :api_version => '1.6' do
+ watch(%r{public/.+\.(css)})
+ watch(%r{public/.+\.(js|html)})
+end
View
129 Rakefile
@@ -2,11 +2,8 @@ require "rubygems"
require "bundler"
Bundler.setup
-require 'source/_helpers'
-
-site_url = "http://yoursite.com" # deployed site url for sitemap.xml generator
port = "4000" # preview project port eg. http://localhost:4000
-site = "site" # compiled site directory
+site = "public" # compiled site directory
source = "source" # source file directory
stash = "_stash" # directory to stash posts for speedy generation
posts = "_posts" # directory for blog files
@@ -19,6 +16,7 @@ document_root = "~/document_root/" # for rsync deployment
## -- Github Pages deploy config -- ##
# Read http://pages.github.com for guidance
+# You can deploy to github pages with `rake push_github` or change the default push task below to :push_github
# If you're not using this, you can remove it
source_branch = "source" # this compiles to your deploy branch
deploy_branch = "master" # For user pages, use "master" for project pages use "gh-pages"
@@ -32,13 +30,13 @@ def ok_failed(condition)
end
end
-## if you're deploying with github, change the default deploy to deploy_github
-desc "default deploy task"
-task :deploy => [:deploy_rsync] do
+## if you're deploying with github, change the default deploy to push_github
+desc "default push task"
+task :push => [:push_rsync] do
end
desc "Generate and deploy task"
-task :generate_deploy => [:integrate, :generate, :clean_debug, :deploy] do
+task :deploy => [:integrate, :generate, :clean_debug, :push] do
end
desc "generate website in output directory"
@@ -49,10 +47,13 @@ end
# usage rake post[my-new-post] or rake post['my new post'] or rake post (defaults to "new-post")
desc "Begin a new post in #{source}/_posts"
task :post, :filename do |t, args|
+ require './_plugins/titlecase.rb'
args.with_defaults(:filename => 'new-post')
- open("#{source}/_posts/#{Time.now.strftime('%Y-%m-%d_%H-%M')}-#{args.filename.downcase.gsub(/[ _]/, '-')}.#{post_format}", 'w') do |post|
+ open("#{source}/_posts/#{Time.now.strftime('%Y-%m-%d')}-#{args.filename.downcase.gsub(/[ _]/, '-')}.#{post_format}", 'w') do |post|
post.puts "---"
post.puts "title: \"#{args.filename.gsub(/[-_]/, ' ').titlecase}\""
+ post.puts "date: #{Time.now.strftime('%Y-%m-%d %H:%M')}"
+ post.puts "layout: post"
post.puts "---"
end
end
@@ -98,124 +99,64 @@ end
desc "Generate site files only"
task :generate_site => [:clean, :generate_style] do
puts "\n\n>>> Generating site files <<<"
- system "jekyll --pygments"
- system "mv #{site}/atom.html #{site}/atom.xml"
-end
-
-def rebuild_site(relative)
- puts "\n\n>>> Change Detected to: #{relative} <<<"
- IO.popen('rake generate_site'){|io| print(io.readpartial(512)) until io.eof?}
- puts '>>> Update Complete <<<'
-end
-
-def rebuild_style(relative)
- puts "\n\n>>> Change Detected to: #{relative} <<<"
- IO.popen('rake generate_style'){|io| print(io.readpartial(512)) until io.eof?}
- puts '>>> Update Complete <<<'
+ system "jekyll"
end
desc "Watch the site and regenerate when it changes"
task :watch do
- require 'fssm'
- puts ">>> Watching for Changes <<<"
- FSSM.monitor do
- path "#{File.dirname(__FILE__)}/#{source}" do
- update {|base, relative| rebuild_site(relative)}
- delete {|base, relative| rebuild_site(relative)}
- create {|base, relative| rebuild_site(relative)}
- end
- path "#{File.dirname(__FILE__)}/stylesheets" do
- glob '**/*.sass'
- update {|base, relative| rebuild_style(relative)}
- delete {|base, relative| rebuild_style(relative)}
- create {|base, relative| rebuild_style(relative)}
- end
- end
+ system "trap 'kill $jekyllPid $guardPid' Exit; guard & guardPid=$!; jekyll --auto & jekyllPid=$!; wait"
end
desc "generate and deploy website via rsync"
-multitask :deploy_rsync do
- puts ">>> Deploying website to #{site_url} <<<"
+multitask :push_rsync do
+ puts ">>> Deploying website via Rsync <<<"
ok_failed system("rsync -avz --delete #{site}/ #{ssh_user}:#{document_root}")
end
-desc "generate and deploy website to github user pages"
-multitask :deploy_github do
+desc "deploy website to github user pages"
+multitask :push_github do
puts ">>> Deploying #{deploy_branch} branch to Github Pages <<<"
require 'git'
repo = Git.open('.')
puts "\n>>> Checking out #{deploy_branch} branch <<<\n"
repo.branch("#{deploy_branch}").checkout
- (Dir["*"] - [site]).each { |f| rm_rf(f) }
+ (Dir["*"] - ["#{site}"]).each { |f| rm_rf(f) }
Dir["#{site}/*"].each {|f| mv(f, ".")}
- rm_rf(site)
- puts "\n>>> Moving generated site files <<<\n"
+ rm_rf("#{site}")
+ puts "\n>>> Moving generated /#{site} files <<<\n"
Dir["**/*"].each {|f| repo.add(f) }
repo.status.deleted.each {|f, s| repo.remove(f)}
puts "\n>>> Commiting: Site updated at #{Time.now.utc} <<<\n"
message = ENV["MESSAGE"] || "Site updated at #{Time.now.utc}"
repo.commit(message)
- puts "\n>>> Pushing generated site to #{deploy_branch} branch <<<\n"
+ puts "\n>>> Pushing generated /#{site} files to #{deploy_branch} branch <<<\n"
repo.push
puts "\n>>> Github Pages deploy complete <<<\n"
repo.branch("#{source_branch}").checkout
end
-desc "start up an instance of serve on the output files"
-task :start_serve => :stop_serve do
- cd "#{site}" do
- print "Starting serve..."
- system("serve #{port} > /dev/null 2>&1 &")
- sleep 1
- pid = `ps auxw | awk '/bin\\/serve\\ #{port}/ { print $2 }'`.strip
- ok_failed !pid.empty?
- system "open http://localhost:#{port}" unless pid.empty?
- end
+desc "start up a web server on the output files"
+task :start_server => :stop_server do
+ print "Starting serve..."
+ system("serve #{site} #{port} > /dev/null 2>&1 &")
+ sleep 1
+ pid = `ps auxw | awk '/bin\\/serve #{site} #{port}/ { print $2 }'`.strip
+ ok_failed !pid.empty?
+ system "open http://localhost:#{port}" unless pid.empty?
end
-desc "stop all instances of serve"
-task :stop_serve do
- pid = `ps auxw | awk '/bin\\/serve\\ #{port}/ { print $2 }'`.strip
+desc "stop the web server"
+task :stop_server do
+ pid = `ps auxw | awk '/bin\\/serve #{site} #{port}/ { print $2 }'`.strip
if pid.empty?
- puts "Serve is not running"
+ puts "Adsf is not running"
else
- print "Stoping serve..."
+ print "Stoping adsf..."
ok_failed system("kill -9 #{pid}")
end
end
desc "preview the site in a web browser"
-task :preview => [:generate, :start_serve, :watch]
-
-desc "Build an XML sitemap of all html files."
-task :sitemap do
- html_files = FileList.new("#{site}/**/*.html").map{|f| f[("#{site}".size)..-1]}.map do |f|
- if f.ends_with?("index.html")
- f[0..(-("index.html".size + 1))]
- else
- f
- end
- end.sort_by{|f| f.size}
- open("#{site}/sitemap.xml", 'w') do |sitemap|
- sitemap.puts %Q{<?xml version="1.0" encoding="UTF-8"?>}
- sitemap.puts %Q{<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">}
- html_files.each do |f|
- priority = case f
- when %r{^/$}
- 1.0
- when %r{^/articles}
- 0.9
- else
- 0.8
- end
- sitemap.puts %Q{ <url>}
- sitemap.puts %Q{ <loc>#{site_url}#{f}</loc>}
- sitemap.puts %Q{ <lastmod>#{Time.now.strftime('%Y-%m-%d')}</lastmod>}
- sitemap.puts %Q{ <changefreq>weekly</changefreq>}
- sitemap.puts %Q{ <priority>#{priority}</priority>}
- sitemap.puts %Q{ </url>}
- end
- sitemap.puts %Q{</urlset>}
- puts "Created #{site}/sitemap.xml"
- end
+task :preview do
+ system "trap 'kill $servePid $jekyllPid $guardPid' Exit; serve #{site} #{port} > /dev/null 2>&1 & servePid=$!; jekyll --auto & jekyllPid=$!; guard & guardPid=$!; compass compile; open http://localhost:#{port}; wait"
end
View
@@ -1,11 +1,28 @@
source: source
-destination: site
+destination: public
+exclude: sass, *.scss
markdown: rdiscount
pygments: true
-permalink: /blog/:year/:month/:day/:title
+permalink: pretty
+
url: http://yoursite.com
-multiviews: true
-sass: false
-haml: true
-post_defaults:
- layout: blog_post
+title: My Octopress Blog
+author: Your Name
+email: you@domain.com #Add your email (optional) for the atom feed
+
+recent_posts: 10
+
+twitter_user: imathis
+tweet_count: 3
+show_replies: false
+
+delicious_user:
+delicious_count: 3
+
+pinboard_user: imathis
+pinboard_count: 3
+
+disqus_short_name:
+
+google_custom_search_id:
+google_analytics_tracking_id:
Oops, something went wrong.

0 comments on commit e4c2d57

Please sign in to comment.