kapusta 0.1.0 → 0.1.1

data/lib/kapusta/reader.rb

@@ -5,13 +5,14 @@ module Kapusta
     WHITESPACE = [' ', "\t", "\n", "\r", "\f", "\v", ','].freeze
     DELIMS = ['(', ')', '[', ']', '{', '}', '"', ';'].freeze
 
-    def self.read_all(source)
-      new(source).read_all
+    def self.read_all(source, preserve_comments: false)
+      new(source, preserve_comments:).read_all
     end
 
-    def initialize(source)
+    def initialize(source, preserve_comments: false)
       @src = source
       @pos = 0
+      @preserve_comments = preserve_comments
     end
 
     def read_all
@@ -20,7 +21,7 @@ module Kapusta
         skip_ws
         break if eof?
 
-        forms << read_form
+        forms << read_next_item
       end
       forms
     end
@@ -46,7 +47,7 @@ module Kapusta
         char = peek
         if WHITESPACE.include?(char)
           advance
-        elsif char == ';'
+        elsif !@preserve_comments && char == ';'
           advance until eof? || peek == "\n"
         else
           break
@@ -58,10 +59,21 @@ module Kapusta
       char.nil? || WHITESPACE.include?(char) || DELIMS.include?(char)
     end
 
+    def read_next_item
+      skip_ws
+      raise 'unexpected eof' if eof?
+
+      return read_comment if @preserve_comments && peek == ';'
+
+      read_form
+    end
+
     def read_form
       skip_ws
       raise 'unexpected eof' if eof?
 
+      return read_comment if @preserve_comments && peek == ';'
+
       form =
         case peek
         when '(' then read_list
@@ -84,7 +96,7 @@ module Kapusta
         raise 'unclosed (' if eof?
         break if peek == ')'
 
-        items << read_form
+        items << read_next_item
       end
       advance
       List.new(items)
@@ -98,7 +110,7 @@ module Kapusta
         raise 'unclosed [' if eof?
         break if peek == ']'
 
-        items << read_form
+        items << read_next_item
       end
       advance
       Vec.new(items)
@@ -106,32 +118,30 @@ module Kapusta
 
     def read_hash
       advance
-      items = []
+      entries = []
+      pending = []
       loop do
         skip_ws
         raise 'unclosed {' if eof?
         break if peek == '}'
 
-        items << read_form
+        item = read_next_item
+        if item.is_a?(Comment)
+          entries << item
+          next
+        end
+
+        pending << item
+        next unless pending.length == 2
+
+        entries << normalize_hash_pair(pending[0], pending[1])
+        pending.clear
       end
       advance
 
-      pairs = []
-      i = 0
-      while i < items.length
-        item = items[i]
-        if item.is_a?(Sym) && item.name == ':'
-          sym = items[i + 1]
-          raise 'bad shorthand' unless sym.is_a?(Sym)
+      raise 'odd number of forms in hash' unless pending.empty?
 
-          key = Kapusta.kebab_to_snake(sym.name).to_sym
-          pairs << [key, sym]
-        else
-          pairs << [item, items[i + 1]]
-        end
-        i += 2
-      end
-      HashLit.new(pairs)
+      HashLit.new(entries)
     end
 
     def read_string
@@ -170,6 +180,12 @@ module Kapusta
       List.new([Sym.new('hashfn'), form])
     end
 
+    def read_comment
+      start = @pos
+      advance until eof? || peek == "\n"
+      Comment.new(@src[start...@pos].rstrip)
+    end
+
     def read_postfix(form)
       current = form
 
@@ -211,5 +227,16 @@ module Kapusta
         Sym.new(token)
       end
     end
+
+    def normalize_hash_pair(item, value)
+      if item.is_a?(Sym) && item.name == ':'
+        raise 'bad shorthand' unless value.is_a?(Sym)
+
+        key = Kapusta.kebab_to_snake(value.name).to_sym
+        [key, value]
+      else
+        [item, value]
+      end
+    end
   end
 end

data/lib/kapusta/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kapusta
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/cli_spec.rb

@@ -74,4 +74,19 @@ RSpec.describe Kapusta::CLI do
 
     expect(output).to eq("Hello, Ada!\n")
   end
+
+  it 'prints the version with -v' do
+    output = capture_stdout do
+      described_class.start(['-v'])
+    end
+
+    expect(output).to eq("kapusta #{Kapusta::VERSION}\n")
+  end
+
+  it 'prints the version with --version from the executable' do
+    stdout, stderr, status = Open3.capture3(RbConfig.ruby, File.expand_path('../exe/kapusta', __dir__), '--version')
+
+    expect(status.success?).to eq(true), stderr
+    expect(stdout).to eq("kapusta #{Kapusta::VERSION}\n")
+  end
 end

data/spec/examples_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
+require 'fileutils'
 require 'stringio'
 
 EXAMPLES_DIR = File.expand_path('../examples', __dir__)
@@ -38,6 +39,14 @@ RSpec.describe 'examples' do
     expect(run_example('binary-search.kap')).to eq("3\nnil\n")
   end
 
+  it 'blocks-and-kwargs.kap' do
+    path = File.expand_path('../tmp/blocks-and-kwargs.txt', EXAMPLES_DIR)
+    FileUtils.rm_f(path)
+
+    expect(run_example('blocks-and-kwargs.kap')).to eq("Ada\nLin\n2\n")
+    expect(File.exist?(path)).to eq(false)
+  end
+
   it 'block-sort.kap' do
     expect(run_example('block-sort.kap')).to eq("3, 2, 1\n")
   end
@@ -74,6 +83,14 @@ RSpec.describe 'examples' do
     expect(run_example('factorial.kap')).to eq("0\t1\n1\t1\n5\t120\n6\t720\n10\t3628800\n")
   end
 
+  it 'files.kap' do
+    path = File.expand_path('../tmp/file-io-example.txt', EXAMPLES_DIR)
+    FileUtils.rm_f(path)
+
+    expect(run_example('files.kap')).to eq("Ada\nLin\n2\n")
+    expect(File.exist?(path)).to eq(false)
+  end
+
   it 'fib.kap' do
     expect(run_example('fib.kap')).to eq("55\n")
   end
@@ -95,6 +112,10 @@ RSpec.describe 'examples' do
     expect(run_example('hashfn.kap')).to eq("5\n21\n")
   end
 
+  it 'inheritance.kap' do
+    expect(run_example('inheritance.kap')).to eq("true\tanimalia\tPoppy the dog\twoof\n")
+  end
+
   it 'leap-year.kap' do
     expect(run_example('leap-year.kap')).to eq("true\n")
   end
@@ -199,6 +220,10 @@ RSpec.describe 'examples' do
   it 'two-sum.kap' do
     expect(run_example('two-sum.kap')).to eq("[0, 1]\n[1, 2]\nnil\n")
   end
+
+  it 'threading.kap' do
+    expect(run_example('threading.kap')).to eq("[Ada Lovelace]!\t<Ada!>\tnil\tATSUPAK\tnil\n")
+  end
 end
 
 RSpec.describe Kapusta do

data/spec/formatter_spec.rb

@@ -2,6 +2,8 @@
 
 require 'spec_helper'
 require 'kapusta/formatter'
+require 'open3'
+require 'rbconfig'
 require 'stringio'
 require 'tmpdir'
 
@@ -128,16 +130,123 @@ RSpec.describe Kapusta::Formatter do
     expect(error_output).to include('Cannot use --fix with stdin (-).')
   end
 
-  it 'rejects comments instead of dropping them' do
+  it 'prints the version with -v' do
+    output = capture_stdout do
+      expect(described_class.new(['-v']).run).to eq(0)
+    end
+
+    expect(output).to eq("kapfmt #{Kapusta::VERSION}\n")
+  end
+
+  it 'prints the version with --version from the executable' do
+    stdout, stderr, status = Open3.capture3(RbConfig.ruby, File.expand_path('../exe/kapfmt', __dir__), '--version')
+
+    expect(status.success?).to eq(true), stderr
+    expect(stdout).to eq("kapfmt #{Kapusta::VERSION}\n")
+  end
+
+  it 'preserves top-level comments and comments inside forms' do
     Dir.mktmpdir do |dir|
       path = File.join(dir, 'sample.kap')
-      File.write(path, "(fn main [] ; comment\n  (print 1))\n")
+      File.write(path, <<~KAP)
+        ; entry point
+        (fn main [] ; inline body comment
+          (print 1))
+      KAP
 
-      error_output = capture_stderr do
-        expect(described_class.new([path]).run).to eq(1)
+      output = capture_stdout do
+        expect(described_class.new([path]).run).to eq(0)
+      end
+
+      expect(output).to eq(<<~KAP)
+        ; entry point
+        (fn main []
+          ; inline body comment
+          (print 1))
+      KAP
+    end
+  end
+
+  it 'normalizes end-of-line comments into standalone indented comments' do
+    Dir.mktmpdir do |dir|
+      path = File.join(dir, 'sample.kap')
+      File.write(path, <<~KAP)
+        (let [words ["red" "green" "blue"]] ; source data
+          (-> words ; start pipeline
+              (: :select (fn [w] (< (length w) 5))) ; keep short words
+              (: :map (fn [w] (w.upcase)))))
+      KAP
+
+      output = capture_stdout do
+        expect(described_class.new([path]).run).to eq(0)
+      end
+
+      expect(output).to eq(<<~KAP)
+        (let [words ["red" "green" "blue"]]
+          ; source data
+          (-> words
+              ; start pipeline
+              (: :select (fn [w] (< (length w) 5)))
+              ; keep short words
+              (: :map (fn [w] (w.upcase)))))
+      KAP
+    end
+  end
+
+  it 'preserves comments in multiline collections' do
+    Dir.mktmpdir do |dir|
+      path = File.join(dir, 'sample.kap')
+      File.write(path, <<~KAP)
+        (let [profile {:name "Ada"
+                       ; active user
+                       :active true}
+              ; next binding
+              role "Engineer"]
+          (print profile role))
+      KAP
+
+      output = capture_stdout do
+        expect(described_class.new([path]).run).to eq(0)
       end
 
-      expect(error_output).to include('kapfmt does not support comments yet.')
+      expect(output).to eq(<<~KAP)
+        (let
+          [
+            profile
+            {
+              :name "Ada"
+              ; active user
+              :active true}
+            ; next binding
+            role
+            "Engineer"]
+          (print profile role))
+      KAP
+    end
+  end
+
+  it 'preserves indented comments in nested bodies' do
+    Dir.mktmpdir do |dir|
+      path = File.join(dir, 'sample.kap')
+      File.write(path, <<~KAP)
+        (fn classify [score]
+          (if (> score 90)
+            ; fast path for top scores
+            :great
+            :ok))
+      KAP
+
+      output = capture_stdout do
+        expect(described_class.new([path]).run).to eq(0)
+      end
+
+      expect(output).to eq(<<~KAP)
+        (fn classify [score]
+          (if (> score 90)
+            ; fast path for top scores
+            :great
+            :ok))
+      KAP
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kapusta
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Evgenii Morozov
@@ -29,6 +29,7 @@ files:
 - examples/anagram.kap
 - examples/binary-search.kap
 - examples/block-sort.kap
+- examples/blocks-and-kwargs.kap
 - examples/calc.kap
 - examples/counter.kap
 - examples/describe.kap
@@ -39,10 +40,12 @@ files:
 - examples/exceptions.kap
 - examples/factorial.kap
 - examples/fib.kap
+- examples/files.kap
 - examples/fizzbuzz.kap
 - examples/gcd.kap
 - examples/greet.kap
 - examples/hashfn.kap
+- examples/inheritance.kap
 - examples/kwargs.kap
 - examples/leap-year.kap
 - examples/match.kap
@@ -64,6 +67,7 @@ files:
 - examples/squares.kap
 - examples/stack.kap
 - examples/sum.kap
+- examples/threading.kap
 - examples/tset.kap
 - examples/two-sum.kap
 - exe/kapfmt
@@ -93,10 +97,13 @@ files:
 - spec/examples_spec.rb
 - spec/formatter_spec.rb
 - spec/spec_helper.rb
-homepage:
+homepage: https://github.com/evmorov/kapusta
 licenses: []
 metadata:
   rubygems_mfa_required: 'true'
+  homepage_uri: https://github.com/evmorov/kapusta
+  source_code_uri: https://github.com/evmorov/kapusta
+  bug_tracker_uri: https://github.com/evmorov/kapusta/issues
 post_install_message:
 rdoc_options: []
 require_paths: