hilight 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3881b5345185548a788caf2cab5d3a727b7d6edb201bfb62398f151dca7eebe
-  data.tar.gz: a6c71e1428bc23aced4111ad5248a3b08311cbf9bf4ff1e3fc0ea5eb84279abb
+  metadata.gz: efb96144dc97389952d9826395882b4a1dd5d68d9e552ec4bf8e1e818a996ce0
+  data.tar.gz: e35ecc2c389873b224a1e22ba5e603dafd54d79cab186b91e03d6560ceacb970
 SHA512:
-  metadata.gz: 0dc73e7b18911d93db9cc214412edfc47ccd577b905241dc3a9d56bd64d923fea79d87fa93c82a718f23b0a25cd6613ee4efcb12012e196e8705ca89e279b79f
-  data.tar.gz: d36ebd749b4f0edb62f2a517fc497dedc0d6ac67e1bd7d097ccc692eca2313610d78dbd7e9147e15fa804421891c44540cc3d3114ad009babd6ea731149b7b84
+  metadata.gz: d34ec3fcbf06c6eee8525b9ed51066f9c057bb4c9574d0d4c8d574e2c56a4cebff69d8f5ae5df341982b72bd04e68ed2dcccc5f54c1bf33dee0c4b96a33d70ab
+  data.tar.gz: 25306cc41aff58fac69477acb38596940f129081035629bf736a64c74d939266a0eb34325d90143e6ad6a6be74c3792799bf85c1dc02ce07847efe5b4559cc71

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    hilight (0.2.0)
-      term-ansicolor
+    hilight (0.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -126,11 +125,8 @@ GEM
       thor (~> 0.19, >= 0.19.4)
       tilt (~> 2.0)
       yard (~> 0.9)
-    term-ansicolor (1.7.1)
-      tins (~> 1.0)
     thor (0.20.3)
     tilt (2.0.9)
-    tins (1.20.2)
     unicode-display_width (1.4.1)
     yard (0.9.18)
 

data/README.md

@@ -37,92 +37,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/ernieb
 ## Code of Conduct
 
 Everyone interacting in the Hilight project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/erniebrodeur/hilight/blob/master/CODE_OF_CONDUCT.md).
-
-["patterns"].map { |m| Match.new m["regexp"],m["sub_string"]  }
-
-``` yaml
-:cmd: rspec
-:patterns:
-- :regexp: (?<green>\\d+) examples, (?<red>\\d+) failures, (?<yellow>\\d+) pending
-  :sub_string: \\k<green> examples, \\k<red> failures, \\k<yellow> pending
-- :regexp: (?<blue>\\d+\\.\\d+)
-  :sub_string: \\k<blue>
-- :regexp: (?<green>.*?)\"|\'(?<green>.*?)\'
-  :sub_string: \\k<green>
-- :regexp: "# (?<red>.*):(?<yellow>\d+)"
-  :sub_string: \\k<red>:\\k<yellow>
-```
-
-``` ruby
-{
-  "cmd" =>     "rspec",
-  "patterns" =>[
-    {
-      "regexp" =>    %r{(?<green>\d+) examples, (?<red>\d+) failures, (?<yellow>\d+) pending},
-      "sub_string" =>'\k<green> examples, \k<red> failures, \k<yellow> pending'
-    },
-    {
-      "regexp" =>    %r{(?<blue>\d+\.\d+)},
-      "sub_string" =>'\k<blue>'
-    },
-    {
-      "regexp" =>    %r{"(?<green>.*?)"|'(?<green>.*?)'},
-      "sub_string" =>'\k<green>'
-    },
-    {
-      "regexp" =>    %r{# (?<red>.*):(?<yellow>\d+)},
-      "sub_string" =>'\k<red>:\k<yellow>'
-    }
-  ]
-}
-```
-
-
-``` json
-{
-  ":cmd":"rspec",
-  ":patterns":[
-    {
-      ":regexp":"(?<green>\\d+) examples, (?<red>\\d+) failures, (?<yellow>\\d+) pending",
-      ":sub_string":"\\k<green> examples, \\k<red> failures, \\k<yellow> pending"
-    },
-    {
-      ":regexp":"(?<blue>\\d+\\.\\d+)",
-      ":sub_string":"\\k<blue>"
-    },
-    {
-      ":regexp":"(?<green>.*?)\\\"|'(?<green>.*?)'",
-      ":sub_string":"\\k<green>"
-    },
-    {
-      ":regexp":"\\# (?<red>.*):(?<yellow>\\d+)",
-      ":sub_string":"\\k<red>:\\k<yellow>"
-    }
-  ]
-}```
-
-
-(pick our input from cmd matching)
- ->(input)->(select our pattern[])->(stringify input)
- ->(add colors)->(stringify output)
-
-
-### Pattern selection / cmdline matching
-filter => Struct[:filter_regexp, :selected_patterns]
-            .find(input_string) (patterns)
-
-
-### String IO Arch
-pattern => Struct[:regexp, :replacement_pattern]
-             .transform(input_string) (String)
-             .transform_stream(IO) (IO)
-             .match?(input_string) (Boolean)
-
-patterns => pattern[]
-             .transform(input_string, stop_on_first: false) (String)
-             .transform_stream(IO) (IO)
-
-# major things to do
-# remove need for termansi by wiring up my own color lambda's
-# wire up themes via lamdas
-# wire up loading (selective or otherwise) of a set of default hilight's

data/bin/convert_vscode

@@ -0,0 +1,70 @@
+#!/usr/env/bin ruby
+require 'pry'
+require 'oj'
+
+c = File.read ARGV[0]
+h = Oj.load c
+colors = h['tokenColors']
+colors.map { |e| [e['name'], e['settings']['foreground']] }.to_h
+monokai_hex_colors = colors.map { |e| [e['name'], e['settings']['foreground']] }.to_h
+monokai_hex_colors.delete_if { |k, v| k.nil? || v.nil? }
+
+String.define_method(:to_rgb) { [self[1..2], self[2..3], self[4..5]].map { |s| s.to_i(16) }.join(";") }
+output = monokai_hex_colors.map { |k,v| [k,v.to_rgb] }.to_h
+
+puts Oj.dump output, indent: 2
+
+# Monokai colors, for later.
+{
+  "Comment"                      => "103;118;247",
+  "String"                       => "229;92;7",
+  "js template-expression"       => "198;103;141",
+  "TemplateString"               => "171;187;43",
+  "Number"                       => "198;103;141",
+  "Embeded String Begin and End" => "198;103;141",
+  "Embeded String"               => "152;140;55",
+  "Built-in constant"            => "86;107;108",
+  "User-defined constant"        => "86;107;108",
+  "Language Variable"            => "224;6;199",
+  "Variable"                     => "97;26;254",
+  "Keyword"                      => "224;6;199",
+  "Keyword Operator"             => "224;6;199",
+  "Storage"                      => "224;6;199",
+  "Storage type"                 => "86;107;108",
+  "Class name"                   => "97;26;254",
+  "Variable Object"              => "97;26;254",
+  "Other variable"               => "171;187;43",
+  "Inherited class"              => "152;140;55",
+  "Function name"                => "152;140;55",
+  "Function argument"            => "209;25;166",
+  "Function call"                => "171;187;43",
+  "Builtin Functions"            => "152;140;55",
+  "Tag name"                     => "224;6;199",
+  "Tag Class and ID"             => "86;107;108",
+  "Tag attribute"                => "152;140;55",
+  "Library constant"             => "86;107;108",
+  "Library class/type"           => "86;107;108",
+  "Json Property"                => "86;107;108",
+  "StyleSheet Property name"     => "171;187;43",
+  "StyleSheet Property value"    => "152;140;55",
+  "StyleSheet Variable"          => "86;107;108",
+  "StyleSheet Variable String"   => "229;92;7",
+  "StyleSheet Unit"              => "198;103;141",
+  "StyleSheet Function"          => "86;107;108",
+  "Invalid"                      => "248;143;143",
+  "Invalid deprecated"           => "248;143;143",
+  "JSON String"                  => "86;107;108",
+  "Link"                         => "97;26;254",
+  "diff.header"                  => "117;87;21",
+  "diff.deleted"                 => "198;103;141",
+  "diff.inserted"                => "229;92;7",
+  "diff.changed"                 => "229;92;7",
+  "Markup: Emphasis Punctuation" => "105;150;150",
+  "Markdown: Link"               => "97;26;254",
+  "Markdown: Bold Punctuation"   => "105;150;150",
+  "Markdown: Heading"            => "105;150;150",
+  "Markdown: Quote"              => "152;140;55",
+  "Markdown: Separator"          => "198;103;141",
+  "Markdown: Raw"                => "86;107;108",
+  "Markdown: List Punctuation"   => "255;255;255"
+}

data/exe/hilight

@@ -1,34 +1,14 @@
 #!/usr/bin/env ruby
 
+require 'json'
 require "hilight"
-require 'term/ansicolor'
 require 'open3'
 require 'optparse'
 
 include Hilight #rubocop:disable all
-def split_opts(array)
-  cmd_start_index = array.find_index { |e| !e.start_with? "-" }
-  return [[], array] if !cmd_start_index || cmd_start_index.zero?
-
-  [array[0..cmd_start_index - 1], array[cmd_start_index..-1]]
-end
-
-rspec = Fabric['rspec', [
-  /(?<green>\d+) examples, (?<red>\d+) failures?, (?<yellow>\d+) pending/,
-  /(?<blue>\d+\.\d+)/,
-  /\"(?<green>.*?)\"|\'(?<green>.*?)\'/,
-  /# (?<red>.*):(?<yellow>\d+)/
-]]
-
-help = Fabric[/-h|--help|help/, /(?<yellow>\B-{1,2}[\w-]+)|(?<blue>[\[\]\(\)\{\}\<\>])|(?<green>["'].*?["'])/]
-git = Fabric["git", /(?<green>'.*?')|(?<blue>".*?")/]
-ruby = Fabric['ruby', /(.*from |)(?<red>.*):(?<blue>\d+)(?::in )(?<yellow>`.*')/]
-default = Fabric['default', /(?<green>\d+\.\d+)|(?<blue>".*")/]
-
-fabrics = [rspec, git, ruby, help, default]
 
+### Parsing
 options = {}
-
 parser = OptionParser.new do |opts|
   opts.banner = "Usage: hilight <cmd>"
 
@@ -37,17 +17,27 @@ parser = OptionParser.new do |opts|
   end
 end
 
+def split_opts(array)
+  cmd_start_index = array.find_index { |e| !e.start_with? "-" }
+  return [[], array] if !cmd_start_index || cmd_start_index.zero?
+
+  [array[0..cmd_start_index - 1], array[cmd_start_index..-1]]
+end
+
 arguments, cmd = split_opts ARGV
 parser.parse arguments
 
+fabrics = Hilight::Quilts.constants.map { |c| Hilight::Quilts.const_get c }
+
+### Execution
 if cmd.any?
   cmd_string = cmd.join(' ')
 
-  fabric = fabrics.find { |f| f.match? cmd_string }
-  fabric ||= default
+  quilt = fabrics.find { |q| q.match? cmd_string }
+  quilt ||= default
 
   output, process = Open3.capture2e(cmd_string)
-  print fabric.transform output
+  print quilt.transform output
 
   exit process.exitstatus
 else

data/hilight.gemspec

@@ -18,7 +18,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'term-ansicolor'
-
   spec.add_development_dependency "bundler", "~> 2.0"
 end

data/lib/hilight.rb

@@ -1,58 +1,70 @@
-require "hilight/version"
-require 'term/ansicolor'
+require 'hilight/fabric'
+require 'hilight/pair'
+require 'hilight/pattern'
+require 'hilight/quilt'
+require 'hilight/quilts'
+require 'hilight/quilts/default'
+require 'hilight/quilts/help'
+require 'hilight/quilts/rspec'
+require 'hilight/quilts/ruby'
+require 'hilight/version'
+
+module Hilight
+  module_function
+
+  define_method(:black)   { |s| "\e[30m" + s.to_s + "\e[0m" }
+  define_method(:red)     { |s| "\e[31m" + s.to_s + "\e[0m" }
+  define_method(:green)   { |s| "\e[32m" + s.to_s + "\e[0m" }
+  define_method(:yellow)  { |s| "\e[33m" + s.to_s + "\e[0m" }
+  define_method(:blue)    { |s| "\e[34m" + s.to_s + "\e[0m" }
+  define_method(:magenta) { |s| "\e[35m" + s.to_s + "\e[0m" }
+  define_method(:cyan)    { |s| "\e[36m" + s.to_s + "\e[0m" }
+  define_method(:white)   { |s| "\e[37m" + s.to_s + "\e[0m" }
+
+  def replace_colors(match)
+    output = match.to_a[0]
+    color_lookup_list = match.named_captures.invert
 
-Hilight.define_singleton_method(:load) do |filename|
-  return Kernel.load filename if File.exist? filename
+    match.to_a[1..-1].each do |s|
+      next unless s
 
-  Kernel.load "#{Dir.home}/.config/hilight/patterns/#{filename}"
-end
+      output.gsub!(s, Hilight.send(color_lookup_list[s], s))
+    end
 
-Hilight.define_singleton_method(:transform) do |input, regexps = []|
-  raise ArgumentError, "#{input} is not a kind of String" unless input.is_a? String
-  raise ArgumentError, "#{input} is not a kind of Array or Regexp" unless regexps.is_a?(Array) || regexps.is_a?(Regexp)
+    output
+  end
 
-  regexp = Regexp.union regexps
+  def raise_or_continue(input, regexps)
+    raise ArgumentError, "#{input} is not a kind of String" unless input.is_a? String
+    raise ArgumentError, "#{input} is not a kind of Array or Regexp" unless regexps.is_a?(Array) || regexps.is_a?(Regexp)
+  end
 
-  match = regexp.match input
-  return input unless match
+  def transform(input, regexps = [])
+    raise_or_continue input, regexps
+    unioned_regexp = regexps.is_a?(Array) ? Regexp.union(regexps) : regexps
 
-  output = []
-  while match
-    output.push match.pre_match unless match.pre_match.empty?
+    match = unioned_regexp.match input
+    return input unless match
 
-    captured_string = match.to_a[0]
-    color_lookup_list = match.named_captures.invert
+    output = []
+    while match
+      output.push match.pre_match unless match.pre_match.empty?
 
-    match.to_a[1..-1].each do |s|
-      next unless s
-
-      color = color_lookup_list[s]
-      captured_string.gsub!(s, Term::ANSIColor.color(color, s))
-    end
+      captured_string = replace_colors match
+      output.push captured_string if captured_string
 
-    output.push captured_string if captured_string
+      post_match = match.post_match
+      match = unioned_regexp.match(match.post_match)
 
-    post_match = match.post_match
-    match = regexp.match(match.post_match)
+      output.push post_match unless match
+    end
 
-    output.push post_match unless match
+    output.join("")
   end
 
-  output.join("")
-end
-
-Hilight::Fabric = Struct.new :pattern, :regexps
-Hilight::Fabric.define_method(:match?) do |string|
-  raise ArgumentError, "#{string} is not a kind of String" unless string.is_a? String
+  def gem_dir
+    return Dir.pwd unless Gem.loaded_specs.include? 'hilight'
 
-  case pattern
-  when Symbol then (pattern.to_s == string)
-  when String then (pattern == string)
-  when Regexp then (pattern.match? string.to_s)
-  else false
+    Gem.loaded_specs['hilight'].full_gem_path
   end
 end
-
-Hilight::Fabric.define_method(:transform) do |string|
-  Hilight.transform string, regexps
-end

data/lib/hilight/fabric.rb

@@ -0,0 +1,28 @@
+class Hilight::Fabric
+  attr_accessor :regexps
+  attr_accessor :match_pattern
+
+  def initialize(match_pattern, regexps)
+    @regexps = regexps
+    @match_pattern = match_pattern
+  end
+
+  def match?(string)
+    raise ArgumentError, "#{string} is not a kind of String" unless string.is_a? String
+
+    case match_pattern
+    when Symbol then (match_pattern.to_s == string)
+    when String then (match_pattern == string)
+    when Regexp then (match_pattern.match? string.to_s)
+    else false
+    end
+  end
+
+  def transform(string)
+    Hilight.transform string, regexps
+  end
+
+  def to_h
+    { match_pattern: match_pattern, regexps: regexps.map(&:to_s) }
+  end
+end

data/lib/hilight/pair.rb

@@ -0,0 +1,3 @@
+module Hilight
+    Pair = Struct.new :verb, :code
+end

data/lib/hilight/pattern.rb

@@ -0,0 +1,15 @@
+class Hilight::Pattern
+  attr_accessor :pairs
+
+  def initialize(pairs)
+    @pairs = pairs
+  end
+
+  def define_methods
+    pairs.each { |pair| Hilight.define_singleton_method(pair.verb) { |s| "\e[#{pair.code}m#{s}\e[39;49m" } }
+  end
+
+  def to_h
+    pairs.map { |p| [p.verb, p.code] }.to_h
+  end
+end

data/lib/hilight/quilt.rb

@@ -0,0 +1,40 @@
+module Hilight
+  class Quilt
+    attr_accessor :fabric
+    attr_accessor :pattern
+
+    def initialize(fabric, pattern)
+      @fabric = fabric
+      @pattern = pattern
+    end
+
+    def match?(string)
+      fabric.match? string
+    end
+
+    def transform(string)
+      pattern.define_methods
+      fabric.transform string
+    end
+
+    def to_h
+      { fabric: fabric.to_h, pattern: pattern.to_h }
+    end
+
+    def self.create_from_hash(hash = {})
+      new(
+        Fabric.new(Regexp.new(hash['fabric']['match_pattern']), hash['fabric']['regexps']
+          .map { |r| Regexp.new r }),
+        Pattern.new(hash['pattern'].map { |k, v| Pair[k.to_s, v] })
+      )
+    end
+
+    def self.load_from_gem(name)
+      create_from_hash(
+        JSON.parse(
+          File.read("#{gem_dir}/data/quilts/#{name}_quilt.json")
+        )
+      )
+    end
+  end
+end

data/lib/hilight/quilts.rb

@@ -0,0 +1,2 @@
+module Hilight::Quilts
+end

data/lib/hilight/quilts/default.rb

@@ -0,0 +1,17 @@
+module Hilight
+  module Quilts
+    Default = Quilt.create_from_hash(
+      "fabric"  => {
+        "match_pattern" => "default",
+        "regexps"       => [
+          "(?-mix:(?<argument>\\B-{1,2}[\\w-]+)|(?<boundary>[\\[\\]\\(\\)\\{\\}\\<\\>])|(?<string>[\"'].*?[\"']))"
+        ]
+      },
+      "pattern" => {
+        "argument" => "33",
+        "boundary" => "34",
+        "string"   => "32"
+      }
+    )
+  end
+end

data/lib/hilight/quilts/help.rb

@@ -0,0 +1,17 @@
+module Hilight
+  module Quilts
+    Help = Quilt.create_from_hash(
+      "fabric"  => {
+        "match_pattern" => "(?-mix:-h|--help|help)",
+        "regexps"       => [
+          "(?-mix:(?<argument>\\B-{1,2}[\\w-]+)|(?<boundary>[\\[\\]\\(\\)\\{\\}\\<\\>])|(?<string>[\"'].*?[\"']))"
+        ]
+      },
+      "pattern" => {
+        "argument" => "33",
+        "boundary" => "34",
+        "string"   => "32"
+      }
+    )
+  end
+end

data/lib/hilight/quilts/rspec.rb

@@ -0,0 +1,23 @@
+module Hilight
+  module Quilts
+    Rspec = Quilt.create_from_hash(
+      "fabric"  => {
+        "match_pattern" => "rspec",
+        "regexps"       => [
+          "(?-mix:(?<test_count>\\d+) examples, (?<test_failures>\\d+) failures?, (?<test_pending>\\d+) pending)",
+          "(?-mix:\"(?<string>.*?)\")",
+          "(?-mix:'(?<string>.*?)')",
+          "(?-mix:# (?<line>.*):(?<line_number>\\d+))"
+        ]
+      },
+      "pattern" => {
+        "string"        => "38;2;229;92;7",
+        "test_count"    => "32",
+        "test_failures" => "31",
+        "test_pending"  => "33",
+        "line"          => "36",
+        "line_number"   => "38;2;100;100;100"
+      }
+    )
+  end
+end

data/lib/hilight/quilts/ruby.rb

@@ -0,0 +1,14 @@
+module Hilight
+  module Quilts
+    Ruby = Quilt.create_from_hash(
+      'fabric'  => {
+        'match_pattern' => "ruby",
+        'regexps'       => [
+          /\"(?<string>.*?)\"/,
+          /'(?<string>.*?)'/
+        ]
+      },
+      'pattern' => { "string" => "31", "comment" => "32" }
+    )
+  end
+end

data/lib/hilight/version.rb

@@ -1,3 +1,3 @@
 module Hilight
-  VERSION = "0.2.0".freeze
+  VERSION = "0.3.0".freeze
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hilight
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ernie Brodeur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-04-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: term-ansicolor
-  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -57,11 +43,23 @@ files:
 - README.md
 - Rakefile
 - bin/add
+- bin/add_theme
 - bin/console
+- bin/convert_vscode
+- bin/generate_theme
 - bin/setup
 - exe/hilight
 - hilight.gemspec
 - lib/hilight.rb
+- lib/hilight/fabric.rb
+- lib/hilight/pair.rb
+- lib/hilight/pattern.rb
+- lib/hilight/quilt.rb
+- lib/hilight/quilts.rb
+- lib/hilight/quilts/default.rb
+- lib/hilight/quilts/help.rb
+- lib/hilight/quilts/rspec.rb
+- lib/hilight/quilts/ruby.rb
 - lib/hilight/version.rb
 homepage: 
 licenses: []