Add --config and --source option to draft command

In some Jekyll setups, the site assets are in a sub-directory. The drafts command, does not process any configuration files or allow to set the site source. Add these options to the draft command and update the FileCreator class to take an optional root that will be prepended to the file.path.

Author: ivorisoutdoors

lib/jekyll-compose/file_creator.rb

@@ -1,10 +1,11 @@
 module Jekyll
   module Compose
     class FileCreator
-      attr_reader :file, :force
-      def initialize(fileInfo, force = false)
+      attr_reader :file, :force, :root
+      def initialize(fileInfo, force = false, root = nil)
         @file = fileInfo
         @force = force
+        @root = root
       end
 
       def create!
@@ -16,20 +17,25 @@ def create!
       private
 
       def validate_should_write!
-        raise ArgumentError.new("A #{file.resource_type} already exists at #{file.path}") if File.exist?(file.path) and !force
+        raise ArgumentError.new("A #{file.resource_type} already exists at #{file_path}") if File.exist?(file_path) and !force
       end
 
       def ensure_directory_exists
-        dir = File.dirname file.path
+        dir = File.dirname file_path
         Dir.mkdir(dir) unless Dir.exist?(dir)
       end
 
       def write_file
-        File.open(file.path, "w") do |f|
+        File.open(file_path, "w") do |f|
           f.puts(file.content)
         end
 
-        puts "New #{file.resource_type} created at #{file.path}."
+        puts "New #{file.resource_type} created at #{file_path}."
+      end
+
+      def file_path
+        return file.path if root.nil? or root.empty?
+        return File.join(root, file.path)
       end
     end
   end

lib/jekyll/commands/draft.rb

@@ -16,18 +16,24 @@ def self.options
         [
           ['extension', '-x EXTENSION', '--extension EXTENSION', 'Specify the file extension'],
           ['layout', '-l LAYOUT', '--layout LAYOUT', "Specify the draft layout"],
-          ['force', '-f', '--force', 'Overwrite a draft if it already exists']
+          ['force', '-f', '--force', 'Overwrite a draft if it already exists'],
+          ['config', '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'],
+          ['source', '-s', '--source SOURCE', 'Custom source directory'],
         ]
       end
 
 
       def self.process(args = [], options = {})
+        config = configuration_from_options(options)
+
         params = Compose::ArgParser.new args, options
         params.validate!
 
         draft = DraftFileInfo.new params
 
-        Compose::FileCreator.new(draft, params.force?).create!
+        root = config['source'].gsub(/^#{Regexp.quote(Dir.pwd)}/, '')
+
+        Compose::FileCreator.new(draft, params.force?, root).create!
       end
 
       class DraftFileInfo < Compose::FileInfo

spec/draft_spec.rb

@@ -73,4 +73,37 @@
       expect(File.read(path)).to match(/layout: post/)
     end
   end
+
+  context 'when a configuration file exists' do
+    let(:config) { source_dir('_config.yml') }
+    let(:drafts_dir) { Pathname.new source_dir(File.join('site', '_drafts')) }
+
+    before(:each) do
+      File.open(config, 'w') do |f|
+        f.write(%{
+source: site
+})
+      end
+    end
+
+    after(:each) do
+      FileUtils.rm(config)
+    end
+
+    it 'should use source directory set by config' do
+      expect(path).not_to exist
+      capture_stdout { described_class.process(args) }
+      expect(path).to exist
+    end
+  end
+
+  context 'when source option is set' do
+    let(:drafts_dir) { Pathname.new source_dir(File.join('site', '_drafts')) }
+
+    it 'should use source directory set by command line option' do
+      expect(path).not_to exist
+      capture_stdout { described_class.process(args, 'source' => 'site') }
+      expect(path).to exist
+    end
+  end
 end

spec/spec_helper.rb

@@ -26,6 +26,8 @@
 
   Kernel.srand config.seed
 
+  Jekyll.logger.log_level = :error
+
   ###
   ### Helper methods
   ###