octopress 3.0.0.rc.37 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 765530d351f9c81fe03631504f60c0af7a2ad5f0
-  data.tar.gz: cb8561096e63d23f3aa4e82fe2db35a81396d2f0
+  metadata.gz: 3c62ba1c92d344cf55c6084df25e946159e9c6ae
+  data.tar.gz: 1b582b665d80923cab33a5a9f6ac4cb501e6c6a7
 SHA512:
-  metadata.gz: e40bacd54778ac775d94d3e85bf013bcd80432e11b6ee36a758c2c09c203c64b84e5e275d93e6c2b82a303f2006263edde4cd145f915fa7a57d83f692605c1d1
-  data.tar.gz: 2d45b2a9fdb6ce3cf0ff3bcb9369c1dbbdca0cf40e1584b0aca62e058c3edac18390b7c7f4651a895382169755fff3598b41627090082719f96c6afe774de117
+  metadata.gz: a5f1786d1425a81b559c62a1bd5267757507c3e78bed0824c2a6624bb861c46babbaec333e9b05aba8c4b68bedd8e97fefbb449d2c624aa9aef2f007b29755c0
+  data.tar.gz: 3b2fa3ac4521e9f54d8db500f64e6f3310988f5be084a2e8853363d62fb6f7b67da17130be92863685191390a256ae984f7b8846264bc79be300d7f0b1637948

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 3.0.0 (2015-05-02)
+- Minor: No more need to run bundle exec. Yay.
+- Minor: Improved octopress docs functionality.
+
 ### 3.0.0 RC37 (2015-04-29)
 
 - Fix: Added UTF-8 encoding to fix an issue with Ruby 1.9 support.

data/bin/octopress

@@ -5,13 +5,7 @@ $LOAD_PATH.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
 require 'mercenary'
 require 'octopress'
 
-if ENV['BUNDLE_BIN_PATH'] || ENV['BUNDLE_GEMFILE']
-  begin
-    require 'bundler'
-    Bundler.require(:octopress)
-  rescue
-  end
-end
+Octopress.require_gems
 
 Mercenary.program(:octopress) do |p|
   p.version Octopress::VERSION

data/lib/octopress.rb

@@ -99,6 +99,19 @@ module Octopress
       end
     end
   end
+
+  def self.require_gems
+    if !ENV["CLASH_NO_BUNDLER_REQUIRE"] && (File.file?("Gemfile") || File.file?("../Gemfile"))
+      require "bundler"
+      Bundler.setup # puts all groups on the load path
+      Bundler.require(:octopress)
+      true
+    else
+      false
+    end
+    rescue LoadError, Bundler::GemfileNotFound
+    false
+  end
 end
 
 Octopress::Docs.add({

data/lib/octopress/version.rb

@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.0.rc.37"
+  VERSION = "3.0.0"
 end

data/local/_includes/nav.html

@@ -1,7 +1,13 @@
 <header>
   <a href="/"><h1>Octopress Local Docs</h1></a>
   <p>Local documentation for your site's plugins.</p>
-  <nav class='main-nav' role='navigation'>
-    <a href="/">Home</a>
-  </nav>
+  {% assign doc_pages = page.docs %}
+  {% if doc_pages.size > 1 %}
+    <nav class='main-nav' role='navigation'>
+    {% for doc in doc_pages %}
+    <a href="{{ doc.url }}">{{ doc.title }}</a>
+    {% endfor %}
+    </nav>
+  {% endif %}
 </header>
+

data/local/_layouts/docs.html

@@ -5,11 +5,3 @@ layout: default
 
 {{ content }}
 
-{% assign doc_pages = page.docs %}
-{% if doc_pages.size > 1 %}
-<nav class='plugin-nav' role='navigation'>
-{% for doc in doc_pages %}
-<a href="{{ doc.url }}">{{ doc.title }}</a>
-{% endfor %}
-</nav>
-{% endif %}

data/local/_sass/_layout.scss

@@ -0,0 +1,31 @@
+* {
+  box-sizing: border-box;
+}
+
+html {
+  background: #eee;
+  height: 100%;
+}
+
+body {
+  padding: 0;
+  margin: 0;
+}
+
+.site {
+  padding: 20px 40px;
+  height: 100%;
+  max-width: 900px;
+  background: #fefefe;
+  margin: 0 auto;
+  box-shadow: rgba(#000, .2) 0 0 15px;
+  font-family: "Source Serif Pro", Georgia, Times, 'Times New Roman', serif;
+}
+
+header {
+  text-align: center;
+  margin-bottom: 1em;
+  padding-bottom: 1em;
+  border-bottom: 2px solid #eee;
+}
+

data/local/stylesheets/site.scss

@@ -1,3 +1,4 @@
 ---
 ---
+@import "layout";
 @import "solarized";

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.37
+  version: 3.0.0
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -209,6 +209,7 @@ files:
 - local/_layouts/docs.html
 - local/_layouts/docs_index.html
 - local/_plugins/docs.rb
+- local/_sass/_layout.scss
 - local/_sass/_solarized.scss
 - local/index.html
 - local/stylesheets/site.scss
@@ -244,9 +245,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.6