octopress 3.0.0.rc.7 → 3.0.0.rc.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59c785e8fc0a2c991a658c34c50f52da7b4b4ca0
-  data.tar.gz: ce63bf02022b52d310125846721207f010005a38
+  metadata.gz: 7181311c72df30bf2bd51536204ffb32729cdbbc
+  data.tar.gz: 870db272c2517159439914f81b78c289b092190f
 SHA512:
-  metadata.gz: 50806cb6a15a804aa1ebd0051455671b69f6030e6b89d106431cd4c93e4e0786cb197576b54e4f3ea950efe049541cc4e699d80d598b083e9a63a3c0183ec42a
-  data.tar.gz: 2efc75fbf39e73fa9ccec8493c87d5d81e38d5715050d5a682a5334dd523060bf8459a4d21b1782df0bef9924dcd5e461ea5c249547416809110904bb13ab069
+  metadata.gz: 8faa5b4e17b749720394be730ea8880a243b4ae09fba9166f5f75fff4e3212b25fae705d91bf726359aee948054a93c358c389c17c48822f3305902b79dab7f7
+  data.tar.gz: 84a04d179116e46154689aa89bcd06eb09b108151110c415f55deae5acb682290ade34191859d0aa7ce5448bc539b87499b9969b38fa1bf4c53a0b2e98e21db3

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Current released version
 
+### 3.0.0 RC8 - 2014-05-02
+
+- Improved draft date management [#35](https://github.com/octopress/octopress/issues/35)
+
 ### 3.0.0 RC7 - 2014-03-24
 
 - Fixed Time.parse with `--date` option on new posts and pages.

data/assets/docs/changelog.markdown

@@ -5,6 +5,10 @@ permalink: /changelog/
 
 ## Current released version
 
+### 3.0.0 RC8 - 2014-05-02
+
+- Improved draft date management [#35](https://github.com/octopress/octopress/issues/35)
+
 ### 3.0.0 RC7 - 2014-03-24
 
 - Fixed Time.parse with `--date` option on new posts and pages.

data/lib/octopress/commands/helpers.rb

@@ -20,7 +20,7 @@ module Octopress
 
     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. (default: Time.now.iso8601)"
+      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
 

data/lib/octopress/draft.rb

@@ -8,8 +8,8 @@ module Octopress
       @options['extension'] ||= @config['post_ext']
       @options['template']  ||= @config['post_template']
 
-      if @options['type'] == 'draft'
-        @options['date']      = convert_date @options['date']
+      if @options['date']
+        @options['date'] = convert_date @options['date']
       end
     end
 
@@ -28,13 +28,12 @@ module Octopress
     # and options passed to the publish command
     #
     def publish
-      @options['date'] ||= read_draft_date
-      @options['date'] = convert_date @options['date']
+      @options['date'] ||= read_draft_date || Time.now.iso8601
 
       post_options = {
         'title'   => read_draft_title,
-        'slug'    => publish_slug,
         'date'    => @options['date'],
+        'slug'    => publish_slug,
         'content' => read_draft_content,
         'dir'     => @options['dir'],
         'type'    => 'post from draft'
@@ -71,24 +70,40 @@ module Octopress
     # Get title from draft post file
     #
     def read_draft_title
-      read.match(/title:\s+(.+)?$/)[1]
+      match = read.match(/title:\s+(.+)?$/)
+      match[1] if match
     end
     
     # read_draft_date
     #
     def read_draft_date
-      read.match(/date:\s+(.+)?$/)[1]
+      match = read.match(/date:\s+(.+)?$/)
+      match[1] if match
     end
     
     # Get content from draft post file
+    # also update the draft's date configuration
     #
     def read_draft_content
       if @options['date']
-        read.sub(/date:\s+.+?$/, "date: #{@options['date']}")
+        # remove date if it exists
+        content = read.sub(/date:\s+.+?\n/, "")
+        
+        # Insert date after title
+        content.sub(/(title:.+$)/i, '\1'+"\ndate: #{@options['date']}")
       else
         read
       end
     end
 
+    # Draft template defaults
+    #
+    def default_content
+      if @options['date']
+        front_matter %w{layout title date}
+      else
+        front_matter %w{layout title}
+      end
+    end
   end
 end

data/lib/octopress/version.rb

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

data/test/expected/_config.yml

@@ -0,0 +1 @@
+timezone: GMT

data/test/test.rb

@@ -13,7 +13,8 @@ FileUtils.cd('test-site') do |dir|
     cmd: [
       'octopress new . --blank',
       'echo "<div class=\'post\'>{{ page.title }}{{ content }}</div>" > _layouts/post.html',
-      'echo "<div class=\'page\'>{{ page.title }}{{ content }}</div>" > _layouts/page.html'
+      'echo "<div class=\'page\'>{{ page.title }}{{ content }}</div>" > _layouts/page.html',
+      'echo "timezone: GMT" > _config.yml'
     ],
     expect: "New jekyll site installed in ."
   })

data/test/test_suite.rb

@@ -62,7 +62,11 @@ end
 def test(options)
   if cmd = options[:cmd]
     cmd = [cmd] unless cmd.is_a? Array
-    output = `#{cmd.join('; ')}`.gsub(/#{Dir.pwd}\/*/,'').strip
+    if options[:debug]
+      system cmd.join('; ')
+    else
+      output = `#{cmd.join('; ')}`.gsub(/#{Dir.pwd}\/*/,'').strip
+    end
     if options[:expect].strip == output
       pout '.'.green
     else
@@ -93,7 +97,7 @@ def print_results
       if test[:message]
         puts test[:message].yellow
       else
-        puts test[:expected].green
+        puts (test[:expected] || '').green
         puts test[:result].red
       end
      # print a newline for easier reading

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.7
+  version: 3.0.0.rc.8
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,96 +9,96 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: octopress-ink
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Octopress is an obsessively designed framework for Jekyll blogging. It’s
@@ -111,8 +111,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -143,6 +143,7 @@ files:
 - scaffold/_octopress.yml
 - scaffold/_templates/page
 - scaffold/_templates/post
+- test/expected/_config.yml
 - test/expected/_drafts/stupid-idea.markdown
 - test/expected/_layouts/page.html
 - test/expected/_layouts/post.html
@@ -181,22 +182,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Octopress is an obsessively designed framework for Jekyll blogging. It’s
   easy to configure and easy to deploy. Sweet huh?
 test_files:
+- test/expected/_config.yml
 - test/expected/_drafts/stupid-idea.markdown
 - test/expected/_layouts/page.html
 - test/expected/_layouts/post.html