ned 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23d27cc1a81863250fe7b264e9199fb794c8d3e62fe879dab529f3201019e2f2
-  data.tar.gz: 6a1124febf6502f5a54693617da98eb869a0c181ae90aa678ec670937b26879d
+  metadata.gz: 160b7291a491361041677df083e0b86804f07b8cd8915c6bf0d488bf080caaa3
+  data.tar.gz: 69e4cfa1448cf5e8b0f106d4e4782c498423aca84d3953b43618f6708f3fecf8
 SHA512:
-  metadata.gz: 99fd8ede92eea52aed8a2308f6e05487219769c06a92104e7fe43fdbb96ea33aa833b598bbe5305a6741758657a7c0b16cfe01c7d96a38727c4166a83ec3fc78
-  data.tar.gz: 5f800186643b9638f32cdee823b64694fd0b4a60041af701e178d9c68967c63849726b0c29758899a483906c8a148103dda11495489d5219b9ae2949dff8e59d
+  metadata.gz: ec4eb7adade48c639e707e71ed1ef1cddf47415390af025990ec69530b4733bbd2989280ea6fdae1783efe37391f7a667c4eb7fcbf9775440a905a8a44e88455
+  data.tar.gz: e898818ec2422271f845da80aca56389a637833e60e0247a96ed53569df00d66b93952332801b3a00778a110510b077d8fb183caf63fa3d2dee32a5e3f0d1761

data/Gemfile.lock

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

data/README.md

@@ -1,24 +1,99 @@
 # Ned
 
 ```
-A stream editor.
-
-Usage: ned [file] [options ...]
-
-Options:
-        --help                         Print this message.
-        --version                      Print version.
-    -a, --append string                Append the specified string to each line.
-    -b, --backward                     Invert all input lines.
-    -g, --grep pattern                 Search using the specified pattern.
-    -h, --head [num]                   Print the first n lines. Defaults to 10.
-    -i, --index start[..end]           Print only the specified lines. Use -1 etc to index from end.
-    -j, --join [string]                Join input lines, optionally with the specified string.
-    -o, --only pattern                 Search using the specified pattern. Only print matching part of line.
-    -p, --prepend string               Prepend the specified string to each line.
-    -q, --quote [string]               Quote each line, optionally with the specified string.
-    -r, --replace pattern replacement  Regex replace.
-    -s, --sort ["num"|"alpha"]         Sort. Defaults to alphabetical.
-    -t, --tail [num]                   Print the last n lines. Defaults to 10.
-    -u, --uniq                         Unique.
+Ned, a stream editor.
+
+Usage: ned [[ned_arg ...] --] [[command] [: command ...]]
+
+OPTIONS
+    -i, --inplace                    Edit each file in place by processing each file independently.
+    -h, --help [COMMAND]             Print this help.
+    -v, --version                    Print Ned version.
+
+COMMANDS
+
+append (a)
+
+  Append the specified string to each input line.
+  
+  Usage: ned append STRING
+
+backward (b)
+
+  Reverse input lines.
+  
+  Usage: ned backward
+
+head (h)
+
+  Print only the first input lines.
+  
+  Usage: ned head [--num NUM]
+  
+  Options:
+      -n, --num NUM                    Number of input lines to print. Defaults to 10.
+
+index (i)
+
+  Print only the specified line(s). Use -1 etc to index from end.
+  
+  Usage: ned index START [END]
+
+join (j)
+
+  Join input lines, optionally with the specified delimiter.
+  
+  Usage: ned join [--delimiter STRING]
+  
+  Options:
+      -d, --delimiter STRING           Join using the specified delimiter.
+
+prepend (p)
+
+  Prepend the specified string to each input line.
+  
+  Usage: ned prepend STRING
+
+quote (q)
+
+  Wrap each input line in quotes.
+  
+  Usage: ned quote [--quote STRING]
+  
+  Options:
+      -q, --quote STRING               Quote using the specified string.
+
+sort (s)
+
+  Sort input lines.
+  
+  Usage: ned sort [--numeric]
+  
+  Options:
+      -n, --numeric                    Sort numerically.
+      -r, --reverse                    Reverse the sort order.
+
+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.
+
+uniq (u)
+
+  Filter out repeated input lines.
+  
+  Usage: ned uniq [--count]
+  
+  Options:
+      -c, --count                      Precede each output line with the number of times the line occurred in the input, followed by a space.
+```
+
+## Installation
+
+```
+gem install ned
 ```

data/bin/ned

@@ -4,4 +4,4 @@ $LOAD_PATH.unshift "#{__dir__}/../lib"
 
 require 'ned'
 
-exit Ned.run
+exit Ned::Main.new.run(ARGV, STDIN, STDOUT, STDERR)

data/lib/ned/command.rb

@@ -1,18 +1,141 @@
 module Ned
   class Command
-    attr_reader :config, :params
+    class ParseError < StandardError; end
 
-    def initialize(config, params)
-      @config = config
-      @params = params
+    class << self
+      def config(name, args)
+        @config ||= { }
+
+        if args.empty?
+          @config[name]
+        elsif args.size == 1
+          @config[name] = args[0]
+          nil
+        else
+          raise "invalid args: #{args}"
+        end
+      end
+
+      def long_name(*args)
+        config(:long_name, args)
+      end
+
+      def short_name(*args)
+        config(:short_name, args)
+      end
+
+      def description(*args)
+        config(:description, args)
+      end
+
+      def option_parser(&block)
+        if block_given?
+          @option_parser = block
+        else
+          @option_parser
+        end
+      end
+
+      def help
+        OptionParser.new do |opts|
+          option_parser.call(opts)
+        end.help
+      end
+    end
+
+    def initialize(input)
+      @input = input
+    end
+
+    def options
+      @options ||= {}
+    end
+
+    def parse(args)
+      OptionParser.new do |opts|
+        opts.on('-h', '--help', 'Print this help.') do |help|
+          help
+        end
+
+        opts.on('-v', '--version', 'Print Ned version.') do |version|
+          version
+        end
+
+        instance_exec(opts, &self.class.option_parser)
+      end.parse!(args, into: options)
+    end
+
+    def execute
+      result = @input.execute
+      return nil if result.nil?
+
+      if result.is_a? Array
+        if require_flat_map?
+          result.flat_map do |line|
+            execute_internal(line)
+          end
+        else
+          result.map do |line|
+            execute_internal(line)
+          end
+        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
+      else
+        lines = @input.execute_all
+        lines.each do |line|
+          execute_internal(line)
+        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)
+    end
+
+    def ensure_trailing_newline
+      @lines[-1].ensure_trailing_newline if @lines[-1]
     end
 
-    def all?
-      config.all?(params)
+    def load_lines
+      unless @lines
+        @lines = @input.execute_all
+        @lines = execute_internal(@lines)
+      end
+      @lines
     end
 
-    def execute(context)
-      config.execute(context, *params)
+    def execute_internal(lines)
+      lines
     end
   end
 end

data/lib/ned/command_registry.rb

@@ -0,0 +1,27 @@
+module Ned
+  class CommandRegistry
+    @all = []
+    @names = { }
+
+    def self.add(command)
+      if @names.key?(command.long_name)
+        raise "duplicate command name \"#{command.long_name}\""
+      end
+
+      if @names.key?(command.short_name)
+        raise "duplicate command name \"#{command.short_name}\""
+      end
+      @names[command.long_name] = command
+      @names[command.short_name] = command
+      @all << command
+    end
+
+    def self.find(name)
+      @names[name]
+    end
+
+    def self.all
+      @all
+    end
+  end
+end

data/lib/ned/commands/append.rb

@@ -1,15 +1,29 @@
-# frozen_string_literal: true
-
-Ned::Config.add(
-  name:        'append',
-  description: 'Append the specified string to each line.',
-  short:       '-a',
-  long:        '--append',
-  params:      'string',
-  validator:   Ned::Validators.num(1),
-  execute:     lambda do |context, string|
-    context.lines = context.lines.flat_map do |line|
-      "#{line}#{string}".split("\n")
+module Ned
+  class Append < Command
+    long_name   'append'
+    short_name  'a'
+
+    option_parser do |opts|
+      opts.banner = <<~EOF
+        Append the specified string to each input line.
+
+        Usage: ned append STRING
+      EOF
+    end
+
+    def parse(args)
+      super
+
+      raise OptionParser::ParseError.new("missing string argument") if args.size == 0
+      @append = args.shift
+      require_flat_map if @append.index("\n")
+    end
+
+    def execute_internal(line)
+      line.insert_before_newline(@append)
+      require_flat_map? ? line.split(/(?<=\n)/) : line
     end
+
+    Ned::CommandRegistry.add(Append)
   end
-)
+end

data/lib/ned/commands/backward.rb

@@ -1,14 +1,21 @@
-# frozen_string_literal: true
-
-Ned::Config.add(
-  name:        'backward',
-  description: 'Invert all input lines.',
-  short:       '-b',
-  long:        '--backward',
-  params:      nil,
-  validator:   Ned::Validators.none(),
-  execute:     lambda do |context|
-    context.lines.reverse!
-  end,
-  all:         true
-)
+module Ned
+  class Backward < Ned::AllCommand
+    long_name   'backward'
+    short_name  'b'
+
+    option_parser do |opts|
+      opts.banner = <<~EOF
+        Reverse input lines.
+
+        Usage: ned backward
+      EOF
+    end
+
+    def execute_internal(lines)
+      ensure_trailing_newline
+      lines.reverse!
+    end
+
+    Ned::CommandRegistry.add(Backward)
+  end
+end

data/lib/ned/commands/head.rb

@@ -1,21 +1,36 @@
-# frozen_string_literal: true
-
-Ned::Config.add(
-  name:        'head',
-  description: 'Print the first n lines. Defaults to 10.',
-  short:       '-h',
-  long:        '--head',
-  params:      '[num]',
-  validator:   Ned::Validators.num(0, 1) do |num|
-    if num
-      Integer(num) rescue nil
-    else
-      []
+module Ned
+  class Head < Command
+    long_name   'head'
+    short_name  'h'
+
+    option_parser do |opts|
+      opts.banner = <<~EOF
+        Print only the first input lines.
+
+        Usage: ned head [--num NUM]
+
+        Options:
+      EOF
+
+      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
+
+        num
+      end
     end
-  end,
-  execute:     lambda do |context, num=10|
-    context.lines = context.lines.flat_map do |line|
-      context.start_index < num ? [line] : []
+
+    def execute_internal(line)
+      @index ||= 0
+      @index += 1
+      if @index <= options.fetch(:num, 10)
+        line
+      else
+        nil
+      end
     end
+
+    Ned::CommandRegistry.add(Head)
   end
-)
+end

data/lib/ned/commands/index.rb

@@ -1,27 +1,36 @@
-# frozen_string_literal: true
-
-Ned::Config.add(
-  name:        'index',
-  description: 'Print only the specified lines. Use -1 etc to index from end.',
-  short:       '-i',
-  long:        '--index',
-  params:      'start[..end]',
-  validator: Ned::Validators.num(1) do |param|
-    if param.index('..')
-      parts = param.split('..')
-      next unless parts.size == 2
-
-      [Integer(parts[0]), Integer(parts[1])] rescue nil
-    else
-      Integer(param) rescue nil
+module Ned
+  class Index < AllCommand
+    long_name  'index'
+    short_name 'i'
+
+    option_parser do |opts|
+      opts.banner = <<~EOF
+        Print only the specified line(s). Use -1 etc to index from end.
+
+        Usage: ned index START [END]
+      EOF
     end
-  end,
-  execute: lambda do |context, start, ending = nil|
-    context.lines = (ending.nil? ? context.lines[start..start] : context.lines[start..ending]) || []
-  end,
-  all: lambda do |start, ending = nil|
-    true
-    # todo
-    #start < 0 || (!ending.nil? && ending < 0)
+
+    def parse(args)
+      if index = args.index { |arg| Integer(arg) rescue false }
+        @start = Integer(args.delete_at(index))
+
+        if index = args.index { |arg| Integer(arg) rescue false }
+          @end = Integer(args.delete_at(index))
+        end
+      end
+
+      @end ||= @start
+
+      super
+
+      raise OptionParser::ParseError.new("missing index argument") unless @start
+    end
+
+    def execute_internal(lines)
+      lines[@start..@end] || []
+    end
+
+    Ned::CommandRegistry.add(Index)
   end
-)
+end

data/lib/ned/commands/join.rb

@@ -1,14 +1,41 @@
-# frozen_string_literal: true
-
-Ned::Config.add(
-  name:        'join',
-  description: 'Join input lines, optionally with the specified string.',
-  short:       '-j',
-  long:        '--join',
-  params:      '[string]',
-  validator:   Ned::Validators.num(0, 1),
-  execute:     lambda do |context, string=''|
-    context.lines = context.lines.join(string).split("\n")
-  end,
-  all:         true
-)
+module Ned
+  class Join < Ned::AllCommand
+    long_name   'join'
+    short_name  'j'
+
+    option_parser do |opts|
+      opts.banner = <<~EOF
+        Join input lines, optionally with the specified delimiter.
+
+        Usage: ned join [--delimiter STRING]
+
+        Options:
+      EOF
+
+      opts.on("-d", '--delimiter STRING', 'Join using the specified delimiter.') do |delimiter|
+        raise OptionParser::ParseError.new('duplicate flag') if options[:delimiter]
+
+        @has_newline = delimiter.index("\n") != nil
+        delimiter
+      end
+    end
+
+    def execute_internal(lines)
+      if lines[-1] && lines[-1][-1] == "\n"
+        trailing_newline = "\n"
+        lines.each { |line| line.slice!(-1) }
+      else
+        trailing_newline = ''
+        lines[0..-2].each { |line| line.slice!(-1) }
+      end
+
+      if @has_newline
+        lines.join(options.fetch(:delimiter, '')).insert(-1, trailing_newline).split(/(?<=\n)/)
+      else
+        [lines.join(options.fetch(:delimiter, '')).insert(-1, trailing_newline)]
+      end
+    end
+
+    Ned::CommandRegistry.add(Join)
+  end
+end

data/lib/ned/commands/prepend.rb

@@ -1,15 +1,29 @@
-# frozen_string_literal: true
-
-Ned::Config.add(
-  name:        'prepend',
-  description: 'Prepend the specified string to each line.',
-  short:       '-p',
-  long:        '--prepend',
-  params:      'string',
-  validator:   Ned::Validators.num(1),
-  execute:     lambda do |context, string|
-    context.lines = context.lines.flat_map do |line|
-      "#{string}#{line}".split("\n")
+module Ned
+  class Prepend < Command
+    long_name   'prepend'
+    short_name  'p'
+
+    option_parser do |opts|
+      opts.banner = <<~EOF
+        Prepend the specified string to each input line.
+
+        Usage: ned prepend STRING
+      EOF
+    end
+
+    def parse(args)
+      super
+
+      raise OptionParser::ParseError.new("missing string argument") if args.size == 0
+      @prepend = args.shift
+      require_flat_map if @prepend.index("\n")
+    end
+
+    def execute_internal(line)
+      line.insert(0, @prepend)
+      require_flat_map? ? line.split(/(?<=\n)/) : line
     end
+
+    Ned::CommandRegistry.add(Prepend)
   end
-)
+end

data/lib/ned/commands/print.rb

@@ -0,0 +1,13 @@
+module Ned
+  class Print < Ned::Command
+    def initialize(input, output)
+      super(input)
+      @output = output
+    end
+
+    def execute_internal(line)
+      @output.print line
+      line
+    end
+  end
+end

data/lib/ned/commands/quote.rb

@@ -1,15 +1,31 @@
-# frozen_string_literal: true
-
-Ned::Config.add(
-  name:        'quote',
-  description: 'Quote each line, optionally with the specified string.',
-  short:       '-q',
-  long:        '--quote',
-  params:      '[string]',
-  validator:   Ned::Validators.num(0, 1),
-  execute:     lambda do |context, char='"'|
-    context.lines = context.lines.flat_map do |line|
-      "#{char}#{line}#{char}".split("\n")
+module Ned
+  class Quote < Ned::Command
+    long_name   'quote'
+    short_name  'q'
+
+    option_parser do |opts|
+      opts.banner = <<~EOF
+        Wrap each input line in quotes.
+
+        Usage: ned quote [--quote STRING]
+
+        Options:
+      EOF
+
+      opts.on('-q', '--quote STRING', 'Quote using the specified string.') do |quote|
+        raise OptionParser::ParseError.new('duplicate flag') if options[:quote]
+
+        require_flat_map if quote.index("\n")
+        quote
+      end
+    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
     end
+
+    Ned::CommandRegistry.add(Quote)
   end
-)
+end