jekyll-page-boilerplate 4.4.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65d5d4ea29334a96097f61f901251bd077dd288ef96db98316e79c289db435ea
-  data.tar.gz: 44365677835697d6b07f636a14e81a96595be48274d0e3a828c9b09499282d89
+  metadata.gz: 1a209c84ac5eea1c4cf34fd0f5918b29d7e946043b3293309d3d805a77a47d02
+  data.tar.gz: dfa1c7e2fd260b72d3cdbe9ca4f197239341ae3cc4eaaf6c8393a9ac01d507a6
 SHA512:
-  metadata.gz: 71b662bc22160d2a1550eac1beedb5ebebca1484765d1e3b18062f863a7948f8b3b7d7773c8caf6a639a8937f9609e01cfed01dc1643d0e0bc1a9c3195b7c0a2
-  data.tar.gz: fd59775cb1917f121ba79861a9b5aad461b0928d482e1af2a59a7b8236732b2ce397ed3594491d4372516a1611213aa14153847ae45f88db3b1340051743f59f
+  metadata.gz: 6615e6621fe7cdc7c240332b77a04aa26af0f2050df52e475f2dc655ca8501654d37f7c98cce3170656fcc20479bfa55e564d7f3bdb78539224abd4b0c926b7e
+  data.tar.gz: 4a1ec868cd8954916586c1d94460066f0d66d2c74b5ce0bfa3e86f001debb19a1a9d69cf7282b7c129fd2c1d3533a1d3eaf77b47374cdbc5a66df41902fe1264

data/lib/jekyll_page_boilerplate/msg/description.md

@@ -14,7 +14,7 @@ A boilerplate is a markdown file you place under the `_boilerplates` folder to g
     author: John Doe
 
 
-`$ boilerplate post -T "Another one about pottery"` would create a new file `_posts/yyyy-mm-dd-another-one-about-pottery.markdown`
+`$ boilerplate post "Another one about pottery"` would create a new file `_posts/yyyy-mm-dd-another-one-about-pottery.markdown`
 
     ---
     title: Another one about pottery

data/lib/jekyll_page_boilerplate/msg.rb

@@ -27,7 +27,11 @@ module JekyllPageBoilerplate::Msg
     begin
       self.info block.call
     rescue => e
-      self.error fatal: e.message
+      if e.kind_of?(JekyllPageBoilerplate::Error)
+        self.error fatal: e.message
+      else
+        self.error fatal: e.message, full: e.full_message
+      end
     end
   end
 

data/lib/jekyll_page_boilerplate/page.rb

@@ -14,13 +14,13 @@ class JekyllPageBoilerplate::Page
 
   attr_reader :tags
 
-  def self.run boilerplate, *options
-    page = self.new(boilerplate, *options)
+  def self.run boilerplate, custom_args, options
+    page = self.new(boilerplate, custom_args, options)
     page.create
     return "Created "+ File.join(page.tags['path'], page.tags['file'])
   end
 
-  def initialize boilerplate, *options, **params
+  def initialize boilerplate, custom_args, options
     plate_path = get_boilerplate_path(boilerplate)
     abort_unless_file_exists( plate_path )
 
@@ -32,11 +32,12 @@ class JekyllPageBoilerplate::Page
     @tags = JekyllPageBoilerplate::Tags.new(
       defaults(plate_path),
       get_header_config(parsed_file['head']),
-      *options,
-      params
+      options,
+      parse_custom_args(custom_args)
     )
     @tags[:file] = '{{ date }}-{{ slug }}{{ suffix }}' if @tags.timestamp
-    @tags.fill(:slug, :file, :path, safe: true)
+    @tags.fill(:slug, :file, safe: true)
+    @tags.fill(:path, safe: false)
 
     @head = get_head(parsed_file['head'])
     @body = parsed_file['body']
@@ -86,6 +87,10 @@ class JekyllPageBoilerplate::Page
     end
   end
 
+  def parse_custom_args args
+    Hash[args.map {|x| x.match /(\w+)=['"]{0,1}([^"']+)['"]{0,1}/}.compact.map {|x| x.captures }]
+  end
+
   def get_header_config head
     return YAML.load(head.match(READ_CONFIG_REGEX).to_s)['_boilerplate']
   end
@@ -95,18 +100,18 @@ class JekyllPageBoilerplate::Page
   end
   
   def get_boilerplate_path plate_name
-    return Dir.glob( "#{File.join(BOILERPLATES_PATH, plate_name)}*" ).first.to_s
+    return Dir.glob( "#{File.join(BOILERPLATES_PATH, plate_name.to_s)}*" ).first.to_s
   end
 
   def abort_if_file_exists(file_path)
     if File.exist?(file_path)
-      raise "#{file_path} already exists!"
+      raise JekyllPageBoilerplate::Error.new, "#{file_path} already exists!"
     end
   end
 
   def abort_unless_file_exists(file_path)
     unless File.exist?(file_path)
-      raise "The file `#{file_path}` does not exist!"
+      raise JekyllPageBoilerplate::Error.new, "The file `#{file_path}` does not exist!"
     end
   end
 

data/lib/jekyll_page_boilerplate/tags.rb

@@ -67,4 +67,4 @@ class JekyllPageBoilerplate::Tags
   def method_missing key
     @tags[key.to_s]
   end
-end
+end

data/lib/jekyll_page_boilerplate/version.rb

@@ -1,3 +1,3 @@
 module JekyllPageBoilerplate
-  VERSION = "4.4.0"
+  VERSION = "5.0.0"
 end

data/lib/jekyll_page_boilerplate.rb

@@ -25,9 +25,9 @@ module JekyllPageBoilerplate
     Msg.file 'description.md'
   end
 
-  def self.page boilerplate_name, options
+  def self.page boilerplate_name, args, options
     Msg.try_and_report do
-      Page.run(boilerplate_name, options)
+      Page.run(boilerplate_name, args, options)
     end
   end  
 

data/lib/jekyll_page_boilerplate_cli.rb

@@ -1,62 +1,64 @@
-require "bales"
+require 'thor'
 require 'jekyll_page_boilerplate'
 
-class JekyllPageBoilerplate::Application < Bales::Application
-  version JekyllPageBoilerplate::VERSION
-  description JekyllPageBoilerplate::Msg.description
-  summary JekyllPageBoilerplate::Msg::SUMMARY
-  # `boilerplate <page>`  
-  option :title, type: String, long_form: '--title', short_form: '-T',
-    description: "`path/<title>.md`"
-  option :path, type: String, long_form: '--path', short_form: '-p',
-    description: "`<path>/title.md`"
-  option :slug, type: String, long_form: '--slug', short_form: '-u',
-    description: "`path/<slug-template>.md` `{{title}}-{{date}}`"
-  option :timestamp, type: TrueClass, long_form: '--timestamp', short_form: '-s',
-    description: "`path/<time.now>-title.md`"
-  option :suffix, type: String, long_form: '--suffix', short_form: '-x',
-    description: "`path/title.<md, markdown, txt>`"
-
-  action do |plate, *custom, title: nil, slug: nil, path: nil, timestamp: nil, suffix: nil|
-    custom = Hash[custom.map {|v| v.split('=')}]
-    JekyllPageBoilerplate.page plate, custom.merge({
-      title: title, path: path, slug: slug,
-      suffix: suffix, timestamp: timestamp
-    })
+
+
+class JekyllPageBoilerplate::Application < Thor
+  
+  SHARED_OPTIONS = {
+    title: { type: :string, aliases: [:t], desc: "`path/<title>.md` `'Foo Bar' > foo-bar.md`" },
+    path: { type: :string, aliases: [:p], desc: "`<path>/title.md`" },
+    slug: { type: :string, aliases: [:u], desc: "`path/<slug-template>.md` `{{title}}-{{date}}`" },
+    timestamp: { type: :boolean, aliases: [:s], desc: "`path/<time.now>-title.md`" },
+    suffix: { type: :string, aliases: [:x], desc: "`path/title.<md, markdown, txt>`" }
+    # TODO: rename suffix to ext ^^^
+  }
+
+  desc "version", "Print the current version."
+  def version
+    puts JekyllPageBoilerplate::VERSION.to_s
   end
 
-  # `boilerplate help`  
-  command 'help', parent: Bales::Command::Help
+  desc "init", "Creates an example boilerplate."
+  def init
+    puts JekyllPageBoilerplate.init
+  end
 
-  # `boilerplate init`  
-  command 'init' do
-    summary "Creates an example boilerplate."
-    action do
-      JekyllPageBoilerplate.init
-    end
+  desc "list", "List all the boilerplates."
+  def list
+    JekyllPageBoilerplate.list
   end
-  
-  # `boilerplate list`  
-  command 'list' do
-    summary "List all the boilerplates"
-    action do 
-      JekyllPageBoilerplate.list
-    end
+
+  desc "create BOILERPLATE TITLE [CUSTOM] (--options)", "Generates a new file from a boilerplate."
+  SHARED_OPTIONS.each do |name, opt_args|
+    option name, **opt_args
+  end
+  def create plate, title = nil, *args
+    _options = options.dup.transform_values(&:dup) || {}
+    _options[:title] ||= title if title
+    JekyllPageBoilerplate.page plate, args, _options
+  end
+
+  desc "readme", "Print out the readme"
+  def readme
+    JekyllPageBoilerplate.readme
   end
-  
 
-  def self.run(*args, **opts)
-    begin
-      super
-    rescue => e
-      JekyllPageBoilerplate.readme 
+  Dir['_boilerplates/*'].each do |file|
+    cmd = File.basename(file, '.*').to_sym
+    desc "#{cmd} TITLE [CUSTOM] (--options)", "Alias for `bplate create #{cmd} ...`"
+    SHARED_OPTIONS.each do |name, opt_args|
+      option name, **opt_args
+    end
+    define_method cmd do |title = nil, *args|
+      _options = options.dup.transform_values(&:dup) || {}
+      _options[:title] ||= title if title
+      JekyllPageBoilerplate.page cmd, args, _options
     end
   end
 
+  default_task :readme
 end
 
-JekyllPageBoilerplate::Application.parse_and_run
+JekyllPageBoilerplate::Application.start(ARGV)
 
-  
-  
-  

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-page-boilerplate
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Sean Ferney
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-17 00:00:00.000000000 Z
+date: 2023-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bales
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
@@ -102,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: A jekyll plugin that allows you to create new pages or posts from a boilerplate