octopress 3.0.9 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a5d0577a968b736c201077dd3281c29361321ff
-  data.tar.gz: 3b5cec2f08534bfd66241977774ec3a3417af2c7
+  metadata.gz: 04ef50919f33ca1251c84f8ac6312a153cc0e15d
+  data.tar.gz: 26afaead4b8f062d3d1dc7f9db9382a110840a45
 SHA512:
-  metadata.gz: 694d83bed6d87a03ac481e5bbd7c9ac1fce8e27f8c168dafe2735ebf1b25a246d806dfcace2fa1aed3bf4abe80a95f9633b2067bad23089abcbc6ccadeacf6aa
-  data.tar.gz: 2ff09c7cc7bcd5c66f9797392b3c80421cab42965cad8adcb4dc51600a6482f2b88e2220c044d9a6501ddd364cd9c9663a6339fbec36189255c119eb0e1f9331
+  metadata.gz: 7bf544c5b8190e857828290c7c2293f20e09ed68f915915f2c6bf46813fc4e354cef48a08f9a099448d69ba782d8fe8b89877140af23e9c8a59b14cd7cfd33e6
+  data.tar.gz: 6fe594627c736bec1b48ae1eac4a887c1bdb587abab11c0f52cb07045f943d6fbb037a606f5895d5869099c099be653e0001e37fc785da243d022272b08cbfd0

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 3.0.10 (2015-07-15)
+- Fixed issue where `--force` flag wouldn't work when publishing drafts
+
 ### 3.0.9 (2015-06-18)
 - Documentation improvements
 

data/README.md

@@ -257,6 +257,8 @@ $ octopress deploy
 
 This reads a `_deploy.yml` configuration and deploys your site. Read below to learn how Octopress can generate a deployment configuration file for you.
 
+Note: The `_deploy.yml` is processed through ERB, which makes it easy to load configurations from environment variables.
+
 Deploy has a few commands you should know.
 
 | Commands                                   | Description                                                        |
@@ -359,6 +361,13 @@ If you choose a bucket which doesn't yet exist, Octopress Deploy will offer to c
 If you configure Octopress to delete files, all files found in the `remote_path` on S3 bucket will be removed unless they match local site files.
 If `remote_path` is a subdirectory, only files in that subdirectory will be evaluated for deletion.
 
+You can also set up your configuration to read your AWS credentials from your environment variables using ERB like this:
+
+```
+access_key_id: <%= ENV['AWS_ACCESS_KEY'] %>
+secret_access_key: <%= ENV['AWS_SECRET_KEY'] %>
+```
+
 ##### S3 Headers
 
 You can create an array of header congifs to set expiration, content and cache settings for any paths matching the `filename`.

data/lib/octopress/commands/unpublish.rb

@@ -3,6 +3,7 @@ module Octopress
     def self.init_with_program(p)
       p.command(:unpublish) do |c|
         c.syntax 'unpublish <POST> [options]'
+        c.option 'force', '--force', 'Overwrite draft if it already exists'
         c.description 'Convert a post to a draft. Command accepts path to post or search string.'
         CommandHelpers.add_common_options c
 

data/lib/octopress/draft.rb

@@ -38,6 +38,7 @@ module Octopress
         'title'   => @options['title'],
         'date'    => @options['date'],
         'slug'    => title_slug,
+        'force'   => @options['force'],
         'content' => read_post_content,
         'dir'     => @options['dir'],
         'type'    => "post from draft",

data/lib/octopress/post.rb

@@ -36,6 +36,7 @@ module Octopress
         'title'   => @options['title'],
         'date'    => @options['date'],
         'slug'    => title_slug,
+        'force'   => @options['force'],
         'content' => read_post_content,
         'dir'     => @options['dir'],
         'type'    => "draft from post",

data/lib/octopress/version.rb

@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.9"
+  VERSION = "3.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.0.10
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary