jekyll-compose 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baa202b78cba83b212ea80b61da9f770e876f45a
-  data.tar.gz: 5967746c3bf1127daad8a48cc3ebeae0dc9ce82c
+  metadata.gz: 3ec3f6f135a6ca3612a807ecbccde9010cc75be4
+  data.tar.gz: 7447bb8d544454e5fe58c8aae94f52519b243913
 SHA512:
-  metadata.gz: 8a5b1798f7c09636759b3eaa0adf319fa8cf5ca77ba80220ce481a6cd17bfaf11b8c9be5156bd7cb982aa510e5bb312583061b4b0c1edef4566f62f1f5d8d6cb
-  data.tar.gz: 71e73e36010c335112206e693814ffb419d55f5b7035298e6cf42496b6c201bae7e3b6c9823119e3721e57ce9cd87b2c88ed4dc687c60e4d59ac783357e091f7
+  metadata.gz: cc359f888d1593a05b749054487a0bef79fbfba21baa3d123f305df2a6b3e198804d822799dab2848346ea9a923e08c136c5e7718d619a51fbb5131b267911a6
+  data.tar.gz: 4515efc64935e0393b1b301854b52da673880e7aa4c301f4cd86ad6e3752ca153b975111deac466a3586729163feca733c4062fdf62e2a740c661da262740f15

data/lib/jekyll-compose/arg_parser.rb

@@ -1,8 +1,9 @@
 class Jekyll::Compose::ArgParser
-  attr_reader :args, :options
+  attr_reader :args, :options, :config
   def initialize(args, options)
     @args = args
     @options = options
+    @config = Jekyll.configuration(options)
   end
 
   def validate!
@@ -10,11 +11,11 @@ class Jekyll::Compose::ArgParser
   end
 
   def type
-    type = options["extension"] || Jekyll::Compose::DEFAULT_TYPE
+    options["extension"] || Jekyll::Compose::DEFAULT_TYPE
   end
 
   def layout
-    layout = options["layout"] || Jekyll::Compose::DEFAULT_LAYOUT
+    options["layout"] || Jekyll::Compose::DEFAULT_LAYOUT
   end
 
   def title
@@ -24,4 +25,8 @@ class Jekyll::Compose::ArgParser
   def force?
     !!options["force"]
   end
+
+  def source
+    config['source'].gsub(/^#{Regexp.quote(Dir.pwd)}/, '')
+  end
 end

data/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 @@ module Jekyll
       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

data/lib/jekyll-compose/file_info.rb

@@ -10,11 +10,11 @@ class Jekyll::Compose::FileInfo
   end
 
   def content
-    <<-CONTENT.gsub /^\s+/, ''
-      ---
-      layout: #{params.layout}
-      title: #{params.title}
-      ---
-    CONTENT
+    front_matter = YAML.dump({
+      'layout' => params.layout,
+      'title' => params.title,
+    })
+
+    front_matter + "---\n"
   end
 end

data/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 @@ module Jekyll
       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
+        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

data/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 @@ module Jekyll
       def path
         args.join ' '
       end
+
+      def source
+        source = config['source'].gsub(/^#{Regexp.quote(Dir.pwd)}/, '')
+      end
     end
   end
 end

data/lib/jekyll-compose/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Compose
-    VERSION = "0.4.1"
+    VERSION = "0.5.0"
   end
 end

data/lib/jekyll/commands/draft.rb

@@ -16,7 +16,9 @@ module Jekyll
         [
           ['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
 
@@ -27,7 +29,7 @@ module Jekyll
 
         draft = DraftFileInfo.new params
 
-        Compose::FileCreator.new(draft, params.force?).create!
+        Compose::FileCreator.new(draft, params.force?, params.source).create!
       end
 
       class DraftFileInfo < Compose::FileInfo

data/lib/jekyll/commands/page.rb

@@ -16,7 +16,9 @@ module Jekyll
         [
           ['extension', '-x EXTENSION', '--extension EXTENSION', 'Specify the file extension'],
           ['layout', '-l LAYOUT', '--layout LAYOUT', "Specify the page layout"],
-          ['force', '-f', '--force', 'Overwrite a page if it already exists']
+          ['force', '-f', '--force', 'Overwrite a page if it already exists'],
+          ['config', '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'],
+          ['source', '-s', '--source SOURCE', 'Custom source directory'],
         ]
       end
 
@@ -26,7 +28,7 @@ module Jekyll
 
         page = PageFileInfo.new params
 
-        Compose::FileCreator.new(page, params.force?).create!
+        Compose::FileCreator.new(page, params.force?, params.source).create!
       end
 
       class PageArgParser < Compose::ArgParser

data/lib/jekyll/commands/post.rb

@@ -17,7 +17,9 @@ module Jekyll
           ['extension', '-x EXTENSION', '--extension EXTENSION', 'Specify the file extension'],
           ['layout', '-l LAYOUT', '--layout LAYOUT', "Specify the post layout"],
           ['force', '-f', '--force', 'Overwrite a post if it already exists'],
-          ['date', '-d DATE', '--date DATE', 'Specify the post date']
+          ['date', '-d DATE', '--date DATE', 'Specify the post date'],
+          ['config', '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'],
+          ['source', '-s', '--source SOURCE', 'Custom source directory'],
         ]
       end
 
@@ -27,7 +29,7 @@ module Jekyll
 
         post = PostFileInfo.new params
 
-        Compose::FileCreator.new(post, params.force?).create!
+        Compose::FileCreator.new(post, params.force?, params.source).create!
       end
 
 

data/lib/jekyll/commands/publish.rb

@@ -7,6 +7,8 @@ module Jekyll
           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 @@ module Jekyll
 
         movement = DraftMovementInfo.new params
 
-        mover = DraftMover.new movement
+        mover = DraftMover.new movement, params.source
         mover.move
       end
 

data/lib/jekyll/commands/unpublish.rb

@@ -6,6 +6,9 @@ module Jekyll
           c.syntax 'unpublish POST_PATH'
           c.description 'Moves a post back into the _drafts directory'
 
+          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|
             process(args, options)
           end
@@ -18,7 +21,7 @@ module Jekyll
 
         movement = PostMovementInfo.new params
 
-        mover = PostMover.new movement
+        mover = PostMover.new movement, params.source
         mover.move
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-compose
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Streamline your writing in Jekyll with these commands.