cli_options.rb in opal-0.7.0.beta1

- old
+ new
@@ -1,103 +1,149 @@
 require 'optparse'
 
 module Opal
   class CLIOptions < OptionParser
     def initialize
+      super
       @options = {}
 
-      super do |opts|
-        opts.banner = 'Usage: opal [options] -- [programfile]'
+      self.banner = 'Usage: opal [options] -- [programfile]'
 
-        opts.on('-v', '--verbose', 'print version number, then turn on verbose mode') do |v|
-          require 'opal/version'
-          puts "Opal v#{Opal::VERSION}"
-          options[:verbose] = true # TODO: print some warnings when verbose = true
-        end
+      separator ''
 
-        opts.on('--version', 'Print the version') do |v|
-          require 'opal/version'
-          puts "Opal v#{Opal::VERSION}"
-          exit
-        end
+      on('-v', '--verbose', 'print version number, then turn on verbose mode') do
+        print_version
+        options[:verbose] = true # TODO: print some warnings when verbose = true
+      end
 
-        opts.on("-h", "--help", "Show this message") do
-          puts opts
-          exit
-        end
+      on('--verbose', 'turn on verbose mode') do
+        options[:verbose] = true # TODO: print some warnings when verbose = true
+      end
 
-        opts.separator ''
-        opts.separator 'Basic Options:'
+      on('--version', 'Print the version') do
+        print_version
+        exit
+      end
 
-        opts.on('-I', '--include DIR',
-                'Append a load path (may be used more than once)') do |i|
-          options[:load_paths] ||= []
-          options[:load_paths] << i
-        end
+      on("-h", "--help", "Show this message") do
+        puts self
+        exit
+      end
 
-        opts.on('-e', '--eval SOURCE', String,
-                'One line of script. Several -e\'s allowed. Omit [programfile]') do |source|
-          options[:evals] ||= []
-          options[:evals] << source
-        end
 
-        opts.on('-r', '--require LIBRARY', String,
-                'Require the library before executing your script') do |library|
-          options[:requires] ||= []
-          options[:requires] << library
-        end
+      section 'Basic Options:'
 
-        opts.on('-s', '--sexp', 'Show Sexps') do
-          options[:sexp] = true
-        end
+      on('-I', '--include DIR',
+              'Append a load path (may be used more than once)') do |i|
+        options[:load_paths] ||= []
+        options[:load_paths] << i
+      end
 
-        opts.on('-m', '--map', 'Show sourcemap') do
-          options[:map] = true
-        end
+      on('-e', '--eval SOURCE', String,
+              'One line of script. Several -e\'s allowed. Omit [programfile]') do |source|
+        options[:evals] ||= []
+        options[:evals] << source
+      end
 
-        opts.on('-c', '--compile', 'Compile to JavaScript') do
-          options[:compile] = true
-        end
+      on('-r', '--require LIBRARY', String,
+              'Require the library before executing your script') do |library|
+        options[:requires] ||= []
+        options[:requires] << library
+      end
 
-        opts.on('-s', '--server [PORT]', 'Start a server (default port: 3000)') do |port|
-          options[:server] = port.to_i
-        end
+      on('-s', '--stub FILE', String, 'Stubbed files will be compiled as empty files') do |stub|
+        options[:stubs] ||= []
+        options[:stubs] << stub
+      end
 
+      on('-p', '--preload FILE', String, 'Preloaded files will be prepared for dynamic requires') do |stub|
+        options[:preload] ||= []
+        options[:preload] << stub
+      end
 
-        opts.separator ''
-        opts.separator 'Compilation Options:'
+      on('-g', '--gem GEM_NAME', String, 'Adds the specified GEM_NAME to Opal\'s load path.') do |g|
+        options[:gems] ||= []
+        options[:gems] << g
+      end
 
-        opts.on('-M', '--[no-]method-missing', 'Disable method missing') do |val|
-          options[:method_missing] = val
-        end
+      section 'Running Options:'
 
-        opts.on('-A', '--[no-]arity-check', 'Enable arity check') do |value|
-          options[:arity_check] = value
-        end
+      on('--sexp', 'Show Sexps') do
+        options[:sexp] = true
+      end
 
-        opts.on('-C', '--[no-]const-missing', 'Disable const missing') do |value|
-          options[:const_missing] = value
-        end
+      on('-m', '--map', 'Show sourcemap') do
+        options[:map] = true
+      end
 
-        dynamic_require_levels = %w[error warning ignore]
-        opts.on('-D', '--dynamic-require LEVEL', dynamic_require_levels,
-                      'Set levelDynamic require severity') do |level|
-          options[:dynamic_require_severity] = level.to_sym
-        end
+      on('-c', '--compile', 'Compile to JavaScript') do
+        options[:compile] = true
+      end
 
-        opts.on('-P', '--no-source-map', 'Disable source map') do |value|
-          options[:source_map_enabled] = false
-        end
+      on('--runner RUNNER', %w[nodejs server phantomjs], 'Choose the runner: nodejs (default), server') do |runner|
+        options[:runner] = runner.to_sym
+      end
 
-        opts.on('-F', '--file FILE', 'Set filename for compiled code') do |file|
-          options[:file] = file
-        end
+      on('--server-port PORT', 'Set the port for the server runner (default port: 3000)') do |port|
+        options[:runner] = :server
+        options[:port] = port.to_i
+      end
 
-        opts.on("--[no-]irb", "IRB var mode") do |flag|
-          options[:irb] = flag
-        end
+
+      section 'Compilation Options:'
+
+      on('-M', '--no-method-missing', 'Enable/Disable method missing') do
+        options[:method_missing] = false
       end
+
+      on('-O', '--no-opal', 'Enable/Disable implicit `require "opal"`') do
+        options[:skip_opal_require] = true
+      end
+
+      on('-A', '--arity-check', 'Enable arity check') do
+        options[:arity_check] = true
+      end
+
+      on('-V', 'Enable inline Operators') do
+        options[:inline_operators] = true
+      end
+
+      dynamic_require_levels = %w[error warning ignore]
+      on('-D', '--dynamic-require LEVEL', dynamic_require_levels,
+                    'Set level of dynamic require severity.',
+                    "(deafult: error, values: #{dynamic_require_levels.join(', ')})") do |level|
+        options[:dynamic_require_severity] = level.to_sym
+      end
+
+      on('-P', '--source-map [FILE]', 'Enable/Disable source map') do |file|
+        options[:source_map_enabled] = true
+        options[:source_map_file] = file if file
+      end
+
+      on('-F', '--file FILE', 'Set filename for compiled code') do |file|
+        options[:file] = file
+      end
+
+      on("--irb", "Enable IRB var mode") do
+        options[:irb] = true
+      end
+
+      separator ''
     end
 
     attr_reader :options
+
+
+    private
+
+    def print_version
+      require 'opal/version'
+      puts "Opal v#{Opal::VERSION}"
+    end
+
+    def section title
+      separator ''
+      separator title
+      separator ''
+    end
   end
 end