nokogiri 1.5.7.rc2-java → 1.5.7.rc3-java

data/CHANGELOG.ja.rdoc

@@ -1,8 +1,15 @@
+
 == 1.5.x
 
 === 1.5.7 / unreleased
 
+* Features
+
+  * Windows support for Ruby 2.0.
+
+
 * Bugfixes
+
   * SAX::Parser.parse_io throw an error when used with lower case encoding. #828
   * (JRuby) Java Nokogiri is finally green (passes all tests) under 1.8 and 1.9 mode. High five everyone. #798, #705
   * (JRuby) Nokogiri::XML::Reader broken (as a pull parser) on jruby - reads the whole XML document. #831
@@ -32,6 +39,7 @@
 
 
 * Bugfixes
+
   * Nokogiri はこのバージョンからXSLT変換のエラーを検出するようになった。#731 (ありがとう、Justin Fitzsimmons!)
   * Don't throw an Error when trying to replace top-level text node in DocumentFragment. #775
   * SAXパーザに不正なエンコーディングに渡された場合はArgumentErrorを投げるようにした。#756 (ありがとう、Bradley Schaefer!)

data/CHANGELOG.rdoc

@@ -2,7 +2,13 @@
 
 === 1.5.7 / unreleased
 
+* Features
+
+  * Windows support for Ruby 2.0.
+
+
 * Bugfixes
+
   * SAX::Parser.parse_io throw an error when used with lower case encoding. #828
   * (JRuby) Java Nokogiri is finally green (passes all tests) under 1.8 and 1.9 mode. High five everyone. #798, #705
   * (JRuby) Nokogiri::XML::Reader broken (as a pull parser) on jruby - reads the whole XML document. #831
@@ -32,6 +38,7 @@
 
 
 * Bugfixes
+
   * Nokogiri now detects XSLT transform errors. #731 (Thanks, Justin Fitzsimmons!)
   * Don't throw an Error when trying to replace top-level text node in DocumentFragment. #775
   * Raise an ArgumentError if an invalid encoding is passed to the SAX parser. #756 (Thanks, Bradley Schaefer!)

data/Rakefile

@@ -7,7 +7,7 @@ Hoe.plugin :debugging
 Hoe.plugin :git
 Hoe.plugin :gemspec
 Hoe.plugin :bundler
-Hoe.add_include_dirs '.' # for ruby 1.9.2
+Hoe.add_include_dirs '.'
 
 GENERATED_PARSER    = "lib/nokogiri/css/parser.rb"
 GENERATED_TOKENIZER = "lib/nokogiri/css/tokenizer.rb"
@@ -35,7 +35,7 @@ HOE = Hoe.spec 'nokogiri' do
   self.clean_globs += [
     'nokogiri.gemspec',
     'lib/nokogiri/nokogiri.{bundle,jar,rb,so}',
-    'lib/nokogiri/1.{8,9}',
+    'lib/nokogiri/{1.8,1.9,2.0}',
     # GENERATED_PARSER,
     # GENERATED_TOKENIZER
   ]
@@ -48,7 +48,7 @@ HOE = Hoe.spec 'nokogiri' do
     ["mini_portile",    ">= 0.2.2"],
     ["minitest",        "~> 2.2.2"],
     ["rake",            ">= 0.9"],
-    ["rake-compiler",   "=  0.8.0"],
+    ["rake-compiler",   "~> 0.8.0"],
     ["racc",            ">= 1.4.6"],
     ["rexical",         ">= 1.0.5"]
   ]
@@ -194,7 +194,7 @@ end
 
 desc "build a windows gem without all the ceremony."
 task "gem:windows" => "gem" do
-  cross_rubies = ["1.8.7-p358", "1.9.3-p194"]
+  cross_rubies = ["1.8.7-p358", "1.9.3-p194", "2.0.0-p0"]
   ruby_cc_version = cross_rubies.collect { |_| _.split("-").first }.join(":") # e.g., "1.8.7:1.9.2"
   rake_compiler_config_path = "#{ENV['HOME']}/.rake-compiler/config.yml"
 
@@ -215,9 +215,12 @@ task "gem:windows" => "gem" do
   end
 
   # verify that --export-all is in the 1.9 rbconfig. see #279,#374,#375.
-  rbconfig_19 = rake_compiler_config["rbconfig-1.9.2"]
+  rbconfig_19 = rake_compiler_config["rbconfig-1.9.3"]
   raise "rbconfig #{rbconfig_19} needs --export-all in its DLDFLAGS value" if File.read(rbconfig_19).split("\n").grep(/CONFIG\["DLDFLAGS"\].*--export-all/).empty?
 
+  rbconfig_20 = rake_compiler_config["rbconfig-2.0.0"]
+  raise "rbconfig #{rbconfig_20} needs --export-all in its DLDFLAGS value" if File.read(rbconfig_20).split("\n").grep(/CONFIG\["DLDFLAGS"\].*--export-all/).empty?
+
   pkg_config_path = %w[libxslt libxml2].collect { |pkg| File.join($recipes[pkg].path, "lib/pkgconfig") }.join(":")
   sh("env PKG_CONFIG_PATH=#{pkg_config_path} RUBY_CC_VERSION=#{ruby_cc_version} rake cross native gem") || raise("build failed!")
 end

data/build_all

@@ -82,6 +82,9 @@ fi
 if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-1.9.3-p194/lib/ruby/1.9.1/x86_64-linux/rbconfig.rb ]] ; then
     bundle exec rake-compiler cross-ruby VERSION=1.9.3-p194
 fi
+if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-2.0.0-p0/lib/ruby/2.0.0/x86_64-linux/rbconfig.rb ]] ; then
+    bundle exec rake-compiler cross-ruby VERSION=2.0.0-p0
+fi
 bundle exec rake cross
 bundle exec rake gem:windows
 cp -v pkg/nokogiri*x86-{mingw32,mswin32}*.gem gems

data/ext/nokogiri/extconf.rb

@@ -8,6 +8,7 @@ RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
 ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 LIBDIR = RbConfig::CONFIG['libdir']
+@libdir_basename = "lib" # shrug, ruby 2.0 won't work for me.
 INCLUDEDIR = RbConfig::CONFIG['includedir']
 
 if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'macruby'

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.5.7.rc2'
+  VERSION = '1.5.7.rc3'
 
   class VersionInfo # :nodoc:
     def jruby?

data/tasks/cross_compile.rb

@@ -48,7 +48,7 @@ namespace :cross do
       end
     end
 
-    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
+    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
     unless File.exist?(checkpoint)
       recipe.cook
       touch checkpoint
@@ -69,7 +69,7 @@ namespace :cross do
       "LDFLAGS=-mno-cygwin"
     ]
 
-    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
+    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
     unless File.exist?(checkpoint)
       recipe.cook
       touch checkpoint
@@ -100,7 +100,7 @@ namespace :cross do
       end
     end
 
-    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
+    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
     unless File.exist?(checkpoint)
       recipe.cook
       touch checkpoint
@@ -130,7 +130,7 @@ namespace :cross do
       end
     end
 
-    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
+    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
     unless File.exist?(checkpoint)
       recipe.cook
       touch checkpoint
@@ -140,7 +140,7 @@ namespace :cross do
 
   task :file_list do
     HOE.spec.files += Dir["lib/nokogiri/nokogiri.rb"]
-    HOE.spec.files += Dir["lib/nokogiri/1.{8,9}/nokogiri.so"]
+    HOE.spec.files += Dir["lib/nokogiri/{1.8,1.9,2.0}/nokogiri.so"]
   end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: nokogiri
 version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 1.5.7.rc2
+  version: 1.5.7.rc3
 platform: java
 authors:
 - Aaron Patterson
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
@@ -130,13 +130,13 @@ dependencies:
   name: rake-compiler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
     none: false