Add support for collections_dir configuration

jekyll · Oct 8, 2018 · 2965cf6 · 2965cf6
1 parent 7aab81a
commit 2965cf6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/lib/jekyll-compose/arg_parser.rb b/lib/jekyll-compose/arg_parser.rb
@@ -31,7 +31,8 @@ def force?
       end
 
       def source
-        config["source"].gsub(%r!^#{Regexp.quote(Dir.pwd)}!, "")
+        File.join(config["source"], config["collections_dir"])
+          .gsub(%r!^#{Regexp.quote(Dir.pwd)}/*!, "")
       end
     end
   end

diff --git a/lib/jekyll-compose/file_creator.rb b/lib/jekyll-compose/file_creator.rb
@@ -30,7 +30,7 @@ def validate_should_write!
 
       def ensure_directory_exists
         dir = File.dirname file_path
-        Dir.mkdir(dir) unless Dir.exist?(dir)
+        FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
       end
 
       def write_file

diff --git a/lib/jekyll-compose/movement_arg_parser.rb b/lib/jekyll-compose/movement_arg_parser.rb
@@ -8,7 +8,7 @@ def validate!
       end
 
       def path
-        args.join " "
+        File.join(source, args.join(" ")).sub(%r!\A/!, "")
       end
     end
   end

diff --git a/lib/jekyll/commands/unpublish.rb b/lib/jekyll/commands/unpublish.rb
@@ -23,7 +23,6 @@ def self.process(args = [], options = {})
         params.validate!
 
         movement = PostMovementInfo.new params
-
         mover = PostMover.new movement, params.force?, params.source
         mover.move
       end