pru 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e3aadfba1442b50864edd1817ede514cf9592cd5cda84df67969958160d4053
-  data.tar.gz: 56047bf61575504fc0c3c489b084c3537ca715d20498c2571d01df92585fe684
+  metadata.gz: f72e74d5784d176b7582189d4a7b805e62c12e574b6d778549c664ecb02fe0b1
+  data.tar.gz: f5135f6bee632dfa47a596e5236ad503c71ce9d505f6daee242338ce05db3620
 SHA512:
-  metadata.gz: '0995c519eaee3cf6b9fd41fa21578b3b4138214d2a5cbc6848fa03d37f9ad0328f16bef8dfbee6c274744408708d7ac47eeb545b5c228f89cf41cc2c42336de0'
-  data.tar.gz: fd7de3b48e9291ab01ad4478b65bc76a02f97841f4d84aa93ae624a600e2c188f921f32e5f2fc90e10cd76579f7fb2434771a9fb586fdebf9fe96dab29c28513
+  metadata.gz: f7f1f60fa40cc36551551f42d1c98c469aa33c4dbd1cc3e6c03a27d008e5ae323bb17e10bf1e5a91f42a3e8f9911ef6faec8508044ae403ac44f51c96574b489
+  data.tar.gz: 456555cd258f16f86dcdc86392c1be6be9c536fa5f60792c6e3d9cd2fb98ecd28d3ecdc3657e333f2ed36b718a2097713059ffdda077afeee74985a09093e8ec

data/bin/pru

@@ -7,10 +7,9 @@ $LOAD_PATH << "#{root}/lib" if File.exist?("#{root}/Gemfile")
 
 require 'pru'
 
-usage = nil
 options = {}
 
-OptionParser.new do |opts|
+parser = OptionParser.new do |opts|
   opts.banner = <<-BANNER.gsub(/^    /, "")
     Pipeable Ruby
 
@@ -28,6 +27,8 @@ OptionParser.new do |opts|
     Options:
   BANNER
   opts.on("-r", "--reduce CODE","reduce via CODE") {|code| options[:reduce] = code }
+  opts.on("-j", "--json","Parse input as a JSON stream, each value is an item") { options[:json] = true }
+  opts.on("-k", "--k8s","Like --json, but iterate the \"items\" array if present (kubectl -o json)") { options[:json] = true; options[:k8s] = true }
   opts.separator ''
   opts.on('-I', '--libdir DIR', 'Add DIR to load path') { |dir| $LOAD_PATH << dir }
   opts.on('--require LIB', 'Require LIB (also comma-separated)') { |lib| lib.split(',').each{|l| require l } }
@@ -35,30 +36,51 @@ OptionParser.new do |opts|
   opts.separator ''
   opts.on("-h", "--help","Show this.") { puts opts; exit }
   opts.on('-v', '--version','Show Version'){ require 'pru/version'; puts Pru::VERSION; exit}
-  usage = opts
-end.parse!
-
-if ARGV.empty? && options.empty? # no arguments -> show usage
-  puts usage
-  exit
 end
+parser.parse!
 
-abort "Too many arguments, see --help" if ARGV.size > 2
+# bad arguments -> fail
+if ARGV.empty? && options.empty?
+  abort parser.to_s
+end
+if ARGV.size > 2
+  abort "Too many arguments, see --help"
+end
+if ARGV.size == 2 && options[:reduce]
+  abort "Cannot combine a reduce argument with --reduce, see --help"
+end
+if options[:file] && ARGV.empty? && !options[:reduce]
+  abort "No code given for --inplace-edit, see --help"
+end
 
 map, reduce = ARGV
 reduce ||= options[:reduce]
 map = 'true' if !map || map.empty?
 
+# reading from file or stdin ?
 if options[:file]
   output_lines = []
   input = File.read(options[:file])
   newline = input[/\r\n|\r|\n/]
-  trailing_newline = (input =~ /#{newline}\Z/)
+  trailing_newline = (newline && input.end_with?(newline))
 else
   input = $stdin
 end
 
+# output as JSON ?
+if options[:json]
+  require 'json' # also used by --k8s, which sets :json
+  output_format = lambda do |out|
+    case out
+    when Hash, Array then JSON.pretty_generate(out)
+    else out
+    end
+  end
+end
+
+# collect results into list or print them
 collector = lambda do |line|
+  line = output_format.call(line) if output_format
   if output_lines
     output_lines << line
   else
@@ -70,14 +92,27 @@ collector = lambda do |line|
   end
 end
 
+# find all items (ideally lazy so we can stream)
+items = if options[:k8s]
+  # single document (e.g. `kubectl get ... -o json`) -> parse once and iterate its items
+  JSON.parse(input.read).fetch("items")
+elsif options[:json]
+  # lazy stream of JSON values
+  Pru.each_json(input)
+else
+  # plain lines, chomped, lazily so streaming/head still work
+  input.each_line.lazy.map { |line| line.chomp }
+end
+
 if reduce
   results = []
-  Pru.map(input, map) { |out| results << out }
+  Pru.map(items, map) { |out| results << out }
   collector.call Pru.reduce(results, reduce)
 else
-  Pru.map(input, map) { |out| collector.call out }
+  Pru.map(items, map) { |out| collector.call out }
 end
 
+# write back to file if requested
 if options[:file]
   content = output_lines.join(newline)
   content << newline if trailing_newline

data/lib/pru/version.rb

@@ -1,3 +1,3 @@
 module Pru
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/pru.rb

@@ -2,34 +2,50 @@ require 'pru/core_ext/array'
 
 module Pru
   class << self
-    def map(io, code)
-      String.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def _pru(i)
-          #{code}
-        end
-      RUBY
-
+    def map(items, code)
+      block = compile(code)
       i = 0
-      io.each_line do |line|
+      items.each do |item|
         i += 1
-        line.chomp!
-        result = line._pru(i) or next
+        result = item.instance_exec(i, &block) || next
 
         case result
-        when true then yield line
-        when Regexp then yield line if line =~ result
+        when true then yield item
+        when Regexp then yield item if item =~ result
         else yield result
         end
       end
     end
 
     def reduce(array, code)
-      Array.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def _pru
-          #{code}
+      array.instance_exec(&compile(code))
+    end
+
+    # An enumerable of JSON values parsed from a stream (newline-delimited or multiline),
+    # parsed lazily so we process as input arrives, by accumulating lines until the buffer
+    # forms a complete value.
+    # TODO: this is not very efficient, but keeping track of opening/closing braces might be ugly too
+    def each_json(io)
+      Enumerator.new do |yielder|
+        buffer = +""
+        io.each_line do |line|
+          buffer << line
+          begin
+            item = JSON.parse(buffer)
+          rescue JSON::ParserError
+            next
+          end
+          yielder << item
+          buffer = +""
         end
-      RUBY
-      array._pru
+        raise JSON::ParserError, "unexpected trailing input: #{buffer.strip}" unless buffer.strip.empty?
+      end
+    end
+
+    private
+
+    def compile(code)
+      eval("proc { |i| #{code} }", TOPLEVEL_BINDING, __FILE__, __LINE__)
     end
   end
 end

metadata

@@ -1,16 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pru
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Grosser
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
-description: 
 email: michael@grosser.it
 executables:
 - pru
@@ -25,7 +23,6 @@ homepage: https://github.com/grosser/pru
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -33,15 +30,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
-signing_key: 
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Pipeable Ruby - forget about grep / sed / awk / wc ... use pure, readable
   Ruby!