ned 0.0.1 → 0.0.2

data/lib/ned_old.rb

@@ -0,0 +1,193 @@
+# frozen_string_literal: true
+
+require 'ned/command'
+require 'ned/config'
+require 'ned/context'
+require 'ned/strings'
+require 'ned/validators'
+require 'ned/version'
+
+Dir["#{__dir__}/ned/commands/**/*.rb"].sort.each { |f| require f }
+
+module Ned
+  def self.help(error_output)
+    error_output.puts <<~EOF
+      A stream editor.
+
+      Usage: ned [file] [options ...]
+
+      Options:
+    EOF
+
+    lines = [
+      ['    --help',    'Print this message.'],
+      ['    --version', 'Print version.']
+    ]
+    max = lines[0][0].length
+    Ned::Config.all.each do |config|
+      next if config.hidden?
+
+      line = "#{config.short}, #{config.long} #{config.params}"
+      lines << [line, config.description]
+      max = [max, line.length].max
+    end
+
+    lines.each do |line|
+      error_output.puts "    #{line[0].ljust(max)}  #{line[1]}"
+    end
+  end
+
+  def self.failure(error_output, message)
+    error_output.puts "fatal: #{message}\n\n"
+    help(error_output)
+  end
+
+  def self.run(input: $stdin, output: $stdout, error_output: $stderr, args: ARGV)
+    args = args.map do |arg|
+      Ned::Strings.unescape!(arg.dup)
+    end
+
+    if args.include?('--help')
+      help(error_output)
+      return 0
+    end
+
+    if args.include?('--version')
+      output.puts("Ned version #{Ned::VERSION}")
+      return 0
+    end
+
+    inputs = []
+    while args.first && !args.first.match(/^-./)
+      arg = args.shift
+
+      if arg == '-'
+        inputs << input
+      else
+        unless File.exist?(arg)
+          failure(error_output, "no such file: #{arg}")
+          return 1
+        end
+        inputs << arg
+      end
+    end
+
+    if input.tty? && (inputs.empty? || (inputs.size == 1 && inputs[0] == input))
+      failure(error_output, 'no input')
+      return 1
+    end
+
+    inputs = inputs.unshift(input) if !input.tty? && !inputs.index(input)
+
+    if inputs.count(input) > 1
+      failure(error_output, "can't read from standard in twice, silly")
+      return 1
+    end
+
+    if inputs.size > 1
+      failure(error_output, "more than one input not yet supported")
+      return 1
+    end
+
+    commands = []
+
+    while arg = args.shift
+      config = Ned::Config.all.find do |config|
+        arg.start_with?(config.short) || arg == config.long || arg.start_with?("#{config.long}=")
+      end
+
+      unless config
+        failure(error_output, "invalid option: #{arg}")
+        return 1
+      end
+
+      params = []
+
+      if arg.start_with?("#{config.long}=")
+        params << arg["#{config.long}=".size..-1]
+      elsif arg.start_with?(config.short) && arg != config.short
+        params << arg[config.short.size..-1]
+      else
+        while !args.empty? && !args.first.start_with?('-')
+          arg = args.shift
+          if arg.start_with? '\\-'
+            arg = arg[1..-1]
+          end
+          params << arg
+        end
+      end
+
+      valid = config.validate(*params)
+      if valid.nil?
+        if config.params.nil?
+          failure(error_output, "invalid param for #{config.name}. found: #{params}, expected none")
+          return 1
+        else
+          failure(error_output, "invalid param for #{config.name}. found: #{params}, expected: #{config.params}")
+          return 1
+        end
+      end
+
+      commands << Ned::Command.new(config, valid)
+    end
+
+    if commands.any?(&:all?)
+      lines = inputs.flat_map do |i|
+        if i.is_a? String
+          IO.readlines(i, sep="\n")
+        else
+          i.readlines(sep="\n")
+        end
+      end
+      process_all(commands, lines, output)
+    else
+      process_each(commands, inputs, output)
+    end
+
+    0
+  end
+
+  def self.process_all(commands, lines, output)
+    final_newline = lines[-1]&.[](-1) == "\n" ? "\n" : ''
+
+    lines = lines.map { |line| line.chomp("\n") }
+    context = Context.new(lines, 0)
+    commands.each do |command|
+      command.execute(context)
+    end
+    last = context.lines.length - 1
+    context.lines.each_with_index do |line, index|
+      output.print "#{line}#{index == last ? final_newline : "\n"}"
+    end
+  end
+
+  def self.process_each(commands, inputs, output)
+    input = inputs[0]
+
+    if input.is_a? String
+      input = File.open(input)
+    end
+
+    current = input.gets(sep="\n")
+    next_line = input.gets(sep="\n")
+    index = 0
+
+    while current
+      final_newline = current[-1]&.[](-1) == "\n" ? "\n" : ''
+      context = Context.new([current.chomp("\n")], index)
+      commands.each do |command|
+        command.execute(context)
+      end
+      index = context.start_index + context.lines.size
+      last = context.lines.length - 1
+      context.lines.each_with_index do |line, index|
+        output.print "#{line}#{index == last && next_line.nil? ? final_newline : "\n"}"
+      end
+
+      current = next_line
+      next_line = input.gets(sep="\n")
+    end
+
+    input.close
+  end
+end

data/ned.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Nick Dower"]
   spec.email         = ["nicholasdower@gmail.com"]
 
-  spec.summary       = "A command line editor."
-  spec.description   = "A command line editor"
+  spec.summary       = "A stream editor."
+  spec.description   = "A stream editor"
   spec.homepage      = "https://github.com/nicholasdower/ned"
   spec.license       = "MIT"
 

data/scripts/generate_readme

@@ -5,4 +5,10 @@ puts <<~EOF
 
 ```
 #{`bundle exec ned --help 2>&1`}```
+
+## Installation
+
+```
+gem install ned
+```
 EOF

data/spec_old/file_spec.rb

@@ -0,0 +1,29 @@
+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

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: ned
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Nick Dower
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-29 00:00:00.000000000 Z
+date: 2022-06-07 00:00:00.000000000 Z
 dependencies: []
-description: A command line editor
+description: A stream editor
 email:
 - nicholasdower@gmail.com
 executables:
@@ -25,30 +25,32 @@ files:
 - bin/ned
 - lib/ned.rb
 - lib/ned/command.rb
+- lib/ned/command_registry.rb
 - lib/ned/commands/append.rb
 - lib/ned/commands/backward.rb
-- lib/ned/commands/grep.rb
 - lib/ned/commands/head.rb
 - lib/ned/commands/index.rb
 - lib/ned/commands/join.rb
-- lib/ned/commands/only.rb
 - lib/ned/commands/prepend.rb
+- lib/ned/commands/print.rb
 - lib/ned/commands/quote.rb
-- lib/ned/commands/replace.rb
+- lib/ned/commands/read.rb
 - lib/ned/commands/sort.rb
 - lib/ned/commands/tail.rb
 - lib/ned/commands/uniq.rb
-- lib/ned/commands/visual.rb
-- lib/ned/config.rb
-- lib/ned/context.rb
+- lib/ned/string.rb
 - lib/ned/strings.rb
-- lib/ned/validators.rb
 - lib/ned/version.rb
+- lib/ned_old.rb
+- lib/ned_old/commands/grep.rb
+- lib/ned_old/commands/only.rb
+- lib/ned_old/commands/replace.rb
+- lib/ned_old/commands/visual.rb
 - ned.gemspec
 - scripts/generate_readme
 - scripts/release
 - scripts/test
-- todo
+- spec_old/file_spec.rb
 homepage: https://github.com/nicholasdower/ned
 licenses:
 - MIT
@@ -74,5 +76,5 @@ requirements: []
 rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
-summary: A command line editor.
+summary: A stream editor.
 test_files: []

data/lib/ned/config.rb

@@ -1,73 +0,0 @@
-# frozen_string_literal: true
-
-module Ned
-  class Config
-    class << self
-      attr_reader :all
-    end
-
-    @all = []
-
-    def self.add(name:, description:, short:, long:, params:, validator:, execute:, all: nil, hidden: false)
-      @all.each do |config|
-        if config.short.start_with?(short) || short.start_with?(config.short)
-          raise "Cannot add command #{name}. Flag conflicts with #{config.name}."
-        end
-
-        if config.long.start_with?(long) || long.start_with?(config.long)
-          raise "Cannot add command #{name}. Flag conflicts with #{config.name}."
-        end
-      end
-
-      @all << Config.new(
-        name: name,
-        description: description,
-        short: short,
-        long: long,
-        params: params,
-        validator: validator, 
-        execute: execute,
-        all: all,
-        hidden: hidden
-      )
-    end
-
-    attr_reader :name, :description, :short, :long, :params
-
-    def initialize(name:, description:, short:, long:, params:, validator:, execute:, all: nil, hidden: false)
-      @name = name
-      @description = description
-      @short = short
-      @long = long
-      @params = params
-      @validator = validator
-      @execute = execute
-      @hidden = hidden
-
-      all = all || false
-      if [true, false].include? all
-        @all = lambda { |*params| all }
-      elsif all.is_a? Proc
-        @all = all
-      else
-        raise "Invalid all type for #{name}: #{all.class}"
-      end
-    end
-
-    def validate(*args)
-      @validator.call(*args)
-    end
-
-    def all?(params)
-      @all.call(*params)
-    end
-
-    def hidden?
-      @hidden
-    end
-
-    def execute(*args)
-      @execute.call(*args)
-    end
-  end
-end

data/lib/ned/context.rb

@@ -1,10 +0,0 @@
-module Ned
-  class Context
-    attr_accessor :lines, :start_index
-
-    def initialize(lines, start_index)
-      @lines = lines
-      @start_index = start_index
-    end
-  end
-end

data/lib/ned/validators.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Ned
-  class Validators
-    def self.none
-      lambda { |*params| params.length == 0 ? [] : nil }
-    end
-
-    def self.num(min, max = nil, &block)
-      lambda do |*params| 
-        max = min unless max
-
-        return nil if params.length < min || params.length > max
-
-        block.nil? ? params : yield(*params)
-      end
-    end
-  end
-end

data/todo

@@ -1,15 +0,0 @@
-add support for a ~/.ned/ dir
-implement highlight
-add color
-add support for more escape sequences, see https://github.com/ruby/ruby/blob/master/doc/syntax/literals.rdoc#label-Strings
-add support for operating on one or more files
-add support for editing files in place
-handle --
-add ljust
-maybe add ability to highlight columns, not just full lines
-write readme
-add support for to_set
-add support for overriding existing commands
-add support for ommitting short or long flags
-add support for uniq with count?
-consider giving commands a way to operate on entire line with newline. currently can't replicate tr.