rbtext 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25c59524b5af0b4acca39400131e5b938e80089937f67fd655a3251cc76d9911
-  data.tar.gz: a8d5abe5d2eb15ef94954d496a2c249cd7888cfa4a1e13604c5b6ada108b1cc5
+  metadata.gz: 3c7c45db810d1c18c792fc0cb8c950a98b595f1e8b2f11f9a52cbd1208ec1b20
+  data.tar.gz: 7ea21e0558cecc832e0880cc8912c30b7a3ad71187826e4ecd74eb3761570a83
 SHA512:
-  metadata.gz: 392a2a3e4edc646db3470d43cc2689b02cb61d3b3f1280c16baef95c61195fa75509e406d90bfc9362332e145a1f5ce810ee0598b91d6e203b748949f4e865fd
-  data.tar.gz: 43c39fb22e69d869886cf69625c8b385c4b1547b48d3b9c3c5138555af8b23abccc089bb18bd40e48e31b37a605d11499a6781b60c2da4a67472ffcbf915218f
+  metadata.gz: 8ec67a8716005d493a6f67e279452d5bf782af7bc7d1660bbccd6c7d81cc2f496ee5fd325957bbd884130ab8ae32139d3763a44a4426a70d02ed4819d7621ca9
+  data.tar.gz: 92971efd9ce33efa7f914022ccc0f3fbcce48047438c96085a19c997d74a92f5f1141e698dda11e617d8dc0864c65714b83d21befa795cce2f92b22e01acd0af

data/bin/ftext

@@ -1,26 +1,48 @@
 #!/usr/bin/env ruby
 require_relative '../lib/rbtext.rb'
+require 'argparse'
 
-params = (ARGV[1..ARGV.length-1]).to_a
+opts = {
+  dump: { has_argument: false },
+  noreset: { has_argument: false },
+  stdin: { has_argument: false },
+  help: { has_argument: false }
+}
 
-if STDIN.tty? && ARGV[0]
+switches = {}
+
+args = ArgsParser::Args.new(options: opts, switches: switches)
+
+if args.options[:help]
+  puts "RBtext ftext #{RBText.version}"
+  puts "Syntax: ftext [ftext] [options]"
+  puts "Options"
+  puts "--dump - Output actual escape codes"
+  puts "--noreset - Doesn't reset formatting when applying ftext to piped input"
+  puts "--stdin - Get ftext from pipe"
+  exit
+end
+
+if STDIN.tty? && ARGV[0] # If no pipe input and argument provided
   txt = ARGV[0].to_s
-elsif STDIN.tty?
-  return
+elsif !STDIN.tty? && args.options[:stdin] # If pipe input and no argument provided
+  ft = STDIN.gets
+  print R::Ft.new(ft)
+  exit
 else
   if ARGV[0]
     txt = []
 
-    args = ARGV[0].split(',')
+    ftargs = args.data[0].split(',')
     lines = STDIN.each_line.to_a
 
-    if args.length < lines.length
-      x = lines.length/args.length
-      args = args * (x+1)
+    if ftargs.length < lines.length
+      x = lines.length/ftargs.length
+      ftargs = ftargs * (x+1)
     end
 
     (0..lines.length-1).each do |l|
-      txt << "#{"_.f:reset._" if !params.include?("--noreset")}_.#{args[l]}._"+lines[l].gsub("_", "\0004")
+      txt << "#{"_.f:reset._" if !args.options[:noreset]}_.#{ftargs[l]}._"+lines[l].gsub("_", "\0004")
     end
 
     txt = txt.join
@@ -30,5 +52,5 @@ else
 end
 
 out = R::Ft.new(txt).to_s.gsub("\0004", "_")
-print out.dump.sub("\"", "").reverse.sub("\"", "").reverse if params.include?("--dump")
-print out if !params.include?("--dump")
+print out.dump.sub("\"", "").reverse.sub("\"", "").reverse if args.options[:dump]
+print out if !args.options[:dump]

data/lib/rbtext.rb

@@ -8,7 +8,7 @@ require "io/console"
 module RBText
   @ver_1 = 0
   @ver_2 = 3
-  @ver_3 = 2
+  @ver_3 = 3
   @ver_4 = ""
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbtext
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Matthias Lee
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-27 00:00:00.000000000 Z
+date: 2023-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-console
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.6
+- !ruby/object:Gem::Dependency
+  name: argparse
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 description: A gem for printing formatted text
 email: matthias@matthiasclee.com
 executables:
@@ -43,7 +57,7 @@ homepage: https://github.com/Matthiasclee/RBText
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -59,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: RBText
 test_files: []