rexe 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7477c149efa64d0b00e4127d5219546c7ef1559fb7708ca8b389a9ef48c7348
-  data.tar.gz: 76114118d28be5a81561f8c67af9727fca5201a5ca443d0cdc6d60f5431451a1
+  metadata.gz: ab6cd585e21edba16a3a5c8a8891e476ec637439d7ad138f4bd3100eb7612dd9
+  data.tar.gz: a5726d9c8796bbe3cba5ce72d29fc47baf1a424a88ee9ee85ddc437e07a659ec
 SHA512:
-  metadata.gz: 615ff910e6a79cdc38b574503253871e5141bf027f6753aaa2375a4b8e2a4108f2ebdd6eb4532dbd46daf655212ac8f6583b538f103164abcc1264e84ae71450
-  data.tar.gz: 6cd017a263416d521de4c1a8b55cdba5fb55605a053d3bb39e019c1521f19c1549eeed715cc9c8c37e90dbe7109681a27de56ee8ef6e53ffa41c337ebd2fb29a
+  metadata.gz: 4ed213f525f937ed0c5a34d0731e4e4373a47d1aa185fa98a6478f73946009afbd91fc50241b6e2ca2aadd377ee1b6d1d812cf3c0f79a7e19d6219d5856aa6ce
+  data.tar.gz: 33772f5dbe83863c18405950cfd84b128a36a8733f7a459221f74cfce1ed7d076bd8b3f815f221b05efc0386ad2b59c4a65e8e3842f412cebfeb91516fa876b9

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## rexe -- Ruby Command Line Executor/Filter
 
+### 1.6.0
+
+* Replace calls to `exists?`, which has been removed, with `exist?`.
+* Add warning messages to stderr for unspecified options (input/output format, input mode), 
+  but only when logging is disabled.
+
+### 1.5.1
+
+* Change string concatenations using << to creation of new strings with += to accommodate default-frozen strings.
+
+
 ### 1.5.0
 
 * Switch from AwesomePrint to AmazingPrint, and change all references in text, help, etc.

data/README.md

@@ -73,7 +73,7 @@ Rexe is at https://github.com/keithrbennett/rexe and can be installed with `gem
 Here is rexe's help text as of the time of this writing:
 
 ```
-rexe -- Ruby Command Line Executor/Filter -- v1.5.0 -- https://github.com/keithrbennett/rexe
+rexe -- Ruby Command Line Executor/Filter -- v1.6.0 -- https://github.com/keithrbennett/rexe
 
 Executes Ruby code on the command line, 
 optionally automating management of standard input and standard output,

data/exe/rexe

@@ -15,7 +15,7 @@ require 'shellwords'
 
 class Rexe
 
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 
   PROJECT_URL = 'https://github.com/keithrbennett/rexe'
 
@@ -57,7 +57,7 @@ class Rexe
 
 
     def clear
-      self.input_filespec = nil
+      self.input_filespec      = nil
       self.input_format        = :none
       self.input_mode          = :none
       self.output_format       = :none
@@ -123,7 +123,7 @@ class Rexe
 
     def formatters
       @formatters ||=  {
-          amazing_print: ->(obj)  { obj.ai << "\n" },
+          amazing_print: ->(obj)  { obj.ai + "\n" },
           inspect:       ->(obj)  { obj.inspect + "\n" },
           json:          ->(obj)  { obj.to_json },
           marshal:       ->(obj)  { Marshal.dump(obj) },
@@ -247,7 +247,7 @@ class Rexe
           to the command line so that you can specify options implicitly 
           (e.g. `export REXE_OPTIONS="-r amazing_print,yaml"`)
 
-      HEREDOC
+    HEREDOC
 
         @help_text.freeze
       end
@@ -289,6 +289,29 @@ class Rexe
 
       prepend_environment_options
 
+      input_mode_specified = false
+      input_format_specified = false
+      output_format_specified = false
+
+      report_unspecified_options = ->() do
+        messages = []
+
+        unless input_mode_specified
+          messages << 'Input mode not specified. Defaulting to -mn (none).'
+        end
+        unless input_format_specified
+          messages << 'Input format not specified. Defaulting to -in (none).'
+        end
+        unless output_format_specified
+          messages << 'Output mode not specified. Defaulting to -on (none).'
+        end
+
+        if messages.any?
+          $stderr.puts("#{messages.join("\n")}")
+          $stderr.puts("See help (run with -h) for more information.\n\n")
+        end
+      end
+
       OptionParser.new do |parser|
 
         parser.on('-c', '--clear_options', "Clear all previous command line options") do |v|
@@ -302,8 +325,10 @@ class Rexe
           end
           options.input_filespec = v
           options.input_format = autodetect_file_format(v)
+          input_format_specified = true
           if [:json, :yaml].include?(options.input_format)
             options.input_mode = :one_big_string
+            input_mode_specified = true
           end
         end
 
@@ -326,6 +351,7 @@ class Rexe
           if options.input_format.nil?
             raise("Input mode was '#{v}' but must be one of #{lookups.input_formats.keys}.")
           end
+          input_format_specified = true
         end
 
         parser.on('-l', '--load RUBY_FILE(S)', 'Ruby file(s) to load, comma separated, or ! to clear') do |v|
@@ -335,7 +361,7 @@ class Rexe
             loadfiles = v.split(',').map(&:strip).map { |s| File.expand_path(s) }
             removes, adds = loadfiles.partition { |filespec| filespec[0] == '-' }
 
-            existent, nonexistent = adds.partition { |filespec| File.exists?(filespec) }
+            existent, nonexistent = adds.partition { |filespec| File.exist?(filespec) }
             if nonexistent.any?
               raise("\nDid not find the following files to load: #{nonexistent}\n\n")
             else
@@ -353,6 +379,7 @@ class Rexe
           if options.input_mode.nil?
             raise("Input mode was '#{v}' but must be one of #{lookups.input_modes.keys}.")
           end
+          input_mode_specified = true
         end
 
         # See https://stackoverflow.com/questions/54576873/ruby-optionparser-short-code-for-boolean-option
@@ -371,6 +398,7 @@ class Rexe
           if [options.output_format_tty, options.output_format_block].include?(nil)
             raise("Bad output mode '#{v}'; each must be one of #{lookups.output_formats.keys}.")
           end
+          output_format_specified = true
         end
 
         parser.on('-r', '--require REQUIRE(S)',
@@ -413,6 +441,7 @@ class Rexe
       options.requires = options.requires.sort.uniq
       options.loads.uniq!
 
+      report_unspecified_options.() if options.log_format == :none
       options
 
     end
@@ -436,7 +465,7 @@ class Rexe
 
     private def load_global_config_if_exists
       filespec = File.join(Dir.home, '.rexerc')
-      load(filespec) if File.exists?(filespec)
+      load(filespec) if File.exist?(filespec)
     end
 
 
@@ -516,7 +545,7 @@ class Rexe
           raise error # re-raise the error, can't fix it
         else
           load_dir = File.dirname(gem_path)
-          $LOAD_PATH << load_dir
+          $LOAD_PATH += load_dir
           require the_require
         end
       end
@@ -566,4 +595,4 @@ def bundler_run(&block)
 end
 
 
-bundler_run { Rexe::Main.new.call }
+bundler_run { Rexe::Main.new.call }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rexe
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Keith Bennett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-15 00:00:00.000000000 Z
+date: 2023-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: Ruby Command Line Executor