rexe 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6499be319e24a076933f783ed75a150a8aaeb6ac94be679ef715a58cf326346d
-  data.tar.gz: 59ddbcdc184f592c14cc61523efa7dc1d60e7383fa1566bc26426ec260b50ea8
+  metadata.gz: e9f5d21ea46dc4d71386e6611f07fa8a5471728c23733fa6cbee7251efe12cdc
+  data.tar.gz: 61a166a3a08214863854eb8d9276aa3b65048d6ae956a835bb6d468e64b05df2
 SHA512:
-  metadata.gz: 830f180887f1b3743707fb563c88fc15d723b8d454729cbd38d363e915ba15f297a7b7b6dfd6d42ada06825ed4d45336e1ab8a1773d2908724d8962dbf84616b
-  data.tar.gz: edccf4ff045bd38d4e97744cb091b07535babf07187d5327c26571b0144a816f98d89dacd46bf949fbe037d5b8a41e5db0ca794c1f1df9028ee90cc1788cb440
+  metadata.gz: 7b58224490be5b8b63a094a522ba318a4827762cab34e39c6f8831daa5a0f4f9d5c8cd373daf5f5df2affecea5701e7d7f7568f625d7eaaa0722a570bc769bac
+  data.tar.gz: f097725d076854d4fcd3c38f81d44222e0b3641e7cb8c996e9b6c3520b4fff82cbc9fc75ae70a071a63c173a99c5db44ddbd81c8b18a389d34406e0c989cdfab

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 ## rexe -- Ruby Command Line Executor
 
 
+### v0.5.0
+
+* Add '!' to require and load command options to clear respective file lists.
+* In 'no input' mode (-mn), fix so that only output explicitly sent to stdout is output (unlike other modes).
+* Gemspec now parses version from text instead of loading the script.
+* Add tests.
+
 ### v0.4.1
 
 * Fix -r (require) bug.

data/README.md

@@ -26,21 +26,21 @@ rexe is a _filter_ in that it can consume standard input and emit standard outpu
 As a summary, here is the help text printed out by the application:
 
 ```
-rexe -- Ruby Command Line Filter -- v0.4.1 -- https://github.com/keithrbennett/rexe
+rexe -- Ruby Command Line Filter/Executor -- v0.5.0 -- https://github.com/keithrbennett/rexe
 
-Optionally takes standard input and runs the specified code on it, sending the result to standard output.
+Executes Ruby code on the command line, optionally taking standard input and writing to standard output.
 
 Options:
 
 -h, --help                  Print help and exit
--l, --load RUBY_FILE(S)     Ruby file(s) to load, comma separated
--u, --load-up RUBY_FILE(S)  Ruby file(s) to load, searching up tree, comma separated
+-l, --load RUBY_FILE(S)     Ruby file(s) to load, comma separated, or ! to clear
+-u, --load-up RUBY_FILE(S)  Ruby file(s) to load, searching up tree, comma separated, or ! to clear
 -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
+-r, --require REQUIRES   Gems and built-in libraries to require, comma separated, or ! to clear
 -v, --[no-]verbose       Verbose mode (logs to stderr) Verbose off short options: -v n, -v false
 
 If there is an .rexerc file in your home directory, it will be run as Ruby code

data/exe/rexe

@@ -7,10 +7,9 @@
 require 'optparse'
 require 'shellwords'
 
-
 class Rexe < Struct.new(:input_mode, :loads, :requires, :verbose)
 
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 
   def initialize
     self.input_mode = :string
@@ -23,21 +22,21 @@ class Rexe < Struct.new(:input_mode, :loads, :requires, :verbose)
   def help_text
     <<~HEREDOC
 
-    rexe -- Ruby Command Line Filter -- v#{VERSION} -- https://github.com/keithrbennett/rexe
+    rexe -- Ruby Command Line Filter/Executor -- v#{VERSION} -- https://github.com/keithrbennett/rexe
 
-    Optionally takes standard input and runs the specified code on it, sending the result to standard output.
+    Executes Ruby code on the command line, optionally taking standard input and writing to standard output.
 
     Options:
 
     -h, --help                  Print help and exit
-    -l, --load RUBY_FILE(S)     Ruby file(s) to load, comma separated
-    -u, --load-up RUBY_FILE(S)  Ruby file(s) to load, searching up tree, comma separated
+    -l, --load RUBY_FILE(S)     Ruby file(s) to load, comma separated, or ! to clear
+    -u, --load-up RUBY_FILE(S)  Ruby file(s) to load, searching up tree, comma separated, or ! to clear
     -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
+    -r, --require REQUIRES   Gems and built-in libraries to require, comma separated, or ! to clear
     -v, --[no-]verbose       Verbose mode (logs to stderr) Verbose off short options: -v n, -v false
 
     If there is an .rexerc file in your home directory, it will be run as Ruby code 
@@ -69,18 +68,26 @@ class Rexe < Struct.new(:input_mode, :loads, :requires, :verbose)
         exit
       end
 
-      parser.on('-l', '--load RUBY_FILE(S)', 'Ruby file(s) to load, comma separated') do |v|
-        v.split(',').map(&:strip).each { |r| self.loads << r }
+      parser.on('-l', '--load RUBY_FILE(S)', 'Ruby file(s) to load, comma separated, or ! to clear') do |v|
+        if v == '!'
+          self.loads.clear
+        else
+          v.split(',').map(&:strip).each { |r| self.loads << r }
+        end
       end
 
-      parser.on('-u', '--load_up RUBY_FILE(S)', 'Ruby file(s) to load, searching up tree, comma separated') do |v|
-        filespecs = v.split(',').map(&:strip)
-        filespecs.each do |filespec|
-          found_file = find_file_up_tree(filespec)
-          if found_file
-            self.loads << found_file
-          else
-            log_if_verbose("Did not find load file #{filespec} in this directory or higher.")
+      parser.on('-u', '--load_up RUBY_FILE(S)', 'Ruby file(s) to load, searching up tree, comma separated, or ! to clear') do |v|
+        if v == '!'
+          self.loads.clear
+        else
+          filespecs = v.split(',').map(&:strip)
+          filespecs.each do |filespec|
+            found_file = find_file_up_tree(filespec)
+            if found_file
+              self.loads << found_file
+            else
+              log_if_verbose("Did not find load file #{filespec} in this directory or higher.")
+            end
           end
         end
       end
@@ -103,8 +110,12 @@ class Rexe < Struct.new(:input_mode, :loads, :requires, :verbose)
       end
 
       parser.on('-r', '--require REQUIRE(S)',
-                'Gems and built-in libraries (e.g. shellwords, yaml) to require, comma separated') do |v|
-        v.split(',').map(&:strip).each { |r| self.requires << r }
+                'Gems and built-in libraries (e.g. shellwords, yaml) to require, comma separated, or ! to clear') do |v|
+        if v == '!'
+          self.requires.clear
+        else
+          v.split(',').map(&:strip).each { |r| self.requires << r }
+        end
       end
 
       # See https://stackoverflow.com/questions/54576873/ruby-optionparser-short-code-for-boolean-option
@@ -114,6 +125,12 @@ class Rexe < Struct.new(:input_mode, :loads, :requires, :verbose)
       parser.on('-v', '--[no-]verbose [FLAG]', TrueClass, 'Verbose mode (logs to stderr)') do |v|
         self.verbose = (v.nil? ? true : v)
       end
+
+
+      parser.on('', '--version', 'Print version') do
+        puts VERSION
+        exit
+      end
     end.parse!
   end
 
@@ -148,7 +165,7 @@ class Rexe < Struct.new(:input_mode, :loads, :requires, :verbose)
     if eval_context_object
       puts eval_context_object.instance_eval(&code)
     else
-      puts code.call
+      code.call
     end
   rescue Errno::EPIPE
     exit(-13)

data/rexe.gemspec

@@ -1,10 +1,13 @@
-# lib = File.expand_path("../exe", __FILE__)
-# $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-load File.expand_path(File.join(File.dirname(__FILE__), 'exe', 'rexe'))
 
 Gem::Specification.new do |spec|
   spec.name          = "rexe"
-  spec.version       = Rexe::VERSION
+
+  spec.version       = -> do
+    rexe_file = File.join(File.dirname(__FILE__), 'exe', 'rexe')
+    version_line = File.readlines(rexe_file).grep(/\s*VERSION\s*=\s*'/).first.chomp
+    version_line.match(/'(.+)'/)[0].gsub("'", '')
+  end.()
+
   spec.authors       = ["Keith Bennett"]
   spec.email         = ["keithrbennett@gmail.com"]
 
@@ -36,6 +39,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "os"
   spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rexe
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Keith Bennett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2019-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -71,8 +85,6 @@ files:
 - bin/console
 - bin/setup
 - exe/rexe
-- lib/rexe.rb
-- lib/rexe/version.rb
 - rexe.gemspec
 homepage: https://github.com/keithrbennett/rexe
 licenses:

data/lib/rexe.rb

@@ -1,6 +0,0 @@
-require "rexe/version"
-
-module Rexe
-  class Error < StandardError; end
-  # Your code goes here...
-end

data/lib/rexe/version.rb

@@ -1,3 +0,0 @@
-module Rexe
-  VERSION = "0.1.0"
-end