elm-compiler 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6e604d6187008d8edbe57c58f5c50b0ae6a161e1
-  data.tar.gz: 8006d7cc87b27a3c96e996ad20ec09543f697ab1
+SHA256:
+  metadata.gz: 28756a5b0cde783ca8b032103fe8c49fe31002f4c9a5cfa1b8f2645b867f63d7
+  data.tar.gz: 16cdc3ab15baa7995c9d2446cadbc4d1e37f744749c763b57c584b3b58cceb29
 SHA512:
-  metadata.gz: 02ae3eeeeaaf8531cd45aceaec1f3a3b114b34bbeea855df3630cac43c1d6443e0e447213a9a31416a09df857e8512640c70ea7e8ad399ee3aa7006cec8d2060
-  data.tar.gz: 3320a10a805fc847cf128a73c0e84a47b86aa3b0372474777ab0d5ff6b2c1682f5a1b30426463b61ac9517de8197781f91f301859f584d89013585aa103e9a5a
+  metadata.gz: 966a4f9d92b274ba0dd678deb558174852d35c5050a6a4d49e85fdb86b28fcf382324533a3721b6067737885f0ba9114a45d7481428d0a226c75c199fe3adf1e
+  data.tar.gz: ead2697e36189e12694db5c227c69c72401b8987ab7793a2a7047e03edb2d360a74a0670cb2e6e031b5f388371101816e7e4fdb9f1c9a61b477a602a4436ebc7

data/.github/workflows/ci.yml

@@ -0,0 +1,18 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ 2.7, '3.0', '3.1' ]
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake
+

data/.gitignore

@@ -10,3 +10,6 @@
 /elm-stuff/
 /elm.js
 *.gem
+/.ruby-version
+/.ruby-gemset
+/.byebug_history

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in elm-compiler.gemspec
 gemspec
+

data/README.md

@@ -1,6 +1,6 @@
 # elm-compiler
 
-[![Build Status](https://travis-ci.org/fbonetti/ruby-elm-compiler.svg?branch=master)](https://travis-ci.org/fbonetti/ruby-elm-compiler)
+[![Build Status](https://github.com/fbonetti/ruby-elm-compiler/actions/workflows/ci.yml/badge.svg)](https://github.com/fbonetti/ruby-elm-compiler/actions/workflows/ci.yml)
 
 Ruby wrapper for the [Elm language compiler](https://github.com/elm-lang/elm-compiler).
 
@@ -28,16 +28,17 @@ Or install it yourself as:
 
 ## Usage
 
-> NOTE: Make sure [Elm](http://elm-lang.org/install) is installed. If the `elm-make` executable can't be found in the current `PATH` or via the `elm_make_path` option, the exception `Elm::Compiler::ExecutableNotFound` will be thrown.
+> NOTE: Make sure [Elm](http://elm-lang.org/install) is installed. If the `elm` executable can't be found in the current `PATH` or via the `elm_path` option, the exception `Elm::Compiler::ExecutableNotFound` will be thrown.
 
 ```ruby
-Elm::Compiler.compile(elm_files, output_path: nil, elm_make_path: nil)
+Elm::Compiler.compile(elm_files, output_path: nil, elm_path: nil, debug: false, esm: false)
 ```
 
 * `elm_files`: Accepts a single file path or an array of file paths.
 * `output_path`: Path to the output file. If left blank, the compiled Javascript will be returned as a string.
-* `elm_make_path`: Path to the `elm-make` executable. If left blank, the executable will be looked up in the current `PATH`.
-
+* `elm_path`: Path to the `elm` executable. If left blank, the executable will be looked up in the current `PATH`, if that cannot be found, it will download elm to /tmp/elm-0.19.1 and use that.
+* `debug`: Whether or not to compile in debug mode. Default is false.
+* `esm`: Whether or not to rewrite the compilation result into ESM format. Default is false. Can also be set on a global basis by `Elm::Compiler.elm = true`
 
 
 ## Examples

data/Rakefile

@@ -1,3 +1,4 @@
+require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/elm-compiler.gemspec

@@ -18,8 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.11'
-  spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.35.1'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'byebug'
 end

data/elm.json

@@ -0,0 +1,24 @@
+{
+    "type": "application",
+    "source-directories": [
+        "spec/fixtures"
+    ],
+    "elm-version": "0.19.1",
+    "dependencies": {
+        "direct": {
+            "elm/browser": "1.0.2",
+            "elm/core": "1.0.5",
+            "elm/html": "1.0.0"
+        },
+        "indirect": {
+            "elm/json": "1.1.3",
+            "elm/time": "1.0.0",
+            "elm/url": "1.0.0",
+            "elm/virtual-dom": "1.0.3"
+        }
+    },
+    "test-dependencies": {
+        "direct": {},
+        "indirect": {}
+    }
+}

data/lib/elm/compiler/version.rb

@@ -1,5 +1,5 @@
 module Elm
   class Compiler
-    VERSION = '0.3.0'
+    VERSION = '0.5.0'
   end
 end

data/lib/elm/compiler.rb

@@ -5,37 +5,78 @@ require 'tempfile'
 module Elm
   class Compiler
     class << self
-      def compile(elm_files, output_path: nil, elm_make_path: "elm-make", debug: false)
-        fail ExecutableNotFound unless elm_executable_exists?(elm_make_path)
+      attr_writer :elm_path
+      def elm_path
+        @elm_path ||= elm_from_env_path || our_elm_path
+      end
+
+      attr_accessor :esm
 
+      def compile(elm_files, output_path: nil, elm_path: self.elm_path, debug: false, esm: self.esm)
+        fail ExecutableNotFound unless elm_executable_exists?(elm_path)
         if output_path
-          elm_make(elm_make_path, elm_files, output_path, debug)
+          elm_make(elm_path, elm_files, output_path, debug, esm)
         else
-          compile_to_string(elm_make_path, elm_files, debug)
+          compile_to_string(elm_path, elm_files, debug, esm)
         end
       end
 
       private
 
-      def elm_executable_exists?(elm_make_path)
-        Open3.popen2(elm_make_path){}.nil?
-      rescue Errno::ENOENT, Errno::EACCES
-        false
-      end
-
-      def compile_to_string(elm_make_path, elm_files, debug)
+      def compile_to_string(elm_path, elm_files, debug, esm)
         Tempfile.open(['elm', '.js']) do |tempfile|
-          elm_make(elm_make_path, elm_files, tempfile.path, debug)
+          elm_make(elm_path, elm_files, tempfile.path, debug, esm)
           return File.read tempfile.path
         end
       end
 
-      def elm_make(elm_make_path, elm_files, output_path, debug)
-        args = [{"LANG" => "en_US.UTF8" }, elm_make_path, *elm_files, '--yes', '--output', output_path]
-        args << "--debug" if debug
+      def elm_make(elm_path, elm_files, output_path, debug, esm)
+        args = [
+          {"LANG" => "en_US.UTF8" },
+          elm_path,
+          "make",
+          *elm_files,
+          "--output=#{output_path}",
+          debug ? "--debug" : "--optimize",
+        ]
         Open3.popen3(*args) do |_stdin, _stdout, stderr, wait_thr|
           fail CompileError, stderr.gets(nil) if wait_thr.value.exitstatus != 0
         end
+        convert_file_to_esm!(output_path) if esm
+      end
+
+      def convert_file_to_esm!(path)
+        contents = File.read(path)
+        exports = contents[/^\s*_Platform_export\((.*)\)\;\n?\}\(this\)\)\;/, 1]
+        contents.gsub!(/\(function\s*\(scope\)\s*\{$/, '// -- \1')
+        contents.gsub!(/['"]use strict['"];$/, '// -- \1')
+        contents.gsub!(/function _Platform_export(.*?)\}\n/, '/*\n\1\n*/')
+        contents.gsub!(/function _Platform_mergeExports(.*?)\}\n\s*}/, '/*\n\1\n*/')
+        contents.gsub!(/^\s*_Platform_export\((.*)\)\;\n?}\(this\)\)\;/, '/*\n\1\n*/')
+        contents << "\nexport default #{exports};"
+        File.write(path, contents)
+      end
+
+      def elm_executable_exists?(path)
+        `#{path} --version`.strip == "0.19.1"
+      rescue
+        false
+      end
+
+      def elm_from_env_path
+        `which elm`.chomp.tap { |p| return nil if p == "" }
+      end
+
+      def our_elm_path
+        path = "/tmp/elm-0.19.1"
+        unless elm_executable_exists?(path)
+          system """
+            curl -sfLo #{path}.gz https://github.com/elm/compiler/releases/download/0.19.1/binary-for-linux-64-bit.gz
+            gunzip -f #{path}.gz
+            chmod +x #{path}
+          """
+        end
+        path
       end
     end
   end

metadata

@@ -1,71 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: elm-compiler
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Frank Bonetti
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2023-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.35.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: '0'
 description: Allows you compile Elm files and write to a file or stdout
 email:
 - frank.r.bonetti@gmail.com
@@ -73,20 +59,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/rspec
-- bin/rubocop
 - bin/setup
 - elm-compiler.gemspec
-- elm-package.json
+- elm.json
 - lib/elm-compiler.rb
 - lib/elm/compiler.rb
 - lib/elm/compiler/exceptions.rb
@@ -110,8 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for the Elm compiler

data/.rubocop.yml

@@ -1,11 +0,0 @@
-Metrics/LineLength:
-  Max: 120
-
-Style/Documentation:
-  Exclude:
-    - 'spec/**/*'
-    - 'test/**/*'
-    - 'lib/elm/compiler.rb'
-    - 'lib/elm/compiler/version.rb'
-
-

data/.travis.yml

@@ -1,11 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 2.2.3
-sudo: false
-before_install:
-  - gem install bundler -v 1.11.2
-install:
-  - bundle install
-  - npm install -g elm
-  - elm-package install --yes

data/bin/rubocop

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rubocop' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
-                                           Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rubocop', 'rubocop')

data/elm-package.json

@@ -1,15 +0,0 @@
-{
-    "version": "1.0.0",
-    "summary": "elm-package.json for rspec test suite",
-    "repository": "https://github.com/user/project.git",
-    "license": "BSD3",
-    "source-directories": [
-        "."
-    ],
-    "exposed-modules": [],
-    "dependencies": {
-        "elm-lang/core": "5.0.0 <= v < 6.0.0",
-        "elm-lang/html": "2.0.0 <= v < 3.0.0"
-    },
-    "elm-version": "0.18.0 <= v < 0.19.0"
-}