mkmatter 3.1.12 → 3.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e51dd62ad3fe54420a842a181a3214e3cd8e24ea3f06ad61f93d43d7cb83667
-  data.tar.gz: 46d59dca27686feb195470b558d7e7b30b25ed5ec7ea809a2b135659363a1539
+  metadata.gz: ee1ddb005d017b3ff2770792c609726b0781a610438ded6478fe341fd80fd0c6
+  data.tar.gz: 0c0e8e5e6d8a90ad22ec76f55c4e16d04d5ed088a029fc2ecb6e9ed58eb26364
 SHA512:
-  metadata.gz: 447dc522fd22a5251b91de493d784280b3538e9b5efba59edb23caa8d7ea6d9eab1b4ed6660f5326f76c0e0a9cc6efbdc127b32d9d36969bde37b938b6e6a452
-  data.tar.gz: 2298565c0ec52f408054374882a6be678fc5ec365951726f56c31c835a8d68c30504a75b0bd6c3c7d48c79bb36c653ef5929263bdbf1286a16909284baf2ae5d
+  metadata.gz: e296cc973212407e248cf12c2d428f9e66edc0b1a06319d40cd2f132b16a74eb114745ecc28cff16e6e93beb5bf971f63eca4f34720b0c13634d5efa4965d58f
+  data.tar.gz: 29dd5eb705e9ef85eb0943499703afc9f0fc56b6e66cc96e139895ed429e9c5609d644d0464185b45264697f57f77fb89d5753ac4a29e1a5fd465581b949d00f

data/lib/mkmatter/answers.rb

@@ -7,7 +7,8 @@ module Mkmatter
     attr_accessor :date, :draft
     attr_accessor :slug_date, :answer_hash
     attr_accessor :published, :file_format
-    attr_reader :matter
+    attr_accessor :matter
+    attr_accessor :extra_fields
 
     def initialize(question_hash, publish)
       @title       = question_hash[:title]
@@ -19,6 +20,8 @@ module Mkmatter
       @slug_date   = now.strftime('%Y-%m-%d')
       @published   = publish
       @file_format = question_hash[:file_format]
+      @extra_fields = question_hash[:extra_fields]
+
       @matter      = {
           layout:     question_hash[:layout],
           title:      @title,
@@ -26,49 +29,11 @@ module Mkmatter
           tags:       @tags,
           date:       @date,
       }
+      if @extra_fields
+        @matter.merge!(@extra_fields)
+      end
       @matter[:published] = @published if publish
     end
 
-    # @return [Hash] returns attribute `.matter`
-    def to_h
-      @matter
-    end
-
-    # @param [Hash] hash other hash
-    # @return [nil] merges hash into attribute `.matter`
-    def to_h=(hash)
-      @matter.merge!(hash)
-    end
-
-    alias_method :inspect, :to_h
-    #
-    # Dumps all file applicable metadata to a provided output.
-    # @return [String] yaml front matter
-    def dump
-      custom_fields = nil
-      hl            = HighLine.new($stdin, $stderr, 80)
-      # Custom matter
-      if hl.agree('Do you want to add custom fields? (usable as {{LAYOUT_TYPE.FIELD}} in templates) ', true)
-        hl.say('Your fields should be inputted as FIELD=>TEXT HERE')
-        hl.say("Type 'EOL' on a new line then press Enter when you are done.")
-        hl.say("<% HighLine.color('NOTE', :bold, :red) %>: Input is <% HighLine.color('NOT', :bold, :red) %> evaluated!")
-        custom_fields = hl.ask('Fields?') do |q|
-          q.gather = /^EOL$/
-        end
-      end
-      if custom_fields
-        fields = Hash.new
-        custom_fields.each do |field|
-          field = field.split(/=>/)
-          fields.store(field[0].to_s, field[1])
-        end
-        self.to_h = fields
-      elsif custom_fields.nil?
-        hl.say('No extra fields were added.')
-      else
-      end
-      self.to_h.stringify_keys.to_yaml(indentation: 2)
-      '---'
-    end
   end
 end

data/lib/mkmatter/cli/subs/new.rb

@@ -19,51 +19,43 @@ module Mkmatter
         long_desc Mkmatter::App::Descriptions::New::PAGE
 
         def page
-          if options[:file]
-            if Mkmatter::Methods.check_if_jekyll
-              @questions = Mkmatter::Questions::Page.new(HILINE).ask
-              answers    = Mkmatter::Answers.new(@questions, options.fetch(:publish, nil))
-              if options.fetch(:index, nil)
-                filename = 'index.' + answers.file_format.downcase
-              else
-                filename   = answers.title.to_slug + '.' + answers.file_format.downcase
-              end
+          if Mkmatter::Methods.check_if_jekyll
+            @questions = Mkmatter::Questions::Page.new(HILINE).ask
+            answers    = Mkmatter::Answers.new(@questions, options.fetch(:publish, nil))
+            if options.fetch(:index, nil)
+              filename = 'index.' + answers.file_format.downcase
+            else
+              filename   = answers.title.to_slug + '.' + answers.file_format.downcase
+            end
 
-              path       = Pathname("./#{filename}").realdirpath
-              if HILINE.agree('Would you like to put this page into a subdirectory?', true)
-                HILINE.say("What path? (directories will be created if they don't exist) ")
-                HILINE.say("Don't use a path starting with a slash, just put a relative path.")
-                HILINE.say('good => path/to/dir ‖ bad => /absolute/paths/are/bad/mmkay')
-                folder = HILINE.ask('? ') do |q|
-                  q.confirm  = true
-                  q.default  = '.'
-                  q.validate = /^[^\/].*$/
-                end
-                folder = Pathname(folder)
-                begin
-                  FileUtils.mkdir_p(File.join(Mkmatter::Methods.get_jekyll_root, folder))
-                rescue Errno::EEXIST
-                  HILINE.say("<%= Paint['Error', 'red', :bold] %>: Insufficient Permissions")
-                  exit 1
-                end
-                path = Pathname(folder).realdirpath.join(filename)
+            path       = Pathname("./#{filename}").realdirpath
+            if HILINE.agree('Would you like to put this page into a subdirectory?', true)
+              HILINE.say("What path? (directories will be created if they don't exist) ")
+              HILINE.say("Don't use a path starting with a slash, just put a relative path.")
+              HILINE.say('good => path/to/dir ‖ bad => /absolute/paths/are/bad/mmkay')
+              folder = HILINE.ask('? ') do |q|
+                q.confirm  = true
+                q.default  = '.'
+                q.validate = /^[^\/].*$/
               end
-              File.open(path.to_path, 'a') do |fd|
-                answers.to_h = {:layout => 'page'}
-                fd.puts answers.to_h.stringify_keys.to_yaml(indentation: 2)
-                fd.puts '---'
+              folder = Pathname(folder)
+              begin
+                FileUtils.mkdir_p(File.join(Mkmatter::Methods.get_jekyll_root, folder))
+              rescue Errno::EEXIST
+                HILINE.say("<%= Paint['Error', 'red', :bold] %>: Insufficient Permissions")
+                exit 1
               end
-              Mkmatter::Methods.launch_editor(options[:editor], path)
-            else
-              $stderr.puts "Not in a Jekyll directory. (no '_config.yml' in any parent directory)"
-              exit 1
+              path = Pathname(folder).realdirpath.join(filename)
             end
+            File.open(path.to_path, 'a') do |fd|
+              answers.to_h = {:layout => 'page'}
+              fd.puts answers.to_h.stringify_keys.to_yaml(indentation: 2)
+              fd.puts '---'
+            end
+            Mkmatter::Methods.launch_editor(options[:editor], path)
           else
-            @questions = Mkmatter::Questions::Page.new(HILINE).ask
-            answers = Mkmatter::Answers.new(@questions, options.fetch(:publish, nil))
-            puts ''
-            puts answers.to_h.stringify_keys.to_yaml(indentation: 2)
-            puts '---'
+            $stderr.puts "Not in a Jekyll directory. (no '_config.yml' in any parent directory)"
+            exit 1
           end
         end
 
@@ -75,94 +67,85 @@ module Mkmatter
         long_desc Mkmatter::App::Descriptions::New::POST
 
         def post
-          if options[:draft] and options[:file]
-            if Mkmatter::Methods.check_if_jekyll
-              # @questions = Mkmatter::Questions::Post.new(HILINE).ask
-              @questions  = Mkmatter::Questions::Post.new.ask
-              answers     = Mkmatter::Answers.new(@questions, options[:publish])
-              file_folder = '_drafts'
-              filename    = [].concat([answers.slug_date, '-', answers.title.to_slug, '.', answers.file_format.downcase]).join
+          if Mkmatter::Methods.check_if_jekyll
+            # @questions = Mkmatter::Questions::Post.new(HILINE).ask
+            @questions  = Mkmatter::Questions::Post.new.ask
+            answers     = Mkmatter::Answers.new(@questions, options[:publish])
+            draft_folder = '_drafts'
+            filename    = [].concat([answers.slug_date, '-', answers.title.to_slug, '.', answers.file_format.downcase]).join
 
-              path = Pathname("./#{file_folder}/#{filename}").realdirpath
-              if HILINE.agree('Would you like to put this page into a subdirectory?', true)
-                HILINE.say("What path? (directories will be created if they don't exist)")
-                HILINE.say("Don't use a path starting with a slash, just put a relative path.")
-                HILINE.say("<% Paint['Good', 'green', :bold] %>: path/to/dir ‖ <%= color('Bad', 'red', :bold) %>: /absolute/paths/are/bad/mmkay")
-                folder = HILINE.ask('? ') do |q|
-                  q.confirm  = true
-                  q.default  = '.'
-                  q.validate = /^[^\/].*$/
-                end
-                folder = Pathname(folder)
-                begin
-                  FileUtils.mkdir_p(File.join(Mkmatter::Methods.get_jekyll_root, folder))
-                rescue Errno::EEXIST
-                  HILINE.say("<% Paint['Error', 'red', :bold] %>:Insufficient Permissions")
-                  exit 1
-                end
-                path = Pathname(folder).realdirpath.join(filename)
+            path = Pathname("./#{file_folder}/#{filename}").realdirpath
+            if HILINE.agree('Would you like to put this page into a subdirectory?', true)
+              HILINE.say("What path? (directories will be created if they don't exist)")
+              HILINE.say("Don't use a path starting with a slash, just put a relative path.")
+              HILINE.say("<% Paint['Good', 'green', :bold] %>: path/to/dir ‖ <%= color('Bad', 'red', :bold) %>: /absolute/paths/are/bad/mmkay")
+              folder = HILINE.ask('? ') do |q|
+                q.confirm  = true
+                q.default  = '.'
+                q.validate = /^[^\/].*$/
               end
-              File.open(path.to_path, 'a') do |fd|
-                answers.to_h = {:layout => 'post'}
-                fd.puts answers.to_h.stringify_keys.to_yaml(indentation: 2)
-                fd.puts '---'
+              folder = Pathname(folder)
+              begin
+                FileUtils.mkdir_p(File.join(Mkmatter::Methods.get_jekyll_root, folder))
+              rescue Errno::EEXIST
+                HILINE.say("<% Paint['Error', 'red', :bold] %>:Insufficient Permissions")
+                exit 1
               end
-              Mkmatter::Methods.launch_editor(options[:editor], path)
-            else
-              puts "Not in a Jekyll directory. (no '_config.yml' in any parent directory)"
-              exit 1
+              path = Pathname(folder).realdirpath.join(filename)
             end
-          elsif options[:file] and options[:draft].nil? or options[:draft] == false
-
-            if Mkmatter::Methods.check_if_jekyll
-              # @questions  = Mkmatter::Questions::Post.new(HILINE).ask
-              @questions = Mkmatter::Questions::Post.new.ask
-              answers     = Mkmatter::Answers.new(@questions, options[:publish])
-              file_folder = '_posts'
-              filename    = [].concat([answers.slug_date, '-', answers.title.to_slug, '.', answers.file_format.downcase]).join('')
-              path        = Pathname("./#{file_folder}/#{filename}").realdirpath
-              if HILINE.agree('Would you like to put this post into a subdirectory?', true)
-                HILINE.say('What path?')
-                HILINE.say('----------------')
-                HILINE.say("Don't use a path starting with a slash, just put a relative path.")
-                HILINE.say("If you enter a path you don't like, you will have manually remove it if you confirm it.")
-                HILINE.say("<% Paint['Good', 'green', :bold] %>: path/to/dir ‖ <% Paint['Bad', :red, :bold] %>: /root/paths/are/bad/mmkay")
-                folder = HILINE.ask('? ') do |q|
-                  q.confirm  = true
-                  q.default  = '.'
-                  q.validate = /^[^\/].*$/
-                end
-                folder = Pathname("#{file_folder}/#{folder}")
-                begin
-                  FileUtils.mkdir_p(File.join(Mkmatter::Methods.get_jekyll_root, folder))
-                rescue Errno::EEXIST
-                  HILINE.say("<% Paint['Error', 'red', :bold] %>:Insufficient Permissions")
-                  exit 1
-                end
-                path = Pathname(folder).realdirpath.join(filename)
-              end
-              File.open(path.to_path, 'a') do |fd|
-                answers.to_h = {:layout => 'post'}
-                fd.puts answers.to_h.stringify_keys.to_yaml(indentation: 2)
-                fd.puts '---'
-              end
-
-              Mkmatter::Methods.launch_editor(options[:editor], path)
-            else
-              puts "Not in a Jekyll directory. (no '_config.yml' in any parent directory)"
-              exit 1
+            File.open(path.to_path, 'a') do |fd|
+              answers.to_h = {:layout => 'post'}
+              fd.puts answers.to_h.stringify_keys.to_yaml(indentation: 2)
+              fd.puts '---'
             end
-          elsif options[:draft].nil? and options[:file].nil?
-            @questions = Mkmatter::Questions::Post.new.ask
-            # @questions = Mkmatter::Questions::Post.new(HILINE).ask
-            answers    = Mkmatter::Answers.new(@questions, options[:publish])
-            puts ''
-            puts answers.to_h.stringify_keys.to_yaml(indentation: 2)
-            puts '---'
-
+            Mkmatter::Methods.launch_editor(options[:editor], path)
+          else
+            puts "Not in a Jekyll directory. (no '_config.yml' in any parent directory)"
+            exit 1
           end
         end
       end
     end
   end
 end
+elsif options[:draft].nil? or options[:draft] == false
+
+  #   if Mkmatter::Methods.check_if_jekyll
+  #     # @questions  = Mkmatter::Questions::Post.new(HILINE).ask
+  #     @questions = Mkmatter::Questions::Post.new.ask
+  #     answers     = Mkmatter::Answers.new(@questions, options[:publish])
+  #     file_folder = '_posts'
+  #     filename    = [].concat([answers.slug_date, '-', answers.title.to_slug, '.', answers.file_format.downcase]).join('')
+  #     path        = Pathname("./#{file_folder}/#{filename}").realdirpath
+  #     if HILINE.agree('Would you like to put this post into a subdirectory?', true)
+  #       HILINE.say('What path?')
+  #       HILINE.say('----------------')
+  #       HILINE.say("Don't use a path starting with a slash, just put a relative path.")
+  #       HILINE.say("If you enter a path you don't like, you will have manually remove it if you confirm it.")
+  #       HILINE.say("<% Paint['Good', 'green', :bold] %>: path/to/dir ‖ <% Paint['Bad', :red, :bold] %>: /root/paths/are/bad/mmkay")
+  #       folder = HILINE.ask('? ') do |q|
+  #         q.confirm  = true
+  #         q.default  = '.'
+  #         q.validate = /^[^\/].*$/
+  #       end
+  #       folder = Pathname("#{file_folder}/#{folder}")
+  #       begin
+  #         FileUtils.mkdir_p(File.join(Mkmatter::Methods.get_jekyll_root, folder))
+  #       rescue Errno::EEXIST
+  #         HILINE.say("<% Paint['Error', 'red', :bold] %>:Insufficient Permissions")
+  #         exit 1
+  #       end
+  #       path = Pathname(folder).realdirpath.join(filename)
+  #     end
+  #     File.open(path.to_path, 'a') do |fd|
+  #       answers.to_h = {:layout => 'post'}
+  #       fd.puts answers.to_h.stringify_keys.to_yaml(indentation: 2)
+  #       fd.puts '---'
+  #     end
+
+  #     Mkmatter::Methods.launch_editor(options[:editor], path)
+  #   else
+  #     puts "Not in a Jekyll directory. (no '_config.yml' in any parent directory)"
+  #     exit 1
+  #   end
+  # end

data/lib/mkmatter/questions.rb

@@ -1,4 +1,5 @@
 require 'highline'
+require 'highline/color'
 require 'ostruct'
 module Mkmatter
   module Questions
@@ -14,7 +15,6 @@ module Mkmatter
 
     class Post
       attr :answers
-      attr :extra_fields
       @hl = HighLine.new
 
       def ask
@@ -109,7 +109,7 @@ module Mkmatter
         if hl.agree('Do you want to add custom fields? (usable as {{LAYOUT_TYPE.FIELD}} in templates) ', true)
           hl.say('Your fields should be inputted as FIELD=>TEXT HERE')
           hl.say("Type 'EOL' on a new line then press Enter when you are done.")
-          hl.say("<% HighLine.color('NOTE', :bold, :red) %>: Input is <% HighLine.color('NOT', :bold, :red) %> evaluated!")
+          hl.say("<% color('NOTE', :bold, :red) %>: Input is <% color('NOT', :bold, :red) %> evaluated!")
           custom_fields = hl.ask('Fields?') do |q|
             q.gather = /^EOL$/
           end
@@ -120,7 +120,7 @@ module Mkmatter
             field = field.split(/=>/)
             fields.store(field[0].to_s, field[1])
           end
-          self.extra_fields = fields
+          
         elsif custom_fields.nil?
           hl.say('No extra fields were added.')
           return
@@ -130,15 +130,23 @@ module Mkmatter
       end
       # @return [OpenStruct]
     end
-
     class Page
       attr :answers
       @hl = HighLine.new
 
+      def ask
+        known_questions = methods.sort.delete_if { |m| m.to_s !~ /^get_.*$/ }
+        known_questions.each do |m|
+          @answers[:layout] = 'page'
+          @answers[m.to_s.gsub(/^get_[0-9]{3}_/, '')] = method(m).call
+        end
+        @answers
+      end
+
       # @!visibility private
       def initialize
         @answers = OpenStruct.new
-
+        @hl = HighLine.new
       end
 
       def get_001_title
@@ -162,7 +170,7 @@ module Mkmatter
       # @return [Array]
       def get_003_categories
         hl = @hl
-        hl.ask("Categories? (write one on each line, then type  '.') ") do |q|
+        hl.ask("Categories? (write one on each line, then type '.') ") do |q|
           q.gather = '.'
         end
       end
@@ -211,7 +219,7 @@ module Mkmatter
           menu.prompt = '? '
         end
       end
-      # @return [Array[Hash]]
+      # @return [String]
       def get_006_extra_fields
         hl = @hl
         custom_fields = nil

data/lib/mkmatter/version.rb

@@ -1,5 +1,5 @@
 module Mkmatter
-  VERSION = '3.1.12'
+  VERSION = '3.1.14'
 
   # Return gem information for certain commands and options
   class GemInfo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mkmatter
 version: !ruby/object:Gem::Version
-  version: 3.1.12
+  version: 3.1.14
 platform: ruby
 authors:
 - Ken Spencer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-30 00:00:00.000000000 Z
+date: 2025-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline