octopress 3.0.0.rc.16 → 3.0.0.rc.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c467f204f6a64e2cb3cc180b6d3b0047e6ef51db
-  data.tar.gz: 26566e933b1e7b3749c3f65469fbfe8b9dfc378b
+  metadata.gz: f479839dc1695278cc9852771af311ab70f6b1e2
+  data.tar.gz: 061cf5d2b7860efdd16f9eb5370864afe67d9356
 SHA512:
-  metadata.gz: 2172acbd11141bb8253035f8ad76baa6cdc57e37278c7c5dbc3c93a8199bc8b6333aabe0c49f03b4c7dabb03d1dd87d002625a0f0fb227a5e2d601d9bfc24347
-  data.tar.gz: ac045544e83a6a7137363f80f48d1a2c7ac6f98bb60704382768b3fcd557e938f64d7dca11d2a778f06874311ca4b0e235fe2632a05e615087b3203eb107f93c
+  metadata.gz: 6164d99a472f778e2fdcdcca93b8fb519bdc70cc340b9c65e09a73d36b4b19bcc825d110660da6be6e50695a8514381c9a8431ded5dad55199159120a3292194
+  data.tar.gz: 5f0460bec58ca35bd67aa0f9e259a5f22ea70613acc7645bca58336db66b9f38412283140077b4c04953735ace781892c01ed2e42c0e7325b8bd35eb5ab5d944

data/CHANGELOG.md

@@ -1,6 +1,8 @@
 # Octopress Changelog
 
-## Current released version
+### 3.0.0 RC17 - 2014-12-08
+
+- Added a configuration tip when adding a new collection page.
 
 ### 3.0.0 RC16 - 2014-11-24
 
@@ -12,8 +14,6 @@
 - Simplified configuration management.
 - Now requiring titlecase gem directly.
 
-## Past versions
-
 ### 3.0.0 RC13 - 2014-07-24
 
 - Templates are no longer required unless passed as an option.

data/assets/docs/index.md

@@ -64,7 +64,7 @@ title: "My Title"
 date: YYYY-MM-DDTHH:MM:SS-00:00
 ```
 
-"OK, great. What else can I do?" Great question! Check out these other options:
+#### Command options
 
 | Option               | Description                             |
 |:---------------------|:----------------------------------------|
@@ -76,12 +76,26 @@ date: YYYY-MM-DDTHH:MM:SS-00:00
 
 ### New Page
 
+Creating a new page is easy, you can use the default file name extension (.html), pass a specific extension, or end with a `/` to create
+an index.html document.
+
 ```
 $ octopress new page some-page           # ./some-page.html
+$ octopress new page about.md            # ./about.md
 $ octopress new page docs/               # ./docs/index.html
-$ octopress new page about.html          # ./about.html
 ```
 
+If you are working with collections, you might add a page like this:
+
+```
+$ octopress new page _legal/terms        # ./_legal/terms.html
+```
+
+After the page is created, Octopress will tell you how to configure this new collection.
+
+
+#### Command options
+
 | Option               | Description                             |
 |:---------------------|:----------------------------------------|
 | `--template PATH`    | Use a template from <path>              |

data/lib/octopress/page.rb

@@ -19,25 +19,49 @@ module Octopress
 
     def write
       if File.exist?(path) && !@options['force']
-        raise "File #{relative_path} already exists. Use --force to overwrite."
+        raise "File #{relative_path(path)} already exists. Use --force to overwrite."
       end
 
-      FileUtils.mkdir_p(File.dirname(path))
+      dir = File.dirname(path)
+
+      FileUtils.mkdir_p(dir)
       File.open(path, 'w') { |f| f.write(@content) }
       if STDOUT.tty?
-        puts "New #{@options['type']}: #{relative_path}"
+        puts "New #{@options['type']}: #{relative_path(path)}"
+        
+        # If path begins with an underscore the page is probably being added to a collection
+        #
+        print_collection_tip($1) if dir =~ /#{source}\/_([^\/]+)/
       else
         puts path
       end
     end
 
-    def relative_path
+    # Print instructions for setting up a new collection
+    #
+    def print_collection_tip(collection)
+      # If Jekyll is not already configurated for this collection, print instructions
+      #
+      if !jekyll_config['collections'] || !jekyll_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"
+        msg += "\n----------------"
+        puts msg
+      end
+    end
+
+    def relative_path(path)
       local = Dir.pwd + '/'
       path.sub(local, '')
     end
 
+    def jekyll_config
+      Configuration.jekyll_config(@options)
+    end
+
     def source
-      Configuration.jekyll_config(@options)['source']
+      jekyll_config['source']
     end
 
     def path

data/lib/octopress/version.rb

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

metadata

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