octopress 3.0.0.rc.1 → 3.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 787005c08bc0ed8ae3f2eefcf5b38ea90b372b20
-  data.tar.gz: 8824a64b418e2eb02a19bdef317ce9040a406628
+  metadata.gz: 8f74a67fb8e1f25191e18ff6f921352954a306a2
+  data.tar.gz: 89ec3dc9c8271c44dd0af7dff544191abc04a7d9
 SHA512:
-  metadata.gz: ccec315c07272d23b79a08a48309e92aa8781f7dbca95f15c7985ded4c3e6794e08ff2eab110d32978856442d817c6ea235de5f1bb1d67874f390540668f0724
-  data.tar.gz: 9fb4b0328393f5880217ff015ae256149afdf0a9f8d666929d43fbb86abde7940b1603ab26b59f5930c0fb6f1cf518ccc307713a9929d022508df051d83c4cfe
+  metadata.gz: e2569d763c4ea1b02acfdfcde7a7119c83ba55e00130b9c46f73b8ec439aa821ede08a50b2b8b6b6bb80f92fbbebc4b82c67c1ca361b49ccfef19faf4089231b
+  data.tar.gz: a87bf1eb80851ff26c73404f93b8c101eb35b3184cb9c858719b5946567c7823078b9855d7ebc5ab686294102dd5eaff22e6400f94b88a93520ac858d1fff37b

data/README.md

@@ -7,7 +7,7 @@ blogs. Pretty sweet, huh?
 
 Add this line to your application's Gemfile:
 
-    gem 'octopress'
+    gem 'octopress', '~> 3.0.0.rc.1'
 
 And then execute:
 
@@ -15,7 +15,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install octopress
+    $ gem install octopress --pre
 
 ## Basic Usage
 
@@ -100,6 +100,7 @@ date: YYYY-MM-DDTHH:MM:SS-00:00
 | `--template PATH`    | Use a template from <path>              |
 | `--date DATE`        | The date for the post. Should be parseable by [Time#parse](http://ruby-doc.org/stdlib-2.1.0/libdoc/time/rdoc/Time.html#method-i-parse) |
 | `--slug SLUG`        | Slug for the new post.                  |
+| `--dir DIR`          | Create post at _posts/DIR/.             |
 | `--force`            | Overwrite exsiting file.                |
 
 ### New Page
@@ -144,6 +145,7 @@ This will move your draft to the `_posts` directory and rename the file with the
 |:-------------------|:------------------------------------------|
 | `--date DATE`      | The date for the post. Should be parseable by [Time#parse](http://ruby-doc.org/stdlib-2.1.0/libdoc/time/rdoc/Time.html#method-i-parse) |
 | `--slug SLUG`      | Change the slug for the new post.         |
+| `--dir DIR`        | Create post at _posts/DIR/.               |
 | `--force`          | Overwrite exsiting file.                  |
 ```
 

data/lib/octopress/commands/new.rb

@@ -33,6 +33,7 @@ module Octopress
           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/.'
           CommandHelpers.add_common_options c
 
           c.action do |args, options|

data/lib/octopress/commands/publish.rb

@@ -6,11 +6,13 @@ module Octopress
         c.description 'Convert a draft to a normal published post.'
         c.option 'date', '--date DATE', 'String that is parseable by Time#parse. (default: Time.now.iso8601)'
         c.option 'force', '--force', 'Overwrite file if it already exists'
+        c.option 'dir', '--dir DIR', 'Create post at _posts/DIR/.'
         CommandHelpers.add_common_options c
 
         c.action do |args, options|
           abort "You must specify a path." if args.empty?
           options['path'] = args.first
+          options['type'] = 'post from draft'
           Draft.new(options).publish
         end
       end

data/lib/octopress/draft.rb

@@ -2,8 +2,15 @@ module Octopress
   class Draft < Post
 
     def set_default_options
-      super
-      @options['type'] = 'draft' 
+      @options['type']      ||= 'draft' 
+      @options['layout']      = @config['post_layout']
+      @options['dir']       ||= ''
+      @options['extension'] ||= @config['post_ext']
+      @options['template']  ||= @config['post_template']
+
+      if @options['type'] == 'draft'
+        @options['date']      = convert_date @options['date']
+      end
     end
 
     def path
@@ -21,12 +28,15 @@ module Octopress
     # and options passed to the publish command
     #
     def publish
+      @options['date'] ||= read_draft_date
+      @options['date'] = convert_date @options['date']
 
       post_options = {
         'title'   => read_draft_title,
         'slug'    => publish_slug,
         'date'    => @options['date'],
         'content' => read_draft_content,
+        'dir'     => @options['dir'],
         'type'    => 'post from draft'
       }
 
@@ -64,10 +74,20 @@ module Octopress
       read.match(/title:\s+(.+)?$/)[1]
     end
     
+    # read_draft_date
+    #
+    def read_draft_date
+      read.match(/date:\s+(.+)?$/)[1]
+    end
+    
     # Get content from draft post file
     #
     def read_draft_content
-      read.sub(/date:\s+.+?$/, "date: #{@options['date']}")
+      if @options['date']
+        read.sub(/date:\s+.+?$/, "date: #{@options['date']}")
+      else
+        read
+      end
     end
 
   end

data/lib/octopress/page.rb

@@ -62,23 +62,22 @@ module Octopress
 
     def set_default_options
       @options['type']      ||= 'page'
-      @options['layout']      =  @config['page_layout']
+      @options['layout']      = @config['page_layout']
       @options['date']        = convert_date @options['date']
       @options['extension'] ||= @config['page_ext']
       @options['template']  ||= @config['page_template']
     end
 
     def convert_date(date)
-      if date
-        if @options['date'] == 'now'
-          @options['date'] = Time.now.iso8601
-        else
-          begin
-            Time.parse(date.to_s).iso8601
-          rescue => error
-            puts 'Could not parse date. Try formatting it like YYYY-MM-DD HH:MM'
-            abort error.message
-          end
+      date ||= 'now'
+      if date == 'now'
+        @options['date'] = Time.now.iso8601
+      else
+        begin
+          Time.parse(date.to_s).iso8601
+        rescue => error
+          puts 'Could not parse date. Try formatting it like YYYY-MM-DD HH:MM'
+          abort error.message
         end
       end
     end

data/lib/octopress/post.rb

@@ -4,15 +4,17 @@ module Octopress
     def set_default_options
       @options['type']      ||= 'post'
       @options['layout']      = @config['post_layout']
-      @options['date']      ||= Time.now.iso8601
       @options['date']        = convert_date @options['date']
       @options['extension'] ||= @config['post_ext']
       @options['template']  ||= @config['post_template']
+      @options['dir']       ||= ''
     end
 
     def path
       name = "#{date_slug}-#{title_slug}.#{extension}"
-      File.join(source, '_posts', name)
+      dir = File.join(source, '_posts', @options['dir'])
+      FileUtils.mkdir_p dir
+      File.join(dir, name)
     end
 
     # Returns a string which is url compatible.

data/lib/octopress/version.rb

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

data/test/expected/_posts/2014-02-10-another-idea.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "Another Idea"
+date: 2014-02-10T15:20:00Z
+---
+

data/test/expected/_posts/ideas/2014-02-13-yet-another-idea.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "Yet Another Idea"
+date: 2014-02-13T15:20:00Z
+---
+

data/test/expected/_posts/stuff/2014-02-11-some-stuff.markdown

@@ -0,0 +1,6 @@
+---
+layout: post
+title: "Some Stuff"
+date: 2014-02-11T05:10:00Z
+---
+

data/test/expected/_site/2014/02/10/another-idea.html

@@ -0,0 +1 @@
+<div class='post'>Another Idea</div>

data/test/expected/_site/2014/02/11/some-stuff.html

@@ -0,0 +1 @@
+<div class='post'>Some Stuff</div>

data/test/expected/_site/2014/02/13/yet-another-idea.html

@@ -0,0 +1 @@
+<div class='post'>Yet Another Idea</div>

data/test/test.rb

@@ -42,6 +42,14 @@ FileUtils.cd('test-site') do |dir|
     expect: '_posts/2014-03-13-awesome.markdown',
   })
 
+  # Add a new post in a subdirectory
+  #
+  test({
+    desc: 'Add a new post',
+    cmd: 'octopress new post "Some stuff" --dir stuff --date "2014-02-11 05:10 -0000"',
+    expect: '_posts/stuff/2014-02-11-some-stuff.markdown',
+  })
+
   # Add a draft
   #
   test({
@@ -50,6 +58,14 @@ FileUtils.cd('test-site') do |dir|
     expect: '_drafts/stupid-idea.markdown',
   })
 
+  # Add another draft
+  #
+  test({
+    desc: 'Add another draft',
+    cmd: 'octopress new draft "Another idea" --date "2014-02-10 15:20 -0000"',
+    expect: '_drafts/another-idea.markdown',
+  })
+
   # Add a draft with a slug
   #
   test({
@@ -58,6 +74,22 @@ FileUtils.cd('test-site') do |dir|
     expect: '_drafts/idea.markdown',
   })
 
+  # Add yet another draft
+  #
+  test({
+    desc: 'Add yet another draft',
+    cmd: 'octopress new draft "yet another idea" --date "2014-02-13 15:20 -0000"',
+    expect: '_drafts/yet-another-idea.markdown',
+  })
+
+  # Publish a draft
+  #
+  test({
+    desc: 'Publish a draft',
+    cmd: 'octopress publish _drafts/another-idea.markdown',
+    expect: '_posts/2014-02-10-another-idea.markdown',
+  })
+
   # Publish a draft with a date
   #
   test({
@@ -66,6 +98,14 @@ FileUtils.cd('test-site') do |dir|
     expect: '_posts/2014-03-11-idea.markdown',
   })
 
+  # Publish a draft in a dir
+  #
+  test({
+    desc: 'Publish a draft in a dir',
+    cmd: 'octopress publish _drafts/yet-another-idea.markdown --dir ideas',
+    expect: '_posts/ideas/2014-02-13-yet-another-idea.markdown',
+  })
+
   # Add a page
   #
   test({

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.1
+  version: 3.0.0.rc.2
 platform: ruby
 authors:
 - Brandon Mathis
@@ -123,9 +123,15 @@ files:
 - test/expected/_layouts/page.html
 - test/expected/_layouts/post.html
 - test/expected/_octopress.yml
+- test/expected/_posts/2014-02-10-another-idea.markdown
 - test/expected/_posts/2014-03-11-idea.markdown
 - test/expected/_posts/2014-03-12-awesome-stuff.markdown
 - test/expected/_posts/2014-03-13-awesome.markdown
+- test/expected/_posts/ideas/2014-02-13-yet-another-idea.markdown
+- test/expected/_posts/stuff/2014-02-11-some-stuff.markdown
+- test/expected/_site/2014/02/10/another-idea.html
+- test/expected/_site/2014/02/11/some-stuff.html
+- test/expected/_site/2014/02/13/yet-another-idea.html
 - test/expected/_site/2014/03/11/idea.html
 - test/expected/_site/2014/03/12/awesome-stuff.html
 - test/expected/_site/2014/03/13/awesome.html
@@ -171,9 +177,15 @@ test_files:
 - test/expected/_layouts/page.html
 - test/expected/_layouts/post.html
 - test/expected/_octopress.yml
+- test/expected/_posts/2014-02-10-another-idea.markdown
 - test/expected/_posts/2014-03-11-idea.markdown
 - test/expected/_posts/2014-03-12-awesome-stuff.markdown
 - test/expected/_posts/2014-03-13-awesome.markdown
+- test/expected/_posts/ideas/2014-02-13-yet-another-idea.markdown
+- test/expected/_posts/stuff/2014-02-11-some-stuff.markdown
+- test/expected/_site/2014/02/10/another-idea.html
+- test/expected/_site/2014/02/11/some-stuff.html
+- test/expected/_site/2014/02/13/yet-another-idea.html
 - test/expected/_site/2014/03/11/idea.html
 - test/expected/_site/2014/03/12/awesome-stuff.html
 - test/expected/_site/2014/03/13/awesome.html