octopress 3.0.0.rc.17 → 3.0.0.rc.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f479839dc1695278cc9852771af311ab70f6b1e2
-  data.tar.gz: 061cf5d2b7860efdd16f9eb5370864afe67d9356
+  metadata.gz: e06beb1aacea443d9b080887b53f8b9b7a705a47
+  data.tar.gz: 236b3fbb3766813875bf93391bcfd62603a88430
 SHA512:
-  metadata.gz: 6164d99a472f778e2fdcdcca93b8fb519bdc70cc340b9c65e09a73d36b4b19bcc825d110660da6be6e50695a8514381c9a8431ded5dad55199159120a3292194
-  data.tar.gz: 5f0460bec58ca35bd67aa0f9e259a5f22ea70613acc7645bca58336db66b9f38412283140077b4c04953735ace781892c01ed2e42c0e7325b8bd35eb5ab5d944
+  metadata.gz: b6f281eb30ffe7a95d4226474f5dc34d0ac36f7d06210a31f2303f083f78921c9b5402ca567d2bbb785e1f3ef6cc7251053cacda7741850f0e34d2d4c4a833a6
+  data.tar.gz: 73ca967e81a63cc7ae0eea83c8a916269be385f6d8d8f57750df4df18df46623164df3220b72dedbdfac65bb7c7e6fb45d4a942c4d033007702bd6a5be4ed444

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Octopress Changelog
 
+### 3.0.0 RC18 - 2014-12-08
+
+- Loads site plugins before creating new pages, posts and drafts, allowing liquid tag processing in _template files.
+
 ### 3.0.0 RC17 - 2014-12-08
 
 - Added a configuration tip when adding a new collection page.

data/lib/octopress/commands/helpers.rb

@@ -1,32 +1,22 @@
 module Octopress
   module CommandHelpers
-    def self.add_build_options(c)
-      c.option 'config',      '--config <CONFIG_FILE>[,CONFIG_FILE2,...]', Array, 'Custom Jekyll configuration file'
-      c.option 'octopress-config', '--octopress-config <CONFIG_FILE>', 'Custom Octopress configuration file'
-      c.option 'future',      '--future',    'Publishes posts with a future date'
-      c.option 'limit_posts', '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
-      c.option 'watch',       '--watch',     'Watch for changes and rebuild'
-      c.option 'list',        '--lsi',       'Use LSI for improved related posts'
-      c.option 'drafts','-D', '--drafts',    'Render posts in the _drafts folder'
-      c.option 'verbose',     '--verbose',   'Print verbose output.'
-    end
-
-    def self.normalize_options(options)
-      if drafts_state = options.delete('drafts')
-        options['show_drafts'] = drafts_state
-      end
-      options
-    end
-
     def self.add_page_options(c)
       c.option 'template', '--template PATH', "New #{c.name.to_s} from a template."
-      c.option 'date', '--date DATE', "Use 'now' or a String that is parseable by Time#parse."
-      c.option 'force', '--force', 'Overwrite file if it already exists'
+      c.option 'date',     '--date DATE', "Use 'now' or a String that is parseable by Time#parse."
+      c.option 'force',    '--force', 'Overwrite file if it already exists'
     end
 
     def self.add_common_options(c)
-      c.option 'config', '--config <CONFIG_FILE>[,CONFIG_FILE2,...]', Array, 'Custom Jekyll configuration file'
+      c.option 'config',           '--config <CONFIG_FILE>[,CONFIG_FILE2,...]', Array, 'Custom Jekyll configuration file'
       c.option 'octopress-config', '--octopress-config <CONFIG_FILE>', 'Custom Octopress configuration file'
     end
+
+    def self.site(options)
+      options = {'config' => options['config']}
+      Jekyll.logger.log_level = :error
+      site = Jekyll::Site.new(Jekyll.configuration(options))
+      Jekyll.logger.log_level = :info
+      site
+    end
   end
 end

data/lib/octopress/commands/new.rb

@@ -25,7 +25,7 @@ module Octopress
 
           c.action do |args, options|
             options['path'] = args.first
-            Page.new(options).write
+            Page.new(CommandHelpers.site(options), options).write
           end
         end
 
@@ -39,7 +39,7 @@ module Octopress
 
           c.action do |args, options|
             options['title'] = args.first
-            Post.new(options).write
+            Post.new(CommandHelpers.site(options), options).write
           end
         end
 
@@ -52,7 +52,7 @@ module Octopress
 
           c.action do |args, options|
             options['title'] = args.first
-            Draft.new(options).write
+            Draft.new(CommandHelpers.site(options), options).write
           end
         end
       end

data/lib/octopress/commands/publish.rb

@@ -13,7 +13,7 @@ module Octopress
           abort "You must specify a path." if args.empty?
           options['path'] = args.first
           options['type'] = 'post from draft'
-          Draft.new(options).publish
+          Draft.new(CommandHelpers.site(options), options).publish
         end
       end
     end

data/lib/octopress/draft.rb

@@ -15,7 +15,7 @@ module Octopress
 
     def path
       name = "#{title_slug}.#{extension}"
-      File.join(source, '_drafts', name)
+      File.join(site.source, '_drafts', name)
     end
 
     # -----
@@ -41,7 +41,7 @@ module Octopress
 
       # Create a new post file
       #
-      Post.new(post_options).write
+      Post.new(site, post_options).write
       
       # Remove the old draft file
       #

data/lib/octopress/page.rb

@@ -1,8 +1,20 @@
 module Octopress
   class Page
 
-    def initialize(options)
-      @config = Octopress.config(options)
+    DEFAULT_OPTIONS = {
+      'post_ext' => 'markdown',
+      'page_ext' => 'html',
+      'post_layout' => 'post',
+      'page_layout' => 'page',
+      'titlecase' => true
+    }
+
+    attr_accessor :site
+
+    def initialize(site, options)
+      @site = site
+      @site.plugin_manager.conscientious_require
+      @config = DEFAULT_OPTIONS.merge(site.config)
       @options = options
       set_default_options
 
@@ -31,7 +43,9 @@ module Octopress
         
         # If path begins with an underscore the page is probably being added to a collection
         #
-        print_collection_tip($1) if dir =~ /#{source}\/_([^\/]+)/
+        if @options['type'] == 'page'
+          print_collection_tip($1) if dir =~ /#{site.source}\/_([^\/]+)/
+        end
       else
         puts path
       end
@@ -42,7 +56,7 @@ module Octopress
     def print_collection_tip(collection)
       # If Jekyll is not already configurated for this collection, print instructions
       #
-      if !jekyll_config['collections'] || !jekyll_config['collections'][collection]
+      if !@config['collections'] || !@config['collections'][collection]
         msg = "\nTIP: To create a new '#{collection}' collection, add this to your Jekyll configuration\n"
         msg += "----------------\n"
         msg += "collections:\n  #{collection}:\n    output: true"
@@ -56,12 +70,8 @@ module Octopress
       path.sub(local, '')
     end
 
-    def jekyll_config
-      Configuration.jekyll_config(@options)
-    end
-
-    def source
-      jekyll_config['source']
+    def site
+      @site
     end
 
     def path
@@ -77,7 +87,7 @@ module Octopress
       #
       file += ".#{extension}" unless file =~ /\.\w+$/
 
-      @path = File.join(source, file)
+      @path = File.join(site.source, file)
     end
 
     def extension
@@ -118,7 +128,7 @@ module Octopress
 
       if file
         file.sub(/^_templates\//, '')
-        file = File.join(source, '_templates', file) if file
+        file = File.join(site.source, '_templates', file) if file
         if File.exist? file
           parse_template File.open(file).read
         elsif @options['template']
@@ -181,6 +191,5 @@ module Octopress
         front_matter %w{layout title}
       end
     end
-
   end
 end

data/lib/octopress/post.rb

@@ -12,7 +12,7 @@ module Octopress
 
     def path
       name = "#{date_slug}-#{title_slug}.#{extension}"
-      dir = File.join(source, '_posts', @options['dir'])
+      dir = File.join(site.source, '_posts', @options['dir'])
       FileUtils.mkdir_p dir
       File.join(dir, name)
     end

data/lib/octopress/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.17
+  version: 3.0.0.rc.18
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary