octopress 3.0.0.rc.35 → 3.0.0.rc.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26f37431f58cb3e1768fdb2ba4a2b6fea442fb4c
-  data.tar.gz: 3ae5d6d3f6d07f80fb8ccc494cded105e390315f
+  metadata.gz: b08d794360068ba72052efefd497779499f23a45
+  data.tar.gz: e6797ddb7a7a2003665b2fd75c419d46ba5889f7
 SHA512:
-  metadata.gz: f8703ccaf1fae3dfaaf71d40dd1f9b4990478be16b8b61410875a0b1ef49f0a02462bc7d7d8a72f4d444c59489a3b061a9f08cb82df06ca2db3a0f69e9350d53
-  data.tar.gz: 9940d5b97ab7660273120f8b1ccdfe760446b3cbc8271448d680a00f5cce3986701ad61fea325cb8ebed1e5b7db248d1e4794e6c43e96e4aae56687142570e11
+  metadata.gz: d02e7f4f06301d06870ced806bd42b367abd157abd2c04dbcf7048c43962a064f9377daf47b3c1995d2cbca45e06f483fde98de93541310141ca63e9aeab754f
+  data.tar.gz: 572c1d688ff5d73962ddfb239b437e13c72b476abf5651755f637b887f04eb3422b36b9dfb540738356be2c7e9a4cd61c5a0f098fbbd00a1d8d6b3a642f1d802

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 3.0.0 RC36 (2015-04-29)
+
+- Fix: Layout is not automatically added to post/page templates
+- Minor: Improved output for publishing drafts. 
+
 ### 3.0.0 RC35 (2015-03-21)
 
 - Raised minimum Jekyll version to 2.5.

data/lib/octopress/commands/helpers.rb

@@ -4,7 +4,7 @@ module Octopress
 
     def add_page_options(c)
       c.option 'date',     '-d', '--date DATE', "Use 'now' or a String that is parseable by Time#parse."
-      c.option 'template', '-tm', '--template PATH', "New #{c.name.to_s} from a template."
+      c.option 'template', '-T','--template PATH', "New #{c.name.to_s} from a template."
       c.option 'force',    '-f', '--force', 'Overwrite file if it already exists'
     end
 

data/lib/octopress/commands/new.rb

@@ -26,7 +26,7 @@ module Octopress
 
           c.action do |args, options|
             if args.empty?
-              c.logger.error "Plese choose a path"
+              c.logger.error "Plese pass a path for your new page."
               puts c
             else
               options['path'] = args.first
@@ -45,7 +45,7 @@ module Octopress
 
           c.action do |args, options|
             if args.empty?
-              c.logger.error "Please choose a title."
+              c.logger.error "Please pass a title for your new post."
               puts c
             else
               options['title'] = args.join(" ")
@@ -63,7 +63,7 @@ module Octopress
 
           c.action do |args, options|
             if args.empty?
-              c.logger.error "Plese choose a title"
+              c.logger.error "Plese pass a title for your new draft."
               puts c
             else
               options['title'] = args.join(" ")

data/lib/octopress/draft.rb

@@ -3,6 +3,7 @@ module Octopress
 
     def set_default_options
       @options['type']      ||= 'draft' 
+      @options['write_message'] ||= 'New draft:'
 
       if @options['title'].nil? && @options[:type] == 'post'
         raise "Draft not created: Please choose a title.\n".red + "  For example: " + "octopress new draft 'The merits of napping'".yellow
@@ -38,7 +39,8 @@ module Octopress
         'slug'    => title_slug,
         'content' => read_post_content,
         'dir'     => @options['dir'],
-        'type'    => 'post from draft'
+        'type'    => "post from draft",
+        'write_message' => "Published: #{relative_path(path)} →"
       }
 
       # Create a new post file

data/lib/octopress/page.rb

@@ -17,7 +17,7 @@ module Octopress
       @options = options
       set_default_options
 
-      @front_matter = %w{layout title date}
+      @front_matter = %w{title date}
 
       # Ensure title
       #
@@ -25,7 +25,7 @@ module Octopress
 
       # Ensure a quoted title to avoid YAML parsing issues.
       #
-      @options['title'] = "\"#{@options['title']}\""
+      @options['title'] = "#{@options['title']}"
 
       @content = options['content'] || content
     end
@@ -36,7 +36,7 @@ module Octopress
 
     def write
       if File.exist?(path) && !@options['force']
-        raise "File #{relative_path(path)} already exists. Use --force to overwrite."
+        abort "File #{relative_path(path)} already exists. Use --force to overwrite."
       end
 
       dir = File.dirname(path)
@@ -44,7 +44,7 @@ module Octopress
       FileUtils.mkdir_p(dir)
       File.open(path, 'w') { |f| f.write(@content) }
       if STDOUT.tty?
-        puts "New #{@options['type']}: #{relative_path(path)}"
+        puts "#{@options['write_message']} #{relative_path(path)}"
         
         # If path begins with an underscore the page is probably being added to a collection
         #
@@ -97,6 +97,7 @@ module Octopress
 
     def set_default_options
       @options['type']      ||= 'page'
+      @options['write_message'] ||= 'New page:'
       @options['layout']      = @config['page_layout']
       if @options['date']
         @options['date']        = convert_date @options['date']

data/lib/octopress/post.rb

@@ -3,6 +3,7 @@ module Octopress
 
     def set_default_options
       @options['type']      ||= 'post'
+      @options['write_message'] ||= 'New post:'
 
       if @options['title'].nil? && @options[:type] == 'post'
         raise "Post not created: Please choose a title.\n".red + "  For example: " + "octopress new post \"Friendship with a tomato?\"".yellow
@@ -36,8 +37,10 @@ module Octopress
         'slug'    => title_slug,
         'content' => read_post_content,
         'dir'     => @options['dir'],
-        'type'    => 'draft from post'
+        'type'    => "draft from post",
+        'write_message' => "Unpublished: #{relative_path(path)} →"
       }
+
       Draft.new(site, post_options).write     
       
       # Remove the old post file

data/lib/octopress/version.rb

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

data/scaffold/_templates/draft

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

data/scaffold/_templates/page

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

data/scaffold/_templates/post

@@ -1,5 +1,5 @@
 ---
 layout: {{ layout }}
-title: {{ title }}
+title: "{{ title }}"
 date: {{ date }}
 ---

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.35
+  version: 3.0.0.rc.36
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -249,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Octopress is an obsessively designed framework for Jekyll blogging. It’s