gloss 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 265e6f48bffa061f213e15f98be4d31b97c900701e95c381c1176048d9e8a75f
-  data.tar.gz: 9398669043cd6de339664f87529388f68d83f519d650b72ea06de6715d7477bb
+  metadata.gz: 9239f0e7898094d7957a2e1eae3b980ff57f94be27eea836f00561262eb8f8d4
+  data.tar.gz: 0ffa974e3146f699a9280878a412f589005cc4723f262c377a215aacd5cae146
 SHA512:
-  metadata.gz: d0ef0a2208f005eaa87c77fcc2e1cca5e2bdf4d08e712a70d0cf5dfa57e4a3d45a691dbc873f47d7c95a928ea48d36fa885b9ca2a62b52e55a42f7ae3540613d
-  data.tar.gz: a21377a395aa60bec26f0d420b8bb2124cb121994bf635b34653e290f0d2441f160888755695711ee6c1dd0e1e16da65fca9c6423a1b0f4600a7a15dc4b4a5a3
+  metadata.gz: 97ef28c0abd86a51f35224661765950f9aab162cb119f7a0d2b05e3d985464f25c58546b0c191cd69fc537a1b921c22ebd8d7c2d4bd446257d17e9b6a454c346
+  data.tar.gz: a9c9b94fbe5ec96b3be1a5c67d5149219d0e138ef7081190c133676c784865fb90d3c1b86b250b0eb207d890c67120a86f27763c5de105baadf550bc158a464f

data/.github/workflows/tests.yml

@@ -0,0 +1,41 @@
+name: Tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+env:
+  ImageOS: ubuntu18
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: johansenja/gloss:latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - uses: actions/cache@v2
+        id: gems-cache
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-
+      - name: install Bundler
+        run: gem install bundler:2.2.3
+      - name: install gems
+        run: bundle install --jobs 4 --retry 3
+      - name: Compile extension
+        run: make
+        working-directory: ext/gloss
+      - name: Run tests
+        run: rake
+      - name: Install dependencies
+        run: shards install
+        working-directory: ext/gloss
+      - name: Run tests
+        run: crystal spec
+        working-directory: ext/gloss
+      - name: Build self with current state
+        run: exe/gloss build

data/.gloss.yml

@@ -2,3 +2,4 @@
 frozen_string_literals: true
 src_dir: src
 entrypoint: src/exe/gloss
+type_checking_strictness: lenient

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    gloss (0.1.1)
+    gloss (0.1.6)
       fast_blank
       listen
-      rbs
-      steep
+      rbs (= 1.0.4)
+      steep (= 0.41.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.1)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    ast (2.4.1)
+    ast (2.4.2)
     ast_utils (0.4.0)
       parser (>= 2.7.0)
     byebug (11.1.3)
@@ -24,15 +24,15 @@ GEM
     concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
     fast_blank (1.0.0)
-    ffi (1.14.2)
-    i18n (1.8.8)
+    ffi (1.15.0)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    language_server-protocol (3.15.0.1)
-    listen (3.4.1)
+    language_server-protocol (3.15.0.2)
+    listen (3.5.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     method_source (1.0.0)
-    minitest (5.14.3)
+    minitest (5.14.4)
     parallel (1.20.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
@@ -77,6 +77,7 @@ GEM
     rubocop-ast (1.4.0)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.11.0)
+    rufo (0.12.0)
     steep (0.41.0)
       activesupport (>= 5.1)
       ast_utils (>= 0.4.0)
@@ -99,6 +100,7 @@ DEPENDENCIES
   rake-compiler
   rspec
   rubocop
+  rufo
 
 BUNDLED WITH
    2.2.3

data/README.md

@@ -1,13 +1,10 @@
-# Gloss
+# ![Gloss](./logo.svg "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)
+[![Tests](https://github.com/johansenja/gloss/workflows/Tests/badge.svg)](https://github.com/johansenja/gloss/actions?query=workflow%3ATests)
+[![Total Downloads](http://ruby-gem-downloads-badge.herokuapp.com/gloss?type=total&color=green&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.
+[Gloss](https://en.wikipedia.org/wiki/Gloss_(annotation)) is a language project inspired by [Crystal](https://github.com/crystal-lang/crystal), Ruby's [RBS](https://github.com/ruby/rbs), [Steep](https://github.com/soutaro/steep) and [TypeScript](https://github.com/microsoft/TypeScript). It compiles to pure Ruby.
 
 ### Current features
 
@@ -22,23 +19,6 @@ efficiency, and to enhance ruby's goal of developer happiness and productivity.
 
 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*
-
-*__Dependent on popularity__
-
 ## Examples:
 
 #### Type checking:
@@ -137,7 +117,7 @@ class Language
     TS = "TypeScript"
     P = "Python"
   end
-  
+
   def favourite_language(language : Lang)
     puts "my favourite language is #{language}"
   end
@@ -213,7 +193,7 @@ end
 ```crystal
 abstract class BaseClass
   attr_reader :var
-  
+
   def initialize(@var); end
 end
 
@@ -227,7 +207,14 @@ BaseClass.new(123) # Error - can't instantiate abstract class
 Child.new(123).what_is_var # Ok - "var is 123"
 ```
 
-## Usage:
+## Getting started:
+
+**Note: This gem currently requires Crystal to be installed. If you don't wish to install it, or run into other installation problems, consider using the Docker image:**
+
+```dockerfile
+FROM johansenja/gloss:latest
+# ...
+```
 
 ```ruby
 # Gemfile
@@ -250,8 +237,18 @@ then
 
 then
 
+`vi .gloss.yml # set entrypoint to src/hello_world.gl`
+
+then
+
 `gloss build`
 
 then
 
 `ruby ./hello_world.rb`
+
+## Example Projects:
+
+- This one! Gloss is mostly self-hosting, so check out the `./src` and `./.gloss.yml`, or the generated output in `./lib`
+- [onefiveone](https://github.com/johansenja/onefiveone) - A Roman Numeral CLI. Read the accompanying article [here](https://johansenja.medium.com/ruby-crystal-pt-ii-a-simple-app-using-gloss-368ff849db67)
+- More to come (including web apps)! Also check out `Used by` section in the sidebar

data/Rakefile

@@ -17,8 +17,10 @@ RSpec::Core::RakeTask.new :spec  do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
 end
 
-task :build do
+task :build_gem do
   sh "cd", "ext/gloss", "&&", "make", "all", "&&", "cd", "-"
 end
 
-task :default => [:spec]
+task build: [:build_gem]
+
+task default: [:spec]

data/ext/gloss/Makefile

@@ -3,16 +3,8 @@ PLATFORM = $(shell uname -s)
 
 ifeq "$(PLATFORM)" "Darwin"
 TARGET = ../../lib/gls.bundle
-
-clean:
-	rm -f $(TARGET) $(TARGET).dwarf
-endif
-
-ifeq "$(PLATFORM)" "Linux"
+else
 TARGET = ../../lib/gls.so
-
-clean:
-	rm -f $(TARGET)
 endif
 
 install: all
@@ -23,4 +15,8 @@ shards:
 	shards
 
 build: ./src/gloss.cr
-	$(CRYSTAL) build  --link-flags "-shared -dynamic -Wl,-undefined,dynamic_lookup" $< -o $(TARGET) --release
+	$(CRYSTAL) build  --link-flags "-shared -Wl,-undefined,dynamic_lookup" $< -o $(TARGET) --release
+
+clean:
+	rm -f $(TARGET)
+	rm -f $(TARGET).dwarf

data/ext/gloss/lib/cr_ruby.cr

@@ -1,8 +1,6 @@
 lib CrRuby
   # every ruby Object is a VALUE
   type VALUE = Void*
-  # ruby method typing
-  type METHOD_FUNC = VALUE, VALUE -> VALUE
 
   # a ruby Class is a VALUE
   $rb_cObject : VALUE
@@ -28,8 +26,11 @@ lib CrRuby
   fun rb_define_module(name: UInt8*) : VALUE
 
   # define ruby method in C
-  fun rb_define_method(klass: VALUE, name: UInt8*, func: METHOD_FUNC, argc: Int32)
+  fun rb_define_method(klass: VALUE, name: UInt8*, func: Proc(CrRuby::VALUE, CrRuby::VALUE,
+                                                              CrRuby::VALUE), argc: Int32)
 
   # define singleton ruby method in C
-  fun rb_define_singleton_method(klass: VALUE, name: UInt8*, func: METHOD_FUNC, argc: Int32)
+  fun rb_define_singleton_method(klass: VALUE, name: UInt8*, func: Proc(CrRuby::VALUE,
+                                                                        CrRuby::VALUE,
+                                                                        CrRuby::VALUE), argc: Int32)
 end

data/ext/gloss/src/gloss.cr

@@ -4,7 +4,7 @@ require "./cr_ast"
 require "./rb_ast"
 require "./parser"
 
-def parse_string(self : CrRuby::VALUE, str : CrRuby::VALUE)
+def parse_string(_self : CrRuby::VALUE, str : CrRuby::VALUE)
   st = CrRuby.rb_str_to_str(str)
   string = String.new(CrRuby.rb_string_value_cstr(pointerof(st)))
 
@@ -21,5 +21,10 @@ fun init = Init_gls
   GC.init
   LibCrystalMain.__crystal_main(0, Pointer(Pointer(UInt8)).null)
   gloss = CrRuby.rb_define_module("Gloss");
-  CrRuby.rb_define_singleton_method(gloss, "parse_buffer", ->parse_string(CrRuby::VALUE, CrRuby::VALUE), 1);
+  CrRuby.rb_define_singleton_method(
+    gloss,
+    "parse_buffer",
+    ->parse_string(CrRuby::VALUE, CrRuby::VALUE),
+    1
+  );
 end

data/gloss.gemspec

@@ -17,11 +17,12 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "fast_blank"
   s.add_runtime_dependency "listen"
-  s.add_runtime_dependency "rbs"
-  s.add_runtime_dependency "steep"
+  s.add_runtime_dependency "rbs", "1.0.4"
+  s.add_runtime_dependency "steep", "0.41.0"
 
+  s.add_development_dependency "pry-byebug"
   s.add_development_dependency "rake-compiler"
   s.add_development_dependency "rspec"
-  s.add_development_dependency "pry-byebug"
   s.add_development_dependency "rubocop"
+  s.add_development_dependency "rufo"
 end

data/lib/gloss.rb

@@ -1,7 +1,6 @@
-  # frozen_string_literal: true
-
+  
   ##### This file was generated by Gloss; any changes made here will be overwritten.
-  ##### See src/ to make changes
+  ##### See / to make changes
 
 require "rbs"
 require "json"
@@ -22,11 +21,8 @@ require "gloss/errors"
 require "gloss/logger"
 require "gloss/prog_loader"
 require "gloss/utils"
-is_ci = ENV.fetch("CI") { ||
-false}
-unless is_ci
-  require "gls"
-end
+require "gloss/runtime"
+require "gls"
 EMPTY_ARRAY = Array.new
 .freeze
 EMPTY_HASH = {}.freeze

data/lib/gloss/cli.rb

@@ -1,7 +1,6 @@
-  # frozen_string_literal: true
-
+  
   ##### This file was generated by Gloss; any changes made here will be overwritten.
-  ##### See src/ to make changes
+  ##### See / to make changes
 
 require "optparse"
 module Gloss
@@ -27,6 +26,7 @@ case command
           when "version", "--version", "-v"
             puts(Gloss::VERSION)
           when "watch", "build"
+            Gloss.load_config
             type_checker = ProgLoader.new
 .run
             (if command.==("watch")

data/lib/gloss/config.rb

@@ -1,7 +1,6 @@
-  # frozen_string_literal: true
-
+  
   ##### This file was generated by Gloss; any changes made here will be overwritten.
-  ##### See src/ to make changes
+  ##### See / to make changes
 
 require "ostruct"
 require "yaml"
@@ -10,14 +9,18 @@ module Gloss
   Config = OpenStruct.new(default_config: {:frozen_string_literals => true,
 :src_dir => "src",
 :entrypoint => nil,
-:strict_require => false}.freeze)
-  user_config = (if File.exist?(CONFIG_PATH)
-    YAML.safe_load(File.read(CONFIG_PATH))
-  else
+:strict_require => false,
+:type_checking_strictness => "lenient",
+:prettify_output_executable_path => nil}.freeze)
+  def self.load_config()
+    user_config = (if File.exist?(File.absolute_path(File.join(Dir.pwd, CONFIG_PATH)))
+      YAML.safe_load(File.read(CONFIG_PATH))
+    else
+      Config.default_config
+    end)
     Config.default_config
-  end)
-  Config.default_config
 .each() { |k, v|
-    Config.send(:"#{k}=", user_config.[](k.to_s) || v)
-  }
+      Config.send(:"#{k}=", user_config.[](k.to_s) || v)
+    }
+  end
 end

data/lib/gloss/errors.rb

@@ -1,7 +1,6 @@
-  # frozen_string_literal: true
-
+  
   ##### This file was generated by Gloss; any changes made here will be overwritten.
-  ##### See src/ to make changes
+  ##### See / to make changes
 
 module Gloss
   module Errors

data/lib/gloss/initializer.rb

@@ -1,7 +1,6 @@
-  # frozen_string_literal: true
-
+  
   ##### This file was generated by Gloss; any changes made here will be overwritten.
-  ##### See src/ to make changes
+  ##### See / to make changes
 
 require "yaml"
 module Gloss

data/lib/gloss/logger.rb

@@ -1,7 +1,6 @@
-  # frozen_string_literal: true
-
+  
   ##### This file was generated by Gloss; any changes made here will be overwritten.
-  ##### See src/ to make changes
+  ##### See / to make changes
 
 module Gloss
   def self.logger()
@@ -24,6 +23,11 @@ nil => nil,
       else
         IO::NULL
       end))
+.tap() { |l|
+        (if real_log_level
+          l.level=(real_log_level)
+        end)
+      }
     end)
   end
 end