octopress 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c62ba1c92d344cf55c6084df25e946159e9c6ae
-  data.tar.gz: 1b582b665d80923cab33a5a9f6ac4cb501e6c6a7
+  metadata.gz: 249663e144fb38926a1dfcfc34cac677b64c9e7f
+  data.tar.gz: 53ce18330fe13d9453d85136dc78e6d42382a751
 SHA512:
-  metadata.gz: a5f1786d1425a81b559c62a1bd5267757507c3e78bed0824c2a6624bb861c46babbaec333e9b05aba8c4b68bedd8e97fefbb449d2c624aa9aef2f007b29755c0
-  data.tar.gz: 3b2fa3ac4521e9f54d8db500f64e6f3310988f5be084a2e8853363d62fb6f7b67da17130be92863685191390a256ae984f7b8846264bc79be300d7f0b1637948
+  metadata.gz: ebae011c7c8e715360988ae9283f9d97c66651b51a8cbddf1e04a55a79e3fc10bcd67ab024b912b7e208715b8ba49de2f3c6b90c2a367e3b9b1be9b9cf10d550
+  data.tar.gz: a66ca39d46c6be80c74f93e319199e32f4adc9e67245be8a42bbecdc5b0a9783ece50c9c2bb3d61e56afcd989e7cae3cd3118baa43d02a52c104b179882d8808

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 3.0.1 (2015-05-05)
+- Fix: Now template scaffolding is installed at the configured Jekyll site source.
+
 ### 3.0.0 (2015-05-02)
 - Minor: No more need to run bundle exec. Yay.
 - Minor: Improved octopress docs functionality.

data/lib/octopress/scaffold.rb

@@ -5,10 +5,23 @@ module Octopress
     attr_reader :path, :force
 
     def initialize(args, options)
-      @path  = File.expand_path(args.join(" "), Dir.pwd)
+      @path  = init_path(args)
       @force = !!options['force']
       @blank = !!options['blank']
     end
+
+    def init_path(args)
+      path = File.expand_path(args.join(" "), Dir.pwd)
+      config_file = File.join(path, '_config.yml') 
+
+      # If there is a Jekyll configuration file present
+      # Add template to source directory
+      if File.exist?(config_file)
+        config = SafeYAML.load_file(config_file)
+        path = File.join(path, config['source'])
+      end
+      path
+    end
     
     def write
       if !@force && File.exist?(File.join(path, '_templates'))

data/lib/octopress/version.rb

@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

metadata

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