octopress 3.0.0.rc.27 → 3.0.0.rc.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c49a09c13d45bf3be7b30759d6284f1de523e94c
-  data.tar.gz: 694d1f23b2ae90f5ea05ded02f696c6ef099e8c5
+  metadata.gz: 19962f7013c2826d4225761b535f04c51c304ce7
+  data.tar.gz: d4291418217bf31b93b8a5b2b344b5d21ff7e42f
 SHA512:
-  metadata.gz: ecbea7b7e07250542ea6de9440307bb5e0ee55a5109212379126425914eb621e3837841ac2200d6ce5a68b146ff61eea566d7dfc397cf848d8a2212bebec7037
-  data.tar.gz: 6cfa88e9943682bcd9df10c734432a1b87086b5f7f5127ff7d161c81a47e4ef8655ef9bbb4757afac356dd1c1ff91407ae35d6c65f7cfe279e4e9a9518c666ca
+  metadata.gz: 361196b074235495103e8f0422f4c73db8b132bf8a2242d9fa1774c69d589637ed3bdf79fa0baa3192242346ddf9a5336f31b617e7f67e00cb3162eb53891845
+  data.tar.gz: 2fbdc312f1b0d38462f736b1954e1b92ca1b0c22a1c394b3a3212ffad929f57e318597901d5a93dd9edfe1f6f8ea6dc76e629808721683d748e70cd32c450a1e

data/CHANGELOG.md

@@ -1,17 +1,22 @@
 # Octopress Changelog
 
-### 3.0.0 RC27 (2015-01-02)
+### 3.0.0 RC27 (2015-01-15)
+
+- Fix: `--template` option accepts a path, allowing shell auto-completion.
+- Added short option flags for most commands.
+
+### 3.0.0 RC27 (2015-01-15)
 
 - Minor fix to paths.
 - Improved scaffold command output.
 - Fixed drafts template config.
 - Added config documentation for template file configs.
 
-### 3.0.0 RC26 (2015-01-02)
+### 3.0.0 RC26 (2015-01-11)
 
 - Added `unpublish` command for converting posts into drafts.
 
-### 3.0.0 RC25 (2015-01-02)
+### 3.0.0 RC25 (2015-01-05)
 
 - Fixed missing scaffolding.
 

data/README.md

@@ -31,7 +31,7 @@ new page <PATH>     # Add a new page to your site
 new draft <TITLE>   # Add a new draft post to your site
 publish <POST>      # Publish a draft from _drafts to _posts
 unpublish <POST>    # Search for a post and convert it into a draft
-isolate [POST]      # Stash all posts but the one you're workign on for a faster build
+isolate [POST]      # Stash all posts but the one you're working on for a faster build
 integrate           # Restores all posts, doing the opposite of the isolate command
 ```
 
@@ -125,7 +125,7 @@ $ octopress new draft "My Title"
 | `--template PATH`  | Use a template from <path>                |
 | `--date DATE`      | The date for the draft. Should be parseable by [Time#parse](http://ruby-doc.org/stdlib-2.1.0/libdoc/time/rdoc/Time.html#method-i-parse) (defaults to Time.now) |
 | `--slug SLUG`      | The slug for the new post.                |
-| `--force`          | Overwrite exsiting file.                  |
+| `--force`          | Overwrite existing file.                  |
 
 ### Publish a draft
 
@@ -187,13 +187,25 @@ a handful of local variables you can use when working with templates.
 | `day`              | The date's day, DD                        |
 
 By default Octopress has templates for pages, posts and drafts. You can change them or create new ones for different types of content.
-To create linkposts template, add a file at `_templates/linkpost` and use it with a new post like this:
+To create linkposts template, add a file at `_templates/linkpost`, such as:
+
+```
+---
+title: {{ title }}
+external-url: {{ url }}
+---
+```
+
+Then you can use it with a new post like this:
 
 ```sh
-$ octopress new post --template _templates/linkpost
+$ octopress new post "Some title" --template linkpost
+$ octopress new post "Some title" -tm _templates/linkpost
 ```
 
-File name extensions are unnecessary since they're just plain text anyway.
+In the second example, I'm passing the full template file path. This way I can use my shell's tab to auto-complete feature.
+
+When creating templates, file name extensions are unnecessary since the files are just plain text anyway.
 
 ## Isolate
 

data/lib/octopress/commands/helpers.rb

@@ -3,13 +3,13 @@ module Octopress
     extend self
 
     def 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 'template', '-tm', '--template PATH', "New #{c.name.to_s} from a template."
+      c.option 'date',     '-d', '--date DATE', "Use 'now' or a String that is parseable by Time#parse."
+      c.option 'force',    '-f', '--force', 'Overwrite file if it already exists'
     end
 
     def add_common_options(c)
-      c.option 'config',    '--config <CONFIG_FILE>[,CONFIG_FILE2,...]', Array, 'Custom Jekyll configuration file'
+      c.option 'config',    '-c', '--config <CONFIG_FILE>[,CONFIG_FILE2,...]', Array, 'Custom Jekyll configuration file'
     end
 
     def select_posts(search, action)

data/lib/octopress/commands/init.rb

@@ -4,7 +4,7 @@ module Octopress
       p.command(:init) do |c|
         c.syntax 'init <PATH> [options]'
         c.description "Add Octopress's default scaffolding to your site."
-        c.option 'force', '--force', 'Overwrite files if they already exist.'
+        c.option 'force', '-f', '--force', 'Overwrite files if they already exist.'
 
         c.action do |args, options|
           Scaffold.new(args, options).write

data/lib/octopress/commands/isolate.rb

@@ -4,7 +4,7 @@ module Octopress
       def self.init_with_program(p)
         p.command(:isolate) do |c|
           c.syntax 'isolate <POST> [options]'
-          c.description "Move all posts not matching selected psot to _posts/_exile. Command accepts path to post or search string."
+          c.description "Move all posts not matching selected post to _posts/_exile. Command accepts path to post or search string."
           CommandHelpers.add_common_options c
 
           c.action do |args, options|
@@ -21,7 +21,7 @@ module Octopress
         p.command(:integrate) do |c|
           c.syntax 'integrate'
           c.description "Reintegrate posts from _posts/_exile."
-          c.option 'config', '--config <CONFIG_FILE>[,CONFIG_FILE2,...]', Array, 'Custom Jekyll configuration file'
+          CommandHelpers.add_common_options c
 
           c.action do |args, options|
             integrate_posts(options)

data/lib/octopress/commands/new.rb

@@ -4,12 +4,13 @@ module Octopress
       p.command(:new) do |c|
         c.syntax 'new <PATH>'
         c.description 'Creates a new site with Jekyll and Octopress scaffolding at the specified path.'
-        c.option 'force', '--force', 'Force creation even if path already exists.'
-        c.option 'blank', '--blank', 'Creates scaffolding but with empty files.'
+        c.option 'force', '-f', '--force', 'Force creation even if path already exists.'
+        c.option 'blank', '-b', '--blank', 'Creates scaffolding but with empty files.'
         
         c.action do |args, options|
           if args.empty?
             c.logger.error "You must specify a path."
+            puts c
           else
             Jekyll::Commands::New.process(args, options)
             Octopress::Scaffold.new(args, options).write
@@ -19,13 +20,18 @@ module Octopress
         c.command(:page) do |c|
           c.syntax 'page <PATH> [options]'
           c.description 'Add a new page to your Jekyll site.'
-          c.option 'title', '--title TITLE', 'String to be added as the title in the YAML front-matter.'
+          c.option 'title', '-t', '--title TITLE', 'String to be added as the title in the YAML front-matter.'
           CommandHelpers.add_page_options c
           CommandHelpers.add_common_options c
 
           c.action do |args, options|
-            options['path'] = args.first
-            Page.new(Octopress.site(options), options).write
+            if args.empty?
+              c.logger.error "Plese choose a path"
+              puts c
+            else
+              options['path'] = args.first
+              Page.new(Octopress.site(options), options).write
+            end
           end
         end
 
@@ -33,13 +39,18 @@ module Octopress
           c.syntax 'post <TITLE> [options]'
           c.description 'Add a new post to your Jekyll site.'
           CommandHelpers.add_page_options c
-          c.option 'slug', '--slug SLUG', 'Use this slug in filename instead of sluggified post title.'
-          c.option 'dir', '--dir DIR', 'Create post at _posts/DIR/.'
+          c.option 'slug', '-s', '--slug SLUG', 'Use this slug in filename instead of sluggified post title.'
+          c.option 'dir', '-d', '--dir DIR', 'Create post at _posts/DIR/.'
           CommandHelpers.add_common_options c
 
           c.action do |args, options|
-            options['title'] = args.first
-            Post.new(Octopress.site(options), options).write
+            if args.empty?
+              c.logger.error "Please choose a title."
+              puts c
+            else
+              options['title'] = args.join(" ")
+              Post.new(Octopress.site(options), options).write
+            end
           end
         end
 
@@ -47,12 +58,17 @@ module Octopress
           c.syntax 'draft <TITLE> [options]'
           c.description 'Add a new draft post to your Jekyll site.'
           CommandHelpers.add_page_options c
-          c.option 'slug', '--slug SLUG', 'Use this slug in filename instead of sluggified post title.'
+          c.option 'slug', '-s', '--slug SLUG', 'Use this slug in filename instead of sluggified post title.'
           CommandHelpers.add_common_options c
 
           c.action do |args, options|
-            options['title'] = args.first
-            Draft.new(Octopress.site(options), options).write
+            if args.empty?
+              c.logger.error "Plese choose a title"
+              puts c
+            else
+              options['title'] = args.join(" ")
+              Draft.new(Octopress.site(options), options).write
+            end
           end
         end
       end

data/lib/octopress/page.rb

@@ -128,7 +128,7 @@ module Octopress
       file = @options['template'] || default_template
 
       if file
-        file.sub(/^_templates\//, '')
+        file.sub!(/^_templates\//, '')
         file = File.join(site.source, '_templates', file) if file
         if File.exist? file
           parse_template File.open(file).read

data/lib/octopress/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.27
+  version: 3.0.0.rc.28
 platform: ruby
 authors:
 - Brandon Mathis