ned 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 160b7291a491361041677df083e0b86804f07b8cd8915c6bf0d488bf080caaa3
-  data.tar.gz: 69e4cfa1448cf5e8b0f106d4e4782c498423aca84d3953b43618f6708f3fecf8
+  metadata.gz: ac2bb61f75a90fed9ba2ec389e0c3e7fe7e49e9405c4882f5f7f7116daff1c9e
+  data.tar.gz: 8d85fe67d13d2b655f31f40bcc6f67b4a61aa4204cdf1b0f0d1b7cda701084c1
 SHA512:
-  metadata.gz: ec4eb7adade48c639e707e71ed1ef1cddf47415390af025990ec69530b4733bbd2989280ea6fdae1783efe37391f7a667c4eb7fcbf9775440a905a8a44e88455
-  data.tar.gz: e898818ec2422271f845da80aca56389a637833e60e0247a96ed53569df00d66b93952332801b3a00778a110510b077d8fb183caf63fa3d2dee32a5e3f0d1761
+  metadata.gz: eb1802ef8d556fc19ceae4d93b1bf2ac2906d73386adee200b24043787bb7a29b07a1209fccfcf996d7472af84e83a418a819075c95ecae83ce9d40e6aecbf90
+  data.tar.gz: 3cc3810a8506518cb2e40bcc4d1dfda713cc21a0c46a05ba9057722639d5d6c76c559cd551f0e305b05d212eb3a712c1b08373f080b1df37b9c405ec87fe14e4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ned (0.0.2)
+    ned (0.1.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -7,6 +7,7 @@ Usage: ned [[ned_arg ...] --] [[command] [: command ...]]
 
 OPTIONS
     -i, --inplace                    Edit each file in place by processing each file independently.
+    -s, --separate                   Process input files one at a time rather than as one stream.
     -h, --help [COMMAND]             Print this help.
     -v, --version                    Print Ned version.
 
@@ -24,29 +25,55 @@ backward (b)
   
   Usage: ned backward
 
-head (h)
+cut (c)
 
-  Print only the first input lines.
+  Print selected portions of each line.
+  
+  Usage: ned cut [--delimiter STRING | --pattern PATTERN] [--join STRING] --field (START|START..END) ...
+  
+  Options:
+      -d, --delimiter STRING           Separate input fields by the specified string. Defaults to space.
+      -p, --pattern PATTERN            Separate input fields by the specified pattern instead of a delimiter.
+      -j, --join STRING                Join output fields with the specified string. Defaults to space.
+      -f, --field INDEX_OR_RANGE       Include the specified index or range in the output.
+
+eval (e)
+
+  Evaluate the specified ruby string.
+  
+  Usage: ned eval STRING
+  
+  Variables:
+    l: the current line or lines
+    i: the current index (zero-based)
+
+grep (g)
+
+  Print lines matching the specified pattern.
   
-  Usage: ned head [--num NUM]
+  Usage: ned grep [--only] PATTERN
   
   Options:
-      -n, --num NUM                    Number of input lines to print. Defaults to 10.
+      -o, --only                       Only print the matching portion of each line.
+      -v, --invert                     Print lines not matching the specified pattern.
+
+head (h)
+
+  Print only the first input lines.
+  
+  Usage: ned head [NUM]
 
 index (i)
 
-  Print only the specified line(s). Use -1 etc to index from end.
+  Print only the lines indicated by the specified indices and ranges.
   
-  Usage: ned index START [END]
+  Usage: ned index INDEX_OR_RANGE ...
 
 join (j)
 
   Join input lines, optionally with the specified delimiter.
   
-  Usage: ned join [--delimiter STRING]
-  
-  Options:
-      -d, --delimiter STRING           Join using the specified delimiter.
+  Usage: ned join [STRING]
 
 prepend (p)
 
@@ -56,12 +83,9 @@ prepend (p)
 
 quote (q)
 
-  Wrap each input line in quotes.
-  
-  Usage: ned quote [--quote STRING]
+  Wrap each input line in quotes, or the specified string.
   
-  Options:
-      -q, --quote STRING               Quote using the specified string.
+  Usage: ned quote [STRING]
 
 sort (s)
 
@@ -77,10 +101,7 @@ tail (t)
 
   Print only the last input lines.
   
-  Usage: ned tail [--num NUM]
-  
-  Options:
-      -n, --num NUM                    Number of input lines to print. Defaults to 10.
+  Usage: ned tail [NUM]
 
 uniq (u)
 

data/lib/ned/command.rb

@@ -28,6 +28,14 @@ module Ned
         config(:description, args)
       end
 
+      def require_all
+        @require_all = true
+      end
+
+      def require_all?
+        @require_all
+      end
+
       def option_parser(&block)
         if block_given?
           @option_parser = block
@@ -45,6 +53,8 @@ module Ned
 
     def initialize(input)
       @input = input
+      @require_all = true if self.class.require_all?
+      @first = true
     end
 
     def options
@@ -66,64 +76,56 @@ module Ned
     end
 
     def execute
-      result = @input.execute
-      return nil if result.nil?
+      if @require_all
+        load_lines.empty? ? nil : load_lines.shift
+      else
+        return nil if @next.nil? && !@first
 
-      if result.is_a? Array
-        if require_flat_map?
-          result.flat_map do |line|
-            execute_internal(line)
-          end
+        if @first
+          @first = false
+          current = @input.execute
+          @next = @input.execute
         else
-          result.map do |line|
-            execute_internal(line)
+          current = @next
+          @next = @input.execute
+        end
+
+        if current.is_a? Array
+          current.flat_map do |line|
+            result = execute_internal(line)
+            result.is_a?(Array) ? result : [result]
           end
+        else
+          execute_internal(current)
         end
-      else
-        execute_internal(result)
       end
     end
 
     def execute_all
-      if require_flat_map?
-        lines = @input.execute_all.flat_map do |line|
-          execute_internal(line)
-        end
-        lines
+      if @require_all
+        load_lines
+        @lines.shift(@lines.size)
       else
         lines = @input.execute_all
-        lines.each do |line|
-          execute_internal(line)
+        lines = lines.each_with_index.flat_map do |line, i|
+          @next = lines[i + 1]
+          result = execute_internal(line)
+          result.is_a?(Array) ? result : [result]
         end
         lines
       end
     end
 
-    def require_flat_map(require_flat_map = true)
-      @require_flat_map = require_flat_map
-    end
-
-    def require_flat_map?
-      @require_flat_map || false
-    end
-
     def execute_internal(line)
       line
     end
-  end
 
-  class AllCommand < Command
-    def execute
-      load_lines.empty? ? nil : load_lines.shift
-    end
-
-    def execute_all
-      load_lines
-      @lines.shift(@lines.size)
+    def require_all
+      @require_all = true
     end
 
-    def ensure_trailing_newline
-      @lines[-1].ensure_trailing_newline if @lines[-1]
+    def require_all?
+      @require_all
     end
 
     def load_lines
@@ -134,8 +136,8 @@ module Ned
       @lines
     end
 
-    def execute_internal(lines)
-      lines
+    def peek
+      require_all? ? @lines[0] : @next
     end
   end
 end

data/lib/ned/commands/append.rb

@@ -16,12 +16,12 @@ module Ned
 
       raise OptionParser::ParseError.new("missing string argument") if args.size == 0
       @append = args.shift
-      require_flat_map if @append.index("\n")
+      @require_split = !!@append.index("\n")
     end
 
     def execute_internal(line)
       line.insert_before_newline(@append)
-      require_flat_map? ? line.split(/(?<=\n)/) : line
+      @require_split ? line.split(/(?<=\n)/) : line
     end
 
     Ned::CommandRegistry.add(Append)

data/lib/ned/commands/backward.rb

@@ -1,8 +1,10 @@
 module Ned
-  class Backward < Ned::AllCommand
+  class Backward < Ned::Command
     long_name   'backward'
     short_name  'b'
 
+    require_all
+
     option_parser do |opts|
       opts.banner = <<~EOF
         Reverse input lines.
@@ -12,7 +14,7 @@ module Ned
     end
 
     def execute_internal(lines)
-      ensure_trailing_newline
+      lines[-1].ensure_trailing_newline if lines[-1]
       lines.reverse!
     end
 

data/lib/ned/commands/cut.rb

@@ -0,0 +1,81 @@
+module Ned
+  class Cut < Ned::Command
+    long_name   'cut'
+    short_name  'c'
+
+    option_parser do |opts|
+      opts.banner = <<~EOF
+        Print selected portions of each line.
+
+        Usage: ned cut [--delimiter STRING | --pattern PATTERN] [--join STRING] --field (START|START..END) ...
+
+        Options:
+      EOF
+
+      opts.on('-d', '--delimiter STRING', 'Separate input fields by the specified string. Defaults to space.') do |delimiter|
+        raise OptionParser::ParseError.new('duplicate flag') if options[:delimiter]
+
+        delimiter
+      end
+
+      opts.on('-p', '--pattern PATTERN', 'Separate input fields by the specified pattern instead of a delimiter.') do |pattern|
+        raise OptionParser::ParseError.new('duplicate flag') if options[:pattern]
+
+        Regexp.new(pattern)
+      end
+
+      opts.on('-j', '--join STRING', 'Join output fields with the specified string. Defaults to space.') do |join|
+        raise OptionParser::ParseError.new('duplicate flag') if options[:join]
+
+        join
+      end
+
+      opts.on('-f', '--field INDEX_OR_RANGE', 'Include the specified index or range in the output.') do |index_or_range|
+        match = index_or_range.match(/(.*)[.][.](.*)/)
+        if match
+          start = Integer(match[1]) rescue nil
+          ending = Integer(match[2]) rescue nil
+          range = start..ending if start && ending
+        else
+          index = Integer(index_or_range) rescue nil
+          range = index..index if index
+        end
+
+        raise OptionParser::InvalidArgument.new(index_or_range) unless range
+
+        options[:ranges] ||= []
+        options[:ranges] << range
+      end
+    end
+
+    def parse(args)
+      super
+
+      raise OptionParser::ParseError.new('specify only one of --delimiter and --pattern') if options[:delimiter] && options[:pattern]
+      raise OptionParser::ParseError.new('you must specify one or more field indices or ranges') unless options[:ranges]
+
+      if options[:delimiter]
+        options[:join] ||= options[:delimiter]
+      else
+        options[:join] ||= ' '
+      end
+
+      @require_split = !!options[:join]&.index("\n")
+    end
+
+    def execute_internal(line)
+      ending = line[-1] == "\n" ? line.slice!(-1) : ''
+
+      columns = line.split(options[:pattern] || options[:delimiter])
+      result = options[:ranges].flat_map do |range|
+        columns[range]
+      end.join(options[:join])
+
+      result << ending
+
+      @require_split ? result.split(/(?<=\n)/) : result
+    end
+
+    Ned::CommandRegistry.add(Cut)
+  end
+end

data/lib/ned/commands/eval.rb

@@ -0,0 +1,57 @@
+module Ned
+  class Eval < Command
+    long_name   'eval'
+    short_name  'e'
+
+    option_parser do |opts|
+      opts.banner = <<~EOF
+        Evaluate the specified ruby string.
+
+        Usage: ned eval STRING
+
+        Variables:
+          l: the current line or lines
+          i: the current index (zero-based)
+      EOF
+    end
+
+    def parse(args)
+      super
+
+      raise OptionParser::ParseError.new("missing string argument") if args.size == 0
+      @code = args.shift
+    end
+
+    def execute_internal(l)
+      @i ||= -1
+      @i += 1
+      i = @i
+
+      if l[-1] == "\n"
+        ending = "\n"
+        l.slice!(-1)
+      else
+        ending = ''
+      end
+
+      result = instance_eval(@code)
+      if result.is_a? Array
+        result = result.flat_map { |line| split_on_newline(line.to_s.ensure_trailing_newline) }
+        result[-1][-1] = ending if result[-1]
+        result
+      else
+        split_on_newline(result.to_s.insert(-1, ending))
+      end
+    end
+
+    def split_on_newline(line_or_lines)
+      if line_or_lines.is_a?(Array)
+        line_or_lines.flat_map { |line| line.to_s.split(/(?<=\n)/) }
+      else
+        line_or_lines.to_s.split(/(?<=\n)/)
+      end
+    end
+
+    Ned::CommandRegistry.add(Eval)
+  end
+end

data/lib/ned/commands/grep.rb

@@ -0,0 +1,50 @@
+module Ned
+  class Grep < Ned::Command
+    long_name   'grep'
+    short_name  'g'
+
+    option_parser do |opts|
+      opts.banner = <<~EOF
+        Print lines matching the specified pattern.
+
+        Usage: ned grep [--only] PATTERN
+
+        Options:
+      EOF
+
+      opts.on('-o', '--only', 'Only print the matching portion of each line.') do |only|
+        raise OptionParser::ParseError.new('duplicate flag') if options[:only]
+
+        only
+      end
+
+      opts.on('-v', '--invert', 'Print lines not matching the specified pattern.') do |invert|
+        raise OptionParser::ParseError.new('duplicate flag') if options[:invert]
+
+        invert
+      end
+    end
+
+    def parse(args)
+      super
+
+      raise OptionParser::ParseError.new("missing pattern argument") if args.size == 0
+
+      @pattern = Regexp.new(args.shift)
+    end
+
+    def execute_internal(line)
+      line.slice!(-1) if line[-1] == "\n"
+
+      if options[:invert]
+        @pattern.match(line) ? [] : [line << "\n"]
+      elsif options[:only]
+        line.scan(@pattern).map(&:ensure_trailing_newline)
+      else
+        @pattern.match(line) ? [line << "\n"] : []
+      end
+    end
+
+    Ned::CommandRegistry.add(Grep)
+  end
+end

data/lib/ned/commands/head.rb

@@ -7,24 +7,25 @@ module Ned
       opts.banner = <<~EOF
         Print only the first input lines.
 
-        Usage: ned head [--num NUM]
-
-        Options:
+        Usage: ned head [NUM]
       EOF
+    end
 
-      opts.on('-n', '--num NUM', Integer, 'Number of input lines to print. Defaults to 10.') do |num|
-        raise OptionParser::ParseError.new('duplicate flag') if options[:num]
-
-        raise OptionParser::ParseError.new("invalid num: #{num}") if num < 0
+    def parse(args)
+      super
 
-        num
+      if arg = args.shift
+        @num = Integer(arg) rescue nil
+        raise OptionParser::InvalidArgument.new(arg) unless @num
+      else
+        @num = 10
       end
     end
 
     def execute_internal(line)
       @index ||= 0
       @index += 1
-      if @index <= options.fetch(:num, 10)
+      if @index <= @num
         line
       else
         nil

data/lib/ned/commands/index.rb

@@ -1,34 +1,52 @@
 module Ned
-  class Index < AllCommand
+  class Index < Command
     long_name  'index'
     short_name 'i'
 
+    require_all
+
     option_parser do |opts|
       opts.banner = <<~EOF
-        Print only the specified line(s). Use -1 etc to index from end.
+        Print only the lines indicated by the specified indices and ranges.
 
-        Usage: ned index START [END]
+        Usage: ned index INDEX_OR_RANGE ...
       EOF
     end
 
     def parse(args)
-      if index = args.index { |arg| Integer(arg) rescue false }
-        @start = Integer(args.delete_at(index))
+      @ranges = []
+
+      i = 0
+      while arg = args[i]
+        range = nil
+        match = arg.match(/(.*)[.][.](.*)/)
+        if match
+          start = Integer(match[1]) rescue nil
+          ending = Integer(match[2]) rescue nil
+          range = start..ending if start && ending
+        else
+          index = Integer(arg) rescue nil
+          range = index..index if index
+        end
 
-        if index = args.index { |arg| Integer(arg) rescue false }
-          @end = Integer(args.delete_at(index))
+        if range
+          args.slice!(i)
+          @ranges << range
+        else
+          i += 1
         end
       end
 
-      @end ||= @start
-
       super
 
-      raise OptionParser::ParseError.new("missing index argument") unless @start
+      raise OptionParser::InvalidArgument.new(args[0]) unless args.empty?
+      raise OptionParser::ParseError.new("you must specify one or more indices or ranges") if @ranges.empty?
     end
 
     def execute_internal(lines)
-      lines[@start..@end] || []
+      @ranges.flat_map do |range|
+        lines[range]
+      end
     end
 
     Ned::CommandRegistry.add(Index)

data/lib/ned/commands/join.rb

@@ -1,23 +1,23 @@
 module Ned
-  class Join < Ned::AllCommand
+  class Join < Ned::Command
     long_name   'join'
     short_name  'j'
 
+    require_all
+
     option_parser do |opts|
       opts.banner = <<~EOF
         Join input lines, optionally with the specified delimiter.
 
-        Usage: ned join [--delimiter STRING]
-
-        Options:
+        Usage: ned join [STRING]
       EOF
+    end
 
-      opts.on("-d", '--delimiter STRING', 'Join using the specified delimiter.') do |delimiter|
-        raise OptionParser::ParseError.new('duplicate flag') if options[:delimiter]
+    def parse(args)
+      super
 
-        @has_newline = delimiter.index("\n") != nil
-        delimiter
-      end
+      @delimiter = args.shift || ''
+      @has_newline = @delimiter.index("\n") != nil
     end
 
     def execute_internal(lines)
@@ -30,9 +30,9 @@ module Ned
       end
 
       if @has_newline
-        lines.join(options.fetch(:delimiter, '')).insert(-1, trailing_newline).split(/(?<=\n)/)
+        lines.join(@delimiter).insert(-1, trailing_newline).split(/(?<=\n)/)
       else
-        [lines.join(options.fetch(:delimiter, '')).insert(-1, trailing_newline)]
+        [lines.join(@delimiter).insert(-1, trailing_newline)]
       end
     end
 

data/lib/ned/commands/prepend.rb

@@ -16,12 +16,12 @@ module Ned
 
       raise OptionParser::ParseError.new("missing string argument") if args.size == 0
       @prepend = args.shift
-      require_flat_map if @prepend.index("\n")
+      @require_split = !!@prepend.index("\n")
     end
 
     def execute_internal(line)
       line.insert(0, @prepend)
-      require_flat_map? ? line.split(/(?<=\n)/) : line
+      @require_split ? line.split(/(?<=\n)/) : line
     end
 
     Ned::CommandRegistry.add(Prepend)

data/lib/ned/commands/quote.rb

@@ -5,25 +5,23 @@ module Ned
 
     option_parser do |opts|
       opts.banner = <<~EOF
-        Wrap each input line in quotes.
+        Wrap each input line in quotes, or the specified string.
 
-        Usage: ned quote [--quote STRING]
-
-        Options:
+        Usage: ned quote [STRING]
       EOF
+    end
 
-      opts.on('-q', '--quote STRING', 'Quote using the specified string.') do |quote|
-        raise OptionParser::ParseError.new('duplicate flag') if options[:quote]
+    def parse(args)
+      super
 
-        require_flat_map if quote.index("\n")
-        quote
-      end
+      @quote = args.shift || '"'
+      @require_split = !!@quote.index("\n")
     end
 
     def execute_internal(line)
-      line.insert(0, options.fetch(:quote, '"'))
-      line.insert_before_newline(options.fetch(:quote, '"'))
-      require_flat_map? ? line.split(/(?<=\n)/) : line
+      line.insert(0, @quote)
+      line.insert_before_newline(@quote)
+      @require_split ? line.split(/(?<=\n)/) : line
     end
 
     Ned::CommandRegistry.add(Quote)

data/lib/ned/commands/read.rb

@@ -31,7 +31,7 @@ module Ned
         lines.concat(current.readlines)
         current.close
         current = @inputs.shift
-        lines[-1].ensure_trailing_newline if !current.nil? && lines[-1]
+        lines[-1].ensure_trailing_newline if !!current && lines[-1]
       end
 
       lines

data/lib/ned/commands/sort.rb

@@ -1,10 +1,12 @@
 module Ned
-  class Sort < Ned::AllCommand
+  class Sort < Ned::Command
     DIGIT_MATCH = /^ *((?:0|-?[1-9][0-9]*)(?:[.][0-9]+)?)(.*)/
 
     long_name   'sort'
     short_name  's'
 
+    require_all
+
     option_parser do |opts|
       opts.banner = <<~EOF
         Sort input lines.
@@ -28,7 +30,8 @@ module Ned
     end
 
     def execute_internal(lines)
-      ensure_trailing_newline
+      lines[-1].ensure_trailing_newline if lines[-1]
+
       if options.fetch(:numeric, false)
         sortable = lines.map do |line|
           match = line.match(DIGIT_MATCH)

data/lib/ned/commands/tail.rb

@@ -1,29 +1,31 @@
 module Ned
-  class Tail < AllCommand
+  class Tail < Command
     long_name   'tail'
     short_name  't'
 
+    require_all
+
     option_parser do |opts|
       opts.banner = <<~EOF
         Print only the last input lines.
 
-        Usage: ned tail [--num NUM]
-
-        Options:
+        Usage: ned tail [NUM]
       EOF
+    end
 
-      opts.on('-n', '--num NUM', Integer, 'Number of input lines to print. Defaults to 10.') do |num|
-        raise OptionParser::ParseError.new('duplicate flag') if options[:num]
-
-        raise OptionParser::ParseError.new("invalid num: #{num}") if num < 0
+    def parse(args)
+      super
 
-        num
+      if arg = args.shift
+        @num = Integer(arg) rescue nil
+        raise OptionParser::InvalidArgument.new(arg) unless @num
+      else
+        @num = 10
       end
     end
 
     def execute_internal(lines)
-      num = options.fetch(:num, 10)
-      num < lines.length ? lines[-num..-1] : lines
+      @num < lines.length ? lines[-@num..-1] : lines
     end
 
     Ned::CommandRegistry.add(Tail)

data/lib/ned/commands/uniq.rb

@@ -1,5 +1,5 @@
 module Ned
-  class Uniq < Ned::AllCommand
+  class Uniq < Ned::Command
     long_name   'uniq'
     short_name  'u'
 
@@ -19,34 +19,28 @@ module Ned
       end
     end
 
-    def execute_internal(lines)
-      ensure_trailing_newline
-
-      previous = nil
-      count = 1
-      lines.each_with_index.flat_map do |line, i|
-        result = []
-        if previous && line != previous
-          if options.fetch(:count, false)
-            previous.insert(0, "#{count} ")
-            result << previous
-          else
-            result << previous
-          end
-          count = 1
-        elsif previous
-          count += 1
-        end
-        previous = line
-        if i == lines.length - 1
-          if options.fetch(:count, false)
-            line.insert(0, "#{count} ")
-            result << line
-          else
-            result << line
-          end
-        end
-        result
+    def parse(args)
+      super
+      @show_count = options.fetch(:count, false)
+    end
+
+    def execute_internal(line)
+      if peek.nil?
+        # last line
+        line.ensure_trailing_newline
+      else
+        # maybe last line, can't easily tell
+        peek.ensure_trailing_newline
+      end
+
+      @count = (@count || 0) + 1
+
+      if line != peek
+        line.insert(0, "#{@count} ") if @show_count
+        @count = 0
+        line
+      else
+        []
       end
     end
 

data/lib/ned/version.rb

@@ -1,3 +1,3 @@
 module Ned
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/ned.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require 'tempfile'
 
 require 'ned/command'
 require 'ned/command_registry'
@@ -9,33 +10,13 @@ require 'ned/version'
 Dir["#{__dir__}/ned/commands/**/*.rb"].sort.each { |f| require f }
 
 # todo
-#  - uniq shouldn't be an all command
-#  - split into files
-#  - commands shouldn't have to implement execute_all, put this in the base or use a wrapper or something
-#  - implement help
-#  - add --version
-#  - write tests
-#  - add tail
-#  - add head
+#  - Add ability to check whether there are more lines.
 #  - add replace
-#  - add grep
-#  - add grep -o or only
-#  - add grep -v or except
-#  - add index
-#  - add join
 #  - add count or something like wc
 #  - implement inline editing
 #  - implement highlighting
-#  - implement append
-#  - add ability for a command to turn one line into many
-#  - add ability for a command to turn one line into zero
-#  - handle newlines in quote, replace, etc.
-#  - add numeric sort
-#  - add reverse sort
 #  - maybe add append and prepend
 #  - figure out how to distrute as gem without bundle
-#  - use OptionParser on main args.
-#  - uniq should not need to be an AllCommand. Add ability to check whether there are more lines.
 #  - add support for a ~/.ned/ dir
 #  - implement highlight
 #  - add color
@@ -47,6 +28,15 @@ Dir["#{__dir__}/ned/commands/**/*.rb"].sort.each { |f| require f }
 #  - add support for to_set in uniq
 #  - add support for overriding existing commands
 #  - index shouldn't always be an all command. It should be based on the indices.
+#  - add a way to operate on input files separately, one at a time.
+#  - maybe add --all to eval to operate on all lines at once
+#  - write more tests:
+#    - '\:'
+#    - duplicate names
+#    - eval
+#    - no short name or no long name
+#  - maybe Command should provide an option to ensure the trailing newline is preserved rather than each command doing it alone.
+#  - add delete to delete strings
 module Ned
   class Main
     def initialize
@@ -67,6 +57,12 @@ module Ned
           inplace
         end
 
+        opts.on('-s', '--separate', 'Process input files one at a time rather than as one stream.') do |separate|
+          raise OptionParser::ParseError.new('duplicate flag') if @options[:separate]
+
+          separate
+        end
+
         opts.on('-h', '--help [COMMAND]', 'Print this help.') do |help|
           help || true
         end
@@ -139,14 +135,12 @@ module Ned
         return 0
       end
 
-      raise 'in-place not implemented' if @options[:inplace]
-
       inputs = ned_args.map do |current|
         if current == '-'
           input
         else
           unless File.exist? current
-            error.puts "fatal: file not found \"#{current}\""
+            error.puts "fatal: file not found: \"#{current}\""
             return 1
           end
           File.new(current)
@@ -192,19 +186,77 @@ module Ned
         return 1
       end
 
-      if inputs.index(input) && @in_place
+      if @options[:inplace] && inputs.index(input)
         error.puts "fatal: option -i specified with stdin"
         return 1
       end
 
+      if @options[:inplace]
+        inputs.each do |i|
+          dup = command_args.map { |a| a.dup }
+          result, command = create_command(dup, [i], output, error)
+
+          return result if result
+
+          if inputs.index(input) && !has_stdin
+            error.puts 'fatal: can\'t read from stdin'
+            return 1
+          end
+
+          temp = Tempfile.new(File.expand_path(i))
+          print = Ned::Print.new(command, temp)
+
+          while line = print.execute; end
+
+          temp.rewind
+          IO.copy_stream(temp, File.expand_path(i))
+          temp.unlink
+        end
+      elsif @options[:separate]
+        inputs.each do |i|
+          dup = command_args.map { |a| a.dup }
+          result, command = create_command(dup, [i], output, error)
+
+          return result if result
+
+          if inputs.index(input) && !has_stdin
+            error.puts 'fatal: can\'t read from stdin'
+            return 1
+          end
+
+          print = Ned::Print.new(command, output)
+
+          while line = print.execute; end
+        end
+      else
+        result, command = create_command(command_args, inputs, output, error)
+
+        return result if result
+
+        if inputs.index(input) && !has_stdin
+          error.puts 'fatal: can\'t read from stdin'
+          return 1
+        end
+
+        print = Ned::Print.new(command, output)
+
+        while line = print.execute; end
+      end
+
+      0
+    end
+
+    def create_command(command_args, inputs, output, error)
       previous = Ned::Read.new(inputs)
       command_args.each do |args|
         command = Ned::CommandRegistry.find(args.shift).new(previous)
         begin
           command.parse(args)
-          raise OptionParser::ParseError.new("invalid arguments: #{args}") unless args.empty?
+          raise OptionParser::InvalidArgument.new(args[0]) unless args.empty?
         rescue OptionParser::ParseError  => e
           error.puts "fatal: error while parsing options for #{command.class.long_name}: #{e.message}"
+          error.puts
+          error.puts command.class.help
           return 1
         end
 
@@ -221,16 +273,7 @@ module Ned
         previous = command
       end
 
-      if inputs.index(input) && !has_stdin
-        error.puts 'fatal: can\'t read from stdin'
-        return 1
-      end
-
-      print = Ned::Print.new(previous, output)
-
-      while line = print.execute; end
-
-      0
+      [nil, previous]
     end
   end
 end

data/scripts/release

@@ -12,6 +12,8 @@ if [ -n "$(git status --porcelain)" ]; then
   exit 1;
 fi
 
+git pull
+
 NEW_VERSION=$1
 CURRENT_VERSION=$(grep VERSION lib/ned/version.rb | cut -d'"' -f 2)
 
@@ -28,4 +30,5 @@ gem build
 gem push ned-$NEW_VERSION.gem
 bundle install
 git commit -a -m "v$NEW_VERSION Release"
+git push
 open "https://github.com/nicholasdower/ned/releases/new?title=v$NEW_VERSION%20Release&tag=v$NEW_VERSION&target=$(git rev-parse HEAD)"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ned
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Nick Dower
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-07 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies: []
 description: A stream editor
 email:
@@ -28,6 +28,9 @@ files:
 - lib/ned/command_registry.rb
 - lib/ned/commands/append.rb
 - lib/ned/commands/backward.rb
+- lib/ned/commands/cut.rb
+- lib/ned/commands/eval.rb
+- lib/ned/commands/grep.rb
 - lib/ned/commands/head.rb
 - lib/ned/commands/index.rb
 - lib/ned/commands/join.rb
@@ -50,7 +53,6 @@ files:
 - scripts/generate_readme
 - scripts/release
 - scripts/test
-- spec_old/file_spec.rb
 homepage: https://github.com/nicholasdower/ned
 licenses:
 - MIT

data/spec_old/file_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe 'files' do
-  test_failure 'no input', args: '-s', stdin: nil, stderr: 'fatal: no input'
-
-  test_failure 'no such file', args: 'foo -s', stdin: nil, stderr: 'fatal: no such file: foo'
-
-  test_failure 'multiple files', args: 'spec/support/file spec/support/file -s', stdin: nil, stderr: 'fatal: more than one input not yet supported'
-
-  test_failure 'no input, standard in as file arg', args: '- -s', stdin: nil, stderr: 'fatal: no input'
-
-  test_failure 'standard in as file arg multiple times', args: '- - -s', stdin: '', stderr: "fatal: can't read from standard in twice, silly"
-
-  context 'all lines read' do
-    test_success 'standard in', stdin: "two\none\n", args: '-s', stdout: "one\ntwo\n"
-
-    test_success 'standard in as file arg', stdin: "two\none\n", args: '- -s', stdout: "one\ntwo\n"
-
-    test_success 'single file', stdin: nil, args: 'spec/support/file -s', stdout: "one\nthree\ntwo\n"
-  end
-
-  context 'lines read one at a time' do
-    test_success 'standard in', stdin: "two\none\n", args: '-a 1', stdout: "two1\none1\n"
-
-    test_success 'standard in as file arg', stdin: "two\none\n", args: '- -a 1', stdout: "two1\none1\n"
-
-    test_success 'single file', stdin: nil, args: 'spec/support/file -a 1', stdout: "one1\ntwo1\nthree1\n"
-  end
-end