opal 0.10.0.rc2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efe75eb88b3f7d58767522527d4af500973e1f14
-  data.tar.gz: a78f99088a2b56b305e27f97b415405b5e4bf3cb
+  metadata.gz: 992ac16e12c48dbaef85eb0de3bd6077fa0859cf
+  data.tar.gz: 8245d6ef34cc2555d0d23a505f35c5a6215162ae
 SHA512:
-  metadata.gz: 9cdf2ece6b3eaf88bb4704cc49db8c8cf3d2cc06f4e609365bf316becde8769eb52dfe4e06d68ecb08faabc5db51c2f93f06adfec209cee901581e9ed2b24303
-  data.tar.gz: c72519167eeca7eda52d339d3df9b8092ea885304f93d20a4a921f8c0b53cc774d0900e943b8deab4c14d571dac15eae25db5bb066d31f619296d97042aaddf3
+  metadata.gz: a2e595513e93d7a7ddec468dcb3ae4ebadee844d042419f80403669b0e2047f8a54a00b736e9fa3408fac685df0f3aaf6894a4f816d814c914708fda00f546e8
+  data.tar.gz: 168be2c9aa3823a6ad810892e3408314bfe538bc776004bc33c8239f6dcfce25ef72e63563fa869347c56ff70809c924e151aca3102a58e9ea3e4bc08aaa1213

data/.travis.yml

@@ -11,26 +11,26 @@ matrix:
   fast_finish: true
 
   include:
-    - rvm: 2.3.0
+    - rvm: 2.3.1
       env: RUN=jshint SUITE=core
 
-    - rvm: 2.3.0
+    - rvm: 2.3.1
       env: RUN=jshint SUITE=stdlib
 
-    - rvm: 2.3.0
+    - rvm: 2.3.1
       env: RUN=mspec_opal_nodejs
 
-    - rvm: 2.3.0
+    - rvm: 2.3.1
       env: RUN=mspec_ruby_nodejs TZ="/usr/share/zoneinfo/Pacific/Fiji"
 
-    - rvm: 2.3.0
+    - rvm: 2.3.1
       env: RUN=mspec_ruby_sprockets_phantomjs
 
-    - rvm: 2.3.0
+    - rvm: 2.3.1
       env: RUN=minitest
 
-    - rvm: 2.3.0
-      env: RUN=rspec RACK_VERSION='2.0.0.alpha' CHECK_COVERAGE=true
+    - rvm: 2.3.1
+      env: RUN=rspec RACK_VERSION='~> 2.0.0' CHECK_COVERAGE=true
 
     - rvm: ruby-head
       env: RUN=rspec
@@ -38,11 +38,11 @@ matrix:
     - rvm: 2.2.4
       env: RUN=rspec TILT_VERSION=2.0.1
 
-    - rvm: 2.1.8
-      env: RUN=rspec
+    - rvm: 2.1.10
+      env: RUN=rspec RACK_VERSION='< 2.0'
 
     - rvm: 2.0.0
-      env: RUN="rspec mspec_opal_nodejs"
+      env: RUN="rspec mspec_opal_nodejs" RACK_VERSION='< 2.0'
 
     - rvm: rbx
       env: RUN=rspec

data/CHANGELOG.md

@@ -21,7 +21,7 @@ Whitespace conventions:
 
 
 
-## [0.10.0] - Unreleased
+## [0.10.0] - 2016-07-04
 
 
 ### Added
@@ -123,6 +123,7 @@ Whitespace conventions:
 - Fixed method definition in method body.
 - Partially implemented `Marshal.load`/`Marshal.dump`. In order to use it require `opal/full`.
 - Fixed docs for Compiled Ruby - Native section. Rename opal variable to win since window was causing error
+- Fixed the `--map` option, now correclty outputs the sourcemap as json
 
 
 ### Removed

data/lib/opal/cli.rb

@@ -36,6 +36,7 @@ module Opal
       @compile     = !!options.delete(:compile)
       @sexp        = options.delete(:sexp)
       @file        = options.delete(:file)
+      @map         = options.delete(:map)
       @no_exit     = options.delete(:no_exit)
       @lib_only    = options.delete(:lib_only)
       @argv        = options.delete(:argv)       || []
@@ -66,6 +67,7 @@ module Opal
 
     def run
       case
+      when @map;     show_source_map
       when sexp?;    show_sexp
       when compile?; show_compiled_source
       else           run_code
@@ -132,10 +134,12 @@ module Opal
       end
     end
 
-    def map
-      compiler = Opal::Compiler.compile(file.read, options.merge(:file => file.path))
-      compiler.compile
-      compiler.source_map
+    def show_source_map
+      evals_or_file do |contents, filename|
+        compiler = Opal::Compiler.new(contents, options.merge(file: filename))
+        compiler.compile
+        puts compiler.source_map.to_json
+      end
     end
 
     def compiler_option_names

data/lib/opal/source_map.rb

@@ -60,6 +60,10 @@ module Opal
       map.as_json
     end
 
+    def to_json
+      map.as_json
+    end
+
     def to_s
       map.to_s
     end

data/lib/opal/version.rb

@@ -1,5 +1,5 @@
 module Opal
   # WHEN RELEASING:
   # Remember to update RUBY_ENGINE_VERSION in opal/corelib/constants.rb too!
-  VERSION = '0.10.0.rc2'
+  VERSION = '0.10.0'
 end

data/opal/corelib/constants.rb

@@ -1,8 +1,8 @@
 RUBY_PLATFORM       = 'opal'
 RUBY_ENGINE         = 'opal'
 RUBY_VERSION        = '2.2.3'
-RUBY_ENGINE_VERSION = '0.10.0.rc2'
-RUBY_RELEASE_DATE   = '2016-06-21'
+RUBY_ENGINE_VERSION = '0.10.0'
+RUBY_RELEASE_DATE   = '2016-07-04'
 RUBY_PATCHLEVEL     = 0
 RUBY_REVISION       = 0
 RUBY_COPYRIGHT      = 'opal - Copyright (C) 2013-2015 Adam Beynon'

data/spec/lib/cli_spec.rb

@@ -180,6 +180,16 @@ describe Opal::CLI do
     end
   end
 
+  describe ':map option' do
+    let(:options)  { {:map => true, :evals => ['foo']} }
+
+    it 'sets the verbose flag (currently unused)' do
+      expect_output_of{ subject.run }.to include(%{"version"=>3})
+    end
+  end
+
+
+
 
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal
 version: !ruby/object:Gem::Version
-  version: 0.10.0.rc2
+  version: 0.10.0
 platform: ruby
 authors:
 - Adam Beynon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sourcemap
@@ -1151,9 +1151,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.4