octopress 3.0.0 → 3.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3c62ba1c92d344cf55c6084df25e946159e9c6ae
4
- data.tar.gz: 1b582b665d80923cab33a5a9f6ac4cb501e6c6a7
3
+ metadata.gz: 249663e144fb38926a1dfcfc34cac677b64c9e7f
4
+ data.tar.gz: 53ce18330fe13d9453d85136dc78e6d42382a751
5
5
  SHA512:
6
- metadata.gz: a5f1786d1425a81b559c62a1bd5267757507c3e78bed0824c2a6624bb861c46babbaec333e9b05aba8c4b68bedd8e97fefbb449d2c624aa9aef2f007b29755c0
7
- data.tar.gz: 3b2fa3ac4521e9f54d8db500f64e6f3310988f5be084a2e8853363d62fb6f7b67da17130be92863685191390a256ae984f7b8846264bc79be300d7f0b1637948
6
+ metadata.gz: ebae011c7c8e715360988ae9283f9d97c66651b51a8cbddf1e04a55a79e3fc10bcd67ab024b912b7e208715b8ba49de2f3c6b90c2a367e3b9b1be9b9cf10d550
7
+ data.tar.gz: a66ca39d46c6be80c74f93e319199e32f4adc9e67245be8a42bbecdc5b0a9783ece50c9c2bb3d61e56afcd989e7cae3cd3118baa43d02a52c104b179882d8808
@@ -1,5 +1,8 @@
1
1
  # Changelog
2
2
 
3
+ ### 3.0.1 (2015-05-05)
4
+ - Fix: Now template scaffolding is installed at the configured Jekyll site source.
5
+
3
6
  ### 3.0.0 (2015-05-02)
4
7
  - Minor: No more need to run bundle exec. Yay.
5
8
  - Minor: Improved octopress docs functionality.
@@ -5,10 +5,23 @@ module Octopress
5
5
  attr_reader :path, :force
6
6
 
7
7
  def initialize(args, options)
8
- @path = File.expand_path(args.join(" "), Dir.pwd)
8
+ @path = init_path(args)
9
9
  @force = !!options['force']
10
10
  @blank = !!options['blank']
11
11
  end
12
+
13
+ def init_path(args)
14
+ path = File.expand_path(args.join(" "), Dir.pwd)
15
+ config_file = File.join(path, '_config.yml')
16
+
17
+ # If there is a Jekyll configuration file present
18
+ # Add template to source directory
19
+ if File.exist?(config_file)
20
+ config = SafeYAML.load_file(config_file)
21
+ path = File.join(path, config['source'])
22
+ end
23
+ path
24
+ end
12
25
 
13
26
  def write
14
27
  if !@force && File.exist?(File.join(path, '_templates'))
@@ -1,3 +1,3 @@
1
1
  module Octopress
2
- VERSION = "3.0.0"
2
+ VERSION = "3.0.1"
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.0
4
+ version: 3.0.1
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-05-02 00:00:00.000000000 Z
12
+ date: 2015-05-06 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: mercenary