mkmatter 3.0.43 → 3.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a405b6be42a7e8fb19622603bed96dd889bb715cfde97b0c01a65057ddd71f12
-  data.tar.gz: c5b9d9ce0af43a758e07f123299d0e88b291f734dfa7f5cd4c90a5e5b72216bc
+SHA1:
+  metadata.gz: b8a12df223dfadcea474ccdd0ad3889bdb8ad424
+  data.tar.gz: 7f7ac303bf1ba4b42d2bdfe2e995893c325455e8
 SHA512:
-  metadata.gz: 7e2a2f63485a52adb8251f416fb110342744e2c3416d76ffe88ae30b1eb5891fd1d91ad9cb7441edf1de1facf4bc50eaab6cf51bddf85489f6ce55efc263efab
-  data.tar.gz: 3d2192267a88ac7e280ba1db8c1f6d02568e582a510936f50a854854121acf78c1db2dfa9fc1d676510907d6fd8ca7c96a7a9a698d2f59ed99c5746790c2b9a5
+  metadata.gz: 5b728c67461d41a80c6b54542758143a1295e3a008407ae478abdc1e0075367dd0afb6d9be2374cdda58f8710128ffba61b06c49da97c9e5f926b5bfbfb71de6
+  data.tar.gz: 0472a4a353cdb5c2b07a2cf4dcd9d3580bb23c38510ca47b260e2987aab2748fd4a4a658aee0144c81e33743c5513498f2b63451846199394aa70e11f9ad105e

data/.gitignore

@@ -9,6 +9,5 @@
 /.idea/
 /.vscode/
 /vendor/
-Gemfile.lock
 *.gem
 pkg/

data/.gitlab-ci.yml

@@ -21,4 +21,4 @@ test:
   stage: test
   script:
   - bundle install --path vendor/bundle
-  - rake spec
+  - bundle exec rake

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 script: echo "Running tests against $(ruby -v) ..."
-cache: bundler
-bundler_args: --jobs=3 --retry=3 --standalone
+bundler_args: --jobs=6 --retry=3 --standalone --deployment
 notifications:
   irc:
     channels:
@@ -14,17 +13,17 @@ notifications:
 jobs:
   include:
   - stage: test Ruby2.2
-    rvm: 2.2.2
+    rvm: 2.2.7
     script:
     - echo "Running tests against $(ruby -v) ..."
     - bundle exec rake -t
   - stage: test Ruby2.3
-    rvm: 2.3.0
+    rvm: 2.3.4
     script:
     - echo "Running tests against $(ruby -v) ..."
     - bundle exec rake -t
   - stage: test Ruby2.4
-    rvm: 2.4.0
+    rvm: 2.4.1
     script:
     - echo "Running tests against $(ruby -v) ..."
     - bundle exec rake -t
@@ -35,7 +34,6 @@ jobs:
     - bundle exec rake -t
   - stage: test Ruby Head
     rvm: ruby-head
-
     script:
     - echo "Running tests against $(ruby -v) ..."
     - bundle exec rake -t

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
-
 # Specify your gem's dependencies in mkmatter.gemspec
 gemspec

data/Gemfile.lock

@@ -0,0 +1,76 @@
+PATH
+  remote: .
+  specs:
+    mkmatter (3.0.44)
+      activesupport (~> 5.1)
+      front_matter_parser (~> 0.1)
+      git (~> 1.3)
+      highline (~> 1.7)
+      micro_install (~> 0.1.0)
+      os (~> 1.0)
+      rake (~> 10.0)
+      slugity (~> 1.1)
+      terminal-table (~> 1.8)
+      thor (~> 0.20)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.1.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.3.8)
+    ansi (1.5.0)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    front_matter_parser (0.1.1)
+    git (1.3.0)
+    highline (1.7.10)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    json (1.8.6)
+    micro_install (0.1.0)
+      highline (~> 1.7)
+      os (~> 1.0)
+      paint (~> 2.0.1)
+      thor (~> 0.20)
+      unirest (~> 1.1)
+    mime-types (1.25.1)
+    minitest (5.11.3)
+    minitest-reporters (1.1.19)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    os (1.0.0)
+    paint (2.0.1)
+    rake (10.5.0)
+    rest-client (1.6.9)
+      mime-types (~> 1.16)
+    ruby-progressbar (1.9.0)
+    slugity (1.1.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.3.0)
+    unirest (1.1.2)
+      addressable (~> 2.3.5)
+      json (~> 1.8.1)
+      rest-client (~> 1.6.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.16)
+  minitest (~> 5)
+  minitest-reporters (~> 1.1)
+  mkmatter!
+
+BUNDLED WITH
+   1.16.1

data/README.md

@@ -1,31 +1,20 @@
 # mkmatter
 
- Builds & Links
-
-<div>
 
 [![Travis branch](https://img.shields.io/travis/IotaSpencer/mkmatter/dev.svg?style=for-the-badge)](https://travis-ci.org/IotaSpencer/mkmatter)
 [![Travis branch](https://img.shields.io/travis/IotaSpencer/mkmatter/master.svg?style=for-the-badge)](https://travis-ci.org/IotaSpencer/mkmatter)
-</div>
-<div class="m-0 p-0">
 
 [![Github commits (since latest release)](https://img.shields.io/github/commits-since/IotaSpencer/mkmatter/latest.svg?style=for-the-badge)]()
 [![GitHub commits](https://img.shields.io/github/commits-since/IotaSpencer/mkmatter/3.0.38.svg?style=for-the-badge)]()
-</div>
 
-###### Gem
 [![Gem](https://img.shields.io/gem/v/mkmatter.svg?style=for-the-badge)](https://rubygems.org/gems/mkmatter)
 [![GitHub tag](https://img.shields.io/github/tag/IotaSpencer/mkmatter.svg?style=for-the-badge)](https://github.com/IotaSpencer/mkmatter/tree/v3.0.27)
 
-
 [![Gem](https://img.shields.io/gem/dt/mkmatter.svg?style=for-the-badge)](https://rubygems.org/gems/mkmatter)
 [![Gem](https://img.shields.io/gem/dtv/mkmatter.svg?style=for-the-badge)](https://rubygems.org/gems/mkmatter)
-
-###### Badges
-
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg?style=for-the-badge)](https://opensource.org/licenses/MIT)
-[![forthebadge](https://forthebadge.com/images/badges/uses-badges.svg)](https://forthebadge.com)
 
+[![forthebadge](https://forthebadge.com/images/badges/uses-badges.svg)](https://forthebadge.com)
 [![forthebadge](https://forthebadge.com/images/badges/built-with-love.svg)](https://forthebadge.com)
 [![forthebadge](https://forthebadge.com/images/badges/uses-git.svg)](https://forthebadge.com)
 
@@ -78,7 +67,7 @@ or
 
 ## Usage
 
-**See [Wiki](https://github.com/IotaSpencer/mkmatter/wiki)
+**See [Wiki](https://github.com/IotaSpencer/mkmatter/wiki)**
 
 ## Contributing
 

data/Rakefile

@@ -1,8 +1,10 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new('spec')
-
+Rake::TestTask.new do |t|
+  t.test_files = FileList['test/**/*_test.rb']
+  t.libs = ['../lib/mkmatter.rb']
+  t.warning = false
+end
 
 desc 'Run tests'
-task :default => :spec
+task default: :test

data/bin/mkmatter

@@ -5,4 +5,4 @@ Signal.trap('INT') do
   $stderr.puts 'Got INT.. Exiting'
   exit 0
 end
-Mkmatter::App::Runner.new(ARGV.dup).execute!
+Mkmatter::App::Runner.new(ARGV).execute!

data/bin/setup

@@ -1,8 +1,7 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
+#!/bin/sh
+#
 
 bundle install
-
-# Do any other automated setup that you need to do here
+if [ $1 = "micro" ]; then
+    bundle exec micro-install
+fi

data/lib/minitest/xs_and_os_plugin.rb

@@ -0,0 +1,206 @@
+require 'minitest'
+require 'minitest/reporters/base_reporter'
+module Minitest
+  module Reporters
+    def plugin_xs_and_os_init
+      Minitest.reporter.reporters.clear
+      Minitest.reporter << TravisReporter.new(options[:io], options)
+    
+    end
+    
+    class TravisReporter < Minitest::Reporters::BaseReporter
+      
+      
+      def initialize(*)
+        super
+        @color_enabled = io.respond_to?(:tty?) && io.tty?
+        @color_for_result_code  = {
+            '.' => :green,
+            'E' => :red,
+            'F' => :red,
+            '$' => :yellow
+        }
+        @result_code_to_unicode = {
+            '.' => "\u{2714}",
+            'F' => "\u{2718}",
+            'E' => "\u{203C}",
+            '$' => "\u{26A1}"
+        }
+        @color                  = {
+            red:    31,
+            green:  32,
+            yellow: 33,
+            blue:   34
+        }
+      end
+      
+      def record(result)
+        super
+        puts
+        print result.class_name
+        print ' '
+        print self.result_name result.name
+        print ' ['
+        print_result_code(result.result_code)
+        print ']'
+      end
+      
+      def start
+        super
+        io.print "Run options: #{options[:args]} / "
+        io.print 'Running:'
+      end
+      
+      def report
+        super
+        io.sync = true
+        
+        failing_results = results.reject(&:skipped?)
+        skipped_results = results.select(&:skipped?)
+        
+        color = :green
+        color = :yellow if skipped_results.any?
+        color = :red if failing_results.any?
+        
+        if failing_results.any? || skipped_results.any?
+          failing_results.each.with_index(1) { |result, index| display_failing(result, index) }
+          skipped_results.each.with_index(failing_results.size + 1) { |result, index| display_skipped(result, index) }
+        end
+        
+        io.print "\n\n"
+        io.puts statistics
+        io.puts color(summary, color)
+        
+        if failing_results.any?
+          io.puts "\nFailed Tests:\n"
+          failing_results.each { |result| display_replay_command(result) }
+          io.puts "\n\n"
+        end
+      end
+      
+      
+      def statistics
+        'Finished in %.6fs, %.4f runs/s, %.4f assertions/s.' %
+            [total_time, count / total_time, assertions / total_time]
+      end
+      
+      def summary # :nodoc:
+        [
+            pluralize('run', count),
+            pluralize('assertion', assertions),
+            pluralize('failure', failures),
+            pluralize('error', errors),
+            pluralize('skip', skips)
+        ].join(', ')
+      end
+      
+      def indent(text)
+        text.gsub(/^/, '      ')
+      end
+      
+      def display_failing(result, index)
+        backtrace = backtrace(result.failure.backtrace)
+        message   = result.failure.message
+        message   = message.lines.tap(&:pop).join.chomp if result.error?
+        
+        str = "\n\n"
+        str << color('%4d) %s' % [index, result_name(result.name)])
+        str << "\n" << color(indent(message), :red)
+        str << "\n" << color(backtrace, :blue)
+        io.print str
+      end
+      
+      def display_skipped(result, index)
+        location = location(result.failure.location)
+        str      = "\n\n"
+        str << color('%4d) %s [SKIPPED]' % [index, result_name(result.name)], :yellow)
+        str << "\n" << indent(color(location, :yellow))
+        io.print str
+      end
+      
+      def display_replay_command(result)
+        location, line = find_test_file(result)
+        return if location.empty?
+        
+        command = if defined?(Rails) && Rails.version >= '5.0.0'
+                    %[bin/rails test #{location}:#{line}]
+                  else
+                    %[rake TEST=#{location} TESTOPTS="--name=#{result.name}"]
+                  end
+        
+        str = "\n"
+        str << color(command, :red)
+        
+        io.print str
+      end
+      
+      def find_test_file(result)
+        location, line = result.method(result.name).source_location
+        location       = location.gsub(%r[^.*?/((?:test|spec)/.*?)$], "\\1")
+        
+        [location, line]
+      end
+      
+      def backtrace(backtrace)
+        backtrace = filter_backtrace(backtrace).map { |line| location(line, true) }
+        return if backtrace.empty?
+        indent(backtrace.join("\n")).gsub(/^(\s+)/, "\\1# ")
+      end
+      
+      def location(location, include_line_number = false)
+        regex    = include_line_number ? /^([^:]+:\d+)/ : /^([^:]+)/
+        location = File.expand_path(location[regex, 1])
+        
+        return location unless location.start_with?(Dir.pwd)
+        
+        location.gsub(%r[^#{Regexp.escape(Dir.pwd)}/], '')
+      end
+      
+      def filter_backtrace(backtrace)
+        Minitest.backtrace_filter.filter(backtrace)
+      end
+      
+      def result_name(name)
+        name
+            .gsub(/^test(_\d+)?_/, '')
+            .gsub(/_/, ' ')
+      end
+      
+      def print_result_code(result_code)
+        result = @result_code_to_unicode[result_code]
+        colors = {
+            "\u{2714}" => :green,
+            "\u{2718}" => :red,
+            "\u{203C}" => :red,
+            "\u{26A1}" => :yellow
+        }
+        io.print color(result_code, colors[result])
+      end
+      
+      def color(string, color = :default)
+        if color_enabled?
+          color = @color.fetch(color, 0)
+          "\e[#{color}m#{string}\e[0m"
+        else
+          string
+        end
+      end
+      
+      def color_enabled?
+        @color_enabled
+      end
+      
+      def pluralize(word, count)
+        case count
+          when 0
+            "no #{word}s"
+          when 1
+            "1 #{word}"
+          else
+            "#{count} #{word}s"
+        end
+      end
+    end
+  end
+
+end

data/lib/mkmatter/answers.rb

@@ -21,8 +21,6 @@ module Mkmatter
       @slug_date   = now.strftime('%Y-%m-%d')
       @published   = publish
       @file_format = question_hash[:file_format]
-      @keywords = question_hash[:keywords]
-      @description = question_hash[:description]
       @matter      = {
           layout:     @layout,
           title:      @title,

data/lib/mkmatter/cli/app.rb

@@ -7,20 +7,19 @@ require 'terminal-table'
 require 'os'
 require 'rbconfig'
 
-require 'mkmatter'
 require 'mkmatter/cli/subs'
 require 'mkmatter/gem_info'
+
 module Mkmatter
   module App
     class CLI < Thor
-      include Thor::Actions
-      
       # \(see {http://www.rubydoc.info/gems/highline/HighLine#initialize-instance_method HighLine#new}\)
       HILINE = HighLine.new($stdin, $stderr, 80)
       map %w[--version -v] => :__print_version
       desc '--version, -v', 'Print the version'
       
       # Prints version string
+      # @return [NilClass] nil
       def __print_version
         puts Mkmatter::VERSION
       end
@@ -28,12 +27,12 @@ module Mkmatter
       map %w[--debug -d] => :__debug
       desc '--debug, -d', 'Prints debug info about the script/gem'
       # Prints debug info
+      # @return [NilClass] returns nil
       def __debug
-        info   = Mkmatter::GemInfo.new
         report = YAML.safe_load(OS.report)
         rows   = {
             'mkmatter_version' => Mkmatter::VERSION,
-            'ruby_version' => RbConfig::CONFIG['RUBY_PROGRAM_VERSION'],
+            'ruby_version'     => RbConfig::CONFIG['RUBY_PROGRAM_VERSION'],
         }
         rows.merge! report
         rows.merge!({
@@ -42,15 +41,14 @@ module Mkmatter
                         'posix'         => OS.posix?,
                         'mac'           => OS.mac?,
                         'under windows' => OS::Underlying.windows?,
-                        'under bsd'     => OS::Underlying.bsd?
+                        'under bsd'     => OS::Underlying.bsd?,
                     })
-        table                  = Terminal::Table.new
-        table.title            = 'mkmatter Debug Info'
-        table.rows             = rows.to_a
+        table       = Terminal::Table.new
+        table.title = 'mkmatter Debug Info'
+        table.rows  = rows.to_a
         table.align_column(0, :left)
-
+        
         puts table
-
       end
       
       map %w[--info -i] => :__print_info
@@ -63,22 +61,20 @@ module Mkmatter
             'author(s)':        Mkmatter::GemInfo.authors.join(', '),
             'e-mail':           Mkmatter::GemInfo.email.join(', '),
             'mkmatter version': Mkmatter::VERSION,
-            'Ruby version': RbConfig::CONFIG['RUBY_PROGRAM_VERSION'],
-            'Platform':         RbConfig::CONFIG['build_os']
+            'Ruby version':     RbConfig::CONFIG['RUBY_PROGRAM_VERSION'],
+            'Platform':         RbConfig::CONFIG['build_os'],
         }
         case format
           when 'table'
-            table                  = Terminal::Table.new
-            table.style.alignment  = :center
-            table.title            = 'mkmatter Info'
-            table.rows             = rows.to_a
+            table                 = Terminal::Table.new
+            table.style.alignment = :center
+            table.title           = 'mkmatter Info'
+            table.rows            = rows.to_a
             table.align_column(0, :left)
-
+            
             puts table
-
           when 'yaml'
             puts rows.stringify_keys.to_yaml
-          
           else
             # noop
             # this doesn't get run because of
@@ -87,12 +83,15 @@ module Mkmatter
         end
       end
       
+      if Pathname(Dir.home).join('.local/bin/micro').exist?
+        class_option(:editor, type: :string, default: "#{Dir.home}/.local/bin")
+      else
+        class_option(:editor, type: :string, default: 'nano')
+      end
       desc 'new SUBCOMMAND [options]', 'Make new content'
       subcommand 'new', Mkmatter::App::Classes::NewContent
       desc 'tags SUBCOMMAND [options]', 'Generate or Create tags'
       subcommand 'tags', Mkmatter::App::Classes::Tags
     end
-      
-    
   end
-end
+end

data/lib/mkmatter/cli/descriptions.rb

@@ -5,16 +5,17 @@ module Mkmatter
   module App
     module Descriptions
       module New
-        PAGE = <<-PAGEDOC
+        PAGE = ERB.new(<<-PAGEDOC.strip_heredoc
         `mkmatter new page` will run you through making a jekyll page.
 
         Given the above options/flags you can modify how the script
 
         outputs your front matter, or whether to mark it as published.
-      
+
         PAGEDOC
-        
-        POST = <<-POSTDOC
+        ).result
+
+        POST = ERB.new(<<-POSTDOC.strip_heredoc
           `mkmatter new post` will run you through making a jekyll post.
 
           Given the above options/flags you can modify how the script
@@ -30,14 +31,18 @@ module Mkmatter
 
             the front matter. So if you omit `--publish` you will publish,
 
-            so you have to explicitly use --no-publish to set `#{HighLine.color('published', :yellow)}: #{HighLine.color('false', :yellow, :bold)}`
+            so you have to explicitly use --no-publish to set `<%= HighLine.color('published', :yellow) %>:
+             <%= HighLine.color('false', :yellow, :bold) %>`
 
         POSTDOC
+        ).result
       end
+
       module Tags
-        GEN = <<-GENDOC
-        
+        GEN = ERB.new(<<-GENDOC
+
         GENDOC
+        ).result
       end
     end
   end