ruhoh 0.0.3 → 0.0.6

data/ruhoh.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     lib/ruhoh/db.rb
     lib/ruhoh/deployers/s3.rb
     lib/ruhoh/friend.rb
+    lib/ruhoh/logger.rb
     lib/ruhoh/page.rb
     lib/ruhoh/parsers/drafts.rb
     lib/ruhoh/parsers/layouts.rb
@@ -49,35 +50,6 @@ Gem::Specification.new do |s|
     lib/ruhoh/version.rb
     lib/ruhoh/watch.rb
     ruhoh.gemspec
-    scaffolds/blog/_config.yml
-    scaffolds/blog/_drafts/.gitkeep
-    scaffolds/blog/_posts/.gitkeep
-    scaffolds/blog/_site.yml
-    scaffolds/blog/_templates/partials/categories_list
-    scaffolds/blog/_templates/partials/pages_list
-    scaffolds/blog/_templates/partials/posts_collate
-    scaffolds/blog/_templates/partials/posts_list
-    scaffolds/blog/_templates/partials/tags_list
-    scaffolds/blog/_templates/syntax/google_prettify/default.css
-    scaffolds/blog/_templates/syntax/google_prettify/desert.css
-    scaffolds/blog/_templates/syntax/google_prettify/sons-of-obsidian.css
-    scaffolds/blog/_templates/syntax/google_prettify/sunburst.css
-    scaffolds/blog/_templates/syntax/google_prettify/twitter-bootstrap.css
-    scaffolds/blog/_templates/themes/twitter/bootstrap/css/bootstrap.min.css
-    scaffolds/blog/_templates/themes/twitter/bootstrap/img/glyphicons-halflings-white.png
-    scaffolds/blog/_templates/themes/twitter/bootstrap/img/glyphicons-halflings.png
-    scaffolds/blog/_templates/themes/twitter/css/style.css
-    scaffolds/blog/_templates/themes/twitter/layouts/default.html
-    scaffolds/blog/_templates/themes/twitter/layouts/page.html
-    scaffolds/blog/_templates/themes/twitter/layouts/post.html
-    scaffolds/blog/_templates/themes/twitter/manifest.yml
-    scaffolds/blog/about.md
-    scaffolds/blog/archive.html
-    scaffolds/blog/categories.html
-    scaffolds/blog/config.ru
-    scaffolds/blog/index.html
-    scaffolds/blog/pages.html
-    scaffolds/blog/tags.html
     scaffolds/layout.html
     scaffolds/page.html
     scaffolds/post.html

data/spec/db_spec.rb

@@ -9,7 +9,7 @@ module DB
     
     before(:each) do
       Ruhoh::Utils.stub(:parse_file_as_yaml).and_return({'theme' => "twitter"})
-      Ruhoh.setup(SampleSitePath)
+      Ruhoh.setup(:source => SampleSitePath)
     end
     
     context "database has not been updated" do

data/spec/page_spec.rb

@@ -6,7 +6,7 @@ module Page
     
     before(:each) do
       Ruhoh::Utils.stub(:parse_file_as_yaml).and_return({'theme' => "twitter"})
-      Ruhoh.setup(SampleSitePath)
+      Ruhoh.setup(:source => SampleSitePath)
     end
     
     describe "Page initialization" do

data/spec/parsers/layouts_spec.rb

@@ -6,7 +6,7 @@ module Layouts
     
     before(:each) do
       Ruhoh::Utils.should_receive(:parse_file_as_yaml).and_return({'theme' => "twitter"})
-      Ruhoh.setup(SampleSitePath)
+      Ruhoh.setup(:source => SampleSitePath)
     end
     
     describe "#generate" do

data/spec/parsers/pages_spec.rb

@@ -8,7 +8,7 @@ module Pages
       
       before(:each) do
         Ruhoh::Utils.should_receive(:parse_file_as_yaml).and_return({'theme' => "twitter"})
-        Ruhoh.setup(SampleSitePath)
+        Ruhoh.setup(:source => SampleSitePath)
       end
       
       let(:pages){
@@ -16,7 +16,7 @@ module Pages
       }
       
       it 'should extract valid pages from source directory.' do
-        pages.keys.sort.should ==  ['about.md', 'archive.html', 'categories.html', 'index.md', 'pages.md', 'tags.html']
+        pages.keys.sort.should ==  ['about.md', 'archive.html', 'categories.html', 'index.html', 'pages.html', 'tags.html']
       end
       
       it 'should return a properly formatted hash for each page' do
@@ -36,7 +36,7 @@ module Pages
         
         before(:each) do
           Ruhoh::Utils.should_receive(:parse_file_as_yaml).and_return({'theme' => "twitter"})
-          Ruhoh.setup(SampleSitePath)
+          Ruhoh.setup(:source => SampleSitePath)
         end
         
         it "should return true for a valid page filepath" do
@@ -64,7 +64,7 @@ module Pages
             'theme' => "twitter",
             'exclude' => filepath
           })
-          Ruhoh.setup(SampleSitePath)
+          Ruhoh.setup(:source => SampleSitePath)
           
           Ruhoh::Parsers::Pages.is_valid_page?(filepath).should == false
         end
@@ -77,7 +77,7 @@ module Pages
             'theme' => "twitter",
             'exclude' => /^test/
           })
-          Ruhoh.setup(SampleSitePath)
+          Ruhoh.setup(:source => SampleSitePath)
           
           Ruhoh::Parsers::Pages.is_valid_page?(filepath1).should == false
           Ruhoh::Parsers::Pages.is_valid_page?(filepath2).should == false

data/spec/parsers/posts_spec.rb

@@ -6,7 +6,7 @@ module Posts
     
     before(:each) do
       Ruhoh::Utils.should_receive(:parse_file_as_yaml).and_return({'theme' => "twitter"})
-      Ruhoh.setup(SampleSitePath)
+      Ruhoh.setup(:source => SampleSitePath)
     end
     
     describe "#generate" do

data/spec/parsers/routes_spec.rb

@@ -8,7 +8,7 @@ module Routes
 
       before(:each) do
         Ruhoh::Utils.should_receive(:parse_file_as_yaml).and_return({'theme' => "twitter"})
-        Ruhoh.setup(SampleSitePath)
+        Ruhoh.setup(:source => SampleSitePath)
       end
       
       let(:pages){

data/spec/parsers/site_spec.rb

@@ -8,7 +8,7 @@ module Site
 
       before(:each) do
         Ruhoh::Utils.should_receive(:parse_file_as_yaml).and_return({'theme' => "twitter"})
-        Ruhoh.setup(SampleSitePath)
+        Ruhoh.setup(:source => SampleSitePath)
       end
       
       it 'should parse the config and site yaml files' do

data/system_partials/syntax/google_prettify

@@ -1,5 +1,5 @@
 <!-- Google Prettify -->
-<link rel="stylesheet" href="{{ SYNTAX_PATH }}/google_prettify/{{ site.config.syntax.google_prettify.theme }}.css" type="text/css" media="screen" charset="utf-8">
+<link rel="stylesheet" href="{{ paths.syntax }}/google_prettify/{{ site.config.syntax.google_prettify.theme }}.css" type="text/css" media="screen" charset="utf-8">
 <script src="http://cdnjs.cloudflare.com/ajax/libs/prettify/188.0.0/prettify.js"></script>
 <script>
   var pres = document.getElementsByTagName("pre");

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruhoh
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000Z
+date: 2012-04-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70238314583000 !ruby/object:Gem::Requirement
+  requirement: &70281607832660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70238314583000
+  version_requirements: *70281607832660
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &70238314582500 !ruby/object:Gem::Requirement
+  requirement: &70281607832160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.99'
   type: :runtime
   prerelease: false
-  version_requirements: *70238314582500
+  version_requirements: *70281607832160
 - !ruby/object:Gem::Dependency
   name: directory_watcher
-  requirement: &70238314582040 !ruby/object:Gem::Requirement
+  requirement: &70281607831700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70238314582040
+  version_requirements: *70281607831700
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70238314581580 !ruby/object:Gem::Requirement
+  requirement: &70281607831240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70238314581580
+  version_requirements: *70281607831240
 description: Ruhoh is a Universal API for your static blog.
 email: plusjade@gmail.com
 executables:
@@ -74,6 +74,7 @@ files:
 - lib/ruhoh/db.rb
 - lib/ruhoh/deployers/s3.rb
 - lib/ruhoh/friend.rb
+- lib/ruhoh/logger.rb
 - lib/ruhoh/page.rb
 - lib/ruhoh/parsers/drafts.rb
 - lib/ruhoh/parsers/layouts.rb
@@ -90,35 +91,6 @@ files:
 - lib/ruhoh/version.rb
 - lib/ruhoh/watch.rb
 - ruhoh.gemspec
-- scaffolds/blog/_config.yml
-- scaffolds/blog/_drafts/.gitkeep
-- scaffolds/blog/_posts/.gitkeep
-- scaffolds/blog/_site.yml
-- scaffolds/blog/_templates/partials/categories_list
-- scaffolds/blog/_templates/partials/pages_list
-- scaffolds/blog/_templates/partials/posts_collate
-- scaffolds/blog/_templates/partials/posts_list
-- scaffolds/blog/_templates/partials/tags_list
-- scaffolds/blog/_templates/syntax/google_prettify/default.css
-- scaffolds/blog/_templates/syntax/google_prettify/desert.css
-- scaffolds/blog/_templates/syntax/google_prettify/sons-of-obsidian.css
-- scaffolds/blog/_templates/syntax/google_prettify/sunburst.css
-- scaffolds/blog/_templates/syntax/google_prettify/twitter-bootstrap.css
-- scaffolds/blog/_templates/themes/twitter/bootstrap/css/bootstrap.min.css
-- scaffolds/blog/_templates/themes/twitter/bootstrap/img/glyphicons-halflings-white.png
-- scaffolds/blog/_templates/themes/twitter/bootstrap/img/glyphicons-halflings.png
-- scaffolds/blog/_templates/themes/twitter/css/style.css
-- scaffolds/blog/_templates/themes/twitter/layouts/default.html
-- scaffolds/blog/_templates/themes/twitter/layouts/page.html
-- scaffolds/blog/_templates/themes/twitter/layouts/post.html
-- scaffolds/blog/_templates/themes/twitter/manifest.yml
-- scaffolds/blog/about.md
-- scaffolds/blog/archive.html
-- scaffolds/blog/categories.html
-- scaffolds/blog/config.ru
-- scaffolds/blog/index.html
-- scaffolds/blog/pages.html
-- scaffolds/blog/tags.html
 - scaffolds/layout.html
 - scaffolds/page.html
 - scaffolds/post.html

data/scaffolds/blog/_config.yml

@@ -1,33 +0,0 @@
----
-version : 0.0.3
-permalink: /:categories/:title
-theme : twitter
-
-production_url : http://sample.com
-
-comments :
-  provider : disqus
-  disqus :
-    short_name : jekyllbootstrap
-  livefyre :
-    site_id : 123
-  intensedebate :
-    account : 123abc
-  facebook :
-    appid : 123
-    num_posts: 5
-    width: 580
-    colorscheme: light
-
-analytics :
-  provider : google
-  google : 
-      tracking_id : 'UA-123-12'
-  getclicky :
-    site_id : 
-
-syntax :
-  provider : google_prettify
-  google_prettify : 
-      theme: twitter-bootstrap
-      linenums : true

data/scaffolds/blog/_site.yml

@@ -1,16 +0,0 @@
-title : Blog Title
-tagline: Blog Tagline
-author :
-  name : Firstname Lastname
-  email : blah@email.test
-  github : username
-  twitter : username
-  feedburner : feedname
-
-navigation :
-  - archive.html
-  - tags.html
-  - categories.html
-  - pages.html
-  - about.md
-  

data/scaffolds/blog/_templates/partials/categories_list

@@ -1,3 +0,0 @@
-<li>
-  <a href="{{ url }}">{{ name }} <span>{{ count }}</span></a>
-</li>

data/scaffolds/blog/_templates/partials/pages_list

@@ -1,7 +0,0 @@
-{{#is_active_page }}
-  <li class="active"><a href="{{url}}" class="active">{{title}}</a></li>
-{{/is_active_page}}
-
-{{^is_active_page}}
-  <li><a href="{{url}}">{{title}}</a></li>
-{{/is_active_page }}

data/scaffolds/blog/_templates/partials/posts_collate

@@ -1,9 +0,0 @@
-<h2>{{year}}</h2>
-{{#months}}
-  <h3>{{month}}</h3>
-  <ul>
-  {{#posts?to_posts}}
-    <li><span>{{date}}</span> &raquo; <a href="{{url}}">{{title}}</a></li>
-  {{/posts?to_posts}}
-  </ul>
-{{/months}}

data/scaffolds/blog/_templates/partials/posts_list

@@ -1 +0,0 @@
-<li><a href="{{url}}">{{title}}</a></li>

data/scaffolds/blog/_templates/partials/tags_list

@@ -1,3 +0,0 @@
-<li>
-  <a href="{{ url }}">{{ name }} <span>{{ count }}</span></a>
-</li>

data/scaffolds/blog/_templates/syntax/google_prettify/default.css

@@ -1,52 +0,0 @@
-/* Pretty printing styles. Used with prettify.js. */
-
-/* SPAN elements with the classes below are added by prettyprint. */
-.pln { color: #000 }  /* plain text */
-
-@media screen {
-  .str { color: #080 }  /* string content */
-  .kwd { color: #008 }  /* a keyword */
-  .com { color: #800 }  /* a comment */
-  .typ { color: #606 }  /* a type name */
-  .lit { color: #066 }  /* a literal value */
-  /* punctuation, lisp open bracket, lisp close bracket */
-  .pun, .opn, .clo { color: #660 }
-  .tag { color: #008 }  /* a markup tag name */
-  .atn { color: #606 }  /* a markup attribute name */
-  .atv { color: #080 }  /* a markup attribute value */
-  .dec, .var { color: #606 }  /* a declaration; a variable name */
-  .fun { color: red }  /* a function name */
-}
-
-/* Use higher contrast and text-weight for printable form. */
-@media print, projection {
-  .str { color: #060 }
-  .kwd { color: #006; font-weight: bold }
-  .com { color: #600; font-style: italic }
-  .typ { color: #404; font-weight: bold }
-  .lit { color: #044 }
-  .pun, .opn, .clo { color: #440 }
-  .tag { color: #006; font-weight: bold }
-  .atn { color: #404 }
-  .atv { color: #060 }
-}
-
-/* Put a border around prettyprinted code snippets. */
-pre.prettyprint { padding: 2px; border: 1px solid #888 }
-
-/* Specify class=linenums on a pre to get line numbering */
-ol.linenums { margin-top: 0; margin-bottom: 0 } /* IE indents via margin-left */
-li.L0,
-li.L1,
-li.L2,
-li.L3,
-li.L5,
-li.L6,
-li.L7,
-li.L8 { list-style-type: none }
-/* Alternate shading for lines */
-li.L1,
-li.L3,
-li.L5,
-li.L7,
-li.L9 { background: #eee }

data/scaffolds/blog/_templates/syntax/google_prettify/desert.css

@@ -1,34 +0,0 @@
-/* desert scheme ported from vim to google prettify */
-pre { display: block; background-color: #333 }
-pre .nocode { background-color: none; color: #000 }
-pre .str { color: #ffa0a0 } /* string  - pink */
-pre .kwd { color: #f0e68c; font-weight: bold }
-pre .com { color: #87ceeb } /* comment - skyblue */
-pre .typ { color: #98fb98 } /* type    - lightgreen */
-pre .lit { color: #cd5c5c } /* literal - darkred */
-pre .pun { color: #fff }    /* punctuation */
-pre .pln { color: #fff }    /* plaintext */
-pre .tag { color: #f0e68c; font-weight: bold } /* html/xml tag    - lightyellow */
-pre .atn { color: #bdb76b; font-weight: bold } /* attribute name  - khaki */
-pre .atv { color: #ffa0a0 } /* attribute value - pink */
-pre .dec { color: #98fb98 } /* decimal         - lightgreen */
-
-/* Specify class=linenums on a pre to get line numbering */
-ol.linenums { margin-top: 0; margin-bottom: 0; color: #AEAEAE } /* IE indents via margin-left */
-li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8 { list-style-type: none }
-/* Alternate shading for lines */
-li.L1,li.L3,li.L5,li.L7,li.L9 { }
-
-@media print {
-  pre { background-color: none }
-  pre .str, code .str { color: #060 }
-  pre .kwd, code .kwd { color: #006; font-weight: bold }
-  pre .com, code .com { color: #600; font-style: italic }
-  pre .typ, code .typ { color: #404; font-weight: bold }
-  pre .lit, code .lit { color: #044 }
-  pre .pun, code .pun { color: #440 }
-  pre .pln, code .pln { color: #000 }
-  pre .tag, code .tag { color: #006; font-weight: bold }
-  pre .atn, code .atn { color: #404 }
-  pre .atv, code .atv { color: #060 }
-}

data/scaffolds/blog/_templates/syntax/google_prettify/sons-of-obsidian.css

@@ -1,117 +0,0 @@
-/*
- * Derived from einaros's Sons of Obsidian theme at
- * http://studiostyl.es/schemes/son-of-obsidian by
- * Alex Ford of CodeTunnel:
- * http://CodeTunnel.com/blog/post/71/google-code-prettify-obsidian-theme
- */
-
-.str
-{
-    color: #EC7600;
-}
-.kwd
-{
-    color: #93C763;
-}
-.com
-{
-    color: #66747B;
-}
-.typ
-{
-    color: #678CB1;
-}
-.lit
-{
-    color: #FACD22;
-}
-.pun
-{
-    color: #F1F2F3;
-}
-.pln
-{
-    color: #F1F2F3;
-}
-.tag
-{
-    color: #8AC763;
-}
-.atn
-{
-    color: #E0E2E4;
-}
-.atv
-{
-    color: #EC7600;
-}
-.dec
-{
-    color: purple;
-}
-pre.prettyprint
-{
-    border: 0px solid #888;
-}
-ol.linenums
-{
-    margin-top: 0;
-    margin-bottom: 0;
-}
-.prettyprint {
-    background: #000;
-}
-li.L0, li.L1, li.L2, li.L3, li.L4, li.L5, li.L6, li.L7, li.L8, li.L9
-{
-    color: #555;
-}
-li.L1, li.L3, li.L5, li.L7, li.L9 {
-    background: #111;
-}
-@media print
-{
-    .str
-    {
-        color: #060;
-    }
-    .kwd
-    {
-        color: #006;
-        font-weight: bold;
-    }
-    .com
-    {
-        color: #600;
-        font-style: italic;
-    }
-    .typ
-    {
-        color: #404;
-        font-weight: bold;
-    }
-    .lit
-    {
-        color: #044;
-    }
-    .pun
-    {
-        color: #440;
-    }
-    .pln
-    {
-        color: #000;
-    }
-    .tag
-    {
-        color: #006;
-        font-weight: bold;
-    }
-    .atn
-    {
-        color: #404;
-    }
-    .atv
-    {
-        color: #060;
-    }
-}

data/scaffolds/blog/_templates/syntax/google_prettify/sunburst.css

@@ -1,51 +0,0 @@
-/* Pretty printing styles. Used with prettify.js. */
-/* Vim sunburst theme by David Leibovic */
-
-pre .str, code .str { color: #65B042; } /* string  - green */
-pre .kwd, code .kwd { color: #E28964; } /* keyword - dark pink */
-pre .com, code .com { color: #AEAEAE; font-style: italic; } /* comment - gray */
-pre .typ, code .typ { color: #89bdff; } /* type - light blue */
-pre .lit, code .lit { color: #3387CC; } /* literal - blue */
-pre .pun, code .pun { color: #fff; } /* punctuation - white */
-pre .pln, code .pln { color: #fff; } /* plaintext - white */
-pre .tag, code .tag { color: #89bdff; } /* html/xml tag    - light blue */
-pre .atn, code .atn { color: #bdb76b; } /* html/xml attribute name  - khaki */
-pre .atv, code .atv { color: #65B042; } /* html/xml attribute value - green */
-pre .dec, code .dec { color: #3387CC; } /* decimal - blue */
-
-pre.prettyprint, code.prettyprint {
-  background-color: #000;
-  -moz-border-radius: 8px;
-  -webkit-border-radius: 8px;
-  -o-border-radius: 8px;
-  -ms-border-radius: 8px;
-  -khtml-border-radius: 8px;
-  border-radius: 8px;
-}
-
-pre.prettyprint {
-  width: 95%;
-  margin: 1em auto;
-  padding: 1em;
-  white-space: pre-wrap;
-}
-
-
-/* Specify class=linenums on a pre to get line numbering */
-ol.linenums { margin-top: 0; margin-bottom: 0; color: #AEAEAE; } /* IE indents via margin-left */
-li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8 { list-style-type: none }
-/* Alternate shading for lines */
-li.L1,li.L3,li.L5,li.L7,li.L9 { }
-
-@media print {
-  pre .str, code .str { color: #060; }
-  pre .kwd, code .kwd { color: #006; font-weight: bold; }
-  pre .com, code .com { color: #600; font-style: italic; }
-  pre .typ, code .typ { color: #404; font-weight: bold; }
-  pre .lit, code .lit { color: #044; }
-  pre .pun, code .pun { color: #440; }
-  pre .pln, code .pln { color: #000; }
-  pre .tag, code .tag { color: #006; font-weight: bold; }
-  pre .atn, code .atn { color: #404; }
-  pre .atv, code .atv { color: #060; }
-}

data/scaffolds/blog/_templates/syntax/google_prettify/twitter-bootstrap.css

@@ -1,30 +0,0 @@
-.com { color: #93a1a1; }
-.lit { color: #195f91; }
-.pun, .opn, .clo { color: #93a1a1; }
-.fun { color: #dc322f; }
-.str, .atv { color: #D14; }
-.kwd, .linenums .tag { color: #1e347b; }
-.typ, .atn, .dec, .var { color: teal; }
-.pln { color: #48484c; }
-
-.prettyprint {
-  padding: 8px;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
-}
-.prettyprint.linenums {
-  -webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
-     -moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
-          box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
-}
-
-/* Specify class=linenums on a pre to get line numbering */
-ol.linenums {
-  margin: 0 0 0 33px; /* IE indents via margin-left */
-} 
-ol.linenums li {
-  padding-left: 12px;
-  color: #bebec5;
-  line-height: 18px;
-  text-shadow: 0 1px 0 #fff;
-}