octopress 3.0.9 → 3.0.10

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8a5d0577a968b736c201077dd3281c29361321ff
4
- data.tar.gz: 3b5cec2f08534bfd66241977774ec3a3417af2c7
3
+ metadata.gz: 04ef50919f33ca1251c84f8ac6312a153cc0e15d
4
+ data.tar.gz: 26afaead4b8f062d3d1dc7f9db9382a110840a45
5
5
  SHA512:
6
- metadata.gz: 694d83bed6d87a03ac481e5bbd7c9ac1fce8e27f8c168dafe2735ebf1b25a246d806dfcace2fa1aed3bf4abe80a95f9633b2067bad23089abcbc6ccadeacf6aa
7
- data.tar.gz: 2ff09c7cc7bcd5c66f9797392b3c80421cab42965cad8adcb4dc51600a6482f2b88e2220c044d9a6501ddd364cd9c9663a6339fbec36189255c119eb0e1f9331
6
+ metadata.gz: 7bf544c5b8190e857828290c7c2293f20e09ed68f915915f2c6bf46813fc4e354cef48a08f9a099448d69ba782d8fe8b89877140af23e9c8a59b14cd7cfd33e6
7
+ data.tar.gz: 6fe594627c736bec1b48ae1eac4a887c1bdb587abab11c0f52cb07045f943d6fbb037a606f5895d5869099c099be653e0001e37fc785da243d022272b08cbfd0
data/CHANGELOG.md CHANGED
@@ -1,5 +1,8 @@
1
1
  # Changelog
2
2
 
3
+ ### 3.0.10 (2015-07-15)
4
+ - Fixed issue where `--force` flag wouldn't work when publishing drafts
5
+
3
6
  ### 3.0.9 (2015-06-18)
4
7
  - Documentation improvements
5
8
 
data/README.md CHANGED
@@ -257,6 +257,8 @@ $ octopress deploy
257
257
 
258
258
  This reads a `_deploy.yml` configuration and deploys your site. Read below to learn how Octopress can generate a deployment configuration file for you.
259
259
 
260
+ Note: The `_deploy.yml` is processed through ERB, which makes it easy to load configurations from environment variables.
261
+
260
262
  Deploy has a few commands you should know.
261
263
 
262
264
  | Commands | Description |
@@ -359,6 +361,13 @@ If you choose a bucket which doesn't yet exist, Octopress Deploy will offer to c
359
361
  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.
360
362
  If `remote_path` is a subdirectory, only files in that subdirectory will be evaluated for deletion.
361
363
 
364
+ You can also set up your configuration to read your AWS credentials from your environment variables using ERB like this:
365
+
366
+ ```
367
+ access_key_id: <%= ENV['AWS_ACCESS_KEY'] %>
368
+ secret_access_key: <%= ENV['AWS_SECRET_KEY'] %>
369
+ ```
370
+
362
371
  ##### S3 Headers
363
372
 
364
373
  You can create an array of header congifs to set expiration, content and cache settings for any paths matching the `filename`.
@@ -3,6 +3,7 @@ module Octopress
3
3
  def self.init_with_program(p)
4
4
  p.command(:unpublish) do |c|
5
5
  c.syntax 'unpublish <POST> [options]'
6
+ c.option 'force', '--force', 'Overwrite draft if it already exists'
6
7
  c.description 'Convert a post to a draft. Command accepts path to post or search string.'
7
8
  CommandHelpers.add_common_options c
8
9
 
@@ -38,6 +38,7 @@ module Octopress
38
38
  'title' => @options['title'],
39
39
  'date' => @options['date'],
40
40
  'slug' => title_slug,
41
+ 'force' => @options['force'],
41
42
  'content' => read_post_content,
42
43
  'dir' => @options['dir'],
43
44
  'type' => "post from draft",
@@ -36,6 +36,7 @@ module Octopress
36
36
  'title' => @options['title'],
37
37
  'date' => @options['date'],
38
38
  'slug' => title_slug,
39
+ 'force' => @options['force'],
39
40
  'content' => read_post_content,
40
41
  'dir' => @options['dir'],
41
42
  'type' => "draft from post",
@@ -1,3 +1,3 @@
1
1
  module Octopress
2
- VERSION = "3.0.9"
2
+ VERSION = "3.0.10"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: octopress
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.9
4
+ version: 3.0.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-06-18 00:00:00.000000000 Z
12
+ date: 2015-07-15 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: mercenary