mkmatter 3.0.43 → 3.0.44

data/lib/mkmatter/cli/methods.rb

@@ -2,86 +2,85 @@ require 'highline'
 require 'find'
 require 'yaml'
 module Mkmatter
-    class Methods
-      # @return [Boolean] whether current directory is inside a jekyll site source directory
-      def Methods.check_if_jekyll
-        cwd = Pathname.new('.')
+  class Methods
+    # @return [Boolean] whether current directory is inside a jekyll site source directory
+    def Methods.check_if_jekyll
+      cwd = Pathname.new('.')
+      cwd.ascend do |path|
+        if path.join('_config.yml').exist?
+          break true
+        elsif cwd.to_s == '/'
+          # hit root, stop
+          break false
+        end
+      end
+    end
+    
+    # @return [Pathname] path of current jekyll site source roo
+    def Methods.get_jekyll_root
+      if Methods.check_if_jekyll
+        cwd = Pathname.new('.').realdirpath
         cwd.ascend do |path|
           if path.join('_config.yml').exist?
-            break true
-          elsif cwd.to_s == '/'
-            # hit root, stop
-            break false
+            return path
+          else
+            next
           end
         end
       end
-      
-      # @return [Pathname] path of current jekyll site source roo
-      def Methods.get_jekyll_root
-        if Methods.check_if_jekyll
-          cwd = Pathname.new('.').realdirpath
-          cwd.ascend do |path|
-            if path.join('_config.yml').exist?
-              return path
-            else
-              next
-            end
-          end
+    end
+    
+    # @return [NilClass] nil
+    def Methods.launch_editor(editor, file_path)
+      hl = HighLine.new($stdin, $stderr, 80)
+      if file_path
+        if hl.agree("Would you like to open an editor? ('editor' command) ", true)
+          pid = spawn("#{} #{file_path}")
+          Process.wait pid
         end
       end
-      
-      # @return [NilClass] nil
-      def Methods.launch_editor(file_path)
-        hl = HighLine.new($stdin, $stderr, 80)
-        if file_path
-          if hl.agree("Would you like to open an editor? ('editor' command) ", true)
-            pid = spawn("editor #{file_path}")
-            Process.wait pid
-          end
-        end
+    end
+    
+    # @param [String] type type of content
+    # @param [String] key root yaml directive to return
+    # @return [Hash] front matter
+    def Methods.find_front_matter(type, key)
+      unless type =~ /^(post|page)$/
+        $stderr.puts "#{HighLine.color('Error', :red, :bold)}: Invalid Argument, allowed values: post, page"
+        exit 1
       end
-      
-      # @param [String] type type of content
-      # @param [String] key root yaml directive to return
-      # @return [Hash] front matter
-      def Methods.find_front_matter(type, key)
-        unless type =~ /^(post|page)$/
-          $stderr.puts "#{HighLine.color('Error', :red, :bold)}: Invalid Argument, allowed values: post, page"
-          exit 1
-        end
-        yaml_loader       = ->(string) {YAML.load(string)}
-        files             = {}
-        html_front_matter = []
-        md_front_matter   = []
-        front_matter      = {}
-        case type
-          when 'page'
-            Find.find(Methods.get_jekyll_root.to_s) do |path|
-              Find.prune if path =~ /(_includes|_layouts|_docs|_site)/ # don't include layouts, includes, site, docs
-              Find.prune if path =~ /(_posts)/ # don't include our own posts either
-              Find.prune if path =~ /(vendor\/bundle)/ # don't include vendor/
-              Find.prune if path =~ /(\/tag\/)/ # don't include our own tags
-              html_front_matter << path if path =~ /.*\.html$/
-              md_front_matter << path if path =~ /.*\.md$/
-            end
-          
-          when 'post'
-            Find.find(Pathname(Methods.get_jekyll_root).join('_posts').to_path) do |path|
-              html_front_matter << path if path =~ /.*\.html$/
-              md_front_matter << path if path =~ /.*\.md$/
-            end
-          else
-            # noop
-        end
-        files['html'] = html_front_matter
-        files['md']   = md_front_matter
-        files.each do |ftype, array|
-          array.each do |ele|
-            front_matter[ele] = YAML.load_file(ele)[key]
+      files             = {}
+      html_front_matter = []
+      md_front_matter   = []
+      front_matter      = {}
+      case type
+        when 'page'
+          Find.find(Methods.get_jekyll_root.to_s) do |path|
+            Find.prune if path =~ /(_includes|_layouts|_docs|_site)/ # don't include layouts, includes, site, docs
+            Find.prune if path =~ /(_posts)/ # don't include our own posts either
+            Find.prune if path =~ /(vendor\/bundle)/ # don't include vendor/
+            Find.prune if path =~ /(\/tag\/)/ # don't include our own tags
+            html_front_matter << path if path =~ /.*\.html$/
+            md_front_matter << path if path =~ /.*\.md$/
+          end
+        
+        when 'post'
+          Find.find(Pathname(Methods.get_jekyll_root).join('_posts').to_path) do |path|
+            html_front_matter << path if path =~ /.*\.html$/
+            md_front_matter << path if path =~ /.*\.md$/
           end
+        else
+          # noop
+      end
+      files['html'] = html_front_matter
+      files['md']   = md_front_matter
+      files.each do |ftype, array|
+        array.each do |ele|
+          front_matter[ele] = YAML.load_file(ele)[key]
         end
-        front_matter.select! {|k, v| !v.nil?}
-        front_matter
       end
+      front_matter.select! {|k, v| !v.nil?}
+      front_matter
     end
-  end
+  end
+end

data/lib/mkmatter/cli/runner.rb

@@ -24,7 +24,7 @@ module Mkmatter
           # The ruby interpreter would pipe this to STDERR and exit 1 in the case of an unhandled exception
           b = e.backtrace
           @stderr.puts("#{b.shift}: #{e.message} (#{e.class})")
-          @stderr.puts(b.map {|s| "\tfrom #{s}"}.join("\n"))
+          @stderr.puts(b.map { |s| "\tfrom #{s}" }.join("\n"))
           1
         rescue SystemExit => e
           e.status

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

@@ -1,4 +1,5 @@
 require 'highline'
+require 'thor'
 
 require 'mkmatter/cli/descriptions'
 require 'mkmatter/cli/methods'
@@ -10,7 +11,7 @@ module Mkmatter
       # Generate 'New' Content
       class NewContent < Thor
         include Thor::Actions
-        HILINE = HighLine.new($stdin, $stderr, 80)
+        HILINE = HighLine.new($stdin, $stderr, 40)
         option :publish, :type => :boolean
         option :file, :type => :boolean
         desc 'page [options]', 'make front matter (and possibly content) for a jekyll page'
@@ -18,9 +19,8 @@ module Mkmatter
     
         def page
           if options[:file]
-        
             if Mkmatter::Methods.check_if_jekyll
-              @questions = Mkmatter::Questions::Page.new(HighLine.new($stdin, $stderr, 80)).ask
+              @questions = Mkmatter::Questions::Page.new(HILINE).ask
               answers    = Mkmatter::Answers.new(@questions, options.fetch(:publish, nil))
               filename   = answers.title.to_slug + '.' + answers.file_format.downcase
               path       = Pathname("./#{filename}").realdirpath
@@ -46,7 +46,7 @@ module Mkmatter
                 fd.puts answers.to_h.stringify_keys.to_yaml(indentation: 2)
                 fd.puts '---'
               end
-              Mkmatter::Methods.launch_editor(path)
+              Mkmatter::Methods.launch_editor(options[:editor], path)
             else
               puts "Not in a Jekyll directory. (no '_config.yml' in any parent directory)"
               exit 1
@@ -71,7 +71,7 @@ module Mkmatter
           if options[:draft] and options[:file]
         
             if Mkmatter::Methods.check_if_jekyll
-              @questions  = Mkmatter::Questions::Post.new(HighLine.new($stdin, $stderr, 80)).ask
+              @questions  = Mkmatter::Questions::Post.new(HILINE).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
@@ -99,7 +99,7 @@ module Mkmatter
                 fd.puts answers.to_h.stringify_keys.to_yaml(indentation: 2)
                 fd.puts '---'
               end
-              Mkmatter::Methods.launch_editor(path)
+              Mkmatter::Methods.launch_editor(options[:editor], path)
             else
               puts "Not in a Jekyll directory. (no '_config.yml' in any parent directory)"
               exit 1
@@ -107,7 +107,7 @@ module Mkmatter
           elsif options[:file] and options[:draft].nil? or options[:draft] == false
         
             if Mkmatter::Methods.check_if_jekyll
-              @questions  = Mkmatter::Questions::Post.new(HighLine.new($stdin, $stderr, 80)).ask
+              @questions  = Mkmatter::Questions::Post.new(HILINE).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('')
@@ -137,21 +137,19 @@ module Mkmatter
                 fd.puts '---'
               end
           
-              Mkmatter::Methods.launch_editor(path)
+              Mkmatter::Methods.launch_editor(options[:editor], path)
             else
               puts "Not in a Jekyll directory. (no '_config.yml' in any parent directory)"
               exit 1
             end
-      
           elsif options[:draft].nil? and options[:file].nil?
-            @questions = Mkmatter::Questions::Post.new(HighLine.new($stdin, $stderr, 80)).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 '---'
       
           end
-    
         end
       end
     end

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

@@ -8,7 +8,7 @@ module Mkmatter
       class Tags < Thor
         include Thor::Actions
         HILINE = HighLine.new($stdin, $stderr, 80)
-    
+        
         desc 'find [options] TYPE', 'find content of type TYPE'
         # @param [String] type Type of content
         def find(type)
@@ -17,7 +17,7 @@ module Mkmatter
             table.title                = 'Tags'
             table.style.all_separators = true
             table.headings             = ["#{HILINE.color('Path from Jekyll Root', :bold)}", "#{HILINE.color('Tags', :bold)}"]
-        
+            
             front_matter = Mkmatter::Methods.find_front_matter(type, 'tags')
             front_matter.each do |path, tags|
               path = path.gsub(/#{Mkmatter::Methods.get_jekyll_root}(\/.*)/, '\1')
@@ -29,29 +29,48 @@ module Mkmatter
             $stderr.puts "#{HILINE.color('Error', :red, :bold)}: Not a Jekyll source directory (no '_config.yml' found in any parent directory)"
           end
         end
+        
         desc 'new [options] TAG', 'create a new tag'
         # @param [String] tag Tag Name
         def new_tag(tag)
           if Mkmatter::Methods.check_if_jekyll
-      
+          
           else
             $stderr.puts "#{HILINE.color('Error', :red, :bold)}: Not a Jekyll source directory (no '_config.yml' found in any parent directory)"
           end
         end
+        
         desc 'gen [options]', 'generate tag files'
         option(:'tag-index', type: :string, default: nil, desc: "configures whether generation of tag files will give them a layout file for a tag index, if you don't want generation to give layouts, omit --tag-index", aliases: %w(-i))
+        option(:'dry-run', type: :boolean, default: false, desc: 'Performs a dry run and prints out what it was going to do')
+        
         def gen # only used for posts
-          if Mkmatter::Tags.has_tag_folder?
-            front_matter = Mkmatter::Methods.find_front_matter('post', 'tags')
-            tags         = []
-            front_matter.each do |key, value|
-              tags << value
+          if options[:'dry-run']
+            if Mkmatter::Tags.has_tag_folder?
+              front_matter = Mkmatter::Methods.find_front_matter('post', 'tags')
+              tags         = []
+              front_matter.each do |key, value|
+                tags << value
+              end
+              all_tags = tags.flatten.sort.uniq
+              Mkmatter::Tags.dry_gen all_tags
+            else
+              HILINE.say "<% color('Error', :red, :bold) %>: No tag folder"
             end
-            all_tags = tags.flatten.sort.uniq
-            all_tags
           else
-            $stderr.puts "#{HILINE.color('Error', :red, :bold)}: Not a Jekyll source directory (no '_config.yml' found in any parent directory)"
+            if Mkmatter::Tags.has_tag_folder?
+              front_matter = Mkmatter::Methods.find_front_matter('post', 'tags')
+              tags         = []
+              front_matter.each do |key, value|
+                tags << value
+              end
+              all_tags = tags.flatten.sort.uniq
+              Mkmatter::Tags.gen_post_tags all_tags
+            else
+              $stderr.puts "#{HILINE.color('Error', :red, :bold)}: Not a Jekyll source directory (no '_config.yml' found in any parent directory)"
+            end
           end
+        
         end
       end
     end

data/lib/mkmatter/cli/tags.rb

@@ -1,7 +1,11 @@
 require 'mkmatter/cli/methods'
-
+require 'thor'
+require 'front_matter_parser'
+require 'active_support/inflector'
 module Mkmatter
-  class Tags
+  class Tags < Thor
+    include Thor::Actions
+    HILINE = HighLine.new($stdin, $stderr, 80)
     
     def Tags.has_tag_folder?
       if Mkmatter::Methods.check_if_jekyll
@@ -15,51 +19,60 @@ module Mkmatter
       end
     end
     
-    def Tags.gen_post_tags
+    # @param [Array] tags Array of tags to generate pages for
+    # @return [Boolean] whether generation was successful
+    def Tags.dry_gen(tags)
       if Mkmatter::Methods.check_if_jekyll
         if Tags.has_tag_folder?
-        
+          tags.each do |tag|
+            file = "#{Mkmatter::Methods.get_jekyll_root}/tag/#{tag}.md"
+            puts <<-PUTS.strip_heredoc
+                ---
+
+                title: #{tag.titleize}
+                tag: #{tag}
+                ---
+              PUTS
+          end
         else
         end
       end
     end
-    
-    # @param [String] type Gets tags from content type TYPE
-    def Tags.get_tags_of_type(type)
-      unless type =~ /^(post|page)$/
-        raise ArgumentError
-      end
-      yaml_loader       = ->(string) {YAML.load(string)}
-      files             = {}
-      html_front_matter = []
-      md_front_matter   = []
-      front_matter      = {}
-      case type
-        when 'page'
-          Find.find(Methods.get_jekyll_root.to_s) do |path|
-            Find.prune if path =~ /(_includes|_layouts|_docs|_site)/ # don't include layouts, includes, site, docs
-            Find.prune if path =~ /(_posts)/ # don't include our own posts either
-            Find.prune if path =~ /(vendor\/bundle)/ # don't include vendor/
-            Find.prune if path =~ /(\/tag\/)/ # don't include our own tags
-            html_front_matter << path if path =~ /.*\.html$/
-            md_front_matter << path if path =~ /.*\.md$/
-          end
-        
-        when 'post'
-          Find.find(Pathname(Methods.get_jekyll_root).join('_posts').to_path) do |path|
-            html_front_matter << path if path =~ /.*\.html$/
-            md_front_matter << path if path =~ /.*\.md$/
+
+    def Tags.gen_post_tags(tags)
+      if Mkmatter::Methods.check_if_jekyll
+        if Tags.has_tag_folder?
+          tags.each do |tag|
+            file = "#{Mkmatter::Methods.get_jekyll_root}/tag/#{tag}.md"
+            self.new.create_file file do
+              <<-PUTS
+                ---
+                #{tag_index unless tag_index.nil?}
+                title: #{tag.titleize}
+                tag: #{tag}
+                ---
+              PUTS
+            end
           end
         else
-          # noop
-      end
-      files['html'] = html_front_matter
-      files['md']   = md_front_matter
-      files.each do |ftype, array|
-        array.each do |ele|
-          front_matter[ele] = FrontMatterParser::Parser.parse_file(ele, syntax_parser: :md, loader: yaml_loader)[key]
         end
       end
+    end
+    
+    def Tags.get_tags
+      yaml_loader  = ->(string) {YAML.load(string)}
+      files        = []
+      front_matter = {}
+      
+      Find.find(Pathname(Methods.get_jekyll_root).join('_posts').to_path) do |path|
+        files << path if path =~ /.*(\.html|\.md)$/
+      end
+      files.each do |ele|
+        yaml = FrontMatterParser::Parser.parse_file(ele, syntax_parser: :md, loader: yaml_loader).front_matter
+        front_matter[ele] = yaml['tags'] if yaml['tags']
+        front_matter[ele] = yaml['tag'] if yaml['tag']
+
+      end
       front_matter.select! {|k, v| !v.nil?}
       front_matter
     end

data/lib/mkmatter/cli.rb

@@ -1,5 +1,5 @@
 require 'mkmatter/cli/app'
 require 'mkmatter/cli/descriptions'
 require 'mkmatter/cli/methods'
-require 'mkmatter/cli/runner'
-require 'mkmatter/cli/subs'
+require 'mkmatter/cli/subs'
+require 'mkmatter/cli/runner'

data/lib/mkmatter/common.rb

@@ -8,7 +8,7 @@ module Mkmatter
     # @return [String]
     def get_title(hl)
       title = hl.ask 'Title: '
-      if hl.agree("Would you like it 'titleized' (Title instead of title)?", true)
+      if hl.agree("Would you like it 'titleized' (Title instead of title)? ", true)
         title.titleize
       else
         title
@@ -18,13 +18,13 @@ module Mkmatter
     # @param [HighLine] hl A highline context
     # @return [String]
     def get_tags(hl)
-      hl.ask('Tags? (space separated list) ', -> (str) {str.split(' ')})
+      hl.ask 'Tags? (this would be a comma separated list.) ', -> (str) {str.split(',')}
     end
     
     # @param [HighLine] hl A highline context
     # @return [String]
     def get_categories(hl)
-      hl.ask('Categories? (space separated list) ', -> (str) {str.split(' ')})
+      hl.ask 'Categories? (space separated list) ', -> (str) {str.split(' ')}
     end
     
     # @param [HighLine] hl A highline context
@@ -42,10 +42,9 @@ module Mkmatter
         m.choice :neither
         m.prompt = '? '
       end
-      case timezone
-        when :neither
+      case
+        when timezone == :neither
           custom = hl.ask('Other Time Zone: ', String)
-        else
       end
       if custom
         hl.say('Checking TimeZone Validity')
@@ -71,11 +70,5 @@ module Mkmatter
         menu.prompt = '? '
       end
     end
-    def get_keywords(hl)
-      hl.ask("Meta Keywords? (example: 'space 'spaced', comma separated, page keywords, goes here') ")
-    end
-    def get_description(hl)
-      hl.ask("Meta Description? (example: 'This page is a bunch of right nonsense.' ")
-    end
   end
 end

data/lib/mkmatter/version.rb

@@ -1,3 +1,3 @@
 module Mkmatter
-  VERSION = '3.0.43'
+  VERSION = '3.0.44'
 end

data/mkmatter.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   end
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(test)/})
   end
   spec.required_ruby_version = '~> 2'
   spec.bindir = 'bin'
@@ -40,14 +40,19 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport', '~> 5.1'
   spec.add_runtime_dependency 'git', '~> 1.3'
   spec.add_runtime_dependency 'slugity', '~> 1.1'
-  spec.add_runtime_dependency 'thor', '~> 0.20.0'
+  spec.add_runtime_dependency 'thor', '~> 0.20'
   spec.add_runtime_dependency 'terminal-table', '~> 1.8'
   spec.add_runtime_dependency 'os', '~> 1.0'
+  spec.add_runtime_dependency 'front_matter_parser', '~> 0.1'
+  spec.add_runtime_dependency 'rake', '~> 10.0'
+  spec.add_runtime_dependency 'micro_install', '~> 0.1.0'
   spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.7', '>= 3.7.0'
-  spec.add_development_dependency 'rspec-core', '~> 3.7', '>= 3.7.0'
-  spec.add_development_dependency 'rspec-mocks', '~> 3.7', '>= 3.7.0'
-  spec.add_development_dependency 'rspec-expectations', '~> 3.7', '>= 3.7.0'
-
+  spec.add_development_dependency 'minitest', '~> 5'
+  spec.add_development_dependency 'minitest-reporters', '~> 1.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