marked-conductor 1.0.33 → 1.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a27e45e5fc64335fa1278d3fd33aff4fd691bbae6edac649689f42d9d8425a2
-  data.tar.gz: e5b70aaa3cf17036e20caa856e4629aa55023ba3dae53be8dbdff3fcd2bef955
+  metadata.gz: ecb00aeb3e1cbd137378b4b4f236ebf7c9b0a1a24a9e9bff5c5788eacb327730
+  data.tar.gz: 6bd4a657d14378e9e65acf704162dc3f79163f87e48840fe93d6e7047eb14455
 SHA512:
-  metadata.gz: 31c5b37a272d7f2caf66016d5696308a7c1a0a666ed80e5900274c26ab0ba5fc485ad4f09f3380459255cec68e07ac86124fb9ae2e61662a018297a9edbad0c0
-  data.tar.gz: e87f4cd7548948a33098717f657dfcab0ec14a7411615754b7dc0af00a511f0155e9c404d2a7bd3a892296300120d73bae513b2b503ebafd41b35c1aa5d1bd74
+  metadata.gz: d7b041001f2ae096a66d9efa3aa359d20e2f8b1ea0bb35a11e455c6e171b3746d97c678bfb1272b7d1d0328045a552023eeef85a131538524c936213d83a7163
+  data.tar.gz: 99c1e9653fd7feffdae8def8ee3b37a79cb3a4e6fc9d2c221cbe41c8ecd9ca39a5971bfc15d140dec867e172da6ed1477d82777530856c53578de9e94a559f12

data/CHANGELOG.md

@@ -1,3 +1,37 @@
+### 1.0.37
+
+2024-08-23 11:04
+
+#### FIXED
+
+- Attempt to fix installation on Ruby 2.6
+
+### 1.0.36
+
+2024-08-23 11:03
+
+#### FIXED
+
+- Attempt to fix installation on Ruby 2.6
+
+### 1.0.35
+
+2024-08-22 10:14
+
+#### IMPROVED
+
+- Code cleanup
+- Cleaner UTF-8 string encoding
+
+### 1.0.34
+
+2024-08-22 10:13
+
+#### IMPROVED
+
+- Code cleanup
+- Cleaner UTF-8 string encoding
+
 ### 1.0.33
 
 2024-08-22 06:35

data/Gemfile

@@ -4,8 +4,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in marked-conductor.gemspec
 gemspec
-
-gem "rake", "~> 13.0"
-
-gem "rubocop", "~> 1.21"
-gem "rspec", "~> 3.13"

data/lib/conductor/command.rb

@@ -67,7 +67,7 @@ module Conductor
       end
 
       if use_stdin
-        `echo #{Shellwords.escape(stdin.force_encoding("utf-8"))} | #{Env} #{path} #{args}`
+        `echo #{Shellwords.escape(stdin.utf8)} | #{Env} #{path} #{args}`
       else
         `#{Env} #{path} #{args}`
       end

data/lib/conductor/filter.rb

@@ -42,7 +42,7 @@ class ::String
   ## @return     [Symbol] metadata type
   ##
   def meta_type
-    lines = clean_encode.split(/\n/)
+    lines = utf8.split(/\n/)
     case lines[0]
     when /^--- *$/
       :yaml
@@ -65,7 +65,7 @@ class ::String
 
     case meta_type
     when :yaml
-      lines = clean_encode.split(/\n/)
+      lines = utf8.split(/\n/)
       lines.shift
       lines.each_with_index do |line, idx|
         next unless line =~ /^(\.\.\.|---) *$/
@@ -74,7 +74,7 @@ class ::String
         break
       end
     when :mmd
-      lines = clean_encode.split(/\n/)
+      lines = utf8.split(/\n/)
       lines.each_with_index do |line, idx|
         next if line =~ /^ *[ \w]+: +\S+/
 
@@ -82,7 +82,7 @@ class ::String
         break
       end
     when :pandoc
-      lines = clean_encode.split(/\n/)
+      lines = utf8.split(/\n/)
       lines.each_with_index do |line, idx|
         next if line =~ /^% +\S/
 
@@ -101,7 +101,7 @@ class ::String
   ##
   def first_h1
     first = nil
-    clean_encode.split(/\n/).each_with_index do |line, idx|
+    utf8.split(/\n/).each_with_index do |line, idx|
       if line =~ /^(# *[^#]|={2,} *$)/
         first = idx
         break
@@ -118,7 +118,7 @@ class ::String
   def first_h2
     first = nil
     meta_end = meta_insert_point
-    clean_encode.split(/\n/).each_with_index do |line, idx|
+    utf8.split(/\n/).each_with_index do |line, idx|
       next if idx <= meta_end
 
       if line =~ /^(## *[^#]|-{2,} *$)/
@@ -177,7 +177,7 @@ class ::String
   ## @return     [String] content with TOC tag added
   ##
   def insert_toc(max = nil, after = :h1)
-    lines = clean_encode.split(/\n/)
+    lines = utf8.split(/\n/)
     max = max.to_i&.positive? ? " max#{max}" : ""
     line = case after.to_sym
            when :h2
@@ -238,7 +238,7 @@ class ::String
     if File.exist?(path)
       content = IO.read(path)
       yui = YuiCompressor::Yui.new
-      content = yui.compress(content.clean_encode)
+      content = yui.compress(content.utf8)
       inject_after_meta(content.wrap_style)
     else
       warn "File not found (#{path})"
@@ -254,7 +254,7 @@ class ::String
   ## @return     [String] string with content injected
   ##
   def inject_after_meta(content)
-    lines = clean_encode.split(/\n/)
+    lines = utf8.split(/\n/)
     insert_point = meta_insert_point
     insert_at = insert_point.positive? ? insert_point + 1 : 0
     lines.insert(insert_at, "#{content}\n\n")
@@ -294,10 +294,10 @@ class ::String
       inject_after_meta(out)
     when :h1
       h1 = first_h1.nil? ? 0 : first_h1 + 1
-      clean_encode.split(/\n/).insert(h1, out).join("\n")
+      utf8.split(/\n/).insert(h1, out).join("\n")
     when :h2
       h2 = first_h2.nil? ? 0 : first_h2 + 1
-      clean_encode.split(/\n/).insert(h2, out).join("\n")
+      utf8.split(/\n/).insert(h2, out).join("\n")
     else
       "#{self}\n#{out}"
     end
@@ -393,7 +393,7 @@ class ::String
       yaml = YAML.load(m[0])
       title = yaml["title"]
     when :mmd
-      clean_encode.split(/\n/).each do |line|
+      utf8.split(/\n/).each do |line|
         if line =~ /^ *title: *(\S.*?)$/i
           title = Regexp.last_match(1)
           break
@@ -401,7 +401,7 @@ class ::String
       end
     when :pandoc
       title = nil
-      clean_encode.split(/\n/).each do |line|
+      utf8.split(/\n/).each do |line|
         if line =~ /^% +(.*?)$/
           title = Regexp.last_match(1)
           break
@@ -419,7 +419,7 @@ class ::String
   end
 
   def insert_title(shift: 0)
-    content = dup.clean_encode
+    content = dup.utf8
     title = read_title
     content.increase_headers!(shift) if shift.positive?
     lines = content.split(/\n/)
@@ -441,7 +441,7 @@ class ::String
   end
 
   def ensure_mmd_meta_newline
-    clean_encode.split(/\n/).insert(meta_insert_point, "\n\n").join("\n")
+    utf8.split(/\n/).insert(meta_insert_point, "\n\n").join("\n")
   end
 
   def add_yaml(key, value)
@@ -466,7 +466,7 @@ class ::String
     if match(/(\A|\n) *#{key}: *\S+/i)
       sub(/^ *#{key}:.*?\n/i, "#{key}: #{value}\n")
     else
-      lines = clean_encode.split(/\n/)
+      lines = utf8.split(/\n/)
       lines.insert(meta_insert_point, "#{key}: #{value}")
       "#{lines.join("\n")}\n"
     end
@@ -484,7 +484,7 @@ class ::String
     if comment?(key)
       sub(/ *#{key}: .*?$/, "#{key}: #{value}")
     else
-      lines = clean_encode.split(/\n/)
+      lines = utf8.split(/\n/)
       lines.insert(meta_insert_point + 1, "\n<!--\n#{key}: #{value}\n-->")
       lines.join("\n")
     end
@@ -506,10 +506,10 @@ class ::String
     when :yaml
       sub(/^---.*?(---|\.\.\.)/m, "")
     when :mmd
-      lines = clean_encode.split(/\n/)
+      lines = utf8.split(/\n/)
       lines[meta_insert_point..].join("\n")
     when :pandoc
-      lines = clean_encode.split(/\n/)
+      lines = utf8.split(/\n/)
       lines[meta_insert_point..].join("\n")
     else
       gsub(/(\n|^)<!--\n[\w\d\s]+: ([\w\d\s]+)\n-->\n/m, '')
@@ -574,7 +574,7 @@ class ::String
   ##
   def ensure_h1
     headers = to_enum(:scan, /(\#{1,6})([^#].*?)$/m).map { Regexp.last_match }
-    return self if headers.select { |h| h[1].size == 1 }.count.positive?
+    return self unless headers.select { |h| h[1].size == 1 }.empty?
 
     lowest_header = headers.min_by { |h| h[1].size }
     return self if lowest_header.nil?

data/lib/conductor/script.rb

@@ -72,7 +72,7 @@ module Conductor
       end
 
       if use_stdin
-        `echo #{Shellwords.escape(stdin.force_encoding("utf-8"))} | #{Env} #{@path} #{@args}`
+        `echo #{Shellwords.escape(stdin.utf8)} | #{Env} #{@path} #{@args}`
       else
         `#{Env} #{@path} #{@args}`
       end

data/lib/conductor/string.rb

@@ -200,6 +200,24 @@ class ::String
     gsub(/\$(\d+)/, '\\\\\1').gsub(/(^["']|["']$)/, "")
   end
 
+  ##
+  ## Discard invalid characters and output a UTF-8 String
+  ##
+  ## @return     [String] UTF-8 encoded string
+  ##
+  def utf8
+    encode('utf-16', invalid: :replace).encode('utf-8')
+  end
+
+  ##
+  ## Destructive version of #utf8
+  ##
+  ## @return     [String] UTF-8 encoded string, in place
+  ##
+  def utf8!
+    replace scrub
+  end
+
   ##
   ## Get a clean UTF-8 string by forcing an ISO encoding and then re-encoding
   ##
@@ -208,4 +226,13 @@ class ::String
   def clean_encode
     force_encoding("ISO-8859-1").encode("utf-8", replace: nil)
   end
+
+  ##
+  ## Destructive version of #clean_encode
+  ##
+  ## @return     [String] UTF-8 string, in place
+  ##
+  def clean_encode!
+    replace clean_encode
+  end
 end

data/lib/conductor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marked-conductor
 version: !ruby/object:Gem::Version
-  version: 1.0.33
+  version: 1.0.37
 platform: ruby
 authors:
 - Brett Terpstra
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -156,6 +156,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.26
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -198,7 +212,6 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - README.rdoc
@@ -219,7 +232,6 @@ files:
 - lib/conductor/string.rb
 - lib/conductor/version.rb
 - lib/conductor/yui_compressor.rb
-- marked-conductor.gemspec
 - src/_README.md
 - test.sh
 homepage: https://github.com/ttscoff/marked-conductor
@@ -229,7 +241,7 @@ metadata:
   homepage_uri: https://github.com/ttscoff/marked-conductor
   source_code_uri: https://github.com/ttscoff/marked-conductor
   changelog_uri: https://github.com/ttscoff/marked-conductor/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -244,8 +256,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: A custom processor manager for Marked 2 (Mac)
 test_files: []

data/Gemfile.lock

@@ -1,103 +0,0 @@
-PATH
-  remote: .
-  specs:
-    marked-conductor (1.0.33)
-      chronic (~> 0.10.2)
-      tty-which (~> 0.5.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ansi (1.5.0)
-    ast (2.4.2)
-    awesome_print (1.9.2)
-    chronic (0.10.2)
-    coderay (1.1.3)
-    diff-lcs (1.5.1)
-    docile (1.4.0)
-    gem-release (2.2.2)
-    json (2.7.2)
-    language_server-protocol (3.17.0.3)
-    method_source (1.1.0)
-    multi_json (1.15.0)
-    parallel (1.24.0)
-    parse_gemspec (1.0.0)
-    parse_gemspec-cli (1.0.0)
-      multi_json
-      parse_gemspec
-      thor
-    parser (3.3.1.0)
-      ast (~> 2.4.1)
-      racc
-    pry (0.14.2)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    racc (1.7.3)
-    rainbow (3.1.1)
-    rake (13.2.1)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
-    rspec (3.13.0)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubocop (1.62.1)
-      json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
-      parallel (~> 1.10)
-      parser (>= 3.3.0.2)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
-    ruby-progressbar (1.13.0)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-console (0.9.1)
-      ansi
-      simplecov
-      terminal-table
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.4)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
-    thor (1.3.1)
-    tty-which (0.5.0)
-    unicode-display_width (2.5.0)
-    yard (0.9.36)
-
-PLATFORMS
-  arm64-darwin-20
-  x86_64-darwin-20
-
-DEPENDENCIES
-  awesome_print (~> 1.9.2)
-  bundler (~> 2.0)
-  gem-release (~> 2.2)
-  marked-conductor!
-  parse_gemspec-cli (~> 1.0)
-  pry (~> 0.14.2)
-  rake (~> 13.0)
-  rspec (~> 3.13)
-  rubocop (~> 1.21)
-  simplecov (~> 0.21)
-  simplecov-console (~> 0.9)
-  yard (~> 0.9, >= 0.9.26)
-
-BUNDLED WITH
-   2.2.29

data/marked-conductor.gemspec

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-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.summary = "A custom processor manager for Marked 2 (Mac)"
-  spec.description = "Conductor allows easy configuration of multiple scripts" \
-                     "which 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
-  spec.metadata["source_code_uri"] = "https://github.com/ttscoff/marked-conductor"
-  spec.metadata["changelog_uri"] = "https://github.com/ttscoff/marked-conductor/CHANGELOG.md"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (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.require_paths = ["lib"]
-
-  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 "pry", "~> 0.14.2"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "simplecov", "~> 0.21"
-  spec.add_development_dependency "simplecov-console", "~> 0.9"
-  spec.add_development_dependency "yard", "~> 0.9", ">= 0.9.26"
-
-  # Uncomment to register a new dependency of your gem
-  spec.add_dependency "chronic", "~> 0.10.2"
-  spec.add_dependency "tty-which", "~> 0.5.0"
-  # For more information and examples about making a new gem, checkout our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end