subtxt 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a51e2f5f00771df588dde9f6f06e8b7818864e5a
-  data.tar.gz: 0539a1ae0e32fa61f031866717aa2c7b9879312d
+SHA256:
+  metadata.gz: 7d6b3f5586203d5fff3aabc5fe4f96924ecbb12c6a074aa85d98e3dfdfd9e1b5
+  data.tar.gz: 39d19a2cd6dbd85d431cb07dc07b8f4f30d3de3d20e62aa70b218eb05ae62778
 SHA512:
-  metadata.gz: e93bfc67f375571700fb3d4e65d5838d864d1da275207dc514f8e609e979b5f99acce8b8a219a71e3432deae9a5bbb727939354797a2d6581e93f0624301b9e7
-  data.tar.gz: 13dd9ae68de892ba890f622b077cbbfa5770c3a27c709dc1eaf7572e76796e5d119b56c636eec123f49b800221152020c1912e05b5fe0e6090000a027fa45e1f
+  metadata.gz: 0ccae6e0c113b355468421e69963c1219b157733a1244c41a0fec26969c0b349103f58c3dcf439a21f3715e54e5f57bdec9244919b4b29e902810d5211da46c9
+  data.tar.gz: cef008ada7bf46741b163094986b5578d4e0f620d7e4bd0f542b0381b88eae08f809d9dc8cf014c619cba4a03ced5e2de4d8471c87f44ff0c202108c72dff042

data/lib/subtxt.rb

@@ -19,22 +19,24 @@ require 'yaml'
   "#{severity}: #{msg}\n"
 end
 
-def load_patterns pfile
+def load_patterns pfiles
+  files = pfiles.split(",")
   records = []
-  File.open(pfile, "r") do |pats|
-    pair = {}
-    rowct = 0
-    pats.each_line do |row|
-      break if row.chomp.downcase == "eof"
-      unless pair['fnd'] and pair['rep']
-        unless pair['fnd']
-          pair['fnd'] = row.chomp
+  files.each do |pfile|
+    File.open(pfile, "r") do |pats|
+      pair = {}
+      pats.each_line do |row|
+        break if row.chomp.downcase == "eof"
+        unless pair['fnd'] and pair['rep']
+          unless pair['fnd']
+            pair['fnd'] = row.chomp
+          else
+            pair['rep'] = row.chomp
+          end
         else
-          pair['rep'] = row.chomp
+          records << pair
+          pair = {}
         end
-      else
-        records << pair
-        pair = {}
       end
     end
   end
@@ -125,7 +127,7 @@ parser = OptionParser.new do|opts|
   \treplace pattern
   \t
   \t(pattern|string|content)-(to)-(find)
-  \t$1 $2 replace
+  \t\1 \2 replace
   \t
   \tregular expression pattern
   \ttokenized substitute output
@@ -146,14 +148,14 @@ parser = OptionParser.new do|opts|
   end
 
   if ARGV[0].split("").first == "-"
-    opts.on('-p PATH', '--patterns PATH', "Full (relative or absolute) path to a text file containing\n\t\t\t\t\tfind & replace patterns in the designated format.\n\t\t\t\t\tREQUIRED. Ex: -p path/to/patterns.rgxp") do |n|
+    opts.on('-p', '--patterns PATH[,PATH]', "Full (relative or absolute) path to a text file containing","find & replace patterns in the designated format.","REQUIRED. Ex: -p path/to/patterns.rgxp,path/to/secondary-patterns.txt") do |n|
       @options[:patterns] = n;
     end
   else # the first arg has no leading - or --, it must be our path
     @options[:patterns] = ARGV[0]
   end
 
-  opts.on('-s PATH', '--source PATH', "Ingest files from this directory. Defaults to current directory.\n\t\t\t\t\tSuperceded if a path is passed as the first argument\n\t\t\t\t\t(subtxt path/to/files -p patterns.rgx). Ex: -i path/to/ingest/dir") do |n|
+  opts.on('-s PATH', '--source PATH', "Ingest files from this directory. Defaults to current directory.","\tSuperceded if a path is passed as the first argument","\t(subtxt path/to/files -p patterns.rgx). Ex: -i path/to/ingest/dir") do |n|
     @options[:ingestdir] = n;
   end
 
@@ -162,7 +164,7 @@ parser = OptionParser.new do|opts|
   #   @options[:recursive] = true
   # end
 
-  opts.on('-f STRING', '--filext STRING', "Restrict ingested files to this extension. The first dot (.) is implied.\n\t\t\t\t\tEx: -f htm") do |n|
+  opts.on('-f STRING', '--filext STRING', "Restrict ingested files to this extension. The first dot (.) is implied.","\tEx: -f htm") do |n|
     @options[:filext] = n;
   end
 
@@ -170,7 +172,7 @@ parser = OptionParser.new do|opts|
     @options[:expath] = n;
   end
 
-  opts.on('--expext STRING', "The export file\'s extension to reassign for all files. The first dot (.)\n\t\t\t\t\tis implied. Defaults to same extension as original. Ex: --expext htm") do |n|
+  opts.on('--expext STRING', "The export file\'s extension to reassign for all files. The first dot (.)","is implied. Defaults to same extension as original. Ex: --expext htm") do |n|
     @options[:expext] = n;
   end
 

data/lib/subtxt/version.rb

@@ -1,3 +1,3 @@
 module Subtxt
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subtxt
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Brian Dominick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 description: A simple text conversion utility using regular expressions for searching
   and replacing multiple strings across multiple files, for conversion projects.
 email:
@@ -69,8 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A simple utility for converting multiple strings across multiple files, for