From ea349cdfbfa4d42110099e49a8ff23f7213cd5b6 Mon Sep 17 00:00:00 2001 From: Brandon Mathis Date: Wed, 29 Jun 2011 14:01:06 -0400 Subject: [PATCH] Moved themes to .themes to get it out of the way. Updated Rakefile to support .themes dir and remove duplication. Improved deploy task. Renamed init_deploy to cofig_deploy and rewrote it to update configurations in the Rakefile for easier deploy use --- .../classic/_plugins/blockquote.rb | 0 .../classic/_plugins/category_generator.rb | 0 .../classic/_plugins/compass_compiler.rb | 0 .../classic/_plugins/custom_filters.rb | 0 .../classic/_plugins/gist_tag.rb | 0 {themes => .themes}/classic/_plugins/haml.rb | 0 .../classic/_plugins/include_code.rb | 0 .../classic/_plugins/include_file.rb | 0 .../classic/_plugins/pullquote.rb | 0 .../classic/_plugins/pygments_cache_patch.rb | 0 .../classic/_plugins/sitemap_generator.rb | 0 .../classic/_plugins/titlecase.rb | 0 {themes => .themes}/classic/sass/_base.scss | 0 .../classic/sass/_partials.scss | 0 .../classic/sass/base/_layout.scss | 0 .../classic/sass/base/_solarized.scss | 0 .../classic/sass/base/_theme.scss | 2 +- .../classic/sass/base/_typography.scss | 0 .../classic/sass/base/_utilities.scss | 0 .../classic/sass/custom/_colors.scss | 0 .../classic/sass/custom/_layout.scss | 0 .../classic/sass/custom/_styles.scss | 0 .../classic/sass/partials/_archive.scss | 0 .../classic/sass/partials/_blog.scss | 0 .../classic/sass/partials/_footer.scss | 0 .../classic/sass/partials/_header.scss | 0 .../classic/sass/partials/_navigation.scss | 0 .../classic/sass/partials/_sidebar.scss | 0 .../classic/sass/partials/_syntax.scss | 0 .../classic/sass/partials/sidebar/_base.scss | 0 .../sass/partials/sidebar/_delicious.scss | 0 .../sass/partials/sidebar/_pinboard.scss | 0 .../sass/partials/sidebar/_twitter.scss | 0 {themes => .themes}/classic/sass/screen.scss | 0 .../source/_includes/archive_post.html | 0 .../classic/source/_includes/article.html | 0 .../source/_includes/asides/delicious.html | 0 .../source/_includes/asides/pinboard.html | 0 .../source/_includes/asides/recent_posts.html | 0 .../source/_includes/asides/twitter.html | 0 .../source/_includes/disqus_thread.html | 0 .../classic/source/_includes/footer.html | 0 .../source/_includes/google_analytics.html | 0 .../classic/source/_includes/head.html | 0 .../classic/source/_includes/header.html | 0 .../classic/source/_includes/navigation.html | 0 .../classic/source/_includes/post_author.html | 0 .../source/_includes/post_categories.html | 0 .../classic/source/_includes/post_date.html | 0 .../classic/source/_includes/sharing.html | 0 .../classic/source/_includes/sidebar.html | 0 .../source/_layouts/category_index.html | 0 .../classic/source/_layouts/default.html | 0 .../classic/source/_layouts/page.html | 0 .../classic/source/_layouts/post.html | 0 .../classic/source/archives.html | 0 .../jwplayer/glow/controlbar/background.png | Bin .../jwplayer/glow/controlbar/blankButton.png | Bin .../jwplayer/glow/controlbar/divider.png | Bin .../glow/controlbar/fullscreenButton.png | Bin .../glow/controlbar/fullscreenButtonOver.png | Bin .../jwplayer/glow/controlbar/muteButton.png | Bin .../glow/controlbar/muteButtonOver.png | Bin .../glow/controlbar/normalscreenButton.png | Bin .../controlbar/normalscreenButtonOver.png | Bin .../jwplayer/glow/controlbar/pauseButton.png | Bin .../glow/controlbar/pauseButtonOver.png | Bin .../jwplayer/glow/controlbar/playButton.png | Bin .../glow/controlbar/playButtonOver.png | Bin .../glow/controlbar/timeSliderBuffer.png | Bin .../glow/controlbar/timeSliderCapLeft.png | Bin .../glow/controlbar/timeSliderCapRight.png | Bin .../glow/controlbar/timeSliderProgress.png | Bin .../glow/controlbar/timeSliderRail.png | Bin .../jwplayer/glow/controlbar/unmuteButton.png | Bin .../glow/controlbar/unmuteButtonOver.png | Bin .../jwplayer/glow/display/background.png | Bin .../jwplayer/glow/display/bufferIcon.png | Bin .../assets/jwplayer/glow/display/muteIcon.png | Bin .../assets/jwplayer/glow/display/playIcon.png | Bin .../assets/jwplayer/glow/dock/button.png | Bin .../source/assets/jwplayer/glow/glow.xml | 0 .../assets/jwplayer/glow/playlist/item.png | Bin .../jwplayer/glow/playlist/itemOver.png | Bin .../glow/playlist/sliderCapBottom.png | Bin .../jwplayer/glow/playlist/sliderCapTop.png | Bin .../jwplayer/glow/playlist/sliderRail.png | Bin .../jwplayer/glow/playlist/sliderThumb.png | Bin .../jwplayer/glow/sharing/embedIcon.png | Bin .../jwplayer/glow/sharing/embedScreen.png | Bin .../jwplayer/glow/sharing/shareIcon.png | Bin .../jwplayer/glow/sharing/shareScreen.png | Bin .../classic/source/assets/jwplayer/player.swf | Bin {themes => .themes}/classic/source/atom.xml | 0 .../classic/source/images/bird_32_gray.png | Bin .../source/images/bird_32_gray_fail.png | Bin .../classic/source/images/code_bg.png | Bin .../classic/source/images/dotted-border.png | Bin .../classic/source/images/email.png | Bin .../classic/source/images/favicon.png | Bin .../classic/source/images/line-tile.png | Bin .../classic/source/images/noise.png | Bin .../classic/source/images/rss.png | Bin .../classic/source/images/search.png | Bin {themes => .themes}/classic/source/index.html | 0 .../classic/source/javascripts/ender.js | 0 .../classic/source/javascripts/libs/ender.js | 0 .../classic/source/javascripts/libs/jXHR.js | 0 .../javascripts/libs/swfobject-dynamic.js | 0 .../source/javascripts/modernizr-2.0.js | 0 .../classic/source/javascripts/octopress.js | 0 .../classic/source/javascripts/pinboard.js | 0 .../classic/source/javascripts/twitter.js | 0 Rakefile | 35 ++++++++++++------ 114 files changed, 25 insertions(+), 12 deletions(-) rename {themes => .themes}/classic/_plugins/blockquote.rb (100%) rename {themes => .themes}/classic/_plugins/category_generator.rb (100%) rename {themes => .themes}/classic/_plugins/compass_compiler.rb (100%) rename {themes => .themes}/classic/_plugins/custom_filters.rb (100%) rename {themes => .themes}/classic/_plugins/gist_tag.rb (100%) rename {themes => .themes}/classic/_plugins/haml.rb (100%) rename {themes => .themes}/classic/_plugins/include_code.rb (100%) rename {themes => .themes}/classic/_plugins/include_file.rb (100%) rename {themes => .themes}/classic/_plugins/pullquote.rb (100%) rename {themes => .themes}/classic/_plugins/pygments_cache_patch.rb (100%) rename {themes => .themes}/classic/_plugins/sitemap_generator.rb (100%) rename {themes => .themes}/classic/_plugins/titlecase.rb (100%) rename {themes => .themes}/classic/sass/_base.scss (100%) rename {themes => .themes}/classic/sass/_partials.scss (100%) rename {themes => .themes}/classic/sass/base/_layout.scss (100%) rename {themes => .themes}/classic/sass/base/_solarized.scss (100%) rename {themes => .themes}/classic/sass/base/_theme.scss (98%) rename {themes => .themes}/classic/sass/base/_typography.scss (100%) rename {themes => .themes}/classic/sass/base/_utilities.scss (100%) rename {themes => .themes}/classic/sass/custom/_colors.scss (100%) rename {themes => .themes}/classic/sass/custom/_layout.scss (100%) rename {themes => .themes}/classic/sass/custom/_styles.scss (100%) rename {themes => .themes}/classic/sass/partials/_archive.scss (100%) rename {themes => .themes}/classic/sass/partials/_blog.scss (100%) rename {themes => .themes}/classic/sass/partials/_footer.scss (100%) rename {themes => .themes}/classic/sass/partials/_header.scss (100%) rename {themes => .themes}/classic/sass/partials/_navigation.scss (100%) rename {themes => .themes}/classic/sass/partials/_sidebar.scss (100%) rename {themes => .themes}/classic/sass/partials/_syntax.scss (100%) rename {themes => .themes}/classic/sass/partials/sidebar/_base.scss (100%) rename {themes => .themes}/classic/sass/partials/sidebar/_delicious.scss (100%) rename {themes => .themes}/classic/sass/partials/sidebar/_pinboard.scss (100%) rename {themes => .themes}/classic/sass/partials/sidebar/_twitter.scss (100%) rename {themes => .themes}/classic/sass/screen.scss (100%) rename {themes => .themes}/classic/source/_includes/archive_post.html (100%) rename {themes => .themes}/classic/source/_includes/article.html (100%) rename {themes => .themes}/classic/source/_includes/asides/delicious.html (100%) rename {themes => .themes}/classic/source/_includes/asides/pinboard.html (100%) rename {themes => .themes}/classic/source/_includes/asides/recent_posts.html (100%) rename {themes => .themes}/classic/source/_includes/asides/twitter.html (100%) rename {themes => .themes}/classic/source/_includes/disqus_thread.html (100%) rename {themes => .themes}/classic/source/_includes/footer.html (100%) rename {themes => .themes}/classic/source/_includes/google_analytics.html (100%) rename {themes => .themes}/classic/source/_includes/head.html (100%) rename {themes => .themes}/classic/source/_includes/header.html (100%) rename {themes => .themes}/classic/source/_includes/navigation.html (100%) rename {themes => .themes}/classic/source/_includes/post_author.html (100%) rename {themes => .themes}/classic/source/_includes/post_categories.html (100%) rename {themes => .themes}/classic/source/_includes/post_date.html (100%) rename {themes => .themes}/classic/source/_includes/sharing.html (100%) rename {themes => .themes}/classic/source/_includes/sidebar.html (100%) rename {themes => .themes}/classic/source/_layouts/category_index.html (100%) rename {themes => .themes}/classic/source/_layouts/default.html (100%) rename {themes => .themes}/classic/source/_layouts/page.html (100%) rename {themes => .themes}/classic/source/_layouts/post.html (100%) rename {themes => .themes}/classic/source/archives.html (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/background.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/blankButton.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/divider.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/fullscreenButton.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/fullscreenButtonOver.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/muteButton.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/muteButtonOver.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/normalscreenButton.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/normalscreenButtonOver.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/pauseButton.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/pauseButtonOver.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/playButton.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/playButtonOver.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/timeSliderBuffer.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapLeft.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapRight.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/timeSliderProgress.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/timeSliderRail.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/unmuteButton.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/controlbar/unmuteButtonOver.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/display/background.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/display/bufferIcon.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/display/muteIcon.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/display/playIcon.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/dock/button.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/glow.xml (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/playlist/item.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/playlist/itemOver.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/playlist/sliderCapBottom.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/playlist/sliderCapTop.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/playlist/sliderRail.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/playlist/sliderThumb.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/sharing/embedIcon.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/sharing/embedScreen.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/sharing/shareIcon.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/glow/sharing/shareScreen.png (100%) rename {themes => .themes}/classic/source/assets/jwplayer/player.swf (100%) rename {themes => .themes}/classic/source/atom.xml (100%) rename {themes => .themes}/classic/source/images/bird_32_gray.png (100%) rename {themes => .themes}/classic/source/images/bird_32_gray_fail.png (100%) rename {themes => .themes}/classic/source/images/code_bg.png (100%) rename {themes => .themes}/classic/source/images/dotted-border.png (100%) rename {themes => .themes}/classic/source/images/email.png (100%) rename {themes => .themes}/classic/source/images/favicon.png (100%) rename {themes => .themes}/classic/source/images/line-tile.png (100%) rename {themes => .themes}/classic/source/images/noise.png (100%) rename {themes => .themes}/classic/source/images/rss.png (100%) rename {themes => .themes}/classic/source/images/search.png (100%) rename {themes => .themes}/classic/source/index.html (100%) rename {themes => .themes}/classic/source/javascripts/ender.js (100%) rename {themes => .themes}/classic/source/javascripts/libs/ender.js (100%) rename {themes => .themes}/classic/source/javascripts/libs/jXHR.js (100%) rename {themes => .themes}/classic/source/javascripts/libs/swfobject-dynamic.js (100%) rename {themes => .themes}/classic/source/javascripts/modernizr-2.0.js (100%) rename {themes => .themes}/classic/source/javascripts/octopress.js (100%) rename {themes => .themes}/classic/source/javascripts/pinboard.js (100%) rename {themes => .themes}/classic/source/javascripts/twitter.js (100%) diff --git a/themes/classic/_plugins/blockquote.rb b/.themes/classic/_plugins/blockquote.rb similarity index 100% rename from themes/classic/_plugins/blockquote.rb rename to .themes/classic/_plugins/blockquote.rb diff --git a/themes/classic/_plugins/category_generator.rb b/.themes/classic/_plugins/category_generator.rb similarity index 100% rename from themes/classic/_plugins/category_generator.rb rename to .themes/classic/_plugins/category_generator.rb diff --git a/themes/classic/_plugins/compass_compiler.rb b/.themes/classic/_plugins/compass_compiler.rb similarity index 100% rename from themes/classic/_plugins/compass_compiler.rb rename to .themes/classic/_plugins/compass_compiler.rb diff --git a/themes/classic/_plugins/custom_filters.rb b/.themes/classic/_plugins/custom_filters.rb similarity index 100% rename from themes/classic/_plugins/custom_filters.rb rename to .themes/classic/_plugins/custom_filters.rb diff --git a/themes/classic/_plugins/gist_tag.rb b/.themes/classic/_plugins/gist_tag.rb similarity index 100% rename from themes/classic/_plugins/gist_tag.rb rename to .themes/classic/_plugins/gist_tag.rb diff --git a/themes/classic/_plugins/haml.rb b/.themes/classic/_plugins/haml.rb similarity index 100% rename from themes/classic/_plugins/haml.rb rename to .themes/classic/_plugins/haml.rb diff --git a/themes/classic/_plugins/include_code.rb b/.themes/classic/_plugins/include_code.rb similarity index 100% rename from themes/classic/_plugins/include_code.rb rename to .themes/classic/_plugins/include_code.rb diff --git a/themes/classic/_plugins/include_file.rb b/.themes/classic/_plugins/include_file.rb similarity index 100% rename from themes/classic/_plugins/include_file.rb rename to .themes/classic/_plugins/include_file.rb diff --git a/themes/classic/_plugins/pullquote.rb b/.themes/classic/_plugins/pullquote.rb similarity index 100% rename from themes/classic/_plugins/pullquote.rb rename to .themes/classic/_plugins/pullquote.rb diff --git a/themes/classic/_plugins/pygments_cache_patch.rb b/.themes/classic/_plugins/pygments_cache_patch.rb similarity index 100% rename from themes/classic/_plugins/pygments_cache_patch.rb rename to .themes/classic/_plugins/pygments_cache_patch.rb diff --git a/themes/classic/_plugins/sitemap_generator.rb b/.themes/classic/_plugins/sitemap_generator.rb similarity index 100% rename from themes/classic/_plugins/sitemap_generator.rb rename to .themes/classic/_plugins/sitemap_generator.rb diff --git a/themes/classic/_plugins/titlecase.rb b/.themes/classic/_plugins/titlecase.rb similarity index 100% rename from themes/classic/_plugins/titlecase.rb rename to .themes/classic/_plugins/titlecase.rb diff --git a/themes/classic/sass/_base.scss b/.themes/classic/sass/_base.scss similarity index 100% rename from themes/classic/sass/_base.scss rename to .themes/classic/sass/_base.scss diff --git a/themes/classic/sass/_partials.scss b/.themes/classic/sass/_partials.scss similarity index 100% rename from themes/classic/sass/_partials.scss rename to .themes/classic/sass/_partials.scss diff --git a/themes/classic/sass/base/_layout.scss b/.themes/classic/sass/base/_layout.scss similarity index 100% rename from themes/classic/sass/base/_layout.scss rename to .themes/classic/sass/base/_layout.scss diff --git a/themes/classic/sass/base/_solarized.scss b/.themes/classic/sass/base/_solarized.scss similarity index 100% rename from themes/classic/sass/base/_solarized.scss rename to .themes/classic/sass/base/_solarized.scss diff --git a/themes/classic/sass/base/_theme.scss b/.themes/classic/sass/base/_theme.scss similarity index 98% rename from themes/classic/sass/base/_theme.scss rename to .themes/classic/sass/base/_theme.scss index adf3364..42fdb6f 100644 --- a/themes/classic/sass/base/_theme.scss +++ b/.themes/classic/sass/base/_theme.scss @@ -7,9 +7,9 @@ $link-color-visited: darken(adjust_hue($link_color, 70), 10) !default; $link-color-active: darken($link-color-hover, 15) !default; // Main Section Colors +$main-bg: #f8f8f8 !default; $page-bg: #252525 !default; $article-border: #eeeeee !default; -$main-bg: #f5f5f5 !default; $header-bg: #333 !default; $header-border: lighten($header-bg, 15) !default; diff --git a/themes/classic/sass/base/_typography.scss b/.themes/classic/sass/base/_typography.scss similarity index 100% rename from themes/classic/sass/base/_typography.scss rename to .themes/classic/sass/base/_typography.scss diff --git a/themes/classic/sass/base/_utilities.scss b/.themes/classic/sass/base/_utilities.scss similarity index 100% rename from themes/classic/sass/base/_utilities.scss rename to .themes/classic/sass/base/_utilities.scss diff --git a/themes/classic/sass/custom/_colors.scss b/.themes/classic/sass/custom/_colors.scss similarity index 100% rename from themes/classic/sass/custom/_colors.scss rename to .themes/classic/sass/custom/_colors.scss diff --git a/themes/classic/sass/custom/_layout.scss b/.themes/classic/sass/custom/_layout.scss similarity index 100% rename from themes/classic/sass/custom/_layout.scss rename to .themes/classic/sass/custom/_layout.scss diff --git a/themes/classic/sass/custom/_styles.scss b/.themes/classic/sass/custom/_styles.scss similarity index 100% rename from themes/classic/sass/custom/_styles.scss rename to .themes/classic/sass/custom/_styles.scss diff --git a/themes/classic/sass/partials/_archive.scss b/.themes/classic/sass/partials/_archive.scss similarity index 100% rename from themes/classic/sass/partials/_archive.scss rename to .themes/classic/sass/partials/_archive.scss diff --git a/themes/classic/sass/partials/_blog.scss b/.themes/classic/sass/partials/_blog.scss similarity index 100% rename from themes/classic/sass/partials/_blog.scss rename to .themes/classic/sass/partials/_blog.scss diff --git a/themes/classic/sass/partials/_footer.scss b/.themes/classic/sass/partials/_footer.scss similarity index 100% rename from themes/classic/sass/partials/_footer.scss rename to .themes/classic/sass/partials/_footer.scss diff --git a/themes/classic/sass/partials/_header.scss b/.themes/classic/sass/partials/_header.scss similarity index 100% rename from themes/classic/sass/partials/_header.scss rename to .themes/classic/sass/partials/_header.scss diff --git a/themes/classic/sass/partials/_navigation.scss b/.themes/classic/sass/partials/_navigation.scss similarity index 100% rename from themes/classic/sass/partials/_navigation.scss rename to .themes/classic/sass/partials/_navigation.scss diff --git a/themes/classic/sass/partials/_sidebar.scss b/.themes/classic/sass/partials/_sidebar.scss similarity index 100% rename from themes/classic/sass/partials/_sidebar.scss rename to .themes/classic/sass/partials/_sidebar.scss diff --git a/themes/classic/sass/partials/_syntax.scss b/.themes/classic/sass/partials/_syntax.scss similarity index 100% rename from themes/classic/sass/partials/_syntax.scss rename to .themes/classic/sass/partials/_syntax.scss diff --git a/themes/classic/sass/partials/sidebar/_base.scss b/.themes/classic/sass/partials/sidebar/_base.scss similarity index 100% rename from themes/classic/sass/partials/sidebar/_base.scss rename to .themes/classic/sass/partials/sidebar/_base.scss diff --git a/themes/classic/sass/partials/sidebar/_delicious.scss b/.themes/classic/sass/partials/sidebar/_delicious.scss similarity index 100% rename from themes/classic/sass/partials/sidebar/_delicious.scss rename to .themes/classic/sass/partials/sidebar/_delicious.scss diff --git a/themes/classic/sass/partials/sidebar/_pinboard.scss b/.themes/classic/sass/partials/sidebar/_pinboard.scss similarity index 100% rename from themes/classic/sass/partials/sidebar/_pinboard.scss rename to .themes/classic/sass/partials/sidebar/_pinboard.scss diff --git a/themes/classic/sass/partials/sidebar/_twitter.scss b/.themes/classic/sass/partials/sidebar/_twitter.scss similarity index 100% rename from themes/classic/sass/partials/sidebar/_twitter.scss rename to .themes/classic/sass/partials/sidebar/_twitter.scss diff --git a/themes/classic/sass/screen.scss b/.themes/classic/sass/screen.scss similarity index 100% rename from themes/classic/sass/screen.scss rename to .themes/classic/sass/screen.scss diff --git a/themes/classic/source/_includes/archive_post.html b/.themes/classic/source/_includes/archive_post.html similarity index 100% rename from themes/classic/source/_includes/archive_post.html rename to .themes/classic/source/_includes/archive_post.html diff --git a/themes/classic/source/_includes/article.html b/.themes/classic/source/_includes/article.html similarity index 100% rename from themes/classic/source/_includes/article.html rename to .themes/classic/source/_includes/article.html diff --git a/themes/classic/source/_includes/asides/delicious.html b/.themes/classic/source/_includes/asides/delicious.html similarity index 100% rename from themes/classic/source/_includes/asides/delicious.html rename to .themes/classic/source/_includes/asides/delicious.html diff --git a/themes/classic/source/_includes/asides/pinboard.html b/.themes/classic/source/_includes/asides/pinboard.html similarity index 100% rename from themes/classic/source/_includes/asides/pinboard.html rename to .themes/classic/source/_includes/asides/pinboard.html diff --git a/themes/classic/source/_includes/asides/recent_posts.html b/.themes/classic/source/_includes/asides/recent_posts.html similarity index 100% rename from themes/classic/source/_includes/asides/recent_posts.html rename to .themes/classic/source/_includes/asides/recent_posts.html diff --git a/themes/classic/source/_includes/asides/twitter.html b/.themes/classic/source/_includes/asides/twitter.html similarity index 100% rename from themes/classic/source/_includes/asides/twitter.html rename to .themes/classic/source/_includes/asides/twitter.html diff --git a/themes/classic/source/_includes/disqus_thread.html b/.themes/classic/source/_includes/disqus_thread.html similarity index 100% rename from themes/classic/source/_includes/disqus_thread.html rename to .themes/classic/source/_includes/disqus_thread.html diff --git a/themes/classic/source/_includes/footer.html b/.themes/classic/source/_includes/footer.html similarity index 100% rename from themes/classic/source/_includes/footer.html rename to .themes/classic/source/_includes/footer.html diff --git a/themes/classic/source/_includes/google_analytics.html b/.themes/classic/source/_includes/google_analytics.html similarity index 100% rename from themes/classic/source/_includes/google_analytics.html rename to .themes/classic/source/_includes/google_analytics.html diff --git a/themes/classic/source/_includes/head.html b/.themes/classic/source/_includes/head.html similarity index 100% rename from themes/classic/source/_includes/head.html rename to .themes/classic/source/_includes/head.html diff --git a/themes/classic/source/_includes/header.html b/.themes/classic/source/_includes/header.html similarity index 100% rename from themes/classic/source/_includes/header.html rename to .themes/classic/source/_includes/header.html diff --git a/themes/classic/source/_includes/navigation.html b/.themes/classic/source/_includes/navigation.html similarity index 100% rename from themes/classic/source/_includes/navigation.html rename to .themes/classic/source/_includes/navigation.html diff --git a/themes/classic/source/_includes/post_author.html b/.themes/classic/source/_includes/post_author.html similarity index 100% rename from themes/classic/source/_includes/post_author.html rename to .themes/classic/source/_includes/post_author.html diff --git a/themes/classic/source/_includes/post_categories.html b/.themes/classic/source/_includes/post_categories.html similarity index 100% rename from themes/classic/source/_includes/post_categories.html rename to .themes/classic/source/_includes/post_categories.html diff --git a/themes/classic/source/_includes/post_date.html b/.themes/classic/source/_includes/post_date.html similarity index 100% rename from themes/classic/source/_includes/post_date.html rename to .themes/classic/source/_includes/post_date.html diff --git a/themes/classic/source/_includes/sharing.html b/.themes/classic/source/_includes/sharing.html similarity index 100% rename from themes/classic/source/_includes/sharing.html rename to .themes/classic/source/_includes/sharing.html diff --git a/themes/classic/source/_includes/sidebar.html b/.themes/classic/source/_includes/sidebar.html similarity index 100% rename from themes/classic/source/_includes/sidebar.html rename to .themes/classic/source/_includes/sidebar.html diff --git a/themes/classic/source/_layouts/category_index.html b/.themes/classic/source/_layouts/category_index.html similarity index 100% rename from themes/classic/source/_layouts/category_index.html rename to .themes/classic/source/_layouts/category_index.html diff --git a/themes/classic/source/_layouts/default.html b/.themes/classic/source/_layouts/default.html similarity index 100% rename from themes/classic/source/_layouts/default.html rename to .themes/classic/source/_layouts/default.html diff --git a/themes/classic/source/_layouts/page.html b/.themes/classic/source/_layouts/page.html similarity index 100% rename from themes/classic/source/_layouts/page.html rename to .themes/classic/source/_layouts/page.html diff --git a/themes/classic/source/_layouts/post.html b/.themes/classic/source/_layouts/post.html similarity index 100% rename from themes/classic/source/_layouts/post.html rename to .themes/classic/source/_layouts/post.html diff --git a/themes/classic/source/archives.html b/.themes/classic/source/archives.html similarity index 100% rename from themes/classic/source/archives.html rename to .themes/classic/source/archives.html diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/background.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/background.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/background.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/background.png diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/blankButton.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/blankButton.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/blankButton.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/blankButton.png diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/divider.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/divider.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/divider.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/divider.png diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButton.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButton.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButton.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButton.png diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButtonOver.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButtonOver.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButtonOver.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButtonOver.png diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/muteButton.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/muteButton.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/muteButton.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/muteButton.png diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/muteButtonOver.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/muteButtonOver.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/muteButtonOver.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/muteButtonOver.png diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButton.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButton.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButton.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButton.png diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButtonOver.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButtonOver.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButtonOver.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButtonOver.png diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/pauseButton.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/pauseButton.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/pauseButton.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/pauseButton.png diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/pauseButtonOver.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/pauseButtonOver.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/pauseButtonOver.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/pauseButtonOver.png diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/playButton.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/playButton.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/playButton.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/playButton.png diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/playButtonOver.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/playButtonOver.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/playButtonOver.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/playButtonOver.png diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderBuffer.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderBuffer.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderBuffer.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderBuffer.png diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapLeft.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapLeft.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapLeft.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapLeft.png diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapRight.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapRight.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapRight.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapRight.png diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderProgress.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderProgress.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderProgress.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderProgress.png diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderRail.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderRail.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderRail.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderRail.png diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButton.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButton.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButton.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButton.png diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButtonOver.png b/.themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButtonOver.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButtonOver.png rename to .themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButtonOver.png diff --git a/themes/classic/source/assets/jwplayer/glow/display/background.png b/.themes/classic/source/assets/jwplayer/glow/display/background.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/display/background.png rename to .themes/classic/source/assets/jwplayer/glow/display/background.png diff --git a/themes/classic/source/assets/jwplayer/glow/display/bufferIcon.png b/.themes/classic/source/assets/jwplayer/glow/display/bufferIcon.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/display/bufferIcon.png rename to .themes/classic/source/assets/jwplayer/glow/display/bufferIcon.png diff --git a/themes/classic/source/assets/jwplayer/glow/display/muteIcon.png b/.themes/classic/source/assets/jwplayer/glow/display/muteIcon.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/display/muteIcon.png rename to .themes/classic/source/assets/jwplayer/glow/display/muteIcon.png diff --git a/themes/classic/source/assets/jwplayer/glow/display/playIcon.png b/.themes/classic/source/assets/jwplayer/glow/display/playIcon.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/display/playIcon.png rename to .themes/classic/source/assets/jwplayer/glow/display/playIcon.png diff --git a/themes/classic/source/assets/jwplayer/glow/dock/button.png b/.themes/classic/source/assets/jwplayer/glow/dock/button.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/dock/button.png rename to .themes/classic/source/assets/jwplayer/glow/dock/button.png diff --git a/themes/classic/source/assets/jwplayer/glow/glow.xml b/.themes/classic/source/assets/jwplayer/glow/glow.xml similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/glow.xml rename to .themes/classic/source/assets/jwplayer/glow/glow.xml diff --git a/themes/classic/source/assets/jwplayer/glow/playlist/item.png b/.themes/classic/source/assets/jwplayer/glow/playlist/item.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/playlist/item.png rename to .themes/classic/source/assets/jwplayer/glow/playlist/item.png diff --git a/themes/classic/source/assets/jwplayer/glow/playlist/itemOver.png b/.themes/classic/source/assets/jwplayer/glow/playlist/itemOver.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/playlist/itemOver.png rename to .themes/classic/source/assets/jwplayer/glow/playlist/itemOver.png diff --git a/themes/classic/source/assets/jwplayer/glow/playlist/sliderCapBottom.png b/.themes/classic/source/assets/jwplayer/glow/playlist/sliderCapBottom.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/playlist/sliderCapBottom.png rename to .themes/classic/source/assets/jwplayer/glow/playlist/sliderCapBottom.png diff --git a/themes/classic/source/assets/jwplayer/glow/playlist/sliderCapTop.png b/.themes/classic/source/assets/jwplayer/glow/playlist/sliderCapTop.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/playlist/sliderCapTop.png rename to .themes/classic/source/assets/jwplayer/glow/playlist/sliderCapTop.png diff --git a/themes/classic/source/assets/jwplayer/glow/playlist/sliderRail.png b/.themes/classic/source/assets/jwplayer/glow/playlist/sliderRail.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/playlist/sliderRail.png rename to .themes/classic/source/assets/jwplayer/glow/playlist/sliderRail.png diff --git a/themes/classic/source/assets/jwplayer/glow/playlist/sliderThumb.png b/.themes/classic/source/assets/jwplayer/glow/playlist/sliderThumb.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/playlist/sliderThumb.png rename to .themes/classic/source/assets/jwplayer/glow/playlist/sliderThumb.png diff --git a/themes/classic/source/assets/jwplayer/glow/sharing/embedIcon.png b/.themes/classic/source/assets/jwplayer/glow/sharing/embedIcon.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/sharing/embedIcon.png rename to .themes/classic/source/assets/jwplayer/glow/sharing/embedIcon.png diff --git a/themes/classic/source/assets/jwplayer/glow/sharing/embedScreen.png b/.themes/classic/source/assets/jwplayer/glow/sharing/embedScreen.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/sharing/embedScreen.png rename to .themes/classic/source/assets/jwplayer/glow/sharing/embedScreen.png diff --git a/themes/classic/source/assets/jwplayer/glow/sharing/shareIcon.png b/.themes/classic/source/assets/jwplayer/glow/sharing/shareIcon.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/sharing/shareIcon.png rename to .themes/classic/source/assets/jwplayer/glow/sharing/shareIcon.png diff --git a/themes/classic/source/assets/jwplayer/glow/sharing/shareScreen.png b/.themes/classic/source/assets/jwplayer/glow/sharing/shareScreen.png similarity index 100% rename from themes/classic/source/assets/jwplayer/glow/sharing/shareScreen.png rename to .themes/classic/source/assets/jwplayer/glow/sharing/shareScreen.png diff --git a/themes/classic/source/assets/jwplayer/player.swf b/.themes/classic/source/assets/jwplayer/player.swf similarity index 100% rename from themes/classic/source/assets/jwplayer/player.swf rename to .themes/classic/source/assets/jwplayer/player.swf diff --git a/themes/classic/source/atom.xml b/.themes/classic/source/atom.xml similarity index 100% rename from themes/classic/source/atom.xml rename to .themes/classic/source/atom.xml diff --git a/themes/classic/source/images/bird_32_gray.png b/.themes/classic/source/images/bird_32_gray.png similarity index 100% rename from themes/classic/source/images/bird_32_gray.png rename to .themes/classic/source/images/bird_32_gray.png diff --git a/themes/classic/source/images/bird_32_gray_fail.png b/.themes/classic/source/images/bird_32_gray_fail.png similarity index 100% rename from themes/classic/source/images/bird_32_gray_fail.png rename to .themes/classic/source/images/bird_32_gray_fail.png diff --git a/themes/classic/source/images/code_bg.png b/.themes/classic/source/images/code_bg.png similarity index 100% rename from themes/classic/source/images/code_bg.png rename to .themes/classic/source/images/code_bg.png diff --git a/themes/classic/source/images/dotted-border.png b/.themes/classic/source/images/dotted-border.png similarity index 100% rename from themes/classic/source/images/dotted-border.png rename to .themes/classic/source/images/dotted-border.png diff --git a/themes/classic/source/images/email.png b/.themes/classic/source/images/email.png similarity index 100% rename from themes/classic/source/images/email.png rename to .themes/classic/source/images/email.png diff --git a/themes/classic/source/images/favicon.png b/.themes/classic/source/images/favicon.png similarity index 100% rename from themes/classic/source/images/favicon.png rename to .themes/classic/source/images/favicon.png diff --git a/themes/classic/source/images/line-tile.png b/.themes/classic/source/images/line-tile.png similarity index 100% rename from themes/classic/source/images/line-tile.png rename to .themes/classic/source/images/line-tile.png diff --git a/themes/classic/source/images/noise.png b/.themes/classic/source/images/noise.png similarity index 100% rename from themes/classic/source/images/noise.png rename to .themes/classic/source/images/noise.png diff --git a/themes/classic/source/images/rss.png b/.themes/classic/source/images/rss.png similarity index 100% rename from themes/classic/source/images/rss.png rename to .themes/classic/source/images/rss.png diff --git a/themes/classic/source/images/search.png b/.themes/classic/source/images/search.png similarity index 100% rename from themes/classic/source/images/search.png rename to .themes/classic/source/images/search.png diff --git a/themes/classic/source/index.html b/.themes/classic/source/index.html similarity index 100% rename from themes/classic/source/index.html rename to .themes/classic/source/index.html diff --git a/themes/classic/source/javascripts/ender.js b/.themes/classic/source/javascripts/ender.js similarity index 100% rename from themes/classic/source/javascripts/ender.js rename to .themes/classic/source/javascripts/ender.js diff --git a/themes/classic/source/javascripts/libs/ender.js b/.themes/classic/source/javascripts/libs/ender.js similarity index 100% rename from themes/classic/source/javascripts/libs/ender.js rename to .themes/classic/source/javascripts/libs/ender.js diff --git a/themes/classic/source/javascripts/libs/jXHR.js b/.themes/classic/source/javascripts/libs/jXHR.js similarity index 100% rename from themes/classic/source/javascripts/libs/jXHR.js rename to .themes/classic/source/javascripts/libs/jXHR.js diff --git a/themes/classic/source/javascripts/libs/swfobject-dynamic.js b/.themes/classic/source/javascripts/libs/swfobject-dynamic.js similarity index 100% rename from themes/classic/source/javascripts/libs/swfobject-dynamic.js rename to .themes/classic/source/javascripts/libs/swfobject-dynamic.js diff --git a/themes/classic/source/javascripts/modernizr-2.0.js b/.themes/classic/source/javascripts/modernizr-2.0.js similarity index 100% rename from themes/classic/source/javascripts/modernizr-2.0.js rename to .themes/classic/source/javascripts/modernizr-2.0.js diff --git a/themes/classic/source/javascripts/octopress.js b/.themes/classic/source/javascripts/octopress.js similarity index 100% rename from themes/classic/source/javascripts/octopress.js rename to .themes/classic/source/javascripts/octopress.js diff --git a/themes/classic/source/javascripts/pinboard.js b/.themes/classic/source/javascripts/pinboard.js similarity index 100% rename from themes/classic/source/javascripts/pinboard.js rename to .themes/classic/source/javascripts/pinboard.js diff --git a/themes/classic/source/javascripts/twitter.js b/.themes/classic/source/javascripts/twitter.js similarity index 100% rename from themes/classic/source/javascripts/twitter.js rename to .themes/classic/source/javascripts/twitter.js diff --git a/Rakefile b/Rakefile index 0873831..0a075b0 100644 --- a/Rakefile +++ b/Rakefile @@ -3,8 +3,12 @@ require "bundler/setup" ## -- Rsync Deploy config -- ## # Be sure your public key is listed in your server's ~/.ssh/authorized_keys file -ssh_user = "mathisweb@imathis.com" -document_root = "~/dev.octopress.org/" +ssh_user = "user@domain.com" +document_root = "~/website.com/" +deploy_default = "rsync" + +# This will be configured for you when you run config_deploy +deploy_branch = "gh-pages" ## -- Misc Configs, you probably have no reason to changes these -- ## @@ -13,6 +17,7 @@ source_dir = "source" # source file directory deploy_dir = "_deploy" # deploy directory (for Github pages deployment) stash_dir = "_stash" # directory to stash posts for speedy generation posts_dir = "_posts" # directory for blog files +themes_dir = ".themes" # directory for blog files post_format = "markdown" # file format for new posts when using the post rake task @@ -21,9 +26,9 @@ task :install, :theme do |t, args| # copy theme into working Jekyll directories theme = args.theme || 'classic' puts "## Copying "+theme+" theme into ./#{source_dir} ./sass and ./_plugins " - system "mkdir -p #{source_dir}; cp -R themes/"+theme+"/source/ #{source_dir}/" - system "mkdir -p sass; cp -R themes/"+theme+"/sass/ sass/" - system "mkdir -p _plugins; cp -R themes/"+theme+"/_plugins/ _plugins/" + system "mkdir -p #{source_dir}; cp -R #{themes_dir}/"+theme+"/source/ #{source_dir}/" + system "mkdir -p sass; cp -R #{themes_dir}/"+theme+"/sass/ sass/" + system "mkdir -p _plugins; cp -R #{themes_dir}/"+theme+"/_plugins/ _plugins/" system "mkdir -p #{source_dir}/#{posts_dir}"; end @@ -87,8 +92,12 @@ end # Deploying # ############## +desc "Default deploy task" +task :deploy => "#{deploy_default}" do +end + desc "Deploy website via rsync" -task :sync do +task :rsync do puts "## Deploying website via Rsync" ok_failed system("rsync -avz --delete #{public_dir}/ #{ssh_user}:#{document_root}") end @@ -106,13 +115,13 @@ task :push do message = "Site updated at #{Time.now.utc}" system "git commit -m '#{message}'" puts "\n## Pushing generated #{deploy_dir} website" - system "git push" + system "git push origin #{deploy_branch}" puts "\n## Github Pages deploy complete" end end desc "setup _deploy folder and deploy branch" -task :init_deploy, :branch do |t, args| +task :config_deploy, :branch do |t, args| puts "!! Please provide a deploy branch, eg. rake init_deploy[gh-pages] !!" unless args.branch puts "## Creating a clean #{args.branch} branch in ./#{deploy_dir} for Github pages deployment" cd "#{deploy_dir}" do @@ -121,8 +130,13 @@ task :init_deploy, :branch do |t, args| system "git clean -fdx" system "echo 'My Octopress Page is coming soon …' > index.html" system "git add ." - system "git commit -m 'My Octopress site is coming soon'" - system "git push origin #{args.branch}" + system "git commit -m 'Octopress init'" + rakefile = IO.read(__FILE__) + rakefile.sub!(/deploy_branch(\s*)=(\s*)(["'])[\w-]*["']/, "deploy_branch\\1=\\2\\3#{args.branch}\\3") + rakefile.sub!(/deploy_default(\s*)=(\s*)(["'])[\w-]*["']/, "deploy_default\\1=\\2\\3push\\3") + File.open(__FILE__, 'w') do |f| + f.write rakefile + end end end @@ -139,4 +153,3 @@ task :list do puts "Tasks: #{(Rake::Task.tasks - [Rake::Task[:list]]).to_sentence}" puts "(type rake -T for more detail)\n\n" end -