opal 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c3f8f806c3ccc492181271b934421d199875687
-  data.tar.gz: 1793e3beab6345556bcb5d9255cbf0bbf6463f68
+  metadata.gz: fba7810f4091cf5497c1e42b55e04b1615b673b7
+  data.tar.gz: a6ba9289a9179285267f449cbc6fe0a6bbed0d54
 SHA512:
-  metadata.gz: 1d3c05b2ef2434e3056b58981e4851964e207d92a5936914e1a54d73f04be7fe9651d43981dd5596c6b6244d3b652395af4cd99944c302d83b385cecfa6e2806
-  data.tar.gz: a2a98bee95fceb779251cd2cea489fac101aa936e32ff3bccb9395056c4e848c5b5c7907a6648970f0e4fc3658dd3853bf28bdf5ceb7692eda825247511f5182
+  metadata.gz: aac7dfdf749778ea7385c0d798636c99f1af6ab3b8f614249265756f521f8765e9eca88adaf11791dabb1ef9ddbbb03f3dbabf3278d26c01961444150926ac1d
+  data.tar.gz: 5bbecad1ba6817cae8cf57eab950444f083ce10abe5450751420ba5ebfcdc66eecad651fa955d9678ea95d1896a56deb1ffd4a163b6ef9be54f8e3f29b1c88cc

data/README.md

@@ -1,8 +1,8 @@
 # Opal
 
-[![Build Status](https://secure.travis-ci.org/opal/opal.png?branch=master)](http://travis-ci.org/opal/opal)
-[![Gem Version](https://badge.fury.io/rb/opal.png)](http://badge.fury.io/rb/opal)
-[![Code Climate](https://codeclimate.com/github/opal/opal.png)](https://codeclimate.com/github/opal/opal)
+[![Build Status](https://secure.travis-ci.org/opal/opal.svg?branch=master)](http://travis-ci.org/opal/opal)
+[![Gem Version](https://badge.fury.io/rb/opal.svg)](http://badge.fury.io/rb/opal)
+[![Code Climate](http://img.shields.io/codeclimate/github/opal/opal.svg)](https://codeclimate.com/github/opal/opal)
 
 Opal is a ruby to javascript source-to-source compiler. It also has an
 implementation of the ruby corelib.
@@ -166,8 +166,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/opal/opal/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-
 [phantomjs]: http://phantomjs.org
 [spectator]: https://github.com/elia/spectator#readme
 [MSpec]: https://github.com/rubyspec/mspec#readme

data/Rakefile

@@ -10,11 +10,15 @@ RSpec::Core::RakeTask.new(:rspec) do |t|
 end
 
 require 'mspec/opal/rake_task'
-MSpec::Opal::RakeTask.new(:mspec)
+MSpec::Opal::RakeTask.new(:mspec) do |config|
+  config.pattern = ENV['MSPEC_PATTERN'] if ENV['MSPEC_PATTERN']
+  config.basedir = ENV['MSPEC_BASEDIR'] if ENV['MSPEC_BASEDIR']
+end
 
 task :default => [:rspec, :mspec]
 
 
+require 'opal/version'
 desc <<-DESC
 Build *corelib* and *stdlib* to "build/"
 
@@ -22,6 +26,7 @@ You can restrict the file list with the FILES env var (comma separated)
 and the destination dir with the DIR env var.
 
 Example: rake dist DIR=/tmp/foo FILES='opal.rb,base64.rb'
+Example: rake dist DIR=cdn/opal/#{Opal::VERSION}
 DESC
 task :dist do
   require 'opal/util'

data/bin/opal

@@ -4,16 +4,22 @@ require 'opal/cli_options'
 options = Opal::CLIOptions.new
 options.parse!
 
-require 'opal/cli'
 
 if ARGV.empty? and !options.options[:evals]
-  puts options
-else
-  cli = Opal::CLI.new options.options.merge(:filename => ARGV.first)
-  begin
-    cli.run
-  rescue Opal::CLI::MissingNodeJS => e
-    $stderr.puts e.message
-    exit 127
+  if options.options[:verbose]
+    exit
+  else
+    options.options[:evals] ||= []
+    options.options[:evals] << gets(nil)
   end
 end
+
+require 'opal/cli'
+cli = Opal::CLI.new options.options.merge(:filename => ARGV.first)
+
+begin
+  cli.run
+rescue Opal::CLI::MissingNodeJS => e
+  $stderr.puts e.message
+  exit 127
+end

data/lib/mspec/opal/rake_task.rb

@@ -24,7 +24,7 @@ require 'webrick'
 
 module MSpec
   module Opal
-    DEFAULT_PATTERN = 'spec/opal/{parser,core,compiler,stdlib}/**/*_spec.rb'
+    DEFAULT_PATTERN = 'spec/{corelib,opal,stdlib}/**/*_spec.rb'
     DEFAULT_BASEDIR = 'spec'
 
     require 'rake'
@@ -84,13 +84,26 @@ module MSpec
         server.kill
       end
 
-      def start_phantomjs
+      require 'opal/util'
+      class PhantomJS < ::Opal::Util::Command
         require 'shellwords'
+
+        def initialize(runner, url)
+          runner = runner.shellescape
+          url    = url.shellescape
+          super 'phantomjs', "#{runner} #{url}", '. Please install PhantomJS'
+        end
+
+        def run
+          system "#{command} #{options}"
+        end
+      end
+
+      def start_phantomjs
         runner  = File.expand_path('../sprockets.js', __FILE__).shellescape
         url     = "http://localhost:#{port}/".shellescape
-        command = %Q{phantomjs #{runner} #{url}}
-
-        @passed = system command
+        command = PhantomJS.new(runner, url)
+        @passed = command.run
       end
 
       def start_server
@@ -108,7 +121,7 @@ module MSpec
         ::Opal::Processor.arity_check_enabled = true
         ::Opal::Processor.dynamic_require_severity = :ignore
         super()
-        @pattern = pattern || DEFAULT_PATTERN
+        @pattern = pattern
         @basedir = basedir = File.expand_path(basedir || DEFAULT_BASEDIR)
         append_path basedir
         use_gem 'mspec'
@@ -117,7 +130,7 @@ module MSpec
           ::Opal::Processor.stub_file asset
         end
 
-        ENV['OPAL_SPEC'] = files_to_run(pattern).join(',')
+        ENV['OPAL_SPEC'] ||= files_to_run(pattern).join(',')
       end
 
       def stubs
@@ -147,6 +160,7 @@ module MSpec
       end
 
       def add_files specs
+        puts "Adding #{specs.size} spec files..."
         files.concat specs.flatten
       end
 
@@ -176,20 +190,26 @@ module MSpec
       end
 
       def rubyspec_white_list
-        File.read("#{basedir}/rubyspecs").split("\n").map do |line|
-          line.sub(/#.*/, '').strip
-        end.reject(&:empty?)
+        File.read("#{basedir}/rubyspecs").split("\n").reject do |line|
+          line.sub(/#.*/, '').strip.empty?
+        end
       end
 
       def files_to_run(pattern=nil)
         # add any filters in spec/filters of specs we dont want to run
         add_files paths_from_glob("#{basedir}/filters/**/*.rb")
 
-        # add custom opal specs from spec/
-        add_files paths_from_glob(pattern) if pattern
+        if pattern
+          # add custom opal specs from spec/
+          add_files paths_from_glob(pattern) & rubyspec_paths
 
-        # add any rubyspecs we want to run (defined in spec/rubyspecs)
-        add_files rubyspec_paths
+        else
+          # add opal specific specs
+          add_files paths_from_glob("#{basedir}/{opal}/**/*_spec.rb")
+
+          # add any rubyspecs we want to run (defined in spec/rubyspecs)
+          add_files rubyspec_paths
+        end
       end
 
       def build_specs file = "#{basedir}/build/specs.js"
@@ -204,7 +224,7 @@ module MSpec
       attr_accessor :pattern, :basedir
 
       def initialize
-        self.pattern = DEFAULT_PATTERN
+        self.pattern = nil
         self.basedir = DEFAULT_BASEDIR
 
         yield(self) if block_given?

data/lib/opal/builder.rb

@@ -1,5 +1,6 @@
 require 'opal/compiler'
 require 'erb'
+require 'pathname'
 
 module Opal
   class Builder
@@ -44,6 +45,8 @@ module Opal
     end
 
     def find_asset(path)
+      return path if Pathname(path).absolute?
+
       path.untaint if path =~ /\A(\w[-.\w]*\/?)+\Z/
       file_types = %w[.rb .js .js.erb]
 

data/lib/opal/cli.rb

@@ -170,8 +170,8 @@ module Opal
     ##
     # OUTPUT
 
-    def puts *args
-      output.puts *args
+    def puts(*args)
+      output.puts(*args)
     end
 
     ##

data/lib/opal/cli_options.rb

@@ -8,7 +8,13 @@ module Opal
       super do |opts|
         opts.banner = 'Usage: opal [options] -- [programfile]'
 
-        opts.on('-v', '--version', 'Display Opal Version') do |v|
+        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
+
+        opts.on('--version', 'Print the version') do |v|
           require 'opal/version'
           puts "Opal v#{Opal::VERSION}"
           exit

data/lib/opal/nodes/base.rb

@@ -37,7 +37,7 @@ module Opal
       end
 
       def compile_to_fragments
-        return @fragments if @fragments
+        return @fragments if defined?(@fragments)
 
         @fragments = []
         self.compile

data/lib/opal/nodes/scope.rb

@@ -43,6 +43,7 @@ module Opal
         @queue    = []
         @unique   = 'a'
         @while_stack = []
+        @identity = nil
 
         @methods = []
 

data/lib/opal/util.rb

@@ -14,22 +14,12 @@ module Opal
       gzip.digest(str)
     end
 
-
-    class DigestSourceCommand
-      def initialize(command, options, message)
+    class Command
+      def initialize(command, options, message = nil)
         @command, @options, @message = command, options, message
-      end
-      attr_reader :command, :options, :message
-
-      def digest(source)
         return unless command_installed? command, message
-        IO.popen("#{command} #{options} #{hide_stderr}", 'r+') do |i|
-          i.puts source
-          i.close_write
-          i.read
-        end
       end
-
+      attr_reader :command, :options, :message
 
       private
 
@@ -54,11 +44,21 @@ module Opal
 
       INSTALLED = {}
       def command_installed?(cmd, install_comment)
-        command_installed = INSTALLED[cmd.to_s] ||= which(cmd)
+        command_installed = Command::INSTALLED[cmd.to_s] ||= which(cmd)
         $stderr.puts %Q("#{cmd}" command not found#{install_comment}) unless command_installed
         command_installed
       end
     end
 
+    class DigestSourceCommand < Command
+      def digest(source)
+        IO.popen("#{command} #{options} #{hide_stderr}", 'r+') do |i|
+          i.puts source
+          i.close_write
+          i.read
+        end
+      end
+    end
+
   end
 end

data/lib/opal/version.rb

@@ -1,3 +1,3 @@
 module Opal
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/opal.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'racc'
   s.add_development_dependency 'rspec', '~> 2.14'
   s.add_development_dependency 'octokit', '~> 2.4.0'
+  s.add_development_dependency 'bundler', '~> 1.6'
 end

data/opal/corelib/hash.rb

@@ -25,6 +25,7 @@ class Hash
       self.none = (defaults === undefined ? nil : defaults);
       self.proc = block;
     }
+    self
   end
 
   def ==(other)

data/opal/corelib/range.rb

@@ -25,16 +25,11 @@ class Range
     }
   end
 
-  # FIXME: currently hardcoded to assume range holds numerics
-  def ===(obj)
-    include?(obj)
-  end
-
-  def cover?(value)
+  def ===(value)
     @begin <= value && (@exclude ? value < @end : value <= @end)
   end
 
-  alias last end
+  alias :cover? :===
 
   def each(&block)
     return enum_for :each unless block_given?
@@ -65,12 +60,11 @@ class Range
     @exclude
   end
 
-  alias first begin
+  alias :first :begin
 
-  # FIXME: currently hardcoded to assume range holds numerics
-  def include?(obj)
-    cover?(obj)
-  end
+  alias :include? :cover?
+
+  alias :last :end
 
   # FIXME: currently hardcoded to assume range holds numerics
   def max
@@ -81,6 +75,8 @@ class Range
     end
   end
 
+  alias :member? :cover?
+
   def min
     if block_given?
       super
@@ -91,6 +87,19 @@ class Range
 
   alias member? include?
 
+  def size
+    _begin = @begin
+    _end   = @end
+    _end  -= 1 if @exclude
+
+    return nil unless Numeric === _begin && Numeric === _end
+    return 0 if _end < _begin
+    infinity = Float::INFINITY
+    return infinity if infinity == _begin.abs || _end.abs == infinity
+
+    (`Math.abs(_end - _begin) + 1`).to_i
+  end
+
   def step(n = 1)
     raise NotImplementedError
   end

data/spec/filters/bugs/time.rb

@@ -169,4 +169,9 @@ opal_filter "Time" do
   fails "Time#wday returns an integer representing the day of the week, 0..6, with Sunday being 0"
 
   fails "Time#year returns the four digit year for a UTC Time as an Integer"
+
+  # The following specs fail under certain TZ / DST conditions
+  fails "Time.utc accepts various year ranges"
+  fails "Time.gm accepts various year ranges"
+
 end

data/spec/opal/core/language/predefined_spec.rb

@@ -71,7 +71,7 @@ describe "The predefined global constants" do
 
   it "includes RUBY_VERSION" do
     Object.const_defined?(:RUBY_VERSION).should == true
-    RUBY_VERSION.should == "2.0.0"
+    RUBY_VERSION.should == "2.1.1"
   end
 
   it "includes RUBY_RELEASE_DATE" do

data/spec/rubyspecs

@@ -47,6 +47,7 @@ corelib/core/matchdata/to_a_spec
 
 corelib/core/range/begin_spec
 corelib/core/range/end_spec
+corelib/core/range/size_spec
 
 corelib/core/string/allocate_spec
 corelib/core/string/append_spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Adam Beynon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: source_map
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 description: Ruby runtime and core library for javascript.
 email: adam.beynon@gmail.com
 executables: