mkmatter 3.1.16 → 3.1.17

data/mkmatter.gemspec

@@ -1,63 +1,62 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'mkmatter/version'
-Gem::Specification.new do |spec|
-  spec.name = 'mkmatter'
-  spec.version = Mkmatter::VERSION
-  spec.authors = ['Ken Spencer']
-  spec.email = 'me@iotaspencer.me'
-  spec.summary = %q{Script facilitating easy content creation and generation for Jekyll Sites}
-  spec.description = %q{A gem that helps a user maintain a jekyll site source directory.}
-  spec.homepage = 'https://iotaspencer.me/projects/mkmatter'
-  spec.license = 'MIT'
-
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata = {
-        'github_repo'       => 'https://github.com/IotaSpencer/mkmatter',
-        'bug_tracker_uri'   => 'https://github.com/IotaSpencer/mkmatter/issues',
-        #'documentation_uri' => 'https://rubydoc.info/gems/mkmatter', no API
-        'homepage_uri'      => 'https://iotaspencer.me/projects/mkmatter',
-        'source_code_uri'   => 'https://github.com/IotaSpencer/mkmatter',
-        'wiki_uri'          => 'https://github.com/IotaSpencer/mkmatter/wiki'
-    }
-  else
-    raise 'RubyGems 2.0 or newer is required to protect against ' \
-          'public gem pushes.'
-  end
-
-  spec.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test)/})
-  end
-  spec.required_ruby_version = '~> 3'
-  spec.bindir = 'bin'
-  spec.executables << 'mkmatter'
-  spec.require_paths = ['lib']
-
-  spec.add_runtime_dependency 'highline', '~> 3.0.1'
-  spec.add_runtime_dependency 'activesupport', '~> 7.1.3.2'
-  spec.add_runtime_dependency 'git', '~> 1.19.1'
-  spec.add_runtime_dependency 'slugity', '~> 1.1'
-  spec.add_runtime_dependency 'thor', '~> 1.3.1'
-  spec.add_runtime_dependency 'terminal-table', '~> 3.0.2'
-  spec.add_runtime_dependency 'os', '~> 1.1.4'
-  spec.add_runtime_dependency 'paint', '~> 2.3.0'
-  spec.add_runtime_dependency 'front_matter_parser', '~> 1.0.1'
-  spec.add_runtime_dependency 'rake', '13.1.0'
-  spec.add_runtime_dependency 'micro_install', '~> 0.4.0'
-  spec.add_development_dependency 'bundler', '~> 2.3.5'
-  spec.add_development_dependency 'minitest', '~> 5'
-  spec.add_development_dependency 'rspec-core', '~> 3.13'
-  spec.add_development_dependency 'rspec-expectations', '~> 3.13'
-  spec.add_development_dependency 'rspec-mocks', '~> 3.13'
-  spec.add_development_dependency 'minitest-reporters', '~> 1.6.1'
-  spec.add_development_dependency 'aruba', '~> 2.2.0'
-  spec.add_development_dependency 'highline-test', '~> 0.0.1'
-  spec.post_install_message = [
-      "Thanks for installing 'mkmatter', It means a lot to me.",
-      "If you'd like to install 'micro', a text editor bundled with 'mkmatter'.",
-      "Then just run 'bundle exec micro-install' or 'micro-install',",
-      "depending on how you installed 'mkmatter'."
-  ].join("\n")
-end
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'mkmatter/version'
+Gem::Specification.new do |spec|
+  spec.name = 'mkmatter'
+  spec.version = Mkmatter::VERSION
+  spec.authors = ['Ken Spencer']
+  spec.email = 'me@iotaspencer.me'
+  spec.summary = %q{Script facilitating easy content creation and generation for Jekyll Sites}
+  spec.description = %q{A gem that helps a user maintain a jekyll site source directory.}
+  spec.homepage = 'https://iotaspencer.me/projects/mkmatter'
+  spec.license = 'MIT'
+
+  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
+  # to allow pushing to a single host or delete this section to allow pushing to any host.
+  if spec.respond_to?(:metadata)
+    spec.metadata = {
+        'github_repo'       => 'https://github.com/IotaSpencer/mkmatter',
+        'bug_tracker_uri'   => 'https://github.com/IotaSpencer/mkmatter/issues',
+        #'documentation_uri' => 'https://rubydoc.info/gems/mkmatter', no API
+        'homepage_uri'      => 'https://iotaspencer.me/projects/mkmatter',
+        'source_code_uri'   => 'https://github.com/IotaSpencer/mkmatter',
+        'wiki_uri'          => 'https://github.com/IotaSpencer/mkmatter/wiki'
+    }
+  else
+    raise 'RubyGems 2.0 or newer is required to protect against ' \
+          'public gem pushes.'
+  end
+
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test)/})
+  end
+  spec.required_ruby_version = '~> 3'
+  spec.bindir = 'bin'
+  spec.executables << 'mkmatter'
+  spec.require_paths = ['lib']
+
+  spec.add_runtime_dependency 'highline', '~> 3.1.2'
+  spec.add_runtime_dependency 'activesupport', '~> 8.0.2'
+  spec.add_runtime_dependency 'git', '~> 3.1.0'
+  spec.add_runtime_dependency 'slugity', '~> 1.1'
+  spec.add_runtime_dependency 'thor', '~> 1.3.2'
+  spec.add_runtime_dependency 'ostruct'
+  spec.add_runtime_dependency 'terminal-table', '~> 4.0.0'
+  spec.add_runtime_dependency 'os', '~> 1.1.4'
+  spec.add_runtime_dependency 'paint', '~> 2.3.0'
+  spec.add_runtime_dependency 'front_matter_parser', '~> 1.0.1'
+  spec.add_runtime_dependency 'rake', '13.2.1'
+  spec.add_runtime_dependency 'micro_install', '~> 0.4.1'
+  spec.add_development_dependency 'bundler', '~> 2.6.9'
+  spec.add_development_dependency 'cancun', '~> 0.2.2'
+  spec.add_development_dependency 'bump', '~> 0.10.0'
+  spec.add_development_dependency 'minitest', '~> 5'
+  spec.add_development_dependency 'minitest-reporters', '~> 1.6.1'
+  spec.add_development_dependency 'rspec', '~> 3.13.1'
+  spec.post_install_message = [
+      "Thanks for installing 'mkmatter', It means a lot to me.",
+      "If you'd like to install 'micro', a text editor bundled with 'mkmatter'.",
+      "Then just run 'bundle exec micro-install' or 'micro-install',",
+      "depending on how you installed 'mkmatter'."
+  ].join("\n")
+end

data/spec/class_option_spec.rb

@@ -5,10 +5,10 @@ RSpec.describe "Test basic 'mkmatter' commands" do
     @app = Mkmatter::App::CLI
   end
   it "outputs commands for 'mkmatter help'" do
-    expect { @app.start(%w(help)) }.to output(/Commands:/).to_stdout_from_any_process
+    expect { @app.start(%w(help)) }.to output(/mkmatter commands:/).to_stdout_from_any_process
   end
   it "outputs commands for 'mkmatter help new'" do
-    expect { @app.start(%w(help new)) }.to output(/Commands:/).to_stdout_from_any_process
+    expect { @app.start(%w(help new)) }.to output(/Usage:\n  (rspec|mkmatter) new \[options\]\n\nOptions:/).to_stdout_from_any_process
   end
   it "outputs the 'mkmatter' version" do
     expect { @app.start(%w(--version)) }.to output(/#{Mkmatter::VERSION}/).to_stdout_from_any_process

data/spec/descriptions_spec.rb

@@ -9,10 +9,8 @@ RSpec.describe "DescriptionsSpec" do
   after do
     # Teardown something
   end
-  it "outputs help for new post" do
-    expect { @app.start(%w(new help post)) }.to output(/mkmatter new post/).to_stdout
-  end
-  it 'outputs help for new page' do
-  expect { @app.start(%w(new help page)) }.to output(/mkmatter new page/).to_stdout
+
+  it 'outputs help for new' do
+    expect { @app.start(%w(help new)) }.to output(/Usage:\n  (rspec|mkmatter) new \[options\].*/).to_stdout
   end
 end

data/spec/questions_spec.rb

@@ -1,72 +1,52 @@
-require_relative 'spec_helper'
-require_relative '../lib/mkmatter/cli/runner'
-require 'rspec/expectations'
-require 'io/console'
-require 'highline'
-require 'highline/test'
-require 'yaml'
+require_relative "spec_helper"
+require_relative "../lib/mkmatter/cli/runner"
+require "rspec/expectations"
+require "io/console"
+require "highline"
+require "yaml"
 
 RSpec.configure do |c|
 end
 
-
-RSpec.describe 'PostQuestionsTest' do
-  before(:example) do
-    @questions = Mkmatter::Questions
-
-    # Before running a test, create a HighLine::Test::Client
-    @client = HighLine::Test::Client.new
-
-    # The application itself is started in a block passed to the #run method
-    @client.run do |driver|
-      # This block is run in a child process
-
-      # The HighLine instance used by the application *must* be the one supplied by
-      # the client.
-      expect(Mkmatter::Questions::Post).to receive(:instance_variable_get) do |args|
-        expect(args[0]).to eq(:@hl)
-      end.and_return(driver.high_line)
-      # Do any other setup (e.g. stubbing) here
-      # Start the application under test
-      # If this block ever completes, the child process will be killed by
-      # HighLine::Test
-    end
-
-    @front_matter_regex = <<~HEREDOC
-      ---\n
-      layout\:\s(?<layout_>post|page)\n
-      title\:\s(?<title_>[[:print:]]{1,})\n
-      categories\:\n
-      (?<categories>(?:(?>-\s[[:print:]]{1,})\n){1,})
-      tags\:\n
-      (?<tags>(?:(?>-\s[[:print:]]{1,})\n){1,})
-      date\:\s\'(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})\s
-      (?<hour>\d{2})\:(?<minute>\d{2})\:(?<second>\d{2})\s
-      [+-]{1}(?<timezone_offset_hour>\d{2})(?<timezone_offset_minute>\d{2})\'\n
-      ---
-    HEREDOC
-  end
-  after :example do
-    @client.cleanup
-  end
-  it 'outputs no file, and is not a draft' do
-    @qs = @questions::Post.new
-    expect { @qs.ask }.to output('Title: ').to_stdout_from_any_process
-    expect { @client.type('some title') }.to output("Would you like it 'titleized' (Title instead of title)? ").to_stdout_from_any_process
-    expect { @client.type 'y' }.to output("Tags? (write one on each line, then type '.') ").to_stdout_from_any_process
-    expect { @client.type "some tags\nwould\ngo\nhere" }.to output("Categories? (write one on each line, then type '. ') ").to_stdout_from_any_process
-    expect { @client.type "Some Category\nHere\nUpdates" }.to output("Time Zone? (select by number):\n1. Eastern Time (US & Canada)\n2. Central Time (US & Canada)\n3. neither\n? ").to_stdout_from_any_process
-    expect { @client.type '1' }.to output("Choose whether you want HTML or\nMarkdown:\n1. html\n2. md\n? ").to_stdout_from_any_process
-    regex = Regexp.new(Regexp.quote(@front_matter_regex), Regexp::EXTENDED)
-    expect { @client.type '2' }.to output(regex).to_stdout_from_any_process
-
-  end
-  # def test_that_page_questions_no_file_and_no_draft_works
-  #   #"some title\ny\nmd\nsome,tags,here,multi word too\nsome categories here\n1\nmd\n"
-  #   #@input.rewind
-  #   #HighLine::Simulate.with "some title\ny\nmd\nsome,tags,here,multi word too\nsome categories here\n1\nmd\n" do
-  #   #  @questions::Page.new(@terminal).ask
-  #   #end
-  #   #@input = IO.new
-  # end
-end
+# describe "PostQuestionsTest" do
+#   # include Cancun::Highline
+#   # include Cancun::Test
+#   before(:all) do
+#     @app = Mkmatter::App::CLI
+#     @input = StringIO.new
+#     @output = StringIO.new
+#     @hl = HighLine.new(@input, @output)
+#     @asker = Mkmatter::Questions
+#     @answers = nil
+#   end
+#   describe "ask" do
+#     it "asks for title" do
+#       @input << "Test post\ny\ntag1\ntag2\ntag3\n.\ncat1\ncat2\ncat3\n.\n1\ny\nseries\ncustom_string\n.\nposts\nthis is a custom string\ny\nThis is a summary.\nIt will be outputted as a YAML Literal\n.\ny\n_posts/#{Time.now.year}/#{Time.now.month}/\ny"
+#       @input.rewind
+#       @question_hash = @asker.new(@hl).ask("post", true)
+#       @answers = Mkmatter::Answers.new(@question_hash, true, true)
+#       expect { @app.start(%w(new --type=post)) }.to output(/Title: \n.*/).to_stdout_from_any_process
+#       @input.gets
+#       @input.gets
+#     end
+#   end
+
+#   @front_matter_regex = <<~HEREDOC
+#     ---\n
+#     layout\:\s(?<layout_>post|page)\n
+#     title\:\s(?<title_>[[:print:]]{1,})\n
+#     categories\:\n
+#     (?<categories>(?:(?>-\s[[:print:]]{1,})\n){1,})
+#     tags\:\n
+#     (?<tags>(?:(?>-\s[[:print:]]{1,})\n){1,})
+#     date\:\s\'(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})\s
+#     (?<hour>\d{2})\:(?<minute>\d{2})\:(?<second>\d{2})\s
+#     [+-]{1}(?<timezone_offset_hour>\d{2})(?<timezone_offset_minute>\d{2})\'\n
+#     ---
+#   HEREDOC
+
+#   # after :example do
+#   #   @client.cleanup
+#   # end
+
+# end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@
 require 'rspec/core'
 require 'rspec/expectations'
 require 'rspec/mocks'
+require 'cancun'
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
     expectations.syntax = [:expect]

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mkmatter
 version: !ruby/object:Gem::Version
-  version: 3.1.16
+  version: 3.1.17
 platform: ruby
 authors:
 - Ken Spencer
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-01 00:00:00.000000000 Z
+date: 2025-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -16,42 +15,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.3.2
+        version: 8.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.3.2
+        version: 8.0.2
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.1
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.1
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: slugity
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +71,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.2
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -142,98 +155,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.1.0
+        version: 13.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.1.0
+        version: 13.2.1
 - !ruby/object:Gem::Dependency
   name: micro_install
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: 2.6.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: 2.6.9
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: cancun
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 0.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
-  name: rspec-core
+  name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.13'
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -249,33 +248,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: highline-test
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 3.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 3.13.1
 description: A gem that helps a user maintain a jekyll site source directory.
 email: me@iotaspencer.me
 executables:
@@ -312,6 +297,7 @@ files:
 - lib/mkmatter/cli/subs/tags.rb
 - lib/mkmatter/cli/tags.rb
 - lib/mkmatter/common.rb
+- lib/mkmatter/helpers.rb
 - lib/mkmatter/questions.rb
 - lib/mkmatter/version.rb
 - mkmatter.gemspec
@@ -349,8 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Script facilitating easy content creation and generation for Jekyll Sites
 test_files: []