octopress 3.0.0.rc.15 → 3.0.0.rc.16

data/test/_layouts/page.html

@@ -0,0 +1 @@
+<div class=page>{{ page.title }}{{ content }}</div>

data/test/_layouts/post.html

@@ -0,0 +1 @@
+<div class=post>{{ page.title }}{{ content }}</div>

data/test/_octopress.yml

@@ -0,0 +1,11 @@
+# Default extension for new posts and pages
+post_ext: markdown
+page_ext: html
+
+# Default templates for posts and pages
+# Found in _templates/
+post_layout: post
+page_layout: page
+
+# Format titles with titlecase?
+titlecase: true

data/test/{expected/_templates/other_page → _templates/draft}

@@ -1,5 +1,4 @@
 ---
 layout: {{ layout }}
 title: {{ title }}
-kittens: true
 ---

data/test/_templates/page

@@ -0,0 +1,4 @@
+---
+layout: {{ layout }}
+title: {{ title }}
+---

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.15
+  version: 3.0.0.rc.16
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -85,16 +85,16 @@ dependencies:
   name: octopress-ink
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.rc
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.rc
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: clash
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +161,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".clash.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
@@ -154,18 +169,18 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- assets/docs/index.md
 - bin/octopress
 - lib/octopress.rb
 - lib/octopress/command.rb
-- lib/octopress/commands/build.rb
-- lib/octopress/commands/doctor.rb
 - lib/octopress/commands/helpers.rb
 - lib/octopress/commands/init.rb
+- lib/octopress/commands/isolate.rb
 - lib/octopress/commands/new.rb
 - lib/octopress/commands/publish.rb
-- lib/octopress/commands/serve.rb
 - lib/octopress/configuration.rb
 - lib/octopress/draft.rb
+- lib/octopress/isolate.rb
 - lib/octopress/page.rb
 - lib/octopress/post.rb
 - lib/octopress/scaffold.rb
@@ -177,42 +192,44 @@ files:
 - scaffold/_templates/page
 - scaffold/_templates/post
 - test/Gemfile
-- test/expected/_config.yml
-- test/expected/_drafts/stupid-idea.markdown
-- test/expected/_layouts/page.html
-- test/expected/_layouts/post.html
-- test/expected/_octopress.yml
-- test/expected/_posts/2014-02-10-another-idea.markdown
-- test/expected/_posts/2014-03-11-idea.markdown
-- test/expected/_posts/2014-03-12-awesome-stuff.markdown
-- test/expected/_posts/2014-03-13-awesome.markdown
-- test/expected/_posts/ideas/2014-02-13-yet-another-idea.markdown
-- test/expected/_posts/stuff/2014-02-11-some-stuff.markdown
-- test/expected/_site/2014/02/10/another-idea.html
-- test/expected/_site/2014/02/11/some-stuff.html
-- test/expected/_site/2014/02/13/yet-another-idea.html
-- test/expected/_site/2014/03/11/idea.html
-- test/expected/_site/2014/03/12/awesome-stuff.html
-- test/expected/_site/2014/03/13/awesome.html
-- test/expected/_site/awesome-page.html
-- test/expected/_site/cool-page.html
-- test/expected/_site/custom-template-page.html
-- test/expected/_site/date-page.html
-- test/expected/_site/index.html
-- test/expected/_site/okay-page/index.html
-- test/expected/_templates/date_page
-- test/expected/_templates/draft
-- test/expected/_templates/other_page
-- test/expected/_templates/page
-- test/expected/_templates/post
-- test/expected/awesome-page.html
-- test/expected/cool-page.html
-- test/expected/custom-template-page.html
-- test/expected/date-page.html
-- test/expected/index.html
-- test/expected/okay-page/index.html
-- test/test.rb
-- test/test_suite.rb
+- test/_config.yml
+- test/_expected/blank/_config.yml
+- test/_expected/blank/_octopress.yml
+- test/_expected/blank/_templates/draft
+- test/_expected/blank/_templates/page
+- test/_expected/blank/_templates/post
+- test/_expected/blank/index.html
+- test/_expected/integrate/_posts/2011-11-11-a-random-post.markdown
+- test/_expected/integrate/_posts/2012-11-11-another-random-post.markdown
+- test/_expected/integrate/_posts/2013-11-11-this-post-is-happy.markdown
+- test/_expected/isolate-path/_posts/2011-11-11-a-random-post.markdown
+- test/_expected/isolate-path/_posts/_exile/2012-11-11-another-random-post.markdown
+- test/_expected/isolate-path/_posts/_exile/2013-11-11-this-post-is-happy.markdown
+- test/_expected/isolate-search/_posts/2011-11-11-a-random-post.markdown
+- test/_expected/isolate-search/_posts/2012-11-11-another-random-post.markdown
+- test/_expected/isolate-search/_posts/_exile/2013-11-11-this-post-is-happy.markdown
+- test/_expected/isolate/_posts/2013-11-11-this-post-is-happy.markdown
+- test/_expected/isolate/_posts/_exile/2011-11-11-a-random-post.markdown
+- test/_expected/isolate/_posts/_exile/2012-11-11-another-random-post.markdown
+- test/_expected/new-draft-slug/_drafts/idea.markdown
+- test/_expected/new-draft/_drafts/some-cool-idea.markdown
+- test/_expected/new-page-date/pages/awesome-page.html
+- test/_expected/new-page-extension/pages/awesome-page.md
+- test/_expected/new-page-index/pages/index.html
+- test/_expected/new-page-template/pages/awesome-page.html
+- test/_expected/new-page/pages/awesome-page.html
+- test/_expected/new-post-dir/_posts/stuff/2014-02-11-some-stuff.markdown
+- test/_expected/new-post-slug/_posts/2014-03-13-awesome.markdown
+- test/_expected/new-post/_posts/2014-03-12-awesome-stuff.markdown
+- test/_expected/publish-draft-date/_posts/2014-03-11-some-cool-idea.markdown
+- test/_expected/publish-draft-dir/_posts/ideas/2014-03-10-some-cool-idea.markdown
+- test/_expected/publish-draft/_posts/2014-03-10-some-cool-idea.markdown
+- test/_layouts/page.html
+- test/_layouts/post.html
+- test/_octopress.yml
+- test/_templates/draft
+- test/_templates/page
+- test/_templates/post
 homepage: http://octopress.org
 licenses:
 - MIT
@@ -240,39 +257,41 @@ summary: Octopress is an obsessively designed framework for Jekyll blogging. It
   easy to configure and easy to deploy. Sweet huh?
 test_files:
 - test/Gemfile
-- test/expected/_config.yml
-- test/expected/_drafts/stupid-idea.markdown
-- test/expected/_layouts/page.html
-- test/expected/_layouts/post.html
-- test/expected/_octopress.yml
-- test/expected/_posts/2014-02-10-another-idea.markdown
-- test/expected/_posts/2014-03-11-idea.markdown
-- test/expected/_posts/2014-03-12-awesome-stuff.markdown
-- test/expected/_posts/2014-03-13-awesome.markdown
-- test/expected/_posts/ideas/2014-02-13-yet-another-idea.markdown
-- test/expected/_posts/stuff/2014-02-11-some-stuff.markdown
-- test/expected/_site/2014/02/10/another-idea.html
-- test/expected/_site/2014/02/11/some-stuff.html
-- test/expected/_site/2014/02/13/yet-another-idea.html
-- test/expected/_site/2014/03/11/idea.html
-- test/expected/_site/2014/03/12/awesome-stuff.html
-- test/expected/_site/2014/03/13/awesome.html
-- test/expected/_site/awesome-page.html
-- test/expected/_site/cool-page.html
-- test/expected/_site/custom-template-page.html
-- test/expected/_site/date-page.html
-- test/expected/_site/index.html
-- test/expected/_site/okay-page/index.html
-- test/expected/_templates/date_page
-- test/expected/_templates/draft
-- test/expected/_templates/other_page
-- test/expected/_templates/page
-- test/expected/_templates/post
-- test/expected/awesome-page.html
-- test/expected/cool-page.html
-- test/expected/custom-template-page.html
-- test/expected/date-page.html
-- test/expected/index.html
-- test/expected/okay-page/index.html
-- test/test.rb
-- test/test_suite.rb
+- test/_config.yml
+- test/_expected/blank/_config.yml
+- test/_expected/blank/_octopress.yml
+- test/_expected/blank/_templates/draft
+- test/_expected/blank/_templates/page
+- test/_expected/blank/_templates/post
+- test/_expected/blank/index.html
+- test/_expected/integrate/_posts/2011-11-11-a-random-post.markdown
+- test/_expected/integrate/_posts/2012-11-11-another-random-post.markdown
+- test/_expected/integrate/_posts/2013-11-11-this-post-is-happy.markdown
+- test/_expected/isolate-path/_posts/2011-11-11-a-random-post.markdown
+- test/_expected/isolate-path/_posts/_exile/2012-11-11-another-random-post.markdown
+- test/_expected/isolate-path/_posts/_exile/2013-11-11-this-post-is-happy.markdown
+- test/_expected/isolate-search/_posts/2011-11-11-a-random-post.markdown
+- test/_expected/isolate-search/_posts/2012-11-11-another-random-post.markdown
+- test/_expected/isolate-search/_posts/_exile/2013-11-11-this-post-is-happy.markdown
+- test/_expected/isolate/_posts/2013-11-11-this-post-is-happy.markdown
+- test/_expected/isolate/_posts/_exile/2011-11-11-a-random-post.markdown
+- test/_expected/isolate/_posts/_exile/2012-11-11-another-random-post.markdown
+- test/_expected/new-draft-slug/_drafts/idea.markdown
+- test/_expected/new-draft/_drafts/some-cool-idea.markdown
+- test/_expected/new-page-date/pages/awesome-page.html
+- test/_expected/new-page-extension/pages/awesome-page.md
+- test/_expected/new-page-index/pages/index.html
+- test/_expected/new-page-template/pages/awesome-page.html
+- test/_expected/new-page/pages/awesome-page.html
+- test/_expected/new-post-dir/_posts/stuff/2014-02-11-some-stuff.markdown
+- test/_expected/new-post-slug/_posts/2014-03-13-awesome.markdown
+- test/_expected/new-post/_posts/2014-03-12-awesome-stuff.markdown
+- test/_expected/publish-draft-date/_posts/2014-03-11-some-cool-idea.markdown
+- test/_expected/publish-draft-dir/_posts/ideas/2014-03-10-some-cool-idea.markdown
+- test/_expected/publish-draft/_posts/2014-03-10-some-cool-idea.markdown
+- test/_layouts/page.html
+- test/_layouts/post.html
+- test/_octopress.yml
+- test/_templates/draft
+- test/_templates/page
+- test/_templates/post

data/lib/octopress/commands/build.rb

@@ -1,19 +0,0 @@
-module Octopress
-  class Build < Command
-    def self.init_with_program(p)
-      p.command(:build) do |c|
-        c.syntax 'build [options]'
-        c.description 'Build your site'
-        CommandHelpers.add_build_options(c)
-        
-        c.action do |args, options|
-          Octopress.config(options)
-          options = CommandHelpers.normalize_options(options)
-          options = ::Jekyll.configuration(options)
-          ::Jekyll::Commands::Build.process(options)
-        end
-      end
-    end
-  end
-end
-

data/lib/octopress/commands/doctor.rb

@@ -1,20 +0,0 @@
-module Octopress
-  class Doctor < Command
-    def self.init_with_program(p)
-      p.command(:doctor) do |c|
-        c.alias(:hyde)
-
-        c.syntax 'doctor'
-        c.description 'Search site and print specific deprecation warnings'
-        CommandHelpers.add_common_options c
-
-        c.action do |args, options|
-          options = CommandHelpers.normalize_options(options)
-          options = Jekyll.configuration(options)
-          Jekyll::Commands::Doctor.process(options)
-        end
-      end
-    end
-  end
-end
-

data/lib/octopress/commands/serve.rb

@@ -1,30 +0,0 @@
-module Octopress
-  class Serve < Command
-    def self.init_with_program(p)
-      p.command(:serve) do |c|
-        c.alias(:server)
-
-        c.syntax 'serve [options]'
-        c.description 'Serve your site locally'
-
-        CommandHelpers.add_build_options(c)
-
-        c.option 'detach', '-B', '--detach',      'Run the server in the background (detach)'
-        c.option 'port',   '-P', '--port PORT',   'Port to listen on'
-        c.option 'host',   '-H', '--host HOST',   'Host to bind to'
-        c.option 'baseurl',      '--baseurl URL', 'Base URL'
-
-        c.action do |args, options|
-          Octopress.config(options)
-          options["serving"] ||= true
-
-          options = CommandHelpers.normalize_options(options)
-          options = Jekyll.configuration(options)
-          Jekyll::Commands::Build.process(options)
-          Jekyll::Commands::Serve.process(options)
-        end
-      end
-    end
-  end
-end
-

data/test/expected/_layouts/page.html

@@ -1 +0,0 @@
-<div class='page'>{{ page.title }}{{ content }}</div>

data/test/expected/_layouts/post.html

@@ -1 +0,0 @@
-<div class='post'>{{ page.title }}{{ content }}</div>

data/test/expected/_posts/2014-02-10-another-idea.markdown

@@ -1,6 +0,0 @@
----
-layout: post
-title: "Another Idea"
-date: 2014-02-10T15:20:00Z
----
-

data/test/expected/_posts/ideas/2014-02-13-yet-another-idea.markdown

@@ -1,6 +0,0 @@
----
-layout: post
-title: "Yet Another Idea"
-date: 2014-02-13T15:20:00Z
----
-

data/test/expected/_site/2014/02/10/another-idea.html

@@ -1,2 +0,0 @@
-<div class='post'>Another Idea
-</div>

data/test/expected/_site/2014/02/11/some-stuff.html

@@ -1,2 +0,0 @@
-<div class='post'>Some Stuff
-</div>

data/test/expected/_site/2014/02/13/yet-another-idea.html

@@ -1,2 +0,0 @@
-<div class='post'>Yet Another Idea
-</div>

data/test/expected/_site/2014/03/11/idea.html

@@ -1,2 +0,0 @@
-<div class='post'>Some Great Idea for a Post
-</div>

data/test/expected/_site/2014/03/12/awesome-stuff.html

@@ -1,2 +0,0 @@
-<div class='post'>Awesome Stuff
-</div>

data/test/expected/_site/2014/03/13/awesome.html

@@ -1,2 +0,0 @@
-<div class='post'>Super Awesome Stuff
-</div>

data/test/expected/_site/awesome-page.html

@@ -1 +0,0 @@
-<div class='page'>Awesome Page</div>

data/test/expected/_site/cool-page.html

@@ -1 +0,0 @@
-<div class='page'>Some Cool Page</div>

data/test/expected/_site/custom-template-page.html

@@ -1 +0,0 @@
-<div class='page'>Some Date Page</div>

data/test/expected/_site/date-page.html

@@ -1 +0,0 @@
-<div class='page'>Some Date Page</div>

data/test/expected/_site/okay-page/index.html

@@ -1 +0,0 @@
-<div class='page'>This Page Is Meh</div>

data/test/expected/cool-page.html

@@ -1,5 +0,0 @@
----
-layout: page
-title: "Some Cool Page"
----
-

data/test/expected/okay-page/index.html

@@ -1,5 +0,0 @@
----
-layout: page
-title: "This Page Is Meh"
----
-

data/test/test.rb

@@ -1,162 +0,0 @@
-require './test_suite'
-
-@failures = []
-  
-`rm -rf test-site; mkdir test-site`
-
-FileUtils.cd('test-site') do |dir|
-  
-  # Create a blank site
-  #
-  test_cmd({
-    desc: 'Create a blank site',
-    cmd: [
-      'octopress new . --blank',
-      'echo "<div class=\'post\'>{{ page.title }}{{ content }}</div>" > _layouts/post.html',
-      'echo "<div class=\'page\'>{{ page.title }}{{ content }}</div>" > _layouts/page.html',
-      'echo "timezone: GMT" > _config.yml'
-    ],
-    expect: "New jekyll site installed in ."
-  })
-
-  # Init Octopress scaffolding
-  #
-  test_cmd({
-    desc: 'Init Octopress scaffolding',
-    cmd: 'octopress init .',
-    expect: "Octopress scaffold added to ."
-  })
-
-  # Add a new post
-  #
-  test_cmd({
-    desc: 'Add a new post',
-    cmd: 'octopress new post "Awesome stuff" --date "2014-03-12 05:10 -0000"',
-    expect: '_posts/2014-03-12-awesome-stuff.markdown',
-  })
-
-  # Add another new post with a slug
-  #
-  test_cmd({
-    desc: 'Add another new post with a slug',
-    cmd: 'octopress new post "Super Awesome stuff" --slug awesome --date "2014-03-13 15:20 -0000"',
-    expect: '_posts/2014-03-13-awesome.markdown',
-  })
-
-  # Add a new post in a subdirectory
-  #
-  test_cmd({
-    desc: 'Add a new post',
-    cmd: 'octopress new post "Some stuff" --dir stuff --date "2014-02-11 05:10 -0000"',
-    expect: '_posts/stuff/2014-02-11-some-stuff.markdown',
-  })
-
-  # Add a draft
-  #
-  test_cmd({
-    desc: 'Add a draft',
-    cmd: 'octopress new draft "Stupid idea" --date "2014-03-10 15:20 -0000"',
-    expect: '_drafts/stupid-idea.markdown',
-  })
-
-  # Add another draft
-  #
-  test_cmd({
-    desc: 'Add another draft',
-    cmd: 'octopress new draft "Another idea" --date "2014-02-10 15:20 -0000"',
-    expect: '_drafts/another-idea.markdown',
-  })
-
-  # Add a draft with a slug
-  #
-  test_cmd({
-    desc: 'Add a draft with a slug',
-    cmd: 'octopress new draft "Some great idea for a post" --slug idea',
-    expect: '_drafts/idea.markdown',
-  })
-
-  # Add yet another draft
-  #
-  test_cmd({
-    desc: 'Add yet another draft',
-    cmd: 'octopress new draft "yet another idea" --date "2014-02-13 15:20 -0000"',
-    expect: '_drafts/yet-another-idea.markdown',
-  })
-
-  # Publish a draft
-  #
-  test_cmd({
-    desc: 'Publish a draft',
-    cmd: 'octopress publish _drafts/another-idea.markdown',
-    expect: '_posts/2014-02-10-another-idea.markdown',
-  })
-
-  # Publish a draft with a date
-  #
-  test_cmd({
-    desc: 'Publish a draft with a date',
-    cmd: 'octopress publish _drafts/idea.markdown --date "2014-03-11 20:20 -0000"',
-    expect: '_posts/2014-03-11-idea.markdown',
-  })
-
-  # Publish a draft in a dir
-  #
-  test_cmd({
-    desc: 'Publish a draft in a dir',
-    cmd: 'octopress publish _drafts/yet-another-idea.markdown --dir ideas',
-    expect: '_posts/ideas/2014-02-13-yet-another-idea.markdown',
-  })
-
-  # Add a page
-  #
-  test_cmd({
-    desc: 'Add a page',
-    cmd: 'octopress new page awesome-page --title "Awesome Page"',
-    expect: 'awesome-page.html',
-  })
-
-  # Add a page with an extension
-  #
-  test_cmd({
-    desc: 'Add a page with an extension',
-    cmd: 'octopress new page cool-page.html --title "some cool page"',
-    expect: 'cool-page.html',
-  })
-
-  # Add a page with a directory
-  #
-  test_cmd({
-    desc: 'Add a page with a directory',
-    cmd: 'octopress new page okay-page/ --title "This page is meh"',
-    expect: 'okay-page/index.html',
-  })
-
-  # Add a page with a date
-  #
-  test_cmd({
-    desc: 'Add a page with a custom template',
-    cmd: [
-      'echo "---\nlayout: {{ layout }}\ntitle: {{ title }}\nkittens: true\n---" > _templates/other_page',
-      'octopress new page custom-template-page.html --title "some date page" --template other_page'
-    ],
-    expect: 'custom-template-page.html',
-  })
-
-  # Add a page with a date
-  #
-  test_cmd({
-    desc: 'Add a page with a date',
-    cmd: [
-      'echo "---\nlayout: {{ layout }}\ntitle: {{ title }}\ndate: {{ date }}\n---" > _templates/date_page',
-      'octopress new page date-page.html --title "some date page" --date "2011-11-11 11:11 -0000" --template date_page'
-    ],
-    expect: 'date-page.html',
-  })
-end
-
-# Build the site
-#
-system "cd test-site; octopress build; cd -"
-test_dirs('Compare directories', 'expected', 'test-site')
-
-print_results