hilight 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4736b1b4d3d3b76d3bc84247936fe4bcd5762170273a62a8eed4a3d26de7a536
-  data.tar.gz: 60c160a0d8b15ae91d032a9dfadc49f58b64fc9dc975d4e0df4a77804c621ba1
+  metadata.gz: d3881b5345185548a788caf2cab5d3a727b7d6edb201bfb62398f151dca7eebe
+  data.tar.gz: a6c71e1428bc23aced4111ad5248a3b08311cbf9bf4ff1e3fc0ea5eb84279abb
 SHA512:
-  metadata.gz: ee465264b4e58ba135f55689fcdb356c8cc0bd1f141828f6d0e655a8fa45e128bcc4ac03885b2b1b8490385a673f67c6e8e44101cbf8377610235d1fed2ec764
-  data.tar.gz: db78510a6651751aa354a3af7acf1352a3076b1c19b625dd32e8688579c9046c53d9af2daf9153479bdde0badd07fb11d68db8d2fb3f09740342bf04f87eaee1
+  metadata.gz: 0dc73e7b18911d93db9cc214412edfc47ccd577b905241dc3a9d56bd64d923fea79d87fa93c82a718f23b0a25cd6613ee4efcb12012e196e8705ca89e279b79f
+  data.tar.gz: d36ebd749b4f0edb62f2a517fc497dedc0d6ac67e1bd7d097ccc692eca2313610d78dbd7e9147e15fa804421891c44540cc3d3114ad009babd6ea731149b7b84

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hilight (0.1.1)
+    hilight (0.2.0)
       term-ansicolor
 
 GEM

data/Guardfile

@@ -2,7 +2,7 @@ clearing :on
 directories [".", "tmp"]
 
 guard(:shell, timeout: 30) do
-  watch("exe/hilight") { puts `ruby exe/hilight` }
+  watch("exe/hilight") { puts `ruby exe/hilight rspec -h` }
 end
 
 group :main, halt_on_fail: true do
@@ -13,7 +13,7 @@ group :main, halt_on_fail: true do
     watch(rspec.spec_helper) { rspec.spec_dir }
     watch(rspec.spec_support) { rspec.spec_dir }
     watch(rspec.spec_files)
-
+    watch('exe/hilight') { rspec.spec_dir }
     ruby = dsl.ruby
     dsl.watch_spec_files_for(ruby.lib_files)
   end

data/README.md

@@ -100,3 +100,29 @@ Everyone interacting in the Hilight project’s codebases, issue trackers, chat
     }
   ]
 }```
+
+
+(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/exe/hilight

@@ -3,54 +3,53 @@
 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?
 
-Filter = Struct.new(:cmd, :patterns)
-
-filters = [
-  Filter["rspec", Patterns[[
-    Pattern[/(?<green>\d+) examples, (?<red>\d+) failures, (?<yellow>\d+) pending/, '\k<green> examples, \k<red> failures, \k<yellow> pending'],
-    Pattern[/(?<blue>\d+\.\d+)/, '\k<blue>'],
-    Pattern[/\"(?<green>.*?)\"|\'(?<green>.*?)\'/, '\k<green>'],
-    Pattern[/# (?<red>.*):(?<yellow>\d+)/, '\k<red>:\k<yellow>']
-  ]]],
-  Filter[/-h|--help|help/, Patterns[[
-    Pattern[%r{(?<yellow>\B-{1,2}[\w-]+)|(?<blue>[\[\]\(\)\{\}\<\>])|(?<green>["'].*?["'])}, '\k<yellow>\k<blue>\k<green>']
-  ]]],
-  Filter["git",   Patterns[[Pattern[/(?<green>'.*')|(?<blue>".*")/, '\k<green>\k<blue>']]]],
-  Filter["ruby",  Patterns[[
-    Pattern[/(.*from |)(?<red>.*):(?<blue>\d+)(?::in )(?<yellow>`.*')/, '\k<red>\k<blue>\k<yellow>']
-  ]]],
-  Filter["default", Patterns[[
-    Pattern[/(?<green>'.*')|(?<blue>".*")/, '\k<green>\k<blue>']
-  ]]]
-]
-
-Filter.define_method(:match?) do |string|
-  case cmd
-  when (String || Symbol) then (cmd.to_s == string.to_s)
-  when Regexp then (cmd.match? string.to_s)
-  else false
-  end
+  [array[0..cmd_start_index - 1], array[cmd_start_index..-1]]
 end
 
-filters.define_singleton_method(:find) do |string|
-  each { |f| return f if f.match? string }
-  filters.find "default"
+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]
+
+options = {}
+
+parser = OptionParser.new do |opts|
+  opts.banner = "Usage: hilight <cmd>"
+
+  opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
+    options[:verbose] = v
+  end
 end
 
-filters.define_singleton_method(:run) do
-  arg_string = ARGV.join(' ')
+arguments, cmd = split_opts ARGV
+parser.parse arguments
 
-  f = filters.find arg_string
+if cmd.any?
+  cmd_string = cmd.join(' ')
 
-  output, process = Open3.capture2e(arg_string)
+  fabric = fabrics.find { |f| f.match? cmd_string }
+  fabric ||= default
 
-  puts f.patterns.output(output)
+  output, process = Open3.capture2e(cmd_string)
+  print fabric.transform output
 
   exit process.exitstatus
+else
+  $stdout << default.transform($stdin.readline) until $stdin.eof?
 end
-
-abort 'hilight <cmd>' unless ARGV.any?
-filters.run

data/lib/hilight.rb

@@ -1,22 +1,58 @@
 require "hilight/version"
 require 'term/ansicolor'
 
-Hilight::Pattern = Struct.new :regexp, :replacement
-Hilight::Pattern.define_method(:output) do |input|
-  # map our colors in to the matches
-  regexp.names.map { |n| replacement.gsub!("\\k<#{n}>") { |s| Term::ANSIColor.color(n, s) } }
-  # map our input into the output, return the original if it doesn't map (replace) anything.
-  input.gsub!(regexp, replacement) || input
+Hilight.define_singleton_method(:load) do |filename|
+  return Kernel.load filename if File.exist? filename
+
+  Kernel.load "#{Dir.home}/.config/hilight/patterns/#{filename}"
 end
 
-Hilight::Patterns = Struct.new :patterns
-Hilight::Patterns.define_method(:output) do |input|
-  patterns.each { |pattern| input = pattern.output(input) }
-  input
+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)
+
+  regexp = Regexp.union regexps
+
+  match = regexp.match input
+  return input unless match
+
+  output = []
+  while match
+    output.push match.pre_match unless match.pre_match.empty?
+
+    captured_string = match.to_a[0]
+    color_lookup_list = match.named_captures.invert
+
+    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
+
+    output.push captured_string if captured_string
+
+    post_match = match.post_match
+    match = regexp.match(match.post_match)
+
+    output.push post_match unless match
+  end
+
+  output.join("")
 end
 
-Hilight.define_singleton_method(:load) do |filename|
-  return Kernel.load filename if File.exist? filename
+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
 
-  Kernel.load "#{Dir.home}/.config/hilight/patterns/#{filename}"
+  case pattern
+  when Symbol then (pattern.to_s == string)
+  when String then (pattern == string)
+  when Regexp then (pattern.match? string.to_s)
+  else false
+  end
+end
+
+Hilight::Fabric.define_method(:transform) do |string|
+  Hilight.transform string, regexps
 end

data/lib/hilight/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hilight
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Ernie Brodeur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor