gloss 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a26f64e872c2884f2fa5969d762e66ed6f1346732933f08ae7b92eb07aea5ab3
-  data.tar.gz: 9cf39520e8dc43e6a74f9ea606a719815e2bd503d19744c7979478f746b8345f
+  metadata.gz: 9315ca2d8d487ca5729f7665abcba9e922ec4e0ee85ac54787248d07b54b7ed5
+  data.tar.gz: 78928faa1a7e77e0184594a31786c0befdc796a4a9b46c5f509adb95c39d37c3
 SHA512:
-  metadata.gz: bdb98f72e57945e9de8bbd03296d95b2cfc221f915e7e8e8fd511e8b4794ef3bb65f1830d9769486c30a004595c3a7f84e3e785bb1b1297d778cff984a0a3234
-  data.tar.gz: 9758d730e858adf27c60f89ec9e88ffb07d3950d2a4f493b1d0ad2b00b7a10999fd76c9ae802753428fdfb0cab005adfe773456c415b504809217507ac30fbc5
+  metadata.gz: c3178c5cf74e3946e327cbe97b5c5f421090e7b678d331c34ce5c8a45aea137cdc9628f91481425e18f66cf3245983d1e5bf965feaae211d619d8d9f5ed55647
+  data.tar.gz: 9d9b5ef709cffe8efb6b0124762bbe025948caa51772cf33a38143862003048f15ee83198c2fd0f6a05128f14da65a9feb22b45205563b686bacb70d51dd5741

data/.gitattributes

@@ -0,0 +1,3 @@
+lib/gloss/**/*.rb  linguist-generated
+# this will basically cover 99% of the syntax anyway
+**/*.gl linguist-language=Crystal

data/.github/workflows/{crystal.yml → crystal_specs.yml}

@@ -1,4 +1,4 @@
-name: Crystal CI
+name: Crystal Specs
 
 on:
   push:

data/.github/workflows/{ruby.yml → ruby_specs.yml}

@@ -5,7 +5,7 @@
 # This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
 # For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
 
-name: Ruby
+name: Ruby Specs
 
 on:
   push:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gloss (0.0.5)
+    gloss (0.0.6)
       fast_blank
       listen
       rbs

data/README.md

@@ -1,7 +1,15 @@
 # Gloss
+[![Gem Version](https://badge.fury.io/rb/gloss.svg)](https://rubygems.org/gems/gloss)
+[![Ruby Specs](https://github.com/johansenja/gloss/workflows/Ruby%20Specs/badge.svg)](https://github.com/johansenja/gloss/actions?query=workflow%3A%22Ruby+Specs%22)
+[![Crystal Specs](https://github.com/johansenja/gloss/workflows/Crystal%20Specs/badge.svg)](https://github.com/johansenja/gloss/actions?query=workflow%3A%22Crystal+Specs%22)
+[![Total Downloads](http://ruby-gem-downloads-badge.herokuapp.com/gloss?type=total&color=green&metric=true&label=downloads%20(total)&total_label=)](https://rubygems.org/gems/gloss)
+[![Current Version](http://ruby-gem-downloads-badge.herokuapp.com/gloss?color=green&label=downloads%20(current%20version)&metric=true)](https://rubygems.org/gems/gloss)
+[![Total Views](https://counter.gofiber.io/badge/johansenja/gloss)](https://rubygems.org/gems/gloss)
 
 [Gloss](https://en.wikipedia.org/wiki/Gloss_(annotation)) is a high-level programming language based on [Ruby](https://github.com/ruby/ruby) and [Crystal](https://github.com/crystal-lang/crystal), which compiles to ruby; its aims are on transparency,
-efficiency, and to enhance ruby's goal of developer happiness and productivity. Some of the features include:
+efficiency, and to enhance ruby's goal of developer happiness and productivity.
+
+### Current features
 
 - Type checking, via optional type annotations
 - Compile-time macros
@@ -10,11 +18,26 @@ efficiency, and to enhance ruby's goal of developer happiness and productivity.
 - All ruby files are valid gloss files (a small exceptions for now; workarounds are mostly available)
 - Other syntactic sugar
 
-Coming soon:
-- abstract classes
+### Current Status
+
+This project is at a stage where the core non-crystal parts are written in Gloss and compile to ruby (essentially self-hosting), albeit with the type checking being fairly loose. However the project is still in the very early stages; with (as of yet) no Linux support nor error handling (see roadmap below). Use at your own discretion!
+
+### Approx. roadmap:
+
+- Improve error handling and logging (currently almost non-existant)
+- Address Linux compatibility (currently more or less non-existant)
+- Implement different strictnesses of type checking
+- Metaprogramming helpers/safety:*
+  - Abstract classes and methods
+  - Method lookup/existence checking at compile time
+  - Method overloading
+
+#### Related items:
+
+- Rails helpers; probably some time away*
+- Editor plugins/syntax highlighting/langserver; probably some time away*
 
-Maybe on the roadmap:
-- Method overloading
+*__Dependent on popularity__
 
 ## Examples:
 
@@ -223,4 +246,12 @@ then
 
 then
 
+`mkdir src && echo "puts 'hello world'" > src/hello_world.gl`
+
+then
+
 `gloss build`
+
+then
+
+`ruby ./hello_world.rb`

data/exe/gloss

@@ -3,4 +3,18 @@
 require "bundler/setup"
 require "gloss"
 
-Gloss::CLI.new(ARGV).run
+begin
+  Gloss::CLI.new(ARGV).run
+rescue SystemExit
+  # raised by `abort` or `exit`; no op
+rescue => e
+  Gloss.logger.fatal <<~MSG
+    Unexpected error: #{e.class.name}
+    Message: #{e.message}
+    Trace:
+      #{e.backtrace.join("\n")}
+
+    This is probably a bug and may warrant a bug report at https://github.com/johansenja/gloss/issues
+  MSG
+  exit 1
+end

data/ext/gloss/src/cr_ast.cr

@@ -235,12 +235,6 @@ module Crystal
     end
   end
 
-  class MacroExpression < ASTNode
-    def to_rb
-      Rb::AST::EmptyNode.new(self.class.name)
-    end
-  end
-
   class MacroIf < ASTNode
     def to_rb
       Rb::AST::MacroIf.new(@cond.to_rb, @then.to_rb, @else.to_rb)

data/ext/gloss/src/gloss.cr

@@ -11,7 +11,6 @@ def parse_string(self : CrRuby::VALUE, str : CrRuby::VALUE)
   output = begin
              Gloss.parse_string(string)
            rescue e : Crystal::SyntaxException
-             pp e.backtrace
              e.to_s
            end
 

data/lib/gloss.rb

@@ -17,6 +17,7 @@ require "gloss/source"
 require "gloss/scope"
 require "gloss/builder"
 require "gloss/errors"
+require "gloss/logger"
 
 require "gls" unless ENV["CI"] # a bit of a hack for now
 

data/lib/gloss/builder.rb

@@ -107,7 +107,14 @@ case node.[](:"type")
           src.write_ln("end")
         when "DefNode"
           args = render_args(node)
-          src.write_ln("def #{node.[](:"name")}#{args.[](:"representation")}")
+          receiver = (if node.[](:"receiver")
+            visit_node(node.[](:"receiver"))
+          else
+            nil
+          end)
+          src.write_ln("def #{(if receiver
+            "#{receiver}."
+          end)}#{node.[](:"name")}#{args.[](:"representation")}")
           return_type = (if node.[](:"return_type")
             RBS::Types::ClassInstance.new(name:             RBS::TypeName.new(name:             eval(visit_node(node.[](:"return_type")))
 .to_s
@@ -121,7 +128,11 @@ case node.[](:"type")
             nil
           end), location:           node.[](:"location"))]
           method_definition = RBS::AST::Members::MethodDefinition.new(name:           node.[](:"name")
-.to_sym, kind: :"instance", types: method_types, annotations: EMPTY_ARRAY, location:           node.[](:"location"), comment:           node.[](:"comment"), overload: false)
+.to_sym, kind:           (if receiver
+            :"class"
+          else
+            :"instance"
+          end), types: method_types, annotations: EMPTY_ARRAY, location:           node.[](:"location"), comment:           node.[](:"comment"), overload: false)
           (if @current_scope
             @current_scope.members
 .<<(method_definition)
@@ -197,7 +208,7 @@ EMPTY_ARRAY          }
           else
             ".."
           end)
-          src.write("(", visit_node(node.[](:"from")), dots, visit_node(node.[](:"to")), ")")
+          src.write("(", "(", visit_node(node.[](:"from")), ")", dots, "(", visit_node(node.[](:"to")), ")", ")")
         when "LiteralNode"
           src.write(node.[](:"value"))
         when "ArrayLiteral"
@@ -216,7 +227,7 @@ EMPTY_ARRAY          }
             str.<<(case c.[](:"type")
               when "LiteralNode"
                 c.[](:"value")
-.[]((1...-1))
+.[](((1)...(-1)))
               else
                 ["\#{", visit_node(c)
 .strip, "}"].join
@@ -278,11 +289,12 @@ EMPTY_ARRAY          }
             key = case k
               when String
                 k.to_sym
+.inspect
               else
                 visit_node(k)
             end
             value = visit_node(v)
-"#{key.inspect} => #{value}"          }
+"#{key} => #{value}"          }
           src.write("{#{contents.join(",\n")}}")
           (if node.[](:"frozen")
             src.write(".freeze")

data/lib/gloss/cli.rb

@@ -11,10 +11,24 @@ module Gloss
     end
     def run()
       command = @argv.first
-      files = @argv.[]((1..-1))
+      files = @argv.[](((1)..(-1)))
       err_msg = catch(:"error") { ||
 case command
           when "watch"
+            files = files.map() { |f|
+              path = (if Pathname.new(f)
+.absolute?
+                f
+              else
+                File.join(Dir.pwd, f)
+              end)
+              (if Pathname.new(path)
+.exist?
+                path
+              else
+                throw(:"error", "Pathname #{f} does not exist")
+              end)
+            }
             Watcher.new(files)
 .watch
           when "build"
@@ -24,7 +38,8 @@ case command
               files
             end)
 .each() { |fp|
-              puts("=====> Building #{fp}")
+              Gloss.logger
+.info("Building #{fp}")
               content = File.read(fp)
               tree_hash = Parser.new(content)
 .run
@@ -32,7 +47,8 @@ case command
               rb_output = Builder.new(tree_hash, type_checker)
 .run
               type_checker.run(rb_output)
-              puts("=====> Writing #{fp}")
+              Gloss.logger
+.info("Writing #{fp}")
               Writer.new(rb_output, fp)
 .run
             }
@@ -51,7 +67,8 @@ case command
         end
 nil      }
       (if err_msg
-        abort(err_msg)
+       Gloss.logger.fatal(err_msg)
+       exit(1)
       end)
     end
   end

data/lib/gloss/initializer.rb

@@ -18,7 +18,8 @@ module Gloss
 .transform_keys(&:"to_s")
 .to_yaml)
       }
-      puts("Created #{CONFIG_PATH} with default preferences")
+      Gloss.logger
+.info("Created #{CONFIG_PATH} with default preferences")
     end
   end
 end

data/lib/gloss/logger.rb

@@ -0,0 +1,34 @@
+  # frozen_string_literal: true
+
+  ##### This file was generated by Gloss; any changes made here will be overwritten.
+  ##### See src/ to make changes
+
+module Gloss
+  def self.logger()
+    (if @logger
+      @logger
+    else
+      env_log_level = ENV.fetch("LOG_LEVEL") { ||
+"INFO"      }
+      real_log_level = {"UNKNOWN" => Logger::UNKNOWN,
+"FATAL" => Logger::FATAL,
+"ERROR" => Logger::ERROR,
+"WARN" => Logger::WARN,
+"INFO" => Logger::INFO,
+"DEBUG" => Logger::DEBUG,
+"NIL" => nil,
+nil => nil,
+"" => nil}.fetch(env_log_level)
+      @logger = Logger.new((if real_log_level
+        STDOUT
+      else
+        nil
+      end))
+      formatter = Logger::Formatter.new
+      @logger.formatter=(proc() { |severity, datetime, progname, msg|
+        formatter.call(severity, datetime, progname, msg)
+      })
+@logger
+    end)
+  end
+end

data/lib/gloss/parser.rb

@@ -3,7 +3,7 @@
   ##### This file was generated by Gloss; any changes made here will be overwritten.
   ##### See src/ to make changes
 
-  module Gloss
+module Gloss
   class Parser
     def initialize(str)
       @str = str
@@ -13,7 +13,22 @@
       begin
         JSON.parse(tree_json, symbolize_names: true)
       rescue JSON::ParserError
-        raise(Errors::ParserError, tree_json)
+        error_message = tree_json
+        error_message.match(/.+\s:(\d+)$/)
+        (if $~.[](1)
+          line_number = $~.[](1)
+.to_i
+          context = @str.lines
+.[](((          line_number.-(2)
+)..(line_number)))
+.map
+.with_index() { |line, index|
+"#{index.-(1)
+.+(line_number)}|  #{line}"          }
+.join
+          error_message = "#{context.rstrip}\n\n#{error_message}\n"
+        end)
+        throw(:"error", error_message)
       end
     end
   end

data/lib/gloss/type_checker.rb

@@ -3,7 +3,8 @@
   ##### This file was generated by Gloss; any changes made here will be overwritten.
   ##### See src/ to make changes
 
-  module Gloss
+require "pry-byebug"
+module Gloss
   class TypeChecker
     Project = Struct.new(:"targets")
     attr_reader(:"steep_target", :"top_level_decls")
@@ -15,30 +16,40 @@
       @top_level_decls = {}
     end
     def run(rb_str)
-      unless       check_types(rb_str)
-        raise(Errors::TypeError, @steep_target.errors
+      begin
+        valid_types = check_types(rb_str)
+      rescue ParseError => e
+        throw(:"error", "")
+      rescue  => e
+        throw(:"error", "Type checking Error: #{e.message} (#{e.class})")
+      end
+      unless valid_types
+        errors = @steep_target.errors
 .map() { |e|
 case e
-            when Steep::Errors::NoMethod
+            when Steep::Diagnostic::Ruby::NoMethod
               "Unknown method :#{e.method}, location: #{e.type
 .location
 .inspect}"
-            when Steep::Errors::MethodBodyTypeMismatch
+            when Steep::Diagnostic::Ruby::MethodBodyTypeMismatch
               "Invalid method body type - expected: #{e.expected}, actual: #{e.actual}"
-            when Steep::Errors::IncompatibleArguments
-              "  Invalid argmuents - method type: #{e.method_type}\n                      method name: #{e.method_type
+            when Steep::Diagnostic::Ruby::IncompatibleArguments
+              "Invalid argmuents - method type: #{e.method_type}\nmethod name: #{e.method_type
 .method_decls
 .first
 .method_name}"
-            when Steep::Errors::ReturnTypeMismatch
+            when Steep::Diagnostic::Ruby::ReturnTypeMismatch
               "Invalid return type - expected: #{e.expected}, actual: #{e.actual}"
-            when Steep::Errors::IncompatibleAssignment
+            when Steep::Diagnostic::Ruby::IncompatibleAssignment
               "Invalid assignment - cannot assign #{e.rhs_type} to type #{e.lhs_type}"
+            when Steep::Diagnostic::Ruby::UnexpectedBlockGiven
+              "Unexpected block given"
             else
               e.inspect
           end
         }
-.join("\n"))
+.join("\n")
+        throw(:"error", errors)
       end
 true
     end
@@ -58,6 +69,25 @@ true
       env = env.resolve_type_names
       @steep_target.instance_variable_set("@environment", env)
       @steep_target.type_check
+      (if @steep_target.status
+.is_a?(Steep::Project::Target::SignatureErrorStatus)
+        throw(:"error", @steep_target.status
+.errors
+.map() { |e|
+"  SignatureSyntaxError:\n    Location: #{e.location}\n    Message: \"#{e.exception
+.error_value
+.value}\""        }
+.join("\n"))
+      end)
+      @steep_target.source_files
+.each() { |path, f|
+        (if f.status
+.is_a?(Steep::Project::SourceFile::ParseErrorStatus)
+          e = f.status
+.error
+          throw(:"error", "#{e.class}: #{e.message}")
+        end)
+      }
 @steep_target.status
 .is_a?(Steep::Project::Target::TypeCheckStatus) && @steep_target.no_error? && @steep_target.errors
 .empty?

data/lib/gloss/version.rb

@@ -4,5 +4,5 @@
   ##### See src/ to make changes
 
 module Gloss
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/gloss/watcher.rb

@@ -3,50 +3,72 @@
   ##### This file was generated by Gloss; any changes made here will be overwritten.
   ##### See src/ to make changes
 
-  require "listen"
+require "listen"
 module Gloss
   class Watcher
     def initialize(paths)
       @paths = paths
       (if @paths.empty?
         @paths = [File.join(Dir.pwd, Config.src_dir)]
+        @only = /\.gl$/
+      else
+        file_names = Array.new
+        paths = Array.new
+        @paths.each() { |pa|
+          pn = Pathname.new(pa)
+          paths.<<(pn.parent
+.to_s)
+          file_names.<<((if pn.file?
+            pn.basename
+.to_s
+          else
+            pa
+          end))
+        }
+        @paths = paths.uniq
+        @only = /#{Regexp.union(file_names)}/
       end)
     end
     def watch()
-      puts("=====> Now listening for changes in #{@paths.join(", ")}")
-      listener = Listen.to(*@paths, latency: 2) { |modified, added, removed|
+      Gloss.logger
+.info("Now listening for changes in #{@paths.join(", ")}")
+      listener = Listen.to(*@paths, latency: 2, only: @only) { |modified, added, removed|
         modified.+(added)
 .each() { |f|
-          unless           f.end_with?(".gl")
-            next
-          end
-          puts("====> Rewriting #{f}")
+          Gloss.logger
+.info("Rewriting #{f}")
           content = File.read(f)
-          Writer.new(Builder.new(Parser.new(content)
+          err = catch(:"error") { ||
+            Writer.new(Builder.new(Parser.new(content)
 .run)
 .run, f)
 .run
-          puts("====> Done")
+nil          }
+          (if err
+            Gloss.logger
+.error(err)
+          else
+            Gloss.logger
+.info("Done")
+          end)
         }
         removed.each() { |f|
-          unless           f.end_with?(".gl")
-            next
-          end
           out_path = Utils.src_path_to_output_path(f)
-          puts("====> Removing #{out_path}")
+          Gloss.logger
+.info("Removing #{out_path}")
           (if File.exist?(out_path)
             File.delete(out_path)
           end)
-          puts("====> Done")
+          Gloss.logger
+.info("Done")
         }
       }
-      listener.start
       begin
-        loop() { ||
-          sleep(10)
-        }
+        listener.start
+        sleep
       rescue Interrupt
-        puts("=====> Interrupt signal received, shutting down")
+        Gloss.logger
+.info("Interrupt signal received, shutting down")
         exit(0)
       end
     end

data/src/lib/gloss/builder.gl

@@ -113,7 +113,8 @@ module Gloss
         src.write_ln "end"
       when "DefNode"
         args = render_args(node)
-        src.write_ln "def #{node[:name]}#{args[:representation]}"
+        receiver = node[:receiver] ? visit_node(node[:receiver]) : nil
+        src.write_ln "def #{"#{receiver}." if receiver}#{node[:name]}#{args[:representation]}"
 
         return_type = if node[:return_type]
                         RBS::Types::ClassInstance.new(
@@ -162,7 +163,7 @@ module Gloss
         ]
         method_definition = RBS::AST::Members::MethodDefinition.new(
           name: node[:name].to_sym,
-          kind: :instance,
+          kind: receiver ? :class : :instance,
           types: method_types,
           annotations: EMPTY_ARRAY, # TODO
           location: node[:location],
@@ -215,9 +216,10 @@ module Gloss
       when "RangeLiteral"
         dots = node[:exclusive] ? "..." : ".."
 
-        # parentheses help the compatibility with precendence of operators in some situations
+        # parentheses around the whole thing help the compatibility with precendence of operators in some situations
         # eg. (1..3).cover? 2 vs. 1..3.cover? 2
-        src.write "(", visit_node(node[:from]), dots, visit_node(node[:to]), ")"
+        # parentheses around either number help with things like arithemtic ((x-1)..(y+5))
+        src.write "(", "(", visit_node(node[:from]), ")", dots, "(", visit_node(node[:to]), ")", ")"
 
       when "LiteralNode"
 
@@ -296,12 +298,12 @@ module Gloss
         contents = node[:elements].map do |k, v|
           key = case k
                 when String
-                  k.to_sym
+                  k.to_sym.inspect
                 else
                   visit_node k
                 end
           value = visit_node v
-          "#{key.inspect} => #{value}"
+          "#{key} => #{value}"
         end
 
         src.write "{#{contents.join(",\n")}}"

data/src/lib/gloss/cli.gl

@@ -13,17 +13,25 @@ module Gloss
       err_msg = catch :error do
         case command
         when "watch"
+          files = files.map do |f|
+            path = Pathname.new(f).absolute? ? f : File.join(Dir.pwd, f)
+            if Pathname.new(path).exist?
+              path
+            else
+              throw :error, "Pathname #{f} does not exist"
+            end
+          end
           Watcher.new(files).watch
         when "build"
           (files.empty? ? Dir.glob("#{Config.src_dir}/**/*.gl") : files).each do |fp|
-            puts "=====> Building #{fp}"
+            Gloss.logger.info "Building #{fp}"
             content = File.read(fp)
             tree_hash = Parser.new(content).run
             type_checker = TypeChecker.new
             rb_output = Builder.new(tree_hash, type_checker).run
             type_checker.run(rb_output)
 
-            puts "=====> Writing #{fp}"
+            Gloss.logger.info "Writing #{fp}"
             Writer.new(rb_output, fp).run
           end
         when "init"
@@ -38,7 +46,10 @@ module Gloss
         nil
       end
 
-      abort err_msg if err_msg
+      if err_msg
+        Gloss.logger.fatal err_msg
+        exit 1
+      end
     end
   end
 end

data/src/lib/gloss/initializer.gl

@@ -14,7 +14,7 @@ module Gloss
         file.puts Config.default_config.transform_keys(&:to_s).to_yaml
       end
 
-      puts "Created #{CONFIG_PATH} with default preferences"
+      Gloss.logger.info "Created #{CONFIG_PATH} with default preferences"
     end
   end
 end

data/src/lib/gloss/logger.gl

@@ -0,0 +1,26 @@
+module Gloss
+  def self.logger
+    if @logger
+      @logger
+    else
+      env_log_level = ENV.fetch("LOG_LEVEL") { "INFO" }
+      real_log_level = {
+        "UNKNOWN" => Logger::UNKNOWN,
+        "FATAL" => Logger::FATAL,
+        "ERROR" => Logger::ERROR,
+        "WARN" => Logger::WARN,
+        "INFO" => Logger::INFO,
+        "DEBUG" => Logger::DEBUG,
+        "NIL" => nil,
+        nil => nil,
+        "" => nil
+      }.fetch env_log_level
+      @logger = Logger.new(real_log_level ? STDOUT : nil)
+      formatter = Logger::Formatter.new
+      @logger.formatter = proc do |severity, datetime, progname, msg|
+        formatter.call(severity, datetime, progname, msg)
+      end
+      @logger
+    end
+  end
+end

data/src/lib/gloss/parser.gl

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Gloss
   class Parser
     def initialize(@str : String)
@@ -10,9 +8,23 @@ module Gloss
       begin
         JSON.parse tree_json, symbolize_names: true
       rescue JSON::ParserError
-        # if parsing fails then tree is invalid and most likely an error message from the parser in
-        # crystal
-        raise Errors::ParserError, tree_json
+        error_message = tree_json
+        error_message.match /.+\s:(\d+)$/
+        if $1
+          line_number = $1.to_i
+          # line numbers start at 1, but array index starts at 0; so this still gives one line
+          # either side of the offending line
+          context = @str.lines[(line_number - 2)..(line_number)].map.with_index { |line, index|
+            "#{index - 1 + line_number}|  #{line}"
+          }.join
+          error_message = <<~MSG
+          #{context.rstrip}
+
+          #{error_message}
+
+          MSG
+        end
+        throw :error, error_message
       end
     end
   end

data/src/lib/gloss/type_checker.gl

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+      require "pry-byebug"
 
 module Gloss
   class TypeChecker
@@ -20,27 +21,37 @@ module Gloss
     end
 
     def run(rb_str)
-      unless check_types(rb_str)
-        raise Errors::TypeError,
-              @steep_target.errors.map { |e|
-                case e
-                when Steep::Errors::NoMethod
-                  "Unknown method :#{e.method}, location: #{e.type.location.inspect}"
-                when Steep::Errors::MethodBodyTypeMismatch
-                  "Invalid method body type - expected: #{e.expected}, actual: #{e.actual}"
-                when Steep::Errors::IncompatibleArguments
-                  <<-ERR
-                    Invalid argmuents - method type: #{e.method_type}
-                                        method name: #{e.method_type.method_decls.first.method_name}
-                  ERR
-                when Steep::Errors::ReturnTypeMismatch
-                  "Invalid return type - expected: #{e.expected}, actual: #{e.actual}"
-                when Steep::Errors::IncompatibleAssignment
-                  "Invalid assignment - cannot assign #{e.rhs_type} to type #{e.lhs_type}"
-                else
-                  e.inspect
-                end
-              }.join("\n")
+      begin
+        valid_types = check_types rb_str
+      rescue ParseError => e
+        throw :error, ""
+      rescue => e
+        throw :error, "Type checking Error: #{e.message} (#{e.class})"
+      end
+
+      unless valid_types
+        errors = @steep_target.errors.map { |e|
+          case e
+            when Steep::Diagnostic::Ruby::NoMethod
+              "Unknown method :#{e.method}, location: #{e.type.location.inspect}"
+            when Steep::Diagnostic::Ruby::MethodBodyTypeMismatch
+              "Invalid method body type - expected: #{e.expected}, actual: #{e.actual}"
+            when Steep::Diagnostic::Ruby::IncompatibleArguments
+              <<-ERR
+              Invalid argmuents - method type: #{e.method_type}
+              method name: #{e.method_type.method_decls.first.method_name}
+              ERR
+            when Steep::Diagnostic::Ruby::ReturnTypeMismatch
+              "Invalid return type - expected: #{e.expected}, actual: #{e.actual}"
+            when Steep::Diagnostic::Ruby::IncompatibleAssignment
+              "Invalid assignment - cannot assign #{e.rhs_type} to type #{e.lhs_type}"
+            when Steep::Diagnostic::Ruby::UnexpectedBlockGiven
+              "Unexpected block given"
+            else
+              e.inspect
+            end
+        }.join("\n")
+        throw :error, errors
       end
 
       true
@@ -65,6 +76,23 @@ module Gloss
 
       @steep_target.type_check
 
+      if @steep_target.status.is_a? Steep::Project::Target::SignatureErrorStatus
+        throw :error, @steep_target.status.errors.map { |e|
+          <<~MSG
+            SignatureSyntaxError:
+              Location: #{e.location}
+              Message: "#{e.exception.error_value.value}"
+          MSG
+        }.join("\n")
+      end
+
+      @steep_target.source_files.each do |path, f|
+        if f.status.is_a? Steep::Project::SourceFile::ParseErrorStatus
+          e = f.status.error
+          throw :error, "#{e.class}: #{e.message}"
+        end
+      end
+
       @steep_target.status.is_a?(Steep::Project::Target::TypeCheckStatus) &&
         @steep_target.no_error? &&
         @steep_target.errors.empty?

data/src/lib/gloss/version.gl

@@ -1,3 +1,3 @@
 module Gloss
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/src/lib/gloss/watcher.gl

@@ -5,42 +5,61 @@ require "listen"
 module Gloss
   class Watcher
     def initialize(@paths : Array[String])
-      @paths = [File.join(Dir.pwd, Config.src_dir)] if @paths.empty?
+      if @paths.empty?
+        @paths = [File.join(Dir.pwd, Config.src_dir)]
+        @only = /\.gl$/
+      else
+        file_names = Array.new
+        paths = Array.new
+        @paths.each do |pa|
+          pn = Pathname.new(pa)
+          paths << pn.parent.to_s
+          file_names << (pn.file? ? pn.basename.to_s : pa)
+        end
+        @paths = paths.uniq
+        @only = /#{Regexp.union(file_names)}/
+      end
     end
 
     def watch
-      puts "=====> Now listening for changes in #{@paths.join(', ')}"
-      listener = Listen.to(*@paths, latency: 2) do |modified, added, removed|
+      Gloss.logger.info "Now listening for changes in #{@paths.join(', ')}"
+      listener = Listen.to(
+        *@paths,
+        latency: 2,
+        only: @only
+      ) do |modified, added, removed|
         (modified + added).each do |f|
-          next unless f.end_with? ".gl"
-
-          puts "====> Rewriting #{f}"
+          Gloss.logger.info "Rewriting #{f}"
           content = File.read(f)
-          Writer.new(
-            Builder.new(
-              Parser.new(
-                content
-              ).run
-            ).run, f
-          ).run
-
-          puts "====> Done"
+          err = catch :error do
+            Writer.new(
+              Builder.new(
+                Parser.new(
+                  content
+                ).run
+              ).run, f
+            ).run
+            nil
+          end
+          if err
+            Gloss.logger.error err
+          else
+            Gloss.logger.info "Done"
+          end
         end
         removed.each do |f|
-          next unless f.end_with? ".gl"
-
           out_path = Utils.src_path_to_output_path(f)
-          puts "====> Removing #{out_path}"
+          Gloss.logger.info "Removing #{out_path}"
           File.delete out_path if File.exist? out_path
 
-          puts "====> Done"
+          Gloss.logger.info "Done"
         end
       end
-      listener.start
       begin
-        loop { sleep 10 }
+        listener.start
+        sleep
       rescue Interrupt
-        puts "=====> Interrupt signal received, shutting down"
+        Gloss.logger.info "Interrupt signal received, shutting down"
         exit 0
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloss
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - johansenja
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-31 00:00:00.000000000 Z
+date: 2021-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_blank
@@ -131,8 +131,9 @@ extensions:
 - ext/gloss/extconf.rb
 extra_rdoc_files: []
 files:
-- ".github/workflows/crystal.yml"
-- ".github/workflows/ruby.yml"
+- ".gitattributes"
+- ".github/workflows/crystal_specs.yml"
+- ".github/workflows/ruby_specs.yml"
 - ".gitignore"
 - ".gloss.yml"
 - ".rspec"
@@ -163,6 +164,7 @@ files:
 - lib/gloss/config.rb
 - lib/gloss/errors.rb
 - lib/gloss/initializer.rb
+- lib/gloss/logger.rb
 - lib/gloss/parser.rb
 - lib/gloss/scope.rb
 - lib/gloss/source.rb
@@ -177,6 +179,7 @@ files:
 - src/lib/gloss/config.gl
 - src/lib/gloss/errors.gl
 - src/lib/gloss/initializer.gl
+- src/lib/gloss/logger.gl
 - src/lib/gloss/parser.gl
 - src/lib/gloss/scope.gl
 - src/lib/gloss/source.gl