rexe 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: facbd7a97a0fba70fb40170f61f53a127b6cb1ec05d44aed85a653a97b711d88
-  data.tar.gz: f742717a826d26f719485bf7cb562e598d1c3130ca3abe4065c2bd1bc90c34c0
+  metadata.gz: cfda8c2ee84b6747e85e1ba54954fefab0da7e246916808994c67976b291e714
+  data.tar.gz: c2221ed77248835efaf56f0f10ffe31803eca929760f67b0c274ac2ed4c1d423
 SHA512:
-  metadata.gz: 819cf812598dfb9612310a71c4b9bb5c8fa00442e16650b9cb8441b2e21a36e39a9e1ead336ca4be9451edf26edf9599f14b1c75ac5935fd069535118f5d78c2
-  data.tar.gz: fe8998aab47ae22b8082439305b28f719296117f183cf49e632ecfe6192cb02bcc99a2536ba9b7b37361642c27619c0cff7d92bae14cd5a8f2a0017369aaab6d
+  metadata.gz: 4b6809b8e4dc6b66cca019993eed4cfcddb65a80c75abcfccb9986206f8f59c1e2d3f4c128bff587899a24c32aeb13a082b5b597ada934b785390f9322ae46c7
+  data.tar.gz: 5127aa52ded297c3a53529b23174f6ec1fa397c59033fd4da5bca0adc700eccd12327c84abab9e644171384a1cabf653a523bbcee8dd96b8ea4abdf17a049243

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 ## rexe -- Ruby Command Line Executor
 
 
+### v0.3.1
+
+* Help text fixes.
+
+
+### v0.3.0
+
+* For consistency with requires, specifying multiple load files on the command line can be done
+  with comma separated filespecs.
+
+
 ### v0.2.0
 
 * Improve README and verbose logging.

data/exe/rexe

@@ -11,7 +11,7 @@ require 'shellwords'
 # Rexe - Ruby Executor
 class Rexe < Struct.new(:input_mode, :loads, :requires, :verbose)
 
-  VERSION = '0.2.0'
+  VERSION = '0.3.1'
 
   def initialize
     self.input_mode = :string
@@ -31,14 +31,14 @@ class Rexe < Struct.new(:input_mode, :loads, :requires, :verbose)
     Options:
 
     -h, --help               Print help and exit
-    -l, --load A_RUBY_FILE   Load this Ruby source code file
+    -l, --load RUBY_FILE(S)  Ruby file(s) to load, comma separated
     -m, --mode MODE          Mode with which to handle input (i.e. what `self` will be in the code):
                                -ms for each line to be handled separately as a string (default)
                                -me for an enumerator of lines (least memory consumption for big data)
                                -mb for 1 big string (all lines combined into single multiline string)
                                -mn to execute the specified Ruby code on no input at all 
     -r, --require REQUIRES   Gems and built-in libraries (e.g. shellwords, yaml) to require, comma separated
-    -v, --[no-]verbose       Verbose mode, writes to stderr
+    -v, --[no-]verbose       Verbose mode (logs to stderr)
 
     If there is an .rexerc file in your home directory, it will be run as Ruby code 
     before processing the input.
@@ -62,6 +62,10 @@ class Rexe < Struct.new(:input_mode, :loads, :requires, :verbose)
   def parse_command_line
     prepend_environment_options
 
+    add_comma_sep_tokens_to_array = ->(string, array) do
+      string.split(',').map(&:strip).each { |r| array << r }
+    end
+
     OptionParser.new do |parser|
 
       parser.on("-h", "--help", "Show help") do |_help_requested|
@@ -69,12 +73,12 @@ class Rexe < Struct.new(:input_mode, :loads, :requires, :verbose)
         exit
       end
 
-      parser.on('-l', '--load RUBY_FILE', 'Loads and runs this Ruby file') do |v|
-        self.loads << v
+      parser.on('-l', '--load RUBY_FILE(S)', 'Ruby file(s) to load, comma separated') do |v|
+        add_comma_sep_tokens_to_array.(v, self.loads)
       end
 
       parser.on('-m', '--mode MODE',
-                'Mode with which to handle input (-ms for string (default), -me for enumerator)') do |v|
+                'Mode with which to handle input (-ms (default), -me, -mb, mn)') do |v|
 
         modes = {
             's' => :string,
@@ -90,11 +94,12 @@ class Rexe < Struct.new(:input_mode, :loads, :requires, :verbose)
         end
       end
 
-      parser.on('-r', '--require REQUIRES', 'Gems and modules to require, comma separated') do |v|
-        v.split(',').map(&:strip).each { |r| self.requires << r }
+      parser.on('-r', '--require REQUIRE(S)',
+                'Gems and built-in libraries (e.g. shellwords, yaml) to require, comma separated') do |v|
+        add_comma_sep_tokens_to_array.(v, self.requires)
       end
 
-      parser.on('-v', '--[no-]verbose', 'Verbose mode') do |v|
+      parser.on('-v', '--[no-]verbose', 'Verbose mode (logs to stderr)') do |v|
         self.verbose = v
       end
     end.parse!
@@ -135,23 +140,21 @@ class Rexe < Struct.new(:input_mode, :loads, :requires, :verbose)
 
     log_if_verbose("rexe version #{VERSION} -- #{Time.now}")
     log_if_verbose('Source Code: ' + ARGV.join(' '))
+    log_if_verbose('Options: ' + self.to_h.to_s)
 
     requires.each do |r|
-      log_if_verbose("Requiring #{r}")
       require(r)
     end
 
     load_global_config_if_exists
 
     loads.each do |file|
-      log_if_verbose("Loading #{file}")
       load(file)
     end
 
     source_code = "Proc.new { #{ARGV.join(' ')} }"
     code = eval(source_code)
 
-
     actions = {
         string:         -> { STDIN.each { |l| execute(l.chomp, code) } },
         enumerator:     -> { execute(STDIN.each_line, code) },
@@ -170,5 +173,3 @@ end
 # and must not have it run at that time:
 called_as_script = (File.basename($0) == File.basename(__FILE__))
 Rexe.new.call if called_as_script
-
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rexe
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Keith Bennett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-04 00:00:00.000000000 Z
+date: 2019-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler