Now building a stand alone escript.

bryanjos · bryanjos · commit bc2ce14fc3d2 · 2015-04-03T16:12:04.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,6 @@ erl_crash.dump
 *.ez
 ex2js
 node_modules
-priv/test_project/dest
+priv/test_project/dest
+/dist
+deploy.sh
diff --git a/README.md b/README.md
@@ -25,10 +25,11 @@ Clone the repo
 Get dependencies
 
     mix deps.get
+    npm install
 
 Compile
 
-    mix compile (runs npm install if node_modules/escodegen is not present)
+    mix compile
 
 Test
 
@@ -38,18 +39,24 @@ To build the escript
 
     mix escript.build
 
+To build distributable tarball
 
-Usage
-===
+    mix ex2js.dist
 
-Add the following to your dependencies:
+    `ex2js-version-tar.gz` will be in the `dist` folder
+
+Installation
+==============
+
+* uncompress `ex2js.tar.gz`.
+* use `ex2js` executable found in the uncompressed folder
 
-    { :ex_to_js, github: "bryanjos/ex_to_js"}
-    
-You can use the included mix task to convert Elixir to JavaScript
+
+Usage
+===
 
 ```
-$ mix ex2js -h
+$ ex2js -h
   usage: ex2js <input> [options]
 
   <input> path to elixir files or 
@@ -60,11 +67,11 @@ $ mix ex2js -h
   -o  --output [path]   places output at the given path
   -t  --ast             shows only produced spider monkey ast
   -ex --elixir          read input as elixir code string
+  -st --stdio           reads from stdio
+      --lib             writes the standard lib js to standard out
   -h  --help            this message
 ```
 
-Alternatively, you can clone the repo, do `mix escript.build` and use the created `ex2js` escript without mix
-
 #Current Limitations (Most if not all of these will be lifted as development goes on)
 
   * No pattern matching
diff --git a/lib/ex_to_js.ex b/lib/ex_to_js.ex
@@ -68,14 +68,9 @@ defmodule ExToJS do
   def javascript_ast_to_code(js_ast) do
     js_ast = Poison.encode!(js_ast)
 
-    path = try do
-      Mix.Project.build_path <> "/lib/ex_to_js/priv/escodegen"
-    rescue
-      UndefinedFunctionError ->
-        System.cwd <> "/_build/dev/lib/ex_to_js/priv/escodegen"
-    end
+    path = "#{operating_path}/alphonse.js"
 
-    case System.cmd(path, [js_ast]) do
+    case System.cmd("node", [path, js_ast]) do
       {js_code, 0} ->
         {:ok, js_code }
       {error, _} ->
@@ -104,4 +99,16 @@ defmodule ExToJS do
 
     File.write!(file_name, js)
   end
+
+
+  def operating_path() do
+    try do
+      Mix.Project.build_path <> "/lib/ex_to_js/priv"
+    rescue
+      UndefinedFunctionError ->
+        split_path = Path.split(Application.app_dir(:ex2js))
+        replaced_path = List.delete_at(split_path, length(split_path) - 1)
+        Path.join(replaced_path)
+    end
+  end
 end
diff --git a/lib/ex_to_js/cli.ex b/lib/ex_to_js/cli.ex
@@ -6,13 +6,14 @@ defmodule ExToJS.CLI do
   end
 
   def parse_args(args) do
-    switches = [ output: :binary, ast: :boolean, elixir: :boolean, stdio: :boolean ]
+    switches = [ output: :binary, ast: :boolean, elixir: :boolean, stdio: :boolean, lib: :boolean]
     aliases = [ o: :output, t: :ast, ex: :elixir, st: :stdio ]
     
     parse = OptionParser.parse(args, switches: switches, aliases: aliases)
 
     case parse do
       { [stdio: true] , _ , _ } -> {:stdio}
+      { [lib: true] , _ , _ } -> {:lib}
       { [ output: output, ast: true, elixir: true], [input], _ } -> { input, output, :ast, :elixir}
       { [ output: output, ast: true], [input], _ } -> { input, output, :ast }
       { [ast: true, elixir: true] , [input], _ } -> { input, :ast, :elixir }
@@ -86,6 +87,13 @@ defmodule ExToJS.CLI do
     end)
   end
 
+  def process({ :lib }) do
+    path = ExToJS.operating_path
+
+    file = File.read!("#{path}/elixir.js")
+    IO.write(file)
+  end
+
   def process({ input }) do
     input 
     |> ExToJS.parse_elixir_files 
@@ -108,6 +116,7 @@ defmodule ExToJS.CLI do
       -t  --ast             shows only produced spider monkey ast
       -ex --elixir          read input as elixir code string
       -st --stdio           reads from stdio
+          --lib             writes the standard lib js to standard out
       -h  --help            this message
     """
   end
diff --git a/lib/mix/tasks/compile.npm.ex b/lib/mix/tasks/compile.npm.ex
diff --git a/lib/mix/tasks/ex2js.dist.ex b/lib/mix/tasks/ex2js.dist.ex
@@ -0,0 +1,37 @@
+defmodule Mix.Tasks.Ex2js.Dist do
+  use Mix.Task
+  
+   @shortdoc "Builds a release for ex2js"
+
+  def run(args) do
+    Mix.Task.run "app.start"
+
+    dist_folder = "dist"
+    folder_name = "#{dist_folder}/ex2js"
+
+    version = Mix.Project.config[:version]
+    archive_file_name = "#{dist_folder}/ex2js.tar.gz"
+
+    if File.exists?(dist_folder) do
+      File.rm_rf(dist_folder)
+    end
+
+    Mix.Tasks.Escript.Build.run([])
+
+    File.mkdir_p(folder_name)
+    File.cp!("priv/ex2js", "#{folder_name}/ex2js")
+    File.cp!("priv/alphonse.js", "#{folder_name}/alphonse.js")
+    File.cp_r!("node_modules", "#{folder_name}/node_modules")
+    File.cp!("package.json", "#{folder_name}/package.json")
+
+    elixirjs_std_lib = Enum.reduce(Path.wildcard("priv/includes/*.js"), "", fn(x, concat) ->
+      concat <> "\n" <> File.read!(x)
+    end)
+
+    File.write!("#{folder_name}/elixir.js", elixirjs_std_lib)
+
+    System.cmd("tar", ["czf", archive_file_name, folder_name])
+
+    File.rm_rf(folder_name)
+  end
+end
diff --git a/mix.exs b/mix.exs
@@ -5,7 +5,7 @@ defmodule ExToJS.Mixfile do
     [app: :ex_to_js,
      version: "0.1.0",
      elixir: "~> 1.0",
-     compilers: Mix.compilers ++ [:ex2js],
+     compilers: Mix.compilers,
      escript: escript_config,
      deps: deps,
      description: description,
diff --git a/mix.lock b/mix.lock
@@ -1,4 +1,5 @@
 %{"elixir_v8": {:git, "git://github.com/le0pard/elixir_v8.git", "2817de7179e247c279d0fb76a00e976c8d0bcdad", []},
+  "erlang_js": {:git, "git://github.com/basho/erlang_js.git", "07467d899ab90a2b719ad19ab0be0048c1c8d873", [tag: "1.3.0"]},
   "erlang_v8": {:git, "git://github.com/strange/erlang-v8.git", "1ca13321d5746f3ec20f0c0bfd2bcc8293db71da", []},
   "estree": {:git, "git://github.com/bryanjos/elixir-estree.git", "c69dc94d23c41647cf33a6236638abd845cf1c48", []},
   "exjsx": {:git, "git://github.com/talentdeficit/jsex.git", "d3572b488f10e3b83fadb1fc595fc87f84c35809", []},
diff --git a/priv/alphonse.js b/priv/alphonse.js
@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 var escodegen = require('escodegen');
 var args = process.argv.slice(2);
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`%{"elixir_v8": {:git, "git://github.com/le0pard/elixir_v8.git", "2817de7179e247c279d0fb76a00e976c8d0bcdad", []},`
	`2`	`+ "erlang_js": {:git, "git://github.com/basho/erlang_js.git", "07467d899ab90a2b719ad19ab0be0048c1c8d873", [tag: "1.3.0"]},`
`2`	`3`	`"erlang_v8": {:git, "git://github.com/strange/erlang-v8.git", "1ca13321d5746f3ec20f0c0bfd2bcc8293db71da", []},`
`3`	`4`	`"estree": {:git, "git://github.com/bryanjos/elixir-estree.git", "c69dc94d23c41647cf33a6236638abd845cf1c48", []},`
`4`	`5`	`"exjsx": {:git, "git://github.com/talentdeficit/jsex.git", "d3572b488f10e3b83fadb1fc595fc87f84c35809", []},`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#!/usr/bin/env node`
`2`	`1`	`var escodegen = require('escodegen');`
`3`	`2`	`var args = process.argv.slice(2);`
`4`	`3`