gloss 0.0.6 → 0.1.4

data/src/lib/gloss/watcher.gl

@@ -1,13 +1,14 @@
-# frozen_string_literal: true
-
 require "listen"
 
 module Gloss
   class Watcher
+    @listener: Listen?
+
     def initialize(@paths : Array[String])
       if @paths.empty?
         @paths = [File.join(Dir.pwd, Config.src_dir)]
-        @only = /\.gl$/
+        # either any filepath with .gl extension, or executable with extension
+        @only = /(?:(\.gl|(?:(?<=\/)[^\.\/]+))\z|\A[^\.\/]+\z)/
       else
         file_names = Array.new
         paths = Array.new
@@ -23,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
@@ -33,7 +34,7 @@ module Gloss
           content = File.read(f)
           err = catch :error do
             Writer.new(
-              Builder.new(
+              Visitor.new(
                 Parser.new(
                   content
                 ).run
@@ -56,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

@@ -4,30 +4,32 @@ require "pathname"
 require "fileutils"
 
 module Gloss
-  module Utils
-    module_function
-
-    def src_path_to_output_path(src_path : String) : String
-      src_path.sub("#{Config.src_dir}/", "")
-              .sub(/\.gl$/, ".rb")
-    end
-  end
-
   class Writer
-    include Utils
-
     def initialize(
       @content,
-      src_path : String,
-      @output_path : Pathname? = Pathname.new(src_path_to_output_path(src_path))
+      @src_path : String,
+      @output_path : Pathname? = Pathname.new(
+        Utils.src_path_to_output_path(src_path)
+      )
     )
     end
 
     def run
       FileUtils.mkdir_p(@output_path.parent) unless @output_path.parent.exist?
       File.open(@output_path, "wb") do |file|
+        sb = shebang
+        file.puts sb if sb
         file.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
+      else
+        nil
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloss
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.4
 platform: ruby
 authors:
 - johansenja
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-07 00:00:00.000000000 Z
+date: 2021-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_blank
@@ -42,32 +42,32 @@ 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'
+        version: 0.41.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.41.0
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -132,8 +132,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"
@@ -159,32 +158,44 @@ files:
 - ext/gloss/src/rb_ast.cr
 - gloss.gemspec
 - lib/gloss.rb
-- lib/gloss/builder.rb
 - lib/gloss/cli.rb
 - lib/gloss/config.rb
 - lib/gloss/errors.rb
 - lib/gloss/initializer.rb
 - lib/gloss/logger.rb
 - lib/gloss/parser.rb
+- lib/gloss/prog_loader.rb
 - lib/gloss/scope.rb
 - lib/gloss/source.rb
 - lib/gloss/type_checker.rb
+- lib/gloss/utils.rb
 - lib/gloss/version.rb
+- lib/gloss/visitor.rb
 - lib/gloss/watcher.rb
 - lib/gloss/writer.rb
-- sig/gloss.rbs
+- logo.svg
+- sig/core.rbs
+- sig/fast_blank.rbs
+- sig/gls.rbs
 - sig/listen.rbs
-- src/lib/gloss/builder.gl
+- sig/optparse.rbs
+- sig/rubygems.rbs
+- sig/yaml.rbs
+- src/exe/gloss
+- src/lib/gloss.gl
 - src/lib/gloss/cli.gl
 - 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/prog_loader.gl
 - src/lib/gloss/scope.gl
 - src/lib/gloss/source.gl
 - src/lib/gloss/type_checker.gl
+- src/lib/gloss/utils.gl
 - src/lib/gloss/version.gl
+- src/lib/gloss/visitor.gl
 - src/lib/gloss/watcher.gl
 - src/lib/gloss/writer.gl
 homepage:

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-latest
-
-    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