rubinius-melbourne 1.0.0.8 → 1.1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb72a9db981661e5e142f9777ef56e5d97979cee
-  data.tar.gz: 71560defeacf5ba515cd222a11a3bfb769d408d3
+  metadata.gz: b188777f947911e3fb23967ada0b692a1e5b4233
+  data.tar.gz: 20e1ca1dc23c54693eae04d2fe64655f57d63b54
 SHA512:
-  metadata.gz: 275ade924575a3616c7123cb4f2f85f5321fa4da84c0495cd2ecb395638fff4a93243f2f832cb49d63ab82eb04242986f16bd8410502f4d89362112b92a92cbb
-  data.tar.gz: 4a2e038241edbe313fbae288e7679657cbdebb25e5797292af2cc3de8de4a517907a2329238715b76aa8401e6f8bd03262a688a81d8efb1418d2d5132d75d21b
+  metadata.gz: 61766445e09b8e2784926fc9a933d624d368b93981fb8da5cfe812e655b35ba11d375e75f3da275f43f7d95b00898b6b623a8cd834005ec44e9328fd3232dd9f
+  data.tar.gz: b72dc888959e1fb54a048f800ceac07c8dfee1eaf799ea7e1d549abf8336ea7db0cc150d2501aa7bc9b3a446a268cc292908e910df5bc9fa362e7e5451997530

data/.gitignore

@@ -21,3 +21,4 @@ tmp
 .rbx
 Makefile
 namespace.h
+.spec_ruby_version

data/ext/rubinius/melbourne/extconf.rb

@@ -1,10 +1,11 @@
 require 'rbconfig'
 
-# Fake out Rubinius::ToolSet for bootstrapping
+# Fake out Rubinius::ToolSets for bootstrapping
 module Rubinius
-  module ToolSet
+  module ToolSets
     def self.current
       @current ||= Module.new
+      @current.const_set :ToolSet, @current
     end
   end
 end
@@ -13,14 +14,21 @@ require File.expand_path("../../../../lib/rubinius/melbourne/version", __FILE__)
 
 path = File.expand_path "../namespace.h", __FILE__
 File.open path, "wb" do |f|
-  version = Rubinius::ToolSet.current::TS::Melbourne::VERSION
+  version = Rubinius::ToolSets.current::ToolSet::Melbourne::VERSION
+
+  if ENV["MELBOURNE_SPEC_VERSION"]
+    # Alter the version to not match any possible loaded version
+    version = version.split(".").map { |x| x + 1 }.join(".")
+  end
+
   melbourne = "melbourne_#{version.gsub(/\./, "_")}"
+
   f.puts "#define MELBOURNE                 #{melbourne}"
   f.puts "#define MELBOURNE_FILE_TO_AST     #{melbourne}_file_to_ast"
   f.puts "#define MELBOURNE_STRING_TO_AST   #{melbourne}_string_to_ast"
 end
 
-unless File.exists? "Makefile" and
+unless File.exist? "Makefile" and
     File.mtime("Makefile") > File.mtime(__FILE__)
   cxx = ENV["CXX"] || RbConfig::CONFIG["CXX"] || "g++"
   cxxflags = "#{ENV["CXXFLAGS"] || ENV["CPPFLAGS"] ||
@@ -37,7 +45,7 @@ unless File.exists? "Makefile" and
   archincdirs = []
   incdirs.each do |x|
     dir = "#{x}/#{RbConfig::CONFIG["arch"]}"
-    archincdirs << dir if File.exists? dir
+    archincdirs << dir if File.exist? dir
   end
   incdirs.concat archincdirs
 
@@ -101,7 +109,7 @@ unless File.exists? "Makefile" and
   dldflags = ENV["LDFLAGS"] || RbConfig::CONFIG["LDFLAGS"] || ""
   dldflags += " #{RbConfig::CONFIG["DLDFLAGS"]}"
   libpath = "-L. -L#{RbConfig::CONFIG["libdir"]}"
-  libs = RbConfig::CONFIG["LIBS"]
+  libs = "#{RbConfig::CONFIG["LIBS"]} #{RbConfig::CONFIG["LIBRUBYARG_SHARED"]}"
   install_path = Dir.pwd.sub %r[/ext/rubinius/melbourne$], "/lib/rubinius/melbourne"
 
   File.open "Makefile", "wb" do |f|

data/ext/rubinius/melbourne/melbourne.cpp

@@ -37,7 +37,7 @@ VALUE MELBOURNE_FILE_TO_AST(VALUE self, VALUE fname, VALUE start) {
 }
 
 void Init_melbourne(void) {
-  VALUE rb_cMelbourne, rb_mToolSet, rb_mTScurrent, rb_mTS;
+  VALUE rb_cMelbourne, rb_mToolSets, rb_mToolSet;
 
   MELBOURNE::init_symbols();
 
@@ -45,10 +45,9 @@ void Init_melbourne(void) {
   VALUE rb_mRubinius = rb_const_get(rb_cObject, rb_intern("Rubinius"));
 #endif
 
-  rb_mToolSet = rb_const_get(rb_mRubinius, rb_intern("ToolSet"));
-  rb_mTScurrent = rb_funcall(rb_mToolSet, rb_intern("current"), 0);
-  rb_mTS = rb_define_module_under(rb_mTScurrent, "TS");
-  rb_cMelbourne = rb_define_class_under(rb_mTS, "Melbourne", rb_cObject);
+  rb_mToolSets = rb_const_get(rb_mRubinius, rb_intern("ToolSets"));
+  rb_mToolSet = rb_funcall(rb_mToolSets, rb_intern("current"), 0);
+  rb_cMelbourne = rb_define_class_under(rb_mToolSet, "Melbourne", rb_cObject);
   rb_define_method(rb_cMelbourne, "string_to_ast",
       RUBY_METHOD_FUNC(MELBOURNE_STRING_TO_AST), 3);
   rb_define_method(rb_cMelbourne, "file_to_ast",

data/lib/rubinius/melbourne/version.rb

@@ -1,5 +1,5 @@
-module Rubinius::ToolSet.current::TS
+module Rubinius::ToolSets.current::ToolSet
   class Melbourne
-    VERSION = "1.0.0.8"
+    VERSION = "1.1.0.0"
   end
 end

data/lib/rubinius/melbourne.rb

@@ -3,7 +3,7 @@ require "rubinius/melbourne/version"
 
 class String
   def to_ast(name="(eval)", line=1)
-    Rubinius::ToolSet.get(:runtime)::Melbourne.parse_string self, name, line
+    Rubinius::ToolSets.get(:runtime)::Melbourne.parse_string self, name, line
   end
 
   def to_sexp(name="(eval)", line=1)
@@ -13,7 +13,7 @@ end
 
 class File
   def self.to_ast(name, line=1)
-    Rubinius::ToolSet.get(:runtime)::Melbourne.parse_file name, line
+    Rubinius::ToolSets.get(:runtime)::Melbourne.parse_file name, line
   end
 
   def self.to_sexp(name, line=1)
@@ -21,7 +21,7 @@ class File
   end
 end
 
-module Rubinius::ToolSet.current::TS
+module Rubinius::ToolSets.current::ToolSet
   class Melbourne
     attr_accessor :transforms
     attr_accessor :magic_handler
@@ -74,7 +74,7 @@ module Rubinius::ToolSet.current::TS
     end
 
     def parse_file
-      unless @name and File.exists? @name
+      unless @name and File.exist? @name
         raise Errno::ENOENT, @name.inspect
       end
 

data/rubinius-melbourne.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "rubinius-melbourne"
   gem.require_paths = ["lib"]
-  gem.version       = Rubinius::ToolSet.current::TS::Melbourne::VERSION
+  gem.version       = Rubinius::ToolSets.current::ToolSet::Melbourne::VERSION
 
-  gem.add_runtime_dependency      "rubinius-toolset"
+  gem.add_runtime_dependency      "rubinius-toolset", "~> 2.0"
 
   gem.add_development_dependency  "mspec", "~> 1.5"
   gem.add_development_dependency  "rake",  "~> 10.0"

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: rubinius-melbourne
 version: !ruby/object:Gem::Version
-  version: 1.0.0.8
+  version: 1.1.0.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubinius-toolset
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: '2.0'
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: mspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+  prerelease: false
+  type: :development
 description: Ruby parser extracted from MRI.
 email:
 - brixen@gmail.com
@@ -60,7 +60,7 @@ extensions:
 - ext/rubinius/melbourne/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -102,18 +102,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rubinius Ruby Parser.
 test_files: []
+has_rdoc: