marked-conductor 1.0.7 → 1.0.9

data/lib/conductor/condition.rb

@@ -11,6 +11,13 @@ module Conductor
       parse_condition
     end
 
+    ##
+    ## @brief      Splits booleans and tests components.
+    ##
+    ## @param      condition  The condition to test
+    ##
+    ## @return     [Boolean] test result
+    ##
     def split_booleans(condition)
       split = condition.split(/ ((?:AND )?NOT|AND|OR) /)
 
@@ -21,7 +28,7 @@ module Conductor
         bool = nil
         prev = false
         split.each do |cond|
-          if cond =~ /((?:AND )?NOT|AND|OR)/
+          if /((?:AND )?NOT|AND|OR|&&|\|\||!!)/.match?(cond)
             bool = cond.bool_to_symbol
             next
           end
@@ -44,6 +51,15 @@ module Conductor
       end
     end
 
+    ##
+    ## @brief      Test operators
+    ##
+    ## @param      value1    Value
+    ## @param      value2    Value to test
+    ## @param      operator  The operator
+    ##
+    ## @return [Boolean] test result
+    ##
     def test_operator(value1, value2, operator)
       case operator
       when :gt
@@ -63,13 +79,46 @@ module Conductor
       end
     end
 
+    ##
+    ## @brief      Splits a natural language condition.
+    ##
+    ## @param      condition  The condition
+    ## @return [Array] Value, value to compare, operator
+    ##
     def split_condition(condition)
+      if condition.match(/(?:((?:does )?not)?(?:ha(?:s|ve)|contains?|includes?) +)?(yaml|headers|frontmatter|mmd|meta(?:data)?|pandoc)(:\S+)?/i)
+        m = Regexp.last_match
+        op = m[1].nil? ? :contains : :not_contains
+        type = case m[2]
+               when /^m/i
+                 "mmd"
+               when /^p/i
+                 "pandoc"
+               else
+                 "yaml"
+               end
+        return ["#{type}#{m[3]}", nil, op]
+      end
+
       res = condition.match(/^(?<val1>.*?)(?:(?: +(?<op>(?:is|does)(?: not)?(?: an?|type(?: of)?|equals?(?: to))?|!?==?|[gl]t|(?:greater|less)(?: than)?|<|>|(?:starts|ends) with|(?:ha(?:s|ve) )?(?:prefix|suffix)|has|contains?|includes?) +)(?<val2>.*?))?$/i)
-      [res['val1'], res['val2'], operator_to_symbol(res['op'])]
+      [res["val1"], res["val2"], operator_to_symbol(res["op"])]
     end
 
+    ##
+    ## @brief      Test for type of value
+    ##
+    ## @param      val1      value
+    ## @param      val2      value to test against
+    ## @param      operator  The operator
+    ##
     def test_type(val1, val2, operator)
       res = case val2
+            when /number/
+              val1.is_a?(Numeric)
+            when /int(eger)?/
+              val1.is_a?(Integer)
+            when /(float|decimal)/
+              val1.is_a?(Float)
             when /array/i
               val1.is_a?(Array)
             when /(string|text)/i
@@ -80,12 +129,21 @@ module Conductor
       operator == :type_of ? res : !res
     end
 
+    ##
+    ## @brief      Compare a string based on operator
+    ##
+    ## @param      val1      The string to test against
+    ## @param      val2      The value to test
+    ## @param      operator  The operator
+    ##
+    ## @return     [Boolean] test result
+    ##
     def test_string(val1, val2, operator)
       return operator == :not_equal ? val1.nil? : !val1.nil? if val2.nil?
 
       return operator == :not_equal if val1.nil?
 
-      val2 = val2.force_encoding('utf-8')
+      val2 = val2.force_encoding("utf-8")
 
       if val1.date?
         if val2.time?
@@ -109,12 +167,12 @@ module Conductor
         return res unless res.nil?
       end
 
-      val2 = if val2.strip =~ %r{^/.*?/$}
-               val2.gsub(%r{(^/|/$)}, '')
+      val2 = if %r{^/.*?/$}.match?(val2.strip)
+               val2.gsub(%r{(^/|/$)}, "")
              else
                Regexp.escape(val2)
              end
-      val1 = val1.dup.to_s.force_encoding('utf-8')
+      val1 = val1.dup.to_s.force_encoding("utf-8")
       case operator
       when :contains
         val1 =~ /#{val2}/i
@@ -135,6 +193,17 @@ module Conductor
       end
     end
 
+    ##
+    ## @brief      Test for the existince of a
+    ##             file/directory in the parent tree
+    ##
+    ## @param      origin    Starting directory
+    ## @param      value     The file/directory to search
+    ##                       for
+    ## @param      operator  The operator
+    ##
+    ## @return     [Boolean] test result
+    ##
     def test_tree(origin, value, operator)
       return true if File.exist?(File.join(origin, value))
 
@@ -142,13 +211,22 @@ module Conductor
 
       if Dir.exist?(File.join(dir, value))
         true
-      elsif [Dir.home, '/'].include?(dir)
+      elsif [Dir.home, "/"].include?(dir)
         false
       else
         test_tree(dir, value, operator)
       end
     end
 
+    ##
+    ## @brief      Test "truthiness"
+    ##
+    ## @param      value1    Value to test against
+    ## @param      value2    Value to test
+    ## @param      operator  The operator
+    ##
+    ## @return     [Boolean] test result
+    ##
     def test_truthy(value1, value2, operator)
       return false unless value2&.bool?
 
@@ -159,34 +237,64 @@ module Conductor
       operator == :not_equal ? !res : res
     end
 
+    ##
+    ## @brief      Test for presence of yaml, optionall for
+    ##             a key, optionally for a key's value
+    ##
+    ## @param      content   Text content containing YAML
+    ## @param      value     The value to test for
+    ## @param      key       The key to test for
+    ## @param      operator  The operator
+    ##
+    ## @return     [Boolean] test result
+    ##
     def test_yaml(content, value, key, operator)
       yaml = YAML.safe_load(content.split(/^(?:---|\.\.\.)/)[1])
 
-      return operator == :not_equal ? true : false unless yaml
+      return operator == :not_equal unless yaml
 
       if key
         value1 = yaml[key]
-        return operator == :not_equal ? true : false if value1.nil?
+        return operator == :not_equal if value1.nil?
+
+        if value.nil?
+          has_key = !value1.nil?
+          return operator == :not_equal ? !has_key : has_key
+        end
 
-        value1 = value1.join(',') if value1.is_a?(Array)
         if %i[type_of not_type_of].include?(operator)
-          test_type(value1, value, operator)
-        elsif value1.bool?
+          return test_type(value1, value, operator)
+        end
+
+        value1 = value1.join(",") if value1.is_a?(Array)
+
+        if value1.bool?
           test_truthy(value1, value, operator)
-        elsif value1.number? && value2.number? && %i[gt lt equal not_equal].include?(operator)
+        elsif value1.number? && value.number? && %i[gt lt equal not_equal].include?(operator)
           test_operator(value1, value, operator)
         else
           test_string(value1, value, operator)
         end
       else
         res = value ? yaml.key?(value) : true
-        operator == :not_equal ? !res : res
+        (operator == :not_equal) ? !res : res
       end
     end
 
+    ##
+    ## @brief      Test for MultiMarkdown metadata,
+    ##             optionally key and value
+    ##
+    ## @param      content   [String] The text content
+    ## @param      value     [String] The value to test for
+    ## @param      key       [String] The key to test for
+    ## @param      operator  [Symbol] The operator
+    ##
+    ## @return     [Boolean] test result
+    ##
     def test_meta(content, value, key, operator)
       headers = []
-      content.split(/\n/).each do |line|
+      content.split("\n").each do |line|
         break if line == /^ *\n$/ || line !~ /\w+: *\S/
 
         headers << line
@@ -199,8 +307,8 @@ module Conductor
       meta = {}
       headers.each do |h|
         parts = h.split(/ *: */)
-        k = parts[0].strip.downcase.gsub(/ +/, '')
-        v = parts[1..].join(':').strip
+        k = parts[0].strip.downcase.gsub(/ +/, "")
+        v = parts[1..].join(":").strip
         meta[k] = v
       end
 
@@ -212,6 +320,11 @@ module Conductor
       end
     end
 
+    def test_pandoc(content, operator)
+      res = content.match(/^%% /)
+      %i[not_contains not_equal].include?(operator) ? !res.nil? : res.nil?
+    end
+
     def test_condition(condition)
       type, value, operator = split_condition(condition)
 
@@ -231,26 +344,20 @@ module Conductor
         test_tree(@env[:origin], value, operator)
       when /^(path|dir)/i
         test_string(@env[:filepath], value, operator) ? true : false
+      when /^(file)?name/i
+        test_string(@env[:filename], value, operator) ? true : false
       when /^phase/i
         test_string(@env[:phase], value, :starts_with) ? true : false
       when /^text/i
-        test_string(IO.read(@env[:filepath]).force_encoding('utf-8'), value, operator) ? true : false
-      when /^(yaml|headers|frontmatter)(?::(.*?))?$/i
-        m = Regexp.last_match
-
-        key = m[2] || nil
-
-        content = IO.read(@env[:filepath]).force_encoding('utf-8')
-
-        content.yaml? ? test_yaml(content, value, key, operator) : false
-      when /^(mmd|meta(?:data)?)(?::(.*?))?$/i
-        m = Regexp.last_match
-
-        key = m[2] || nil
-
-        content = IO.read(@env[:filepath]).force_encoding('utf-8')
-
-        content.meta? ? test_meta(content, value, key, operator) : false
+        test_string(Conductor.stdin, value, operator) ? true : false
+      when /^(?:yaml|headers|frontmatter)(?::(.*?))?$/i
+        key = Regexp.last_match(1) || nil
+        Conductor.stdin.yaml? ? test_yaml(Conductor.stdin, value, key, operator) : false
+      when /^(?:mmd|meta(?:data)?)(?::(.*?))?$/i
+        key = Regexp.last_match(1) || nil
+        Conductor.stdin.meta? ? test_meta(Conductor.stdin, value, key, operator) : false
+      when /^pandoc/
+        test_pandoc(Conductor.stdin, operator)
       else
         false
       end
@@ -264,6 +371,8 @@ module Conductor
         :gt
       when /(lt|less( than)?|<|(?:is )?before)/i
         :lt
+      when /not (ha(?:s|ve)|contains|includes|match(es)?)/i
+        :not_contains
       when /(ha(?:s|ve)|contains|includes|match(es)?|\*=)/i
         :contains
       when /not (suffix|ends? with)/i

data/lib/conductor/config.rb

@@ -6,22 +6,22 @@ module Conductor
     attr_reader :config, :tracks
 
     def initialize
-      config_file = File.expand_path('~/.config/conductor/tracks.yaml')
+      config_file = File.expand_path("~/.config/conductor/tracks.yaml")
 
       create_config(config_file) unless File.exist?(config_file)
 
       @config ||= YAML.safe_load(IO.read(config_file))
 
-      @tracks = @config['tracks'].symbolize_keys
+      @tracks = @config["tracks"].symbolize_keys
     end
   end
 
   def create_config(config_file)
     config_dir = File.dirname(config_file)
-    scripts_dir = File.dirname(File.join(config_dir, 'scripts'))
+    scripts_dir = File.dirname(File.join(config_dir, "scripts"))
     FileUtils.mkdir_p(config_dir) unless File.directory?(config_dir)
     FileUtils.mkdir_p(scripts_dir) unless File.directory?(scripts_dir)
-    File.open(config_file, 'w') { |f| f.puts sample_config }
+    File.open(config_file, "w") { |f| f.puts sample_config }
     puts "Sample config created at #{config_file}"
 
     Process.exit 0

data/lib/conductor/env.rb

@@ -3,52 +3,54 @@
 module Conductor
   module Env
     def self.env
-      @env ||= if ENV['CONDUCTOR_TEST'] == 'true'
-                 load_test_env
-               else
-                 @env ||= {
-                   home: ENV['HOME'],
-                   css_path: ENV['MARKED_CSS_PATH'],
-                   ext: ENV['MARKED_EXT'],
-                   includes: ENV['MARKED_INCLUDES'],
-                   origin: ENV['MARKED_ORIGIN'],
-                   filepath: ENV['MARKED_PATH'],
-                   phase: ENV['MARKED_PHASE'],
-                   outline: ENV['OUTLINE'],
-                   path: ENV['PATH']
-                 }
-               end
+      @env ||= if ENV["CONDUCTOR_TEST"] == "true"
+        load_test_env
+      else
+        @env ||= {
+          home: ENV["HOME"],
+          css_path: ENV["MARKED_CSS_PATH"],
+          ext: ENV["MARKED_EXT"],
+          includes: ENV["MARKED_INCLUDES"],
+          origin: ENV["MARKED_ORIGIN"],
+          filepath: ENV["MARKED_PATH"],
+          filename: File.basename(ENV["MARKED_PATH"]),
+          phase: ENV["MARKED_PHASE"],
+          outline: ENV["OUTLINE"],
+          path: ENV["PATH"]
+        }
+      end
 
       @env
     end
 
     def self.load_test_env
       @env = {
-        home: '/Users/ttscoff',
-        css_path: '/Applications/Marked 2.app/Contents/Resources/swiss.css',
-        ext: 'md',
+        home: "/Users/ttscoff",
+        css_path: "/Applications/Marked 2.app/Contents/Resources/swiss.css",
+        ext: "md",
         includes: [],
-        origin: '/Users/ttscoff/Desktop/Code/marked-conductor/',
-        filepath: '/Users/ttscoff/Desktop/Code/marked-conductor/README.md',
-        phase: 'PREPROCESS',
-        outline: 'NONE',
-        path: '/Developer/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/Users/ttscoff/Dropbox/Writing/brettterpstra.com/_drafts/'
+        origin: "/Users/ttscoff/Desktop/Code/nvultra-docs/content/",
+        filepath: "/Users/ttscoff/Desktop/Code/nvultra-docs/content/advanced-features.md",
+        filename: "advanced-features.md",
+        phase: "PROCESS",
+        outline: "NONE",
+        path: "/Developer/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/Users/ttscoff/Desktop/Code/nvultra-docs/content/"
       }
     end
 
     def self.to_s
       out_h = {
-        'HOME' => @env[:home],
-        'MARKED_CSS_PATH' => @env[:css_path],
-        'MARKED_EXT' => @env[:ext],
-        'MARKED_ORIGIN' => @env[:origin],
-        'MARKED_INCLUDES' => @env[:includes],
-        'MARKED_PATH' => @env[:filepath],
-        'MARKED_PHASE' => @env[:phase],
-        'OUTLINE' => @env[:outline],
-        'PATH'=> @env[:path]
+        "HOME" => @env[:home],
+        "MARKED_CSS_PATH" => @env[:css_path],
+        "MARKED_EXT" => @env[:ext],
+        "MARKED_ORIGIN" => @env[:origin],
+        "MARKED_INCLUDES" => @env[:includes],
+        "MARKED_PATH" => @env[:filepath],
+        "MARKED_PHASE" => @env[:phase],
+        "OUTLINE" => @env[:outline],
+        "PATH" => @env[:path]
       }
-      out_h.map { |k, v| %(#{k}="#{v}") }.join(' ')
+      out_h.map { |k, v| %(#{k}="#{v}") }.join(" ")
     end
   end
 end

data/lib/conductor/hash.rb

@@ -6,6 +6,6 @@ class ::Hash
   end
 
   def symbolize_keys
-    each_with_object({}) { |(k, v), hsh| hsh[k.to_sym] = v.is_a?(Hash) ? v.symbolize_keys : v }
+    each_with_object({}) { |(k, v), hsh| hsh[k.to_sym] = (v.is_a?(Hash) || v.is_a?(Array)) ? v.symbolize_keys : v }
   end
 end

data/lib/conductor/script.rb

@@ -8,44 +8,44 @@ module Conductor
     def initialize(script)
       parts = Shellwords.split(script)
       self.path = parts[0]
-      self.args = parts[1..].join(' ')
+      self.args = parts[1..].join(" ")
     end
 
     def path=(path)
-      @path = if path =~ %r{^[%/]}
-                File.expand_path(path)
-              else
-                script_dir = File.expand_path('~/.config/conductor/scripts')
-                if File.exist?(File.join(script_dir, path))
-                  File.join(script_dir, path)
-                elsif TTY::Which.exist?(path)
-                  TTY::Which.which(path)
-                else
-                  raise "Path to #{path} not found"
-
-                end
-              end
+      @path = if %r{^[%/]}.match?(path)
+        File.expand_path(path)
+      else
+        script_dir = File.expand_path("~/.config/conductor/scripts")
+        if File.exist?(File.join(script_dir, path))
+          File.join(script_dir, path)
+        elsif TTY::Which.exist?(path)
+          TTY::Which.which(path)
+        else
+          raise "Path to #{path} not found"
+
+        end
+      end
     end
 
     def args=(array)
       @args = if array.is_a?(Array)
-                array.join(' ')
-              else
-                array
-              end
+        array.join(" ")
+      else
+        array
+      end
     end
 
     def run
       stdin = Conductor.stdin
 
-      raise 'Script path not defined' unless @path
+      raise "Script path not defined" unless @path
 
       use_stdin = true
-      if args =~ /\$\{?file\}?/
+      if /\$\{?file\}?/.match?(args)
         use_stdin = false
         args.sub!(/\$\{?file\}?/, Env.env[:filepath])
       else
-        raise 'No input' unless stdin
+        raise "No input" unless stdin
 
       end
 

data/lib/conductor/string.rb

@@ -4,9 +4,9 @@
 class ::String
   def bool_to_symbol
     case self
-    when /NOT/
+    when /(NOT|!!)/
       :not
-    when /AND/
+    when /(AND|&&)/
       :and
     else
       :or
@@ -14,32 +14,32 @@ class ::String
   end
 
   def date?
-    dup.force_encoding('utf-8').match(/^\d{4}-\d{2}-\d{2}/) ? true : false
+    dup.force_encoding("utf-8").match?(/^\d{4}-\d{2}-\d{2}/)
   end
 
   def time?
-    dup.force_encoding('utf-8').match(/ \d{1,2}(:\d\d)? *([ap]m)?/i)
+    dup.force_encoding("utf-8").match(/ \d{1,2}(:\d\d)? *([ap]m)?/i)
   end
 
   def to_date
-    Chronic.parse(self.dup.force_encoding('utf-8'))
+    Chronic.parse(dup.force_encoding("utf-8"))
   end
 
   def strip_time
-    dup.force_encoding('utf-8').sub(/ \d{1,2}(:\d\d)? *([ap]m)?/i, '')
+    dup.force_encoding("utf-8").sub(/ \d{1,2}(:\d\d)? *([ap]m)?/i, "")
   end
 
   def to_day(time = :end)
-    t = time == :end ? '23:59' : '00:00'
-    Chronic.parse("#{self.strip_time} #{t}")
+    t = time == :end ? "23:59" : "00:00"
+    Chronic.parse("#{strip_time} #{t}")
   end
 
   def number?
-    to_f > 0
+    to_f.positive?
   end
 
   def bool?
-    dup.force_encoding('utf-8').match(/^(?:y(?:es)?|no?|t(?:rue)?|f(?:alse)?)$/) ? true : false
+    dup.force_encoding("utf-8").match?(/^(?:y(?:es)?|no?|t(?:rue)?|f(?:alse)?)$/)
   end
 
   def meta?

data/lib/conductor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Conductor
-  VERSION = '1.0.7'
+  VERSION = '1.0.9'
 end

data/lib/conductor.rb

@@ -1,28 +1,30 @@
 # frozen_string_literal: true
 
-require 'tty-which'
-require 'yaml'
-require 'shellwords'
-require 'fcntl'
-require 'time'
-require 'chronic'
-require 'fileutils'
-require_relative 'conductor/version'
-require_relative 'conductor/env'
-require_relative 'conductor/config'
-require_relative 'conductor/hash'
-require_relative 'conductor/array'
-require_relative 'conductor/boolean'
-require_relative 'conductor/string'
-require_relative 'conductor/script'
-require_relative 'conductor/command'
-require_relative 'conductor/condition'
+require "tty-which"
+require "yaml"
+require "shellwords"
+require "fcntl"
+require "time"
+require "chronic"
+require "fileutils"
+require_relative "conductor/version"
+require_relative "conductor/env"
+require_relative "conductor/config"
+require_relative "conductor/hash"
+require_relative "conductor/array"
+require_relative "conductor/boolean"
+require_relative "conductor/string"
+require_relative "conductor/script"
+require_relative "conductor/command"
+require_relative "conductor/condition"
 
 module Conductor
   class << self
+    attr_writer :stdin
+
     def stdin
-      warn 'input on STDIN required' unless $stdin.stat.size.positive? || $stdin.fcntl(Fcntl::F_GETFL, 0).zero?
-      @stdin ||= $stdin.read.strip.force_encoding('utf-8')
+      warn "input on STDIN required" unless $stdin.stat.size.positive? || $stdin.fcntl(Fcntl::F_GETFL, 0).zero?
+      @stdin ||= $stdin.read.strip.force_encoding("utf-8")
     end
   end
 end

data/marked-conductor.gemspec

@@ -3,15 +3,15 @@
 require_relative "lib/conductor/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "marked-conductor"
-  spec.version       = Conductor::VERSION
-  spec.authors       = ["Brett Terpstra"]
-  spec.email         = ["me@brettterpstra.com"]
+  spec.name = "marked-conductor"
+  spec.version = Conductor::VERSION
+  spec.authors = ["Brett Terpstra"]
+  spec.email = ["me@brettterpstra.com"]
 
-  spec.summary       = "A custom processor manager for Marked 2 (Mac)"
-  spec.description   = "Conductor allows easy configuration of multiple scripts that are run as custom pre/processors for Marked based on conditional statements."
-  spec.homepage      = "https://github.com/ttscoff/marked-conductor"
-  spec.license       = "MIT"
+  spec.summary = "A custom processor manager for Marked 2 (Mac)"
+  spec.description = "Conductor allows easy configuration of multiple scripts that are run as custom pre/processors for Marked based on conditional statements."
+  spec.homepage = "https://github.com/ttscoff/marked-conductor"
+  spec.license = "MIT"
   spec.required_ruby_version = ">= 2.6.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
@@ -25,12 +25,20 @@ Gem::Specification.new do |spec|
       (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
     end
   end
-  spec.bindir        = "bin"
-  spec.executables   = spec.files.grep(%r{\Abin/}) { |f| File.basename(f) }
+  spec.bindir = "bin"
+  spec.executables = spec.files.grep(%r{\Abin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "pry", "~> 0.14.2"
   spec.add_development_dependency "awesome_print", "~> 1.9.2"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "gem-release", "~> 2.2"
+  spec.add_development_dependency "parse_gemspec-cli", "~> 1.0"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "yard", "~> 0.9", ">= 0.9.26"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "simplecov", "~> 0.21"
+  spec.add_development_dependency "simplecov-console", "~> 0.9"
 
   # Uncomment to register a new dependency of your gem
   spec.add_dependency "tty-which", "~> 0.5.0"