Add source and config options to publish command

Update Publish command to allow custom Jekyll source.

Update MovementArgParser to generate Jekyll config like was done with ArgParser.

Update FileMover to automatically use a root directory if given.

Author: Matthew Loberg

lib/jekyll-compose/file_mover.rb

@@ -1,9 +1,10 @@
 module Jekyll
   module Compose
     class FileMover
-      attr_reader :movement
-      def initialize(movement)
+      attr_reader :movement, :root
+      def initialize(movement, root = nil)
         @movement = movement
+        @root = root
       end
 
       def resource_type
@@ -17,17 +18,31 @@ def move
       end
 
       def validate_source
-        raise ArgumentError.new("There was no #{resource_type} found at '#{movement.from}'.") unless File.exist? movement.from
+        raise ArgumentError.new("There was no #{resource_type} found at '#{from}'.") unless File.exist? from
       end
 
       def ensure_directory_exists
-        dir = File.dirname movement.to
+        dir = File.dirname to
         Dir.mkdir(dir) unless Dir.exist?(dir)
       end
 
       def move_file
-        FileUtils.mv(movement.from, movement.to)
-        puts "#{resource_type.capitalize} #{movement.from} was moved to #{movement.to}"
+        FileUtils.mv(from, to)
+        puts "#{resource_type.capitalize} #{from} was moved to #{to}"
+      end
+
+      private
+      def from
+        file_path(movement.from)
+      end
+
+      def to
+        file_path(movement.to)
+      end
+
+      def file_path(path)
+        return path if root.nil? or root.empty?
+        return File.join(root, path)
       end
     end
   end

lib/jekyll-compose/movement_arg_parser.rb

@@ -1,10 +1,11 @@
 module Jekyll
   module Compose
     class MovementArgParser
-      attr_reader :args, :options
+      attr_reader :args, :options, :config
       def initialize(args, options)
         @args = args
         @options = options
+        @config = Jekyll.configuration(options)
       end
 
       def validate!
@@ -14,6 +15,10 @@ def validate!
       def path
         args.join ' '
       end
+
+      def source
+        source = config['source'].gsub(/^#{Regexp.quote(Dir.pwd)}/, '')
+      end
     end
   end
 end

lib/jekyll/commands/publish.rb

@@ -7,6 +7,8 @@ def self.init_with_program(prog)
           c.description 'Moves a draft into the _posts directory and sets the date'
 
           c.option 'date', '-d DATE', '--date DATE', 'Specify the post date'
+          c.option 'config', '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
+          c.option 'source', '-s', '--source SOURCE', 'Custom source directory'
 
           c.action do |args, options|
             Jekyll::Commands::Publish.process(args, options)
@@ -20,7 +22,7 @@ def self.process(args = [], options = {})
 
         movement = DraftMovementInfo.new params
 
-        mover = DraftMover.new movement
+        mover = DraftMover.new movement, params.source
         mover.move
       end
 

spec/publish_spec.rb

@@ -46,7 +46,7 @@
     output = capture_stdout { described_class.process(args) }
     expect(output).to eql("Draft _drafts/#{draft_to_publish} was moved to _posts/#{post_filename}\n")
   end
-  
+
   it 'publishes a draft on the specified date' do
     path = posts_dir.join "2012-03-04-a-test-post.md"
     capture_stdout { described_class.process(args, {"date" => '2012-3-4'}) }
@@ -72,4 +72,40 @@
     }).to raise_error("There was no draft found at '_drafts/i-do-not-exist.markdown'.")
   end
 
+  context 'when a configuration file exists' do
+    let(:config) { source_dir('_config.yml') }
+    let(:drafts_dir) { Pathname.new source_dir('site', '_drafts') }
+    let(:posts_dir)  { Pathname.new source_dir('site', '_posts') }
+
+    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(post_path).not_to exist
+      expect(draft_path).to exist
+      capture_stdout { described_class.process(args) }
+      expect(post_path).to exist
+    end
+  end
+
+  context 'when source option is set' do
+    let(:drafts_dir) { Pathname.new source_dir('site', '_drafts') }
+    let(:posts_dir)  { Pathname.new source_dir('site', '_posts') }
+
+    it 'should use source directory set by command line option' do
+      expect(post_path).not_to exist
+      expect(draft_path).to exist
+      capture_stdout { described_class.process(args, 'source' => 'site') }
+      expect(post_path).to exist
+    end
+  end
 end