octopress 3.0.0.alpha8 → 3.0.0.rc.1

data/test/expected/_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/_posts/2014-03-11-idea.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "Some Great Idea for a Post"
+date: 2014-03-11T20:20:00Z
+---
+

data/test/expected/_posts/2014-03-12-awesome-stuff.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "Awesome Stuff"
+date: 2014-03-12T05:10:00Z
+---
+

data/test/expected/_posts/2014-03-13-awesome.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "Super Awesome Stuff"
+date: 2014-03-13T15:20:00Z
+---
+

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

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

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

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

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

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

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

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

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

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

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

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

data/test/expected/_templates/page

@@ -0,0 +1,6 @@
+---
+layout: {{ layout }}
+title: {{ title }}
+date: {{ date }}
+---
+

data/test/expected/_templates/post

@@ -0,0 +1,6 @@
+---
+layout: {{ layout }}
+title: {{ title }}
+date: {{ date }}
+---
+

data/test/expected/awesome-page.html

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

data/test/expected/cool-page.html

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

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

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

data/test/test.rb

@@ -0,0 +1,100 @@
+require './test_suite'
+
+@failures = []
+  
+`rm -rf test-site; mkdir test-site`
+
+FileUtils.cd('test-site') do |dir|
+  
+  # Create a blank site
+  #
+  test({
+    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'
+    ],
+    expect: "New jekyll site installed in ."
+  })
+
+  # Init Octopress scaffolding
+  #
+  test({
+    desc: 'Init Octopress scaffolding',
+    cmd: 'octopress init .',
+    expect: "Octopress scaffold added to ."
+  })
+
+  # Add a new post
+  #
+  test({
+    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({
+    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 draft
+  #
+  test({
+    desc: 'Add a draft',
+    cmd: 'octopress new draft "Stupid idea" --date "2014-03-10 15:20 -0000"',
+    expect: '_drafts/stupid-idea.markdown',
+  })
+
+  # Add a draft with a slug
+  #
+  test({
+    desc: 'Add a draft with a slug',
+    cmd: 'octopress new draft "Some great idea for a post" --slug idea',
+    expect: '_drafts/idea.markdown',
+  })
+
+  # Publish a draft with a date
+  #
+  test({
+    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',
+  })
+
+  # Add a page
+  #
+  test({
+    desc: 'Add a page',
+    cmd: 'octopress new page awesome-page --title "Awesome Page"',
+    expect: 'awesome-page.html',
+  })
+
+  # Add a page with an extension
+  #
+  test({
+    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({
+    desc: 'Add a page with a directory',
+    cmd: 'octopress new page okay-page/ --title "This page is meh"',
+    expect: 'okay-page/index.html',
+  })
+
+end
+
+# Build the site
+#
+system "cd test-site; octopress build; cd -"
+compare_directories('test-site', 'expected')
+
+print_results

data/test/test_suite.rb

@@ -0,0 +1,107 @@
+require 'colorator'
+require 'find'
+
+# This is a makeshift integration test-suite.
+# It is unapologetically pragmatic.
+
+# Find all files in a given directory
+#
+def dir_files(dir)
+  Find.find(dir).to_a.reject!{|f| File.directory?(f) }
+end
+
+# Recursively diff two directories
+#
+# This will walk through dir1 and diff matching paths in dir2
+#
+def compare_directories(dir1, dir2)
+  dir_files(dir1).each do |file|
+    file2 = file.sub(dir1, dir2)
+    if File.exist?(file2)
+      diff = diff_file(file, file2)
+      if diff =~ /(<.+?\n)?(---\n)?(>.+)/
+        @failures << {
+          desc: "Diff of file: #{file} in #{dir2}",
+          expected: $1,
+          result: $3
+        }
+        pout 'F'.red
+      else
+        pout '.'.green
+      end
+    else
+      @failures << {
+        desc: "Diff of file: #{file} in #{dir2}",
+        message: "No such file or directory: #{file2}"
+      }
+      pout 'F'.red
+    end
+  end
+end
+
+# Diff two files
+#
+def diff_file(file1, file2)
+  diff = `diff #{file1} #{file2}`
+  if diff.size > 0
+    diff
+  else
+    false
+  end
+end
+
+# Run test cases
+#
+# Input: options hash, format:
+#   {
+#     desc:   description of task
+#     cmd:    system command to be run, (String or Array)
+#     expect: expected output from command
+#   } 
+#
+def test(options)
+  if cmd = options[:cmd]
+    cmd = [cmd] unless cmd.is_a? Array
+    output = `#{cmd.join('; ')}`.gsub(/#{Dir.pwd}\/*/,'').strip
+    if options[:expect].strip == output
+      pout '.'.green
+    else
+      pout 'F'.red
+      @failures << {
+        desc: options[:desc],
+        expected: options[:expect],
+        result: output,
+      }
+    end
+  end
+end
+
+
+# Print a single character without a newline
+#
+def pout(str)
+  print str
+  $stdout.flush
+end
+
+# Ouptut nicely formatted failure messages
+#
+def print_results
+  if !@failures.empty?
+    @failures.each do |test|
+      puts "\nFailed: #{test[:desc]}"
+      if test[:message]
+        puts test[:message].yellow
+      else
+        puts test[:expected].green
+        puts test[:result].red
+      end
+     # print a newline for easier reading
+      puts ""
+    end
+    abort
+  else
+    puts "All passed!".green
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha8
+  version: 3.0.0.rc.1
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -92,30 +92,55 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/octopress
-- docs/_octopress.yml
-- docs/_site/index.html
-- docs/index.html
 - lib/octopress.rb
 - lib/octopress/command.rb
 - lib/octopress/commands/build.rb
-- lib/octopress/commands/docs.rb
 - lib/octopress/commands/doctor.rb
 - lib/octopress/commands/helpers.rb
+- lib/octopress/commands/init.rb
 - lib/octopress/commands/new.rb
 - lib/octopress/commands/publish.rb
 - lib/octopress/commands/serve.rb
 - lib/octopress/configuration.rb
-- lib/octopress/core_ext.rb
 - lib/octopress/draft.rb
+- lib/octopress/ext/hash.rb
+- lib/octopress/ext/titlecase.rb
 - lib/octopress/page.rb
 - lib/octopress/post.rb
+- lib/octopress/scaffold.rb
 - lib/octopress/version.rb
 - octopress.gemspec
+- scaffold/_octopress.yml
+- scaffold/_templates/page
+- scaffold/_templates/post
+- test/expected/_drafts/stupid-idea.markdown
+- test/expected/_layouts/page.html
+- test/expected/_layouts/post.html
+- test/expected/_octopress.yml
+- 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/_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/index.html
+- test/expected/_site/okay-page/index.html
+- test/expected/_templates/page
+- test/expected/_templates/post
+- test/expected/awesome-page.html
+- test/expected/cool-page.html
+- test/expected/index.html
+- test/expected/okay-page/index.html
+- test/test.rb
+- test/test_suite.rb
 homepage: http://octopress.org
 licenses:
 - MIT
@@ -141,4 +166,26 @@ signing_key:
 specification_version: 4
 summary: Octopress is an obsessively designed framework for Jekyll blogging. It’s
   easy to configure and easy to deploy. Sweet huh?
-test_files: []
+test_files:
+- test/expected/_drafts/stupid-idea.markdown
+- test/expected/_layouts/page.html
+- test/expected/_layouts/post.html
+- test/expected/_octopress.yml
+- 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/_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/index.html
+- test/expected/_site/okay-page/index.html
+- test/expected/_templates/page
+- test/expected/_templates/post
+- test/expected/awesome-page.html
+- test/expected/cool-page.html
+- test/expected/index.html
+- test/expected/okay-page/index.html
+- test/test.rb
+- test/test_suite.rb

data/docs/_octopress.yml

@@ -1 +0,0 @@
-docs_mode: true

data/docs/index.html

@@ -1 +0,0 @@
-OMG DOCS

data/lib/octopress/commands/docs.rb

@@ -1,74 +0,0 @@
-require 'jekyll'
-require 'yaml'
-require File.expand_path('helpers', File.dirname(__FILE__))
-
-module Octopress
-  class Docs < Command
-    def self.init_with_program(p)
-      p.command(:docs) do |c|
-        c.syntax 'octopress docs'
-        c.description "Launch local server with docs for Octopress v#{Octopress::VERSION} and Octopress Ink plugins."
-
-        c.option 'port', '-P', '--port [PORT]', 'Port to listen on'
-        c.option 'host', '-H', '--host [HOST]', 'Host to bind to'
-        if ENV['OCTODEV']
-          c.option 'watch', '--watch', 'Watch docs site for changes and rebuild. (For docs development)'
-        end
-        c.option 'jekyll', '--jekyll', "Launch local server with docs for Jekyll v#{Jekyll::VERSION}"
-
-        c.action do |args, options|
-          serve_docs(options)
-        end
-      end
-    end
-
-    def self.serve_docs(options)
-      if options['jekyll']
-        options = init_jekyll_docs(options)
-      else
-        options = init_octopress_docs(options)
-      end
-      options["serving"] = true
-      options = CommandHelpers.normalize_options(options)
-      options = ::Jekyll.configuration(options.to_symbol_keys)
-      ::Jekyll::Commands::Build.process(options)
-      ::Jekyll::Commands::Serve.process(options)
-    end
-
-    def self.init_octopress_docs(options)
-      Octopress.config({'octopress-config'=>File.join(site_dir, '_octopress.yml')})
-      require_gems
-      options['source'] = site_dir
-      options['destination'] = File.join(site_dir, '_site')
-      options
-    end
-
-    def self.init_jekyll_docs(options)
-      options.delete('jekyll')
-
-      # Find local Jekyll gem path
-      #
-      spec = Gem::Specification.find_by_name("jekyll")
-      gem_path = spec.gem_dir
-
-      options['source'] = "#{gem_path}/site",
-      options['destination'] = "#{gem_path}/site/_site"
-      options
-    end
-
-    def self.site_dir
-      File.expand_path('docs', File.join(File.dirname(__FILE__), '../../../', ))
-    end
-
-    def self.require_gems
-      file = File.join(Dir.pwd, '_config.yml')
-      if File.exist? file
-        config = YAML.safe_load(File.open(file))
-        gems = config['gems']
-        if gems && gems.is_a?(Array)
-          gems.each {|g| require g }
-        end
-      end
-    end
-  end
-end