opal · Apr 10, 2014 · Apr 10, 2014 · Apr 10, 2014
Showing with 82 additions and 14 deletions.

+5 −0 CHANGELOG.md

+1 −1 bin/opal

+70 −7 bin/opal-build

+2 −2 lib/opal/cli.rb

+4 −4 opal.gemspec
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## edge
 
+*   Add `opal-build` command utility to easily build libraries to js
+
+*   Add `opal-repl` to gemspec executables,
+    previously was only available by using Opal from source
+
 *   Fix parsing `=>` in hash literals where it would sometimes incorrectly
     parse as a key name.
 

diff --git a/bin/opal b/bin/opal
@@ -12,7 +12,7 @@ else
   cli = Opal::CLI.new options.options.merge(:filename => ARGV.first)
   begin
     cli.run
-  rescue Opal::CLI::MissingNode => e
+  rescue Opal::CLI::MissingNodeJS => e
     $stderr.puts e.message
     exit 127
   end

diff --git a/bin/opal-build b/bin/opal-build
@@ -1,14 +1,77 @@
 #!/usr/bin/env ruby
 
-require 'opal'
+require 'optparse'
 
-if ARGV.first == '--gem'
-  gem_name = ARGV[1]
+module Opal
+  class BuilderOptions < OptionParser
+    def initialize
+      @options = {}
 
-  require 'rubygems'
-  Opal.use_gem gem_name
+      super do |opts|
+        opts.banner = 'Usage: opal-build [options] -- [libname]'
+
+        opts.separator ''
+        opts.separator 'Options:'
+
+        opts.on("-h", "--help", "Show this message") do
+          puts opts
+          exit
+        end
+
+        opts.on('-g', '--gem GEM_NAME', String,
+                'Adds the specified GEM_NAME to Opal\'s load path.',
+                'E.g.: opal-build --require opal-browser browser`',
+                'Will build browser.rb from the Opal gem opal-browser') do |g|
+          options[:gems] ||= []
+          options[:gems] << g
+        end
+
+        opts.on('-s', '--stub STUB', String) do |stub|
+          options[:stubs] ||= []
+          options[:stubs] << stub
+        end
+
+        opts.on('-r', '--require LIBRARY', String,
+                'Require the library before executing your script',
+                'E.g.: opal-build --require opal-browser browser`',
+                'Will build browser.rb from the Opal gem opal-browser') do |library|
+          options[:requires] ||= []
+          options[:requires] << library
+        end
+
+        opts.on('-o', '--output FILE', String,
+                'Write the built lib to a file (defaults to STDOUT)') do |file|
+          options[:output] = file
+        end
+      end
+    end
+
+    attr_reader :options
+  end
+end
+
+option_parser = Opal::BuilderOptions.new
+option_parser.parse!
+
+if ARGV.empty?
+  puts options
+else
+  require 'opal'
+  options = option_parser.options
+
+  if options[:gems]
+    require 'rubygems'
+    options[:gems].each { |gem_name| Opal.use_gem gem_name }
+  end
+
+  if options[:requires]
+    options[:requires].each { |required_lib| require required_lib }
+  end
+
+  lib_name = ARGV.first
+
+  output = options[:output] ? File.open(options[:output], 'w') : $stdout
+  output.puts Opal::Builder.build(lib_name.dup.untaint)
 end
 
-require_file = ARGV[1..-1].last || gem_name.dup.untaint.gsub('-','/')
-puts Opal::Builder.build require_file
 
diff --git a/lib/opal/cli.rb b/lib/opal/cli.rb
@@ -76,7 +76,7 @@ def run_with_node(code)
       begin
         stdin, stdout, stderr = Open3.popen3('node')
       rescue Errno::ENOENT
-        raise MissingNode, 'Please install Node.js to be able to run Opal scripts.'
+        raise MissingNodeJS, 'Please install Node.js to be able to run Opal scripts.'
       end
 
       stdin.write code
@@ -88,7 +88,7 @@ def run_with_node(code)
       end
     end
 
-    class MissingNode < StandardError
+    class MissingNodeJS < StandardError
     end
 
     def start_server

diff --git a/opal.gemspec b/opal.gemspec
@@ -13,10 +13,10 @@ Gem::Specification.new do |s|
   s.description  = 'Ruby runtime and core library for javascript.'
   s.license      = 'MIT'
 
-  s.files          = `git ls-files`.split("\n")
-  s.executables    = ['opal']
-  s.test_files     = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.require_paths  = ['lib']
+  s.files         = `git ls-files`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = ['lib']
 
   s.add_dependency 'source_map'
   s.add_dependency 'sprockets'