mkmatter 3.1.16 → 3.1.17

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

@@ -1,113 +1,70 @@
-require 'highline'
-require 'thor'
-require 'mkmatter/cli/descriptions'
-require 'mkmatter/cli/methods'
-require 'mkmatter/questions'
-require 'mkmatter/answers'
-module Mkmatter
-  module App
-    module Classes
-      # Generate 'New' Content
-      class NewContent < Thor
-        include Thor::Actions
-        HILINE = HighLine.new($stdin, $stderr, 40)
-        option :publish, :type => :boolean
-        option :file, :type => :boolean, :default => true
-        option :index, :type => :boolean, :default => nil
-        method_options %w( template -t ) => :boolean
-        desc 'page [options]', 'make front matter (and possibly content) for a jekyll page'
-        long_desc Mkmatter::App::Descriptions::New::PAGE
+# require 'highline'
+# require 'thor'
+# require 'mkmatter/cli/descriptions'
+# require 'mkmatter/cli/methods'
+# require 'mkmatter/questions'
+# require 'mkmatter/answers'
+# module Mkmatter
+#   module App
+#     module Classes
+#       # Generate 'New' Content
+#       class NewContent < Thor
+#         include Thor::Actions
+#         HILINE = HighLine.new($stdin, $stderr, 40)
+#         option :publish, :type => :boolean
+#         option :file, :type => :boolean, :default => true
+#         option :index, :type => :boolean, :default => nil
+#         method_options %w( template -t ) => :boolean
+#         desc 'page [options]', 'make front matter (and possibly content) for a jekyll page'
+#         long_desc Mkmatter::App::Descriptions::New::PAGE
 
-        def page
-          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
+#         def page
+#           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)
-            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
-            $stderr.puts "Not in a Jekyll directory. (no '_config.yml' in any parent directory)"
-            exit 1
-          end
-        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)
+#             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
+#             $stderr.puts "Not in a Jekyll directory. (no '_config.yml' in any parent directory)"
+#             exit 1
+#           end
+#         end
 
 
-        option :publish, :type => :boolean
-        option :file, :type => :boolean, :default => true
-        option :draft, :type => :boolean, :default => nil
-        desc 'post [options]', 'make front matter (and possibly content) for a jekyll post'
-        long_desc Mkmatter::App::Descriptions::New::POST
-
-        def post
-          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)
-            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
-      end
-    end
-  end
-end
+        
+#       end
+#     end
+#   end
+# end
 # elsif options[:draft].nil? or options[:draft] == false
 
   #   if Mkmatter::Methods.check_if_jekyll

data/lib/mkmatter/cli/subs.rb

@@ -1,2 +1 @@
-require 'mkmatter/cli/subs/new'
 require 'mkmatter/cli/subs/tags'

data/lib/mkmatter/helpers.rb

@@ -0,0 +1,89 @@
+def get_time_zone_full(time_object)
+  require 'tzinfo'
+  offset = time_object.utc_offset
+  if offset.is_a?(Integer)
+    offset = offset / 3600 # Convert seconds to hours
+  elsif offset.is_a?(String) && offset.include?(':')
+    # If the offset is in the format "+HH:MM" or "-HH:MM"
+    parts = offset.split(':')
+    offset = parts[0].to_i + (parts[1].to_i / 60.0)
+
+  elsif offset.is_a?(String) && offset.length == 1
+    # Single character offset, e.g. "Z" for UTC, or "A" for UTC-1
+    # Not commonly used, but handling it for completeness
+    case offset.upcase
+      when 'Z'
+        offset = '+0000' # UTC
+      when 'A'
+        offset = '+0100' # UTC+1
+      when 'B'
+        offset = '+0200' # UTC+2
+      when 'C'
+        offset = '+0300' # UTC+3
+      when 'D'
+        offset = '+0400' # UTC+4
+      when 'E'
+        offset = '+0500' # UTC+5
+      when 'F'
+        offset = '+0600' # UTC+6
+      when 'G'
+        offset = '+0700' # UTC+7
+      when 'H'
+        offset = '+0800' # UTC+8
+      when 'I'
+        offset = '+0900' # UTC+9
+      when 'K'
+        offset = '+1000' # UTC+10
+      when 'L'
+        offset = '+1100' # UTC+11
+      when 'M'
+        offset = '+1200' # UTC+12
+      when 'N'
+        offset = '-0100' # UTC-1
+      when 'O'
+        offset = '-0200' # UTC-2
+      when 'P'
+        offset = '-0300' # UTC-3
+      when 'Q'
+        # US Eastern Time
+        # US Eastern Time is UTC-4, but it can also be UTC-5 during Daylight Saving Time
+        offset = '-0400' # UTC-4
+        return 'Eastern Time (US & Canada)' if time_object.zone == 'EDT' || time_object.zone == 'EST'
+      when 'R' # US Central Time
+        # US Central Time is UTC-5, but it can also be UTC-6 during Daylight Saving Time
+        offset = '-0500' # UTC-5
+        return 'Central Time (US & Canada)' if time_object.zone == 'CDT' || time_object.zone == 'CST'
+      when 'S'
+        # US Mountain Time
+        # US Mountain Time is UTC-6, but it can also be UTC-7 during Daylight Saving Time
+        offset = '-0600' # UTC-6
+        return 'Mountain Time (US & Canada)' if time_object.zone == 'MDT' || time_object.zone == 'MST'
+      when 'T'
+        # US Pacific Time
+        # US Pacific Time is UTC-7, but it can also be UTC-8 during Daylight Saving Time
+        offset = '-0700' # UTC-7
+        return 'Pacific Time (US & Canada)' if time_object.zone == 'PDT' || time_object.zone == 'PST'
+      when 'U'
+        # US Alaska Time
+        # US Alaska Time is UTC-8, but it can also be UTC-9 during Daylight Saving Time
+        offset = '-0800' # UTC-8
+        return 'Alaska Time (US & Canada)' if time_object.zone == 'AKDT' || time_object.zone == 'AKST'
+      when 'V'
+        # US Hawaii-Aleutian Time
+        # US Hawaii-Aleutian Time is UTC-9, but it can also be UTC-10 during Daylight Saving Time
+        # Note: Hawaii does not observe Daylight Saving Time
+        offset = '-0900' # UTC-9
+      when 'W'
+        offset = '-1000' # UTC-10
+      when 'X'
+        offset = '-1100' # UTC-11
+      when 'Y'
+        offset = '-1200' # UTC-12
+      else
+        raise ArgumentError, "Invalid time zone offset character: #{offset}"
+    end
+  else
+    raise ArgumentError, "Invalid time zone offset format: #{offset}"
+  end
+  # puts "Offset: #{offset}"
+end

data/lib/mkmatter/questions.rb

@@ -1,250 +1,143 @@
-require 'highline'
-require 'ostruct'
-module Mkmatter
-  module Questions
-    def self.ask(cls)
+require "highline"
+require "ostruct"
 
-      known_questions = const_get(cls).methods.sort.delete_if { |m| m.to_s !~ /^get_.*$/ }
+module Mkmatter
+  class Questions
+    attr :answers
+    @hl = HighLine.new
+    # def self.ask(cls)
+    #   known_questions = const_get(cls).methods.sort.delete_if { |m| m.to_s !~ /^get_.*$/ }
+    #   known_questions.each do |m|
+    #     @answers[:layout] = cls.to_s.lower
+    #     @answers[m.to_s.gsub(/^get_[0-9]{3}_/, "")] = method(m).call
+    #   end
+    #   @answers
+    # end
+
+    def ask(type, include_post_qs)
+      known_questions = methods.sort.delete_if { |m| m.to_s !~ /^get_.*$/ }
+      if type != "post"
+        if include_post_qs
+        else
+          post_only_questions = [
+            :get_002_tags,
+            :get_003_categories,
+            :get_006_summary,
+          ]
+          2.times do
+            for q in known_questions
+              if post_only_questions.include?(q)
+                known_questions.delete(q)
+              end
+            end
+          end
+        end
+        # puts known_questions
+      end
       known_questions.each do |m|
-        @answers[:layout] = cls.to_s.lower
-        @answers[m.to_s.gsub(/^get_[0-9]{3}_/, '')] = method(m).call
+        @answers[:layout] = type
+        @answers[m.to_s.gsub(/^get_[0-9]{3}_/, "")] = method(m).call
       end
       @answers
     end
 
-    class Post
-      attr :answers
+    # @!visibility private
+    def initialize
+      @answers = OpenStruct.new
       @hl = HighLine.new
+    end
 
-      def ask
-        known_questions = methods.sort.delete_if { |m| m.to_s !~ /^get_.*$/ }
-        known_questions.each do |m|
-          @answers[:layout] = 'post'
-          @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
-        hl = @hl
-        title = hl.ask 'Title: '
-        if hl.agree("Would you like it 'titleized' (Title instead of title)? ")
-          title.titleize
-        else
-          title
-        end
-      end
-
-      # @return [Array]
-      def get_002_tags
-        hl = @hl
-        hl.ask("Tags? (write one on each line, then type '.') ") do |q|
-          q.gather = '.'
-        end
-      end
-
-      # @return [Array]
-      def get_003_categories
-        hl = @hl
-        hl.ask("Categories? (write one on each line, then type '.') ") do |q|
-          q.gather = '.'
-        end
-      end
-
-      # @return [String]
-      def get_004_time_zone
-        hl = @hl
-        custom = nil
-        timezone = hl.choose do |m|
-          m.header = 'Time Zone? (select by number)'
-          m.choice('Eastern Time (US & Canada)') do
-            return 'Eastern Time (US & Canada)'
-          end
-          m.choice('Central Time (US & Canada)') do
-            return 'Central Time (US & Canada)'
-          end
-          m.choice :neither
-          m.prompt = '? '
-        end
-        custom = hl.ask('Other Time Zone: ', String) if timezone == :neither
-        return unless custom
-
-        hl.say('Checking TimeZone Validity')
-        print '.'
-        sleep(0.05)
-        5.times do
-          print '.'
-          sleep(0.05)
-          puts ''
-          TimeZone.find_tzinfo custom
-        end
-        custom
-      end
-
-      # @return [String]
-      def get_005_file_format
-        hl = @hl
-        hl.choose do |menu|
-          menu.header = 'Choose whether you want HTML or Markdown'
-          menu.choice 'html' do
-            return 'html'
-          end
-          menu.choice 'md' do
-            return 'md'
-          end
-          menu.prompt = '? '
-        end
-      end
-      # @return [String]
-      def get_006_extra_fields
-        hl = @hl
-        custom_fields = nil
-        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("<% color('NOTE', :bold, :red) %>: Input is <% 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
-          
-        elsif custom_fields.nil?
-          hl.say('No extra fields were added.')
-          return
-        else
-        end
-        custom_fields
+    def get_001_title
+      hl = @hl
+      title = hl.ask "Title: "
+      if hl.agree("Would you like it 'titleized' (Title instead of title)? ", true)
+        title.titleize
+      else
+        title
       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
+    # @return [Array]
+    def get_002_tags
+      hl = @hl
+      hl.ask("Tags? (write one on each line, then press '.' then press 'Enter')") do |q|
+        q.gather = '.'
       end
+    end
 
-      # @!visibility private
-      def initialize
-        @answers = OpenStruct.new
-        @hl = HighLine.new
+    # @return [Array]
+    def get_003_categories
+      hl = @hl
+      hl.ask("Categories? (write one on each line, then press '.' then press 'Enter')") do |q|
+        q.gather = '.'
       end
+    end
 
-      def get_001_title
-        hl = @hl
-        title = hl.ask 'Title: '
-        if hl.agree("Would you like it 'titleized' (Title instead of title)? ")
-          title.titleize
-        else
-          title
+    # @return [String]
+    def get_004_file_format
+      hl = @hl
+      hl.choose do |menu|
+        menu.header = "Choose whether you want HTML or Markdown"
+        menu.choice "html" do
+          return "html"
         end
-      end
-
-      # @return [Array]
-      def get_002_tags
-        hl = @hl
-        hl.ask("Tags? (write one on each line, then type '.') ") do |q|
-          q.gather = '.'
+        menu.choice "md" do
+          return "md"
         end
+        menu.prompt = "? "
       end
+    end
 
-      # @return [Array]
-      def get_003_categories
-        hl = @hl
-        hl.ask("Categories? (write one on each line, then type '.') ") do |q|
+    # @return [String]
+    def get_005_extra_fields
+      hl = @hl
+      fields = {}
+      custom_fields = nil
+      cfh = nil
+      if hl.agree("Do you want to add custom fields? ", true)
+        hl.say(<<~EXTRA_FIELDS)
+        These fields will be usable as {{LAYOUT_TYPE.FIELD}} in pages/posts etc.
+        Your fields should be inputted as FIELD=>TEXT HERE
+        Type 'EOL' on a new line then press Enter when you are done.
+        <%= color('NOTE', :bold, RED) %>: Input is <%= color('NOT', :bold, RED) %> evaluated!
+        EXTRA_FIELDS
+        custom_fields = hl.ask("Fields?") do |q|
           q.gather = '.'
         end
       end
-
-      # @return [String]
-      def get_004_time_zone
-        hl = @hl
-        custom = nil
-        timezone = hl.choose do |m|
-          m.header = 'Time Zone? (select by number)'
-          m.choice('Eastern Time (US & Canada)') do
-            return 'Eastern Time (US & Canada)'
-          end
-          m.choice('Central Time (US & Canada)') do
-            return 'Central Time (US & Canada)'
-          end
-          m.choice :neither
-          m.prompt = '? '
+      if !custom_fields.empty?
+        custom_fields.each do |field|
+          fields.store(field.to_sym, 'nil')
         end
-        custom = hl.ask('Other Time Zone: ', String) if timezone == :neither
-        return unless custom
-
-        hl.say('Checking TimeZone Validity')
-        print '.'
-        sleep(0.05)
-        5.times do
-          print '.'
-          sleep(0.05)
-          puts ''
-          TimeZone.find_tzinfo custom
+      end        
+      if custom_fields.empty?
+        hl.say("No extra fields were added.")
+        return
+      else
+        hl.say("#{fields} #{fields.class}")
+        cfh = hl.ask("Value of field '<%= key %>'?") do |q|
+          q.gather = fields
         end
-        custom
       end
+      cfh
+    end
 
-      # @return [String]
-      def get_005_file_format
-        hl = @hl
-        hl.choose do |menu|
-          menu.header = 'Choose whether you want HTML or Markdown'
-          menu.choice 'html' do
-            return 'html'
-          end
-          menu.choice 'md' do
-            return 'md'
-          end
-          menu.prompt = '? '
-        end
-      end
-      # @return [String]
-      def get_006_extra_fields
-        hl = @hl
-        custom_fields = nil
-        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.extra_fields = fields
-        elsif custom_fields.nil?
-          hl.say('No extra fields were added.')
-          return
-        else
-        end
-        custom_fields
-      end
-      # @return [OpenStruct]
+    # @return [OpenStruct]
+    def get_006_summary
+      hl = @hl
+      summary = nil
+      summary_if = hl.agree("Summary? ", true)
+      if summary_if
+        summary = hl.ask(<<~SUMMARYDOC) do |q|
+          Input a summary of the post.
+          This will be outputted as a summary in the front matter.
+          This is useful for a post that is long and you want to
+          show a summary of the post.
+        SUMMARYDOC
+          q.gather = "."
+        end
+      end
+      summary.join("\n")
     end
   end
 end

data/lib/mkmatter/version.rb

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