marked-conductor 1.0.35 → 1.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31042fe7c5635982e15c551493cf380e0d3aabae92051871144172e5890e2328
-  data.tar.gz: 8ea8a81fb13a5342332e5c3ac779fea2dced77b34318f1e43210d1d5c388dd54
+  metadata.gz: d11929a623cf222dcc0fb6cb681b2292a9d00b1560651f2705935089b42c6b8f
+  data.tar.gz: 2162e63d939709e7a81ed1d686c7fde34024b763a05ea41ccbd17165bd4c60ec
 SHA512:
-  metadata.gz: d8bea2c1c42bf3bf95819b1371368ad73a810860725fc2e86ccf2803c11de5de826740cd32723c5b67ccf2423e7bebb15442888e163c1fe5188924988c9b15f3
-  data.tar.gz: b8a3881c29831dae7b37b7eeafb31acf5c34ccaf79c99e9b2bed2252a71f82575417dfe8941ba9c2d6629fad6c10511dacff6d40dd05a5022c91804720568c96
+  metadata.gz: f695ce001dbaae4e25e2bb03106923cf6488e90b71a5e427b0511d3cba57d395e47e6e6cd4f19c2d365a9be11edf7f4a518349950a2e90b4b7beabd94a625e51
+  data.tar.gz: 42092c947da449d3dc54d36f9b48e36f3a213767145f0151dce5b98a00b92c0a1ff575a8f3f8904aed43841b444dbac3ef27ed31f5140f9dabbb9e062e145537

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+### 1.0.38
+
+2024-08-23 11:20
+
+### 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

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/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/version.rb

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

data/marked-conductor.gemspec

@@ -41,6 +41,9 @@ Gem::Specification.new do |spec|
   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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marked-conductor
 version: !ruby/object:Gem::Version
-  version: 1.0.35
+  version: 1.0.38
 platform: ruby
 authors:
 - Brett Terpstra
 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

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