gloss 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cb01614c6e4395edaf5600dd39e958b2ca86ae6c2650c2028519659c813ff64
-  data.tar.gz: a1ee0171851a7463113c4e12dff9dd81bb2c003e080896171060dfc439a18499
+  metadata.gz: 622926d0bd44e5bd9b93cfa75ea54dc67d976a63c91a5a60f17c859987ee2fce
+  data.tar.gz: 789917be6b264be0108cb03371b797c4ebc865e01fcb7218589808ccd68bdf83
 SHA512:
-  metadata.gz: 781f7dc53f12231f843947aa619521fbd99deca1bf15a7a5263a279e7a030683c4da2d72722beb30d4a35beba8e98e86085eabd3046d1567be1c37c7d577c6d7
-  data.tar.gz: b3a63fbcb5c81a8c0d4336dcfdb64d46a2ebf624fd804942ba8243c04b43fab05a881ba6386e6f6a5c7fb76b416ca8677212e7993ea8ea22cdca981bff2645fd
+  metadata.gz: c5fe3cf7f37aa5eec834b806c1f80083dde5be4b15000f18ae4807cb0d2ee5e3f378eaa271ffe3cb4d61b58feb98c3ac0586ab65da5ef2bb3df5dad1e4a02b2e
+  data.tar.gz: b2f55defed2e6ba5d3dec55dd7b6795a3f3ff54fa1e94532bc0bda6d91f099200d5ec40926c6c3b001a27809477016bdd8a59d24a6472419b0958647df6b5c00

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    gloss (0.1.4)
+    gloss (0.1.5)
       fast_blank
       listen
-      rbs (~> 1.0.4)
-      steep (~> 0.41.0)
+      rbs (= 1.0.4)
+      steep (= 0.41.0)
 
 GEM
   remote: https://rubygems.org/
@@ -49,7 +49,7 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (1.0.6)
+    rbs (1.0.4)
     regexp_parser (2.0.3)
     rexml (3.2.4)
     rspec (3.10.0)
@@ -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/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", "~>1.0.4"
-  s.add_runtime_dependency "steep", "~>0.41.0"
+  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 "rubocop"
+  s.add_development_dependency "rufo"
 end

data/lib/gloss/config.rb

@@ -11,7 +11,8 @@ module Gloss
 :src_dir => "src",
 :entrypoint => nil,
 :strict_require => false,
-:type_checking_strictness => "strict"}.freeze)
+:type_checking_strictness => "strict",
+: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))

data/lib/gloss/prog_loader.rb

@@ -19,27 +19,31 @@ module Gloss
     end
     def run()
       @files_to_process.each() { |path_string|
-        unless @processed_files.member?(path_string) || OUTPUT_BY_PATH.[](path_string)
-          Gloss.logger
+        (if path_string.end_with?(".rbs")
+          @type_checker.load_sig_path(path_string)
+        else
+          (if !@processed_files.member?(path_string) || !OUTPUT_BY_PATH.[](path_string)
+            Gloss.logger
 .debug("Loading #{path_string}")
-          path = Utils.absolute_path(path_string)
-          file_contents = File.open(path)
+            path = Utils.absolute_path(path_string)
+            file_contents = File.open(path)
 .read
-          contents_tree = Parser.new(file_contents)
+            contents_tree = Parser.new(file_contents)
 .run
-          on_new_file_referenced = proc() { |ps, relative|
-            ps.each() { |pa|
-              (if relative
-                handle_require_relative(pa, path_string)
-              else
-                handle_require(pa)
-              end)
+            on_new_file_referenced = proc() { |ps, relative|
+              ps.each() { |pa|
+                (if relative
+                  handle_require_relative(pa, path_string)
+                else
+                  handle_require(pa)
+                end)
+              }
             }
-          }
-          OUTPUT_BY_PATH.[]=(path_string, Visitor.new(contents_tree, @type_checker, on_new_file_referenced)
+            OUTPUT_BY_PATH.[]=(path_string, Visitor.new(contents_tree, @type_checker, on_new_file_referenced)
 .run)
-          @processed_files.add(path_string)
-        end
+            @processed_files.add(path_string)
+          end)
+        end)
       }
 @type_checker
     end

data/lib/gloss/version.rb

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

data/lib/gloss/writer.rb

@@ -24,6 +24,9 @@ module Gloss
         end)
         file.puts(@content)
       }
+      (if Config.prettify_output_executable_path
+        system(Config.prettify_output_executable_path, @output_path.to_s)
+      end)
     end
     private     def shebang()
       (if @output_path.executable?

data/src/lib/gloss/config.gl

@@ -9,7 +9,8 @@ module Gloss
       src_dir: "src",
       entrypoint: nil,
       strict_require: false,
-      type_checking_strictness: "strict"
+      type_checking_strictness: "strict",
+      prettify_output_executable_path: nil
     }
   )
 

data/src/lib/gloss/prog_loader.gl

@@ -23,7 +23,9 @@ module Gloss
     def run
       @files_to_process.each do |path_string|
         # currently steep would give an `unexpected jump` if next was used
-        unless @processed_files.member?(path_string) || OUTPUT_BY_PATH.[](path_string)
+        if path_string.end_with? ".rbs"
+          @type_checker.load_sig_path path_string
+        elsif !@processed_files.member?(path_string) || !OUTPUT_BY_PATH.[](path_string)
           Gloss.logger.debug "Loading #{path_string}"
           path = Utils.absolute_path(path_string)
           file_contents = File.open(path).read

data/src/lib/gloss/version.gl

@@ -1,3 +1,3 @@
 module Gloss
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/src/lib/gloss/writer.gl

@@ -21,6 +21,9 @@ module Gloss
         file.puts sb if sb
         file.puts @content
       end
+      if Config.prettify_output_executable_path
+        system Config.prettify_output_executable_path, @output_path.to_s
+      end
     end
 
     private def shebang

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloss
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - johansenja
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-12 00:00:00.000000000 Z
+date: 2021-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_blank
@@ -42,28 +42,28 @@ dependencies:
   name: rbs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: steep
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.41.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.41.0
 - !ruby/object:Gem::Dependency
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rufo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A rich language which compiles to ruby. Including type annotations, type
   checking, macros, annotations, enums and more
 email:
@@ -217,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A superset of ruby