Merge remote-tracking branch 'origin' into mcjit

rubinius · Jan 25, 2016 · 0699fba · 0699fba
2 parents bab0934 + fa397f8
commit 0699fba
Show file tree

Hide file tree

Showing 101 changed files with 1,496 additions and 368 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,12 +3,15 @@ sudo: required
 dist: trusty
 compiler:
 - clang
+os:
+- linux
+- osx
+ruby: 2.2.0
 before_install:
 - echo $LANG
 - echo $LC_ALL
-- if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update && sudo apt-get install -y libedit-dev llvm-3.6; fi
+- if [ $TRAVIS_OS_NAME == linux ]; then ./scripts/llvm.sh; fi
 - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install llvm; fi
-- rvm use $RVM --install --binary --fuzzy
 - gem update --system
 - gem --version
 before_script:
@@ -21,8 +24,6 @@ after_success:
 branches:
   only:
   - master
-  - 1.8.7
-  - 2.2
   - "/^v\\d+\\./"
 notifications:
   email: false
@@ -37,24 +38,10 @@ notifications:
     on_success: change
     on_failure: always
     on_start: always
-matrix:
-  exclude:
-  - compiler: clang
-  - os: linux
-  - os: osx
-  include:
-  - env: RVM=rbx-2
-    os: osx
-  - env: RVM=2.2.0
-    os: linux
-    compiler: clang
 env:
   global:
   - LANG="en_US.UTF-8"
   - RBXOPT=-Xint
   - secure: olbok/GN6rOYvPnHBYWGz7giCoCdLFpT/7WSBHukYO3E0uNeqAUOOgW2BFOwCVWdSEJ/iTvJXZQ4qVZHX+6jRfvILZeGv+D2P93VdD8UFQRoTOfFC7esAo525s9fuKm9ehUGWZxlzGOBHHckky1jn6pEf8mlXAVM5e76dlH0fck=
   - secure: aqG9eB/PrzQ7XJQN6YX/00sNVvwSB77saxXQzguL2WFjAXB74h6168Hzq+awHtNX/vfOb6ta7fpWLHrA0D+gmZnvTR29VlP6nd0vs1tkdX1/jWbiBHjamRffp+NWVdKbJKYn5iLOGXcuUMOzY/opLKOdvxKZfkxGMxR2tTNLZUE=
   - secure: eElvNLjuFZAuixJdgom4Kv8RDziE4ArFcSEwYctvprMe/414CAaJcFkjQKg0RrJzAxZ51oGjdcZhEfmjNXcUU1gA5l++IdnlQm0x4kt8r7aql+q2geHzrrjhhwPujT9a8JNtXs6dHnbi+quNlxyVItWzeGJsjyhJzH8hxiFhCYI=
-os:
-- linux
-- osx
diff --git a/Gemfile.installed b/Gemfile.installed
@@ -8,7 +8,7 @@ gem "daedalus-core", "~> 0.1"
 gem "rubinius-build_tools", "~> 2.0"
 gem "rubinius-developer_tools", "~> 2.0"
 
-gem "rubysl", "~> 2.0"
+gem "rubysl", "~> 2.2"
 gem "rubysl-test-unit", "~> 2.0"
 gem "minitest", "~> 4.7"
 gem "racc", "~> 1.4"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     daedalus-core (0.5.0)
-    rake (10.4.2)
+    rake (10.5.0)
     redcard (1.1.0)
     rubinius-ast (2.3.2)
     rubinius-bridge (1.1.0)

diff --git a/README b/README
@@ -11,10 +11,15 @@ Rubinius runs on Mac OS X and many Unix/Linux operating systems.  Microsoft
 Windows is not yet supported.
 
 
-2. The Ruby Programming Language
+2. Code of Conduct
+
+Participation in the Rubinius project is governed by the Rubinius Code of
+Conduct. See http://rubinius.com/code-of-conduct/
+
+3. The Ruby Programming Language
 
 Many popular Ruby applications, like Rails, run on Rubinius, which aims to be
-compatible with Ruby version 2.1.
+compatible with Ruby version 2.2.
 
 Rubinius includes a Ruby parser, Ruby bytecode compiler, Ruby core library,
 and C-API compatibility for native C extensions. The Ruby core library is
@@ -33,13 +38,13 @@ The following Ruby features are not supported on Rubinius:
 * $SAFE levels
 
 
-3. License
+4. License
 
 Rubinius uses the MPL-2.0 license. See LICENSE for details. Contributions made
 prior to January 3rd, 2016 are licensed under the old BSD 3-clause license. A
 copy of this license can be found in the file "BSD_LICENSE".
 
-4. Installing Rubinius from Source
+5. Installing Rubinius from Source
 
 To install Rubinius, use the following steps:
 
@@ -56,21 +61,21 @@ information see http://rubinius.com/doc/en/getting-started/requirements/
 and http://rubinius.com/doc/en/getting-started/building/.
 
 
-5. Using RubyGems
+6. Using RubyGems
 
 Rubinius comes with RubyGems built-in. To install a gem, run the following:
 
   $ rbx -S gem install <gem_name>
 
 
-6. Documentation
+7. Documentation
 
 The Rubinius documentation is available at the Rubinius website:
 
   http://rubinius.com
 
 
-7. Issues & Support
+8. Issues & Support
 
 Please file tickets for bugs or problems. The issue tracker is:
 
@@ -81,7 +86,7 @@ For additional help, visit the Rubinius Gitter chat room:
   https://gitter.im/rubinius/rubinius
 
 
-8. Contributing
+9. Contributing
 
 The Rubinius team welcomes contributions. For more information, read the
 CONTRIBUTING file in the root directory of Rubinius.
diff --git a/README.md b/README.md
@@ -9,10 +9,15 @@ Rubinius includes a bytecode virtual machine, generational garbage collector, an
 Rubinius runs on Mac OS X and many Unix/Linux operating systems.  Microsoft Windows is not yet supported.
 
 
+### Code of Conduct
+
+Participation in the Rubinius project is governed by the Rubinius [Code of
+Conduct](http://rubinius.com/code-of-conduct/).
+
 ### The Ruby Programming Language
 
 Many popular Ruby applications, like Rails, run on Rubinius, which aims to be
-compatible with Ruby version 2.1.
+compatible with Ruby version 2.2.
 
 Rubinius includes a Ruby parser, Ruby bytecode compiler, Ruby core library,
 and C-API compatibility for native C extensions. The Ruby core library is

diff --git a/configure b/configure
@@ -77,6 +77,7 @@ class Configure
     @dtrace_const = false
     @have_lchmod  = false
     @have_lchown  = false
+    @have_mkfifo  = false
     @debug_build  = false
     @include_dirs = []
     @lib_dirs     = []
@@ -1280,6 +1281,10 @@ int main() { return tgetnum(""); }
     if has_function("lchown", ["sys/stat.h", "unistd.h"])
       @have_lchown = true
     end
+
+    if has_function("mkfifo", ["sys/stat.h", "sys/types.h"])
+      @have_mkfifo = true
+    end
   end
 
   def detect_structures
@@ -1641,6 +1646,7 @@ int main() { return tgetnum(""); }
 #define RBX_LIBC             "#{@libc}"
 #define RBX_HAVE_LCHMOD      #{@have_lchmod}
 #define RBX_HAVE_LCHOWN      #{@have_lchown}
+#define RBX_HAVE_MKFIFO      #{@have_mkfifo}
 #define RBX_DEBUG_BUILD      #{@debug_build.inspect}
       EOC
 

diff --git a/dockerfiles/ubuntu/14.04/Dockerfile b/dockerfiles/ubuntu/14.04/Dockerfile
diff --git a/dockerfiles/ubuntu/15.10/Dockerfile b/dockerfiles/ubuntu/15.10/Dockerfile
diff --git a/gems_list.txt b/gems_list.txt
@@ -5,7 +5,7 @@ json-1.8.3.gem
 minitest-4.7.5.gem
 psych-2.0.17.gem
 racc-1.4.14.gem
-rake-10.4.2.gem
+rake-10.5.0.gem
 rb-readline-0.5.3.gem
 rdoc-4.2.1.gem
 redcard-1.1.0.gem
@@ -20,7 +20,7 @@ rubinius-melbourne-2.3.1.0.gem
 rubinius-processor-2.3.0.gem
 rubinius-profiler-2.0.2.gem
 rubinius-toolset-2.3.1.gem
-rubysl-2.1.0.gem
+rubysl-2.2.0.gem
 rubysl-abbrev-2.0.4.gem
 rubysl-base64-2.0.0.gem
 rubysl-benchmark-2.0.1.gem
@@ -70,9 +70,9 @@ rubysl-net-smtp-2.0.1.gem
 rubysl-net-telnet-2.0.0.gem
 rubysl-nkf-2.0.1.gem
 rubysl-observer-2.0.0.gem
-rubysl-open-uri-2.0.0.gem
 rubysl-open3-2.0.0.gem
 rubysl-openssl-2.8.0.gem
+rubysl-open-uri-2.0.0.gem
 rubysl-optparse-2.0.1.gem
 rubysl-ostruct-2.1.0.gem
 rubysl-pathname-2.1.0.gem
@@ -93,7 +93,7 @@ rubysl-securerandom-2.0.0.gem
 rubysl-set-2.0.1.gem
 rubysl-shellwords-2.0.0.gem
 rubysl-singleton-2.0.0.gem
-rubysl-socket-2.1.0.gem
+rubysl-socket-2.1.1.gem
 rubysl-stringio-2.0.0.gem
 rubysl-strscan-2.0.0.gem
 rubysl-sync-2.0.0.gem
@@ -107,6 +107,7 @@ rubysl-timeout-2.0.0.gem
 rubysl-tmpdir-2.0.1.gem
 rubysl-tsort-2.0.1.gem
 rubysl-un-2.0.0.gem
+rubysl-unicode_normalize-2.0.gem
 rubysl-uri-2.0.0.gem
 rubysl-weakref-2.0.0.gem
 rubysl-webrick-2.0.0.gem

diff --git a/kernel/bootstrap/io.rb b/kernel/bootstrap/io.rb
@@ -145,13 +145,6 @@ def socket_recv(bytes, flags, type)
     raise PrimitiveFailure, "io_socket_read failed"
   end
 
-  module Socketable
-    def accept
-      Rubinius.primitive :io_accept
-      raise PrimitiveFailure, "io_accept failed"
-    end
-  end
-
   module TransferIO
     def send_io
       Rubinius.primitive :io_send_io

diff --git a/kernel/common/argf.rb b/kernel/common/argf.rb
@@ -330,6 +330,7 @@ def readbyte
     def read(bytes=nil, output=nil)
       # The user might try to pass in nil, so we have to check here
       output ||= default_value
+      output.clear
 
       if bytes
         bytes_left = bytes
@@ -401,6 +402,27 @@ def readlines(sep=$/)
 
     alias_method :to_a, :readlines
 
+    def readpartial(maxlen, output=nil)
+      output ||= default_value
+
+      unless advance!
+        output.clear
+        raise EOFError, "ARGF at end"
+      end
+
+      begin
+        @stream.readpartial(maxlen, output)
+      rescue EOFError => e
+        raise e if @use_stdin_only
+
+        @stream.close
+        @advance = true
+        advance! or raise e
+      end
+
+      return output
+    end
+
     #
     # Rewind the stream to its beginning.
     #