gloss 0.1.1 → 0.1.6

data/src/lib/gloss/watcher.gl

@@ -2,6 +2,8 @@ require "listen"
 
 module Gloss
   class Watcher
+    @listener: Listen?
+
     def initialize(@paths : Array[String])
       if @paths.empty?
         @paths = [File.join(Dir.pwd, Config.src_dir)]
@@ -22,7 +24,7 @@ module Gloss
 
     def watch
       Gloss.logger.info "Now listening for changes in #{@paths.join(', ')}"
-      listener = Listen.to(
+      @listener ||= Listen.to(
         *@paths,
         latency: 2,
         only: @only
@@ -55,12 +57,16 @@ module Gloss
         end
       end
       begin
-        listener.start
+        @listener.start
         sleep
       rescue Interrupt
-        Gloss.logger.info "Interrupt signal received, shutting down"
-        exit 0
+        kill
       end
     end
+
+    def kill
+      Gloss.logger.info "Interrupt signal received, shutting down"
+      @listener.stop if @listener
+    end
   end
 end

data/src/lib/gloss/writer.gl

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "pathname"
 require "fileutils"
 
@@ -8,28 +6,46 @@ module Gloss
     def initialize(
       @content,
       @src_path : String,
-      @output_path : Pathname? = Pathname.new(
-        Utils.src_path_to_output_path(src_path)
-      )
+      @output : Pathname | IO | NilClass = nil
     )
     end
 
     def run
-      FileUtils.mkdir_p(@output_path.parent) unless @output_path.parent.exist?
-      File.open(@output_path, "wb") do |file|
+      write_to_output do |otpt|
         sb = shebang
-        file.puts sb if sb
-        file.puts @content
+        otpt.puts sb if sb
+        otpt.puts @content
       end
     end
 
     private def shebang
-      if @output_path.executable?
-        first_line = File.open(@src_path) { |f| f.readline }
-        first_line.start_with?("#!") ? first_line : nil
+      case @output
+      when Pathname
+        if @output.executable?
+          first_line = File.open(@src_path) { |f| f.readline }
+          first_line.start_with?("#!") ? first_line : nil
+        end
       else
         nil
       end
     end
+
+    private def write_to_output(&blk)
+      case @output
+      when IO, StringIO
+        # blk.call(@output)
+        yield @output
+      else
+        output = @output || Pathname.new(Utils.src_path_to_output_path(@src_path))
+        FileUtils.mkdir_p(output.parent) unless output.parent.exist?
+        File.open(output, "wb") do |file|
+          # blk.call(file)
+          yield file
+        end
+        if Config.prettify_output_executable_path
+          system Config.prettify_output_executable_path, @output.to_s
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloss
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - johansenja
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-06 00:00:00.000000000 Z
+date: 2021-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_blank
@@ -42,24 +42,38 @@ dependencies:
   name: rbs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        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
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rufo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -132,8 +146,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".gitattributes"
-- ".github/workflows/crystal_specs.yml"
-- ".github/workflows/ruby_specs.yml"
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".gloss.yml"
 - ".rspec"
@@ -166,6 +179,7 @@ files:
 - lib/gloss/logger.rb
 - lib/gloss/parser.rb
 - lib/gloss/prog_loader.rb
+- lib/gloss/runtime.rb
 - lib/gloss/scope.rb
 - lib/gloss/source.rb
 - lib/gloss/type_checker.rb
@@ -174,6 +188,7 @@ files:
 - lib/gloss/visitor.rb
 - lib/gloss/watcher.rb
 - lib/gloss/writer.rb
+- logo.svg
 - sig/core.rbs
 - sig/fast_blank.rbs
 - sig/gls.rbs
@@ -190,6 +205,7 @@ files:
 - src/lib/gloss/logger.gl
 - src/lib/gloss/parser.gl
 - src/lib/gloss/prog_loader.gl
+- src/lib/gloss/runtime.gl
 - src/lib/gloss/scope.gl
 - src/lib/gloss/source.gl
 - src/lib/gloss/type_checker.gl

data/.github/workflows/crystal_specs.yml

@@ -1,26 +0,0 @@
-name: Crystal Specs
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-defaults:
-  run:
-    working-directory: ext/gloss
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    container:
-      image: crystallang/crystal
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install dependencies
-      run: shards install
-    - name: Run tests
-      run: crystal spec

data/.github/workflows/ruby_specs.yml

@@ -1,33 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# 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 Specs
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  test:
-
-    runs-on: ubuntu-20.04
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@21351ecc0a7c196081abca5dc55b08f085efe09a
-      with:
-        ruby-version: 2.7
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake build && bundle exec rake spec