Check for overwrite when publishing or unpublishing (#59)

Merge pull request 59

Author: alzeih

lib/jekyll-compose/file_mover.rb

@@ -3,34 +3,44 @@
 module Jekyll
   module Compose
     class FileMover
-      attr_reader :movement, :root
-      def initialize(movement, root = nil)
+      attr_reader :force, :movement, :root
+      def initialize(movement, force = false, root = nil)
         @movement = movement
+        @force = force
         @root = root
       end
 
-      def resource_type
+      def resource_type_from
+        "file"
+      end
+
+      def resource_type_to
         "file"
       end
 
       def move
         validate_source
+        validate_should_write!
         ensure_directory_exists
         move_file
       end
 
       def validate_source
-        raise ArgumentError, "There was no #{resource_type} found at '#{from}'." unless File.exist? from
+        raise ArgumentError, "There was no #{resource_type_from} found at '#{from}'." unless File.exist? from
       end
 
       def ensure_directory_exists
         dir = File.dirname to
         Dir.mkdir(dir) unless Dir.exist?(dir)
       end
 
+      def validate_should_write!
+        raise ArgumentError, "A #{resource_type_to} already exists at #{to}" if File.exist?(to) && !force
+      end
+
       def move_file
         FileUtils.mv(from, to)
-        puts "#{resource_type.capitalize} #{from} was moved to #{to}"
+        puts "#{resource_type_from.capitalize} #{from} was moved to #{to}"
       end
 
       private

lib/jekyll-compose/movement_arg_parser.rb

@@ -2,13 +2,7 @@
 
 module Jekyll
   module Compose
-    class MovementArgParser
-      attr_reader :args, :options, :config
-      def initialize(args, options)
-        @args = args
-        @options = options
-        @config = Jekyll.configuration(options)
-      end
+    class MovementArgParser < ArgParser
 
       def validate!
         raise ArgumentError, "You must specify a #{resource_type} path." if args.empty?
@@ -17,10 +11,6 @@ def validate!
       def path
         args.join " "
       end
-
-      def source
-        config["source"].gsub(%r!^#{Regexp.quote(Dir.pwd)}!, "")
-      end
     end
   end
 end

lib/jekyll/commands/publish.rb

@@ -10,6 +10,7 @@ def self.init_with_program(prog)
 
           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 "force", "-f", "--force", "Overwrite a post if it already exists"
           c.option "source", "-s", "--source SOURCE", "Custom source directory"
 
           c.action do |args, options|
@@ -24,7 +25,7 @@ def self.process(args = [], options = {})
 
         movement = DraftMovementInfo.new params
 
-        mover = DraftMover.new movement, params.source
+        mover = DraftMover.new movement, params.force?, params.source
         mover.move
       end
     end
@@ -60,9 +61,12 @@ def to
     end
 
     class DraftMover < Compose::FileMover
-      def resource_type
+      def resource_type_from
         "draft"
       end
+      def resource_type_to
+        "post"
+      end
     end
   end
 end

lib/jekyll/commands/unpublish.rb

@@ -9,6 +9,7 @@ def self.init_with_program(prog)
           c.description "Moves a post back into the _drafts directory"
 
           c.option "config", "--config CONFIG_FILE[,CONFIG_FILE2,...]", Array, "Custom configuration file"
+          c.option "force", "-f", "--force", "Overwrite a draft if it already exists"
           c.option "source", "-s", "--source SOURCE", "Custom source directory"
 
           c.action do |args, options|
@@ -23,7 +24,7 @@ def self.process(args = [], options = {})
 
         movement = PostMovementInfo.new params
 
-        mover = PostMover.new movement, params.source
+        mover = PostMover.new movement, params.force?, params.source
         mover.move
       end
     end
@@ -54,9 +55,12 @@ def to
     end
 
     class PostMover < Compose::FileMover
-      def resource_type
+      def resource_type_from
         "post"
       end
+      def resource_type_to
+        "draft"
+      end
     end
   end
 end

spec/publish_spec.rb

@@ -74,6 +74,30 @@
     }).to raise_error("There was no draft found at '_drafts/i-do-not-exist.markdown'.")
   end
 
+  context "when the post already exists" do
+    let(:args) { ["_drafts/#{draft_to_publish}"] }
+
+    before(:each) do
+      FileUtils.touch post_path
+    end
+
+    it "raises an error" do
+      expect(lambda {
+        capture_stdout { described_class.process(args) }
+      }).to raise_error("A post already exists at _posts/#{post_filename}")
+      expect(draft_path).to exist
+      expect(post_path).to exist
+    end
+
+    it "overwrites if --force is given" do
+      expect(lambda {
+        capture_stdout { described_class.process(args, "force" => true) }
+      }).not_to raise_error
+      expect(draft_path).not_to exist
+      expect(post_path).to exist
+    end
+  end
+
   context "when a configuration file exists" do
     let(:config) { source_dir("_config.yml") }
     let(:drafts_dir) { Pathname.new source_dir("site", "_drafts") }

spec/unpublish_spec.rb

@@ -59,6 +59,30 @@
     }).to raise_error("There was no post found at '#{weird_path}'.")
   end
 
+  context "when the draft already exists" do
+    let(:args) { ["_posts/#{post_filename}"] }
+
+    before(:each) do
+      FileUtils.touch draft_path
+    end
+
+    it "raises an error" do
+      expect(lambda {
+        capture_stdout { described_class.process(args) }
+      }).to raise_error("A draft already exists at _drafts/#{post_name}")
+      expect(draft_path).to exist
+      expect(post_path).to exist
+    end
+
+    it "overwrites if --force is given" do
+      expect(lambda {
+        capture_stdout { described_class.process(args, "force" => true) }
+      }).not_to raise_error
+      expect(draft_path).to exist
+      expect(post_path).not_to exist
+    end
+  end
+
   context "when a configuration file exists" do
     let(:config) { source_dir("_config.yml") }
     let(:drafts_dir) { Pathname.new(source_dir("site", "_drafts")) }