jekyll-compose 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ec3f6f135a6ca3612a807ecbccde9010cc75be4
-  data.tar.gz: 7447bb8d544454e5fe58c8aae94f52519b243913
+  metadata.gz: f6626f1690b5584b65e7d569272b59eb416414a5
+  data.tar.gz: 7d57720c9bdefd1f9bebb577829fde1371ff4150
 SHA512:
-  metadata.gz: cc359f888d1593a05b749054487a0bef79fbfba21baa3d123f305df2a6b3e198804d822799dab2848346ea9a923e08c136c5e7718d619a51fbb5131b267911a6
-  data.tar.gz: 4515efc64935e0393b1b301854b52da673880e7aa4c301f4cd86ad6e3752ca153b975111deac466a3586729163feca733c4062fdf62e2a740c661da262740f15
+  metadata.gz: 19cca9b6e9f8b0e2d743c05daa6463ed574663994e7cd3dc495f04a04870df5624758a890f12f730bfdbb22de8276424d53329f6d1c9ce7b69e91679221ce560
+  data.tar.gz: 37130e32cfa032e7690da8685a7e257e9037a91e4273539fa01ee355c4196d3fe0b4820adf0e3af0dc1be2d7d9b8ba0900ecf531ea1cde737f96f6fbb395bcdc

data/lib/jekyll-compose.rb

@@ -7,12 +7,12 @@ require "jekyll-compose/file_info"
 
 module Jekyll
   module Compose
-    DEFAULT_TYPE = "md"
-    DEFAULT_LAYOUT = "post"
-    DEFAULT_LAYOUT_PAGE = "page"
+    DEFAULT_TYPE = "md".freeze
+    DEFAULT_LAYOUT = "post".freeze
+    DEFAULT_LAYOUT_PAGE = "page".freeze
   end
 end
 
 %w{draft post publish unpublish page}.each do |file|
-  require File.expand_path("jekyll/commands/#{file}.rb", File.dirname(__FILE__))
+  require File.expand_path("jekyll/commands/#{file}.rb", __dir__)
 end

data/lib/jekyll-compose/arg_parser.rb

@@ -7,7 +7,7 @@ class Jekyll::Compose::ArgParser
   end
 
   def validate!
-    raise ArgumentError.new('You must specify a name.') if args.empty?
+    raise ArgumentError, "You must specify a name." if args.empty?
   end
 
   def type
@@ -19,7 +19,7 @@ class Jekyll::Compose::ArgParser
   end
 
   def title
-    args.join ' '
+    args.join " "
   end
 
   def force?
@@ -27,6 +27,6 @@ class Jekyll::Compose::ArgParser
   end
 
   def source
-    config['source'].gsub(/^#{Regexp.quote(Dir.pwd)}/, '')
+    config["source"].gsub(%r!^#{Regexp.quote(Dir.pwd)}!, "")
   end
 end

data/lib/jekyll-compose/file_creator.rb

@@ -17,7 +17,7 @@ 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, "A #{file.resource_type} already exists at #{file_path}" if File.exist?(file_path) && !force
       end
 
       def ensure_directory_exists
@@ -34,7 +34,7 @@ module Jekyll
       end
 
       def file_path
-        return file.path if root.nil? or root.empty?
+        return file.path if root.nil? || root.empty?
         return File.join(root, file.path)
       end
     end

data/lib/jekyll-compose/file_info.rb

@@ -9,11 +9,11 @@ class Jekyll::Compose::FileInfo
     "#{name}.#{params.type}"
   end
 
-  def content
+  def content(custom_front_matter = {})
     front_matter = YAML.dump({
-      'layout' => params.layout,
-      'title' => params.title,
-    })
+      "layout" => params.layout,
+      "title"  => params.title,
+    }.merge(custom_front_matter))
 
     front_matter + "---\n"
   end

data/lib/jekyll-compose/file_mover.rb

@@ -8,7 +8,7 @@ module Jekyll
       end
 
       def resource_type
-        'file'
+        "file"
       end
 
       def move
@@ -18,7 +18,7 @@ module Jekyll
       end
 
       def validate_source
-        raise ArgumentError.new("There was no #{resource_type} found at '#{from}'.") unless File.exist? from
+        raise ArgumentError, "There was no #{resource_type} found at '#{from}'." unless File.exist? from
       end
 
       def ensure_directory_exists
@@ -41,7 +41,7 @@ module Jekyll
       end
 
       def file_path(path)
-        return path if root.nil? or root.empty?
+        return path if root.nil? || root.empty?
         return File.join(root, path)
       end
     end

data/lib/jekyll-compose/movement_arg_parser.rb

@@ -9,15 +9,15 @@ module Jekyll
       end
 
       def validate!
-        raise ArgumentError.new("You must specify a #{resource_type} path.") if args.empty?
+        raise ArgumentError, "You must specify a #{resource_type} path." if args.empty?
       end
 
       def path
-        args.join ' '
+        args.join " "
       end
 
       def source
-        source = config['source'].gsub(/^#{Regexp.quote(Dir.pwd)}/, '')
+        source = config["source"].gsub(%r!^#{Regexp.quote(Dir.pwd)}!, "")
       end
     end
   end

data/lib/jekyll-compose/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Compose
-    VERSION = "0.5.0"
+    VERSION = "0.6.0".freeze
   end
 end

data/lib/jekyll/commands/draft.rb

@@ -3,10 +3,10 @@ module Jekyll
     class Draft < Command
       def self.init_with_program(prog)
         prog.command(:draft) do |c|
-          c.syntax 'draft NAME'
-          c.description 'Creates a new draft post with the given NAME'
+          c.syntax "draft NAME"
+          c.description "Creates a new draft post with the given NAME"
 
-          options.each {|opt| c.option *opt }
+          options.each { |opt| c.option *opt }
 
           c.action { |args, options| process args, options }
         end
@@ -14,15 +14,14 @@ module Jekyll
 
       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'],
-          ['config', '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'],
-          ['source', '-s', '--source SOURCE', 'Custom source directory'],
+          ["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"],
+          ["config", "--config CONFIG_FILE[,CONFIG_FILE2,...]", Array, "Custom configuration file"],
+          ["source", "-s", "--source SOURCE", "Custom source directory"],
         ]
       end
 
-
       def self.process(args = [], options = {})
         params = Compose::ArgParser.new args, options
         params.validate!
@@ -34,7 +33,7 @@ module Jekyll
 
       class DraftFileInfo < Compose::FileInfo
         def resource_type
-          'draft'
+          "draft"
         end
 
         def path

data/lib/jekyll/commands/page.rb

@@ -3,10 +3,10 @@ module Jekyll
     class Page < Command
       def self.init_with_program(prog)
         prog.command(:page) do |c|
-          c.syntax 'page NAME'
-          c.description 'Creates a new page with the given NAME'
+          c.syntax "page NAME"
+          c.description "Creates a new page with the given NAME"
 
-          options.each {|opt| c.option *opt }
+          options.each { |opt| c.option *opt }
 
           c.action { |args, options| process args, options }
         end
@@ -14,11 +14,11 @@ module Jekyll
 
       def self.options
         [
-          ['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'],
-          ['config', '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'],
-          ['source', '-s', '--source SOURCE', 'Custom source directory'],
+          ["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"],
+          ["config", "--config CONFIG_FILE[,CONFIG_FILE2,...]", Array, "Custom configuration file"],
+          ["source", "-s", "--source SOURCE", "Custom source directory"],
         ]
       end
 
@@ -39,11 +39,10 @@ module Jekyll
 
       class PageFileInfo < Compose::FileInfo
         def resource_type
-          'page'
+          "page"
         end
 
         alias_method :path, :file_name
-
       end
     end
   end

data/lib/jekyll/commands/post.rb

@@ -3,10 +3,10 @@ module Jekyll
     class Post < Command
       def self.init_with_program(prog)
         prog.command(:post) do |c|
-          c.syntax 'post NAME'
-          c.description 'Creates a new post with the given NAME'
+          c.syntax "post NAME"
+          c.description "Creates a new post with the given NAME"
 
-          options.each {|opt| c.option *opt }
+          options.each { |opt| c.option *opt }
 
           c.action { |args, options| process args, options }
         end
@@ -14,12 +14,12 @@ module Jekyll
 
       def self.options
         [
-          ['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'],
-          ['config', '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'],
-          ['source', '-s', '--source SOURCE', 'Custom source directory'],
+          ["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"],
+          ["config", "--config CONFIG_FILE[,CONFIG_FILE2,...]", Array, "Custom configuration file"],
+          ["source", "-s", "--source SOURCE", "Custom source directory"],
         ]
       end
 
@@ -32,7 +32,6 @@ module Jekyll
         Compose::FileCreator.new(post, params.force?, params.source).create!
       end
 
-
       class PostArgParser < Compose::ArgParser
         def date
           options["date"].nil? ? Time.now : DateTime.parse(options["date"])
@@ -41,7 +40,7 @@ module Jekyll
 
       class PostFileInfo < Compose::FileInfo
         def resource_type
-          'post'
+          "post"
         end
 
         def path
@@ -53,7 +52,15 @@ module Jekyll
         end
 
         def _date_stamp
-          @params.date.strftime '%Y-%m-%d'
+          @params.date.strftime "%Y-%m-%d"
+        end
+
+        def _time_stamp
+          @params.date.strftime("%Y-%m-%d %H:%M %z")
+        end
+
+        def content(custom_front_matter = {})
+          super({ "date" => _time_stamp }.merge(custom_front_matter))
         end
       end
     end

data/lib/jekyll/commands/publish.rb

@@ -3,12 +3,12 @@ module Jekyll
     class Publish < Command
       def self.init_with_program(prog)
         prog.command(:publish) do |c|
-          c.syntax 'publish DRAFT_PATH'
-          c.description 'Moves a draft into the _posts directory and sets the date'
+          c.syntax "publish DRAFT_PATH"
+          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.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)
@@ -25,7 +25,6 @@ module Jekyll
         mover = DraftMover.new movement, params.source
         mover.move
       end
-
     end
 
     class PublishArgParser < Compose::MovementArgParser
@@ -53,14 +52,14 @@ module Jekyll
       end
 
       def to
-        date_stamp = params.date.strftime '%Y-%m-%d'
+        date_stamp = params.date.strftime "%Y-%m-%d"
         "_posts/#{date_stamp}-#{params.name}"
       end
     end
 
     class DraftMover < Compose::FileMover
       def resource_type
-        'draft'
+        "draft"
       end
     end
   end

data/lib/jekyll/commands/unpublish.rb

@@ -3,11 +3,11 @@ module Jekyll
     class Unpublish < Command
       def self.init_with_program(prog)
         prog.command(:unpublish) do |c|
-          c.syntax 'unpublish POST_PATH'
-          c.description 'Moves a post back into the _drafts directory'
+          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.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)
@@ -24,16 +24,15 @@ module Jekyll
         mover = PostMover.new movement, params.source
         mover.move
       end
-
     end
 
     class UnpublishArgParser < Compose::MovementArgParser
       def resource_type
-        'post'
+        "post"
       end
 
       def name
-        File.basename(path).sub /\d{4}-\d{2}-\d{2}-/, ''
+        File.basename(path).sub %r!\d{4}-\d{2}-\d{2}-!, ""
       end
     end
 
@@ -54,7 +53,7 @@ module Jekyll
 
     class PostMover < Compose::FileMover
       def resource_type
-        'post'
+        "post"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-compose
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Streamline your writing in Jekyll with these commands.