opal · Apr 21, 2014 · Apr 21, 2014 · Apr 21, 2014 · Apr 21, 2014 · Apr 21, 2014
Showing with 72 additions and 37 deletions.

+4 −1 Rakefile

+25 −10 lib/mspec/opal/rake_task.rb

+14 −14 lib/opal/util.rb

+1 −0 opal.gemspec

+1 −0 opal/corelib/hash.rb

+21 −12 opal/corelib/range.rb

+5 −0 spec/filters/bugs/time.rb

+1 −0 spec/rubyspecs
diff --git a/Rakefile b/Rakefile
@@ -10,7 +10,10 @@ 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]
 

diff --git a/lib/mspec/opal/rake_task.rb b/lib/mspec/opal/rake_task.rb
@@ -84,13 +84,26 @@ def stop_server
         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
@@ -117,7 +130,7 @@ def initialize(basedir = nil, pattern = nil)
           ::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
@@ -185,11 +198,13 @@ 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
-
-        # add any rubyspecs we want to run (defined in spec/rubyspecs)
-        add_files rubyspec_paths
+        if pattern
+          # add custom opal specs from spec/
+          add_files paths_from_glob(pattern)
+        else
+          # 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"

diff --git a/lib/opal/util.rb b/lib/opal/util.rb
@@ -14,22 +14,12 @@ def gzip(str)
       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 @@ def which(cmd)
 
       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
diff --git a/opal.gemspec b/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
diff --git a/opal/corelib/hash.rb b/opal/corelib/hash.rb
@@ -25,6 +25,7 @@ def initialize(defaults = undefined, &block)
       self.none = (defaults === undefined ? nil : defaults);
       self.proc = block;
     }
+    self
   end
 
   def ==(other)

diff --git a/opal/corelib/range.rb b/opal/corelib/range.rb
@@ -25,16 +25,11 @@ def ==(other)
     }
   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 @@ def exclude_end?
     @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 @@ def max
     end
   end
 
+  alias :member? :cover?
+
   def min
     if block_given?
       super
@@ -91,6 +87,19 @@ def min
 
   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

diff --git a/spec/filters/bugs/time.rb b/spec/filters/bugs/time.rb
@@ -169,4 +169,9 @@
   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
diff --git a/spec/rubyspecs b/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