marked-conductor 1.0.37 → 1.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecb00aeb3e1cbd137378b4b4f236ebf7c9b0a1a24a9e9bff5c5788eacb327730
-  data.tar.gz: 6bd4a657d14378e9e65acf704162dc3f79163f87e48840fe93d6e7047eb14455
+  metadata.gz: afa046834bd1aa489d0b5e30a4a20e954c958d01fec5a825ede7f6bd4160c926
+  data.tar.gz: 13c549beca3c2a1034a37275c7aa5254df2ea86a348d1f24b39bf826b6a51045
 SHA512:
-  metadata.gz: d7b041001f2ae096a66d9efa3aa359d20e2f8b1ea0bb35a11e455c6e171b3746d97c678bfb1272b7d1d0328045a552023eeef85a131538524c936213d83a7163
-  data.tar.gz: 99c1e9653fd7feffdae8def8ee3b37a79cb3a4e6fc9d2c221cbe41c8ecd9ca39a5971bfc15d140dec867e172da6ed1477d82777530856c53578de9e94a559f12
+  metadata.gz: 0350024a2c2481624e537b2b75f30d5b70b957d68ef1664050d2211412fbb0ff4d20c69d314e702b1592ae9024126dd0218d647c74d4147ab9bb726a54023dc9
+  data.tar.gz: ea0c11aa9377089252cb71e1efeb0c863f0c08d89d99cd5596b206e2deb8e4dde222869f53452bcd2919d4546b29a665375fdd5fff2dc82a8098d90d43f4161d

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 1.0.39
+
+2025-01-01 13:55
+
+#### FIXED
+
+- Inert_file messing up file extensions
+
+### 1.0.38
+
+2024-08-23 11:20
+
 ### 1.0.37
 
 2024-08-23 11:04

data/Gemfile.lock

@@ -0,0 +1,104 @@
+PATH
+  remote: .
+  specs:
+    marked-conductor (1.0.39)
+      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
+  arm64-darwin-24
+  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.0)
+  rubocop (~> 1.21)
+  simplecov (~> 0.21)
+  simplecov-console (~> 0.9)
+  yard (~> 0.9, >= 0.9.26)
+
+BUNDLED WITH
+   2.2.29

data/README.md

@@ -1,10 +1,17 @@
 
+
 [![RubyGems.org](https://img.shields.io/gem/v/marked-conductor)](https://rubygems.org/gems/marked-conductor)
 
 # Marked Conductor
 
 A "train conductor" for [Marked 2](https://marked2app.com) (Mac only). Conductor can be set up as a Custom Preprocessor or Custom Processor for Marked, and can run different commands and scripts based on conditions in a YAML configuration file, allowing you to have multiple processors that run based on predicates.
 
+Conductor configuration uses "natural language," allowing for complex
+operations without having to write any code. A condition can look like
+"name contains work-" to match a file named `work-project1.md`. The
+actions you can take include scripts, commands, and built in filters for
+an array of common operations.
+
 ## Installation
 
     $ gem install marked-conductor

data/bin/conductor

@@ -1,29 +1,53 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -W1
 # frozen_string_literal: true
 
-#
-# This file was generated by Bundler.
-#
-# The application 'conductor' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+require_relative "../lib/conductor"
+require "optparse"
+
+optparse = OptionParser.new do |opts|
+  opts.banner = "Called from Marked 2 as a Custom Pre/Processor"
+
+  opts.on("-v", "--version", "Show version number") do
+    puts "conductor v#{Conductor::VERSION}"
+    Process.exit 0
+  end
+
+  opts.on("-h", "--help", "Display this screen") do
+    puts opts
+    exit
   end
 end
 
-require "rubygems"
-require "bundler/setup"
+optparse.parse!
+
+config = Conductor::Config.new
+res = config.configure
+
+Process.exit 0 unless res
 
-load Gem.bin_path("marked-conductor", "conductor")
+Conductor.stdin
+Conductor.original_input = Conductor.stdin
+
+tracks = config.tracks
+res, condition = Conductor.conduct(tracks)
+
+##
+## Clean up conditions for output
+##
+## @param      condition  The condition
+##
+def clean_condition(condition)
+  condition.join("").sub(/ *(->|,) *$/, "")
+end
+
+if res.nil?
+  warn "No conditions satisfied"
+  # puts Conductor::Env
+  puts "NOCUSTOM"
+elsif res == Conductor.original_input
+  warn "No change in output"
+  puts "NOCUSTOM"
+else
+  warn "Met condition: #{clean_condition(condition)}"
+  puts res
+end

data/lib/conductor/filter.rb

@@ -12,13 +12,14 @@ class ::String
   def find_file_in(paths, filename, ext)
     return filename if File.exist?(filename)
 
+    ext = ext.sub(/^\./, "")
+
     filename = File.basename(filename, ".#{ext}")
 
     paths.each do |path|
       exp = File.join(File.expand_path("~/.config/conductor/"), path, "#{filename}.#{ext}")
       return exp if File.exist?(exp)
     end
-
     "#{filename}.#{ext}"
   end
 
@@ -180,13 +181,13 @@ class ::String
     lines = utf8.split(/\n/)
     max = max.to_i&.positive? ? " max#{max}" : ""
     line = case after.to_sym
-           when :h2
-             first_h2.nil? ? 0 : first_h2 + 1
-           when :h1
-             first_h1.nil? ? 0 : first_h1 + 1
-           else
-             meta_insert_point.positive? ? meta_insert_point + 1 : 0
-           end
+      when :h2
+        first_h2.nil? ? 0 : first_h2 + 1
+      when :h1
+        first_h1.nil? ? 0 : first_h1 + 1
+      else
+        meta_insert_point.positive? ? meta_insert_point + 1 : 0
+      end
 
     lines.insert(line, "\n<!--toc#{max}-->\n").join("\n")
   end
@@ -272,21 +273,21 @@ class ::String
     path = path.strip
 
     path = if path =~ %r{^[.~/]}
-             File.expand_path(path)
-           else
-             find_file_in(%w[files], path, File.extname(path))
-           end
+        File.expand_path(path)
+      else
+        find_file_in(%w[files], path, File.extname(path))
+      end
 
     warn "File not found: #{path}" unless File.exist?(path)
 
     out = case type
-          when :code
-            "<<(#{path})"
-          when :raw
-            "<<{#{path}}"
-          else
-            "<<[#{path}]"
-          end
+      when :code
+        "<<(#{path})"
+      when :raw
+        "<<{#{path}}"
+      else
+        "<<[#{path}]"
+      end
     out = "\n#{out}\n"
 
     case position
@@ -363,10 +364,10 @@ class ::String
     return insert_raw_javascript(path) if path =~ /\(.*?\)/
 
     path = if path =~ %r{^[~/.]}
-             File.expand_path(path)
-           else
-             find_file_in(%w[javascript javascripts js scripts], path.sub(/(\.js)?$/, ".js"), "js")
-           end
+        File.expand_path(path)
+      else
+        find_file_in(%w[javascript javascripts js scripts], path.sub(/(\.js)?$/, ".js"), "js")
+      end
 
     if File.exist?(path)
       insert_javascript(path)
@@ -381,7 +382,7 @@ class ::String
     filename.sub!(/-?\d{4}-\d{2}-\d{2}-?/, "")
     filename.sub!(/\bdot\b/, ".")
     filename.sub!(/ dash /, "-")
-    filename.gsub(/-/, ' ')
+    filename.gsub(/-/, " ")
   end
 
   def read_title
@@ -512,7 +513,7 @@ class ::String
       lines = utf8.split(/\n/)
       lines[meta_insert_point..].join("\n")
     else
-      gsub(/(\n|^)<!--\n[\w\d\s]+: ([\w\d\s]+)\n-->\n/m, '')
+      gsub(/(\n|^)<!--\n[\w\d\s]+: ([\w\d\s]+)\n-->\n/m, "")
     end
   end
 
@@ -697,10 +698,10 @@ module Conductor
         amt = 0
         if @params
           amt = if @params[0] =~ /^[yts]/
-                  1
-                else
-                  @params[0].to_i
-                end
+              1
+            else
+              @params[0].to_i
+            end
         end
         content.insert_title(shift: amt)
       when /(insert|add|inject)script/
@@ -713,19 +714,19 @@ module Conductor
         m = Regexp.last_match
 
         position = if @params.count == 2
-                     @params[1].normalize_position
-                   else
-                     m[1].normalize_position
-                   end
+            @params[1].normalize_position
+          else
+            m[1].normalize_position
+          end
         content.insert_file(@params[0], m[2].normalize_include_type, position)
       when /inserttoc/
         max = @params.nil? || @params.empty? ? nil : @params[0]
 
         after = if @params && @params.count == 2
-                  @params[1] =~ /2/ ? :h2 : :h1
-                else
-                  :start
-                end
+            @params[1] =~ /2/ ? :h2 : :h1
+          else
+            :start
+          end
 
         content.insert_toc(max, after)
       when /(add|set)meta/

data/lib/conductor/version.rb

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

data/marked-conductor.gemspec

@@ -0,0 +1,52 @@
+# 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"
+
+  spec.add_development_dependency "rubocop", "~> 1.21"
+
+
+  # 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

data/src/_README.md

@@ -1,10 +1,17 @@
 <!--README-->
+<!--GITHUB-->
 [![RubyGems.org](https://img.shields.io/gem/v/marked-conductor)](https://rubygems.org/gems/marked-conductor)
 
 # Marked Conductor
-
+<!--END GITHUB-->
 A "train conductor" for [Marked 2](https://marked2app.com) (Mac only). Conductor can be set up as a Custom Preprocessor or Custom Processor for Marked, and can run different commands and scripts based on conditions in a YAML configuration file, allowing you to have multiple processors that run based on predicates.
 
+<!--JEKYLL {% img alignright /images/projecticons/conductor.png 146 174 "Conductor icon"  %}-->Conductor configuration uses "natural language," allowing for complex
+operations without having to write any code. A condition can look like
+"name contains work-" to match a file named `work-project1.md`. The
+actions you can take include scripts, commands, and built in filters for
+an array of common operations.
+
 ## Installation
 
     $ gem install marked-conductor

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: marked-conductor
 version: !ruby/object:Gem::Version
-  version: 1.0.37
+  version: 1.0.39
 platform: ruby
 authors:
 - Brett Terpstra
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-23 00:00:00.000000000 Z
+date: 2025-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -212,6 +211,7 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - README.rdoc
@@ -232,6 +232,7 @@ 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
@@ -241,7 +242,6 @@ 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: 
 rdoc_options: []
 require_paths:
 - lib
@@ -256,8 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A custom processor manager for Marked 2 (Mac)
 test_files: []