mkmatter 3.0.44 → 3.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8a12df223dfadcea474ccdd0ad3889bdb8ad424
-  data.tar.gz: 7f7ac303bf1ba4b42d2bdfe2e995893c325455e8
+  metadata.gz: 2887153201c4031bf7657eaf3034510b57a124fb
+  data.tar.gz: ee281dfd39a59fbc5a7549cdb8fffe6bec2ebc51
 SHA512:
-  metadata.gz: 5b728c67461d41a80c6b54542758143a1295e3a008407ae478abdc1e0075367dd0afb6d9be2374cdda58f8710128ffba61b06c49da97c9e5f926b5bfbfb71de6
-  data.tar.gz: 0472a4a353cdb5c2b07a2cf4dcd9d3580bb23c38510ca47b260e2987aab2748fd4a4a658aee0144c81e33743c5513498f2b63451846199394aa70e11f9ad105e
+  metadata.gz: 70b2fb1a3ba7e594eb8f6fdaee2f36e3dc32388c05c0f265fc5aaa588cca0c2f19d01b698414962c469dc2053a5e08858f73d06b02229d21d97e6824b12d4cd3
+  data.tar.gz: 0e6424d949d23738c79ff423b5a5513525c3f98db1c6b065459e37b68428a4fc70589774f159904e04ec7bfd340351fb37e8d3a14627eed64c8048c5bfd557c4

data/README.md

@@ -1,12 +1,8 @@
 # mkmatter
 
-
 [![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)
 
-[![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)]()
-
 [![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)
 
@@ -27,7 +23,6 @@
 
 [![E-mail](https://img.shields.io/badge/mkmatter%20on%20IotaSpencer%2eme-Project-green.svg?style=for-the-badge)](https://iotaspencer.me/projects/mkmatter)
 
-
 ## About mkmatter
 
 'mkmatter' is a gem designed to make it easy to generate front matter for files and also subsequently edit them.
@@ -38,6 +33,24 @@ This is needed for any part that `reads from/writes to` the filesystem.
 
 ## Installation
 
+**Note**: Thanks to [@zyedidia](https://github.com/zyedidia), His project [micro](https://github.com/zyedidia/micro) has been bundled alongside mkmatter. Just by using one command you can install it for your own use.
+
+However, to use micro the way its installed using the gem, you need to have the directory in your `$PATH`.
+
+### Micro Installation
+
+Add 
+```shell
+PATH="$HOME/bin:$HOME/.local/bin:$PATH"
+```
+
+If you do install micro, it will use micro by default unless you override it with `--editor=EDITOR`
+
+
+### Mkmatter Installation
+
+#### Bundler
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -45,25 +58,32 @@ gem 'mkmatter'
 ```
 
 And then execute:
+```
+$ bundle install
+```
 
-    $ bundle install
-
-### Standalone
+#### Standalone
 
 To install to the system/user instead of a project, use the following
 
-#### System-wide
+##### System-wide
 As root or by using sudo, run:
 
-```$ gem install mkmatter```
+```
+$ gem install mkmatter
+```
 
 or
 
-```$ sudo gem install mkmatter```
+```
+$ sudo gem install mkmatter
+```
 
-#### User
+##### User
 
-```$ gem install --user-install mkmatter```
+```
+$ gem install --user-install mkmatter
+```
 
 ## Usage
 

data/lib/minitest/xs_and_os_plugin.rb

@@ -9,29 +9,29 @@ module Minitest
     end
     
     class TravisReporter < Minitest::Reporters::BaseReporter
-      
+      @@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
+      }
       
       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)
@@ -167,7 +167,7 @@ module Minitest
       end
       
       def print_result_code(result_code)
-        result = @result_code_to_unicode[result_code]
+        result = @@result_code_to_unicode[result_code]
         colors = {
             "\u{2714}" => :green,
             "\u{2718}" => :red,
@@ -179,7 +179,7 @@ module Minitest
       
       def color(string, color = :default)
         if color_enabled?
-          color = @color.fetch(color, 0)
+          color = @@color.fetch(color, 0)
           "\e[#{color}m#{string}\e[0m"
         else
           string

data/lib/mkmatter/answers.rb

@@ -4,14 +4,12 @@ require 'highline'
 module Mkmatter
   class Answers
     attr_accessor :title, :tags, :categories
-    attr_accessor :date, :layout, :draft
+    attr_accessor :date, :draft
     attr_accessor :slug_date, :answer_hash
     attr_accessor :published, :file_format
     attr_reader :matter
     
     def initialize(question_hash, publish)
-      
-      @layout      = question_hash[:layout]
       @title       = question_hash[:title]
       @tags        = question_hash[:tags]
       @categories  = question_hash[:categories]

data/lib/mkmatter/cli/app.rb

@@ -84,7 +84,10 @@ module Mkmatter
       end
       
       if Pathname(Dir.home).join('.local/bin/micro').exist?
-        class_option(:editor, type: :string, default: "#{Dir.home}/.local/bin")
+        class_option(:editor, type: :string, default: "#{Dir.home}/.local/bin/micro")
+        
+      elsif Methods.which('micro')
+        class_option(:editor, type: :string, default: 'micro')
       else
         class_option(:editor, type: :string, default: 'nano')
       end

data/lib/mkmatter/cli/methods.rb

@@ -29,13 +29,25 @@ module Mkmatter
         end
       end
     end
-    
+
+    def Methods.which(cmd)
+      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each { |ext|
+          exe = File.join(path, "#{cmd}#{ext}")
+          return exe if File.executable?(exe) && !File.directory?(exe)
+        }
+      end
+      return nil
+    end
+    # @param [String] editor An editor to use
+    # @param [String] file_path Path to file to open
     # @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}")
+          pid = spawn("#{editor} #{file_path}")
           Process.wait pid
         end
       end

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

@@ -43,6 +43,7 @@ module Mkmatter
                 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
@@ -52,6 +53,7 @@ module Mkmatter
               exit 1
             end
           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)
@@ -96,6 +98,7 @@ module Mkmatter
                 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
@@ -133,6 +136,7 @@ module Mkmatter
                 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

data/lib/mkmatter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mkmatter
 version: !ruby/object:Gem::Version
-  version: 3.0.44
+  version: 3.0.45
 platform: ruby
 authors:
 - Ken Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline