yaji 0.3.4-x86-mingw32 → 0.3.5-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19f59d651042624fb13bc072062927ae2bb5c9f2
-  data.tar.gz: df67a99c5caae29c93a1c52b8b0261dd796070b5
+  metadata.gz: 263c651ab68fe37c3bb72d91ee17816286367e5b
+  data.tar.gz: 2e4850e26e2e61d3d40bfeb62681c8c5e85623fe
 SHA512:
-  metadata.gz: 389eda49510ecc977015cceb9f0e65e257773e17e5ab5a566f585a6152e9687308691421c5b757ce684e447b3949f144f6abcd7d66c236b4f9eb16755fed8a7c
-  data.tar.gz: b5ad0c638084e1356c100d3125def2ed35472ce8bf587a3e81d9b81b0f7f97941192dd53c58377e33955b9a1321ffd8f4875f22e28d0b35c7e4ebcabc430d06b
+  metadata.gz: dc32cb0d9d1770dc28e6962f2e7435e1612526d9c754b22288a7bf37be6328525ff08df4d47db33627d4577813c9de03109b787761fdb3df0cfa1f011e2a699c
+  data.tar.gz: 01a642d3757112477a44fe5448bb10022aeaf320c6d7c999c248acd4a0f6694164bcf94d61e6712788a868d6fcbe9d48c86bccfbb1ca47776ec01303b4ab946f

data/HISTORY.markdown

@@ -1,4 +1,8 @@
-=== 0.3.4 / 2012-06-05
+=== 0.3.5 / 2014-01-08
+
+* Build 64-bit versions for windows
+
+=== 0.3.4 / 2013-07-19
 
 * Build gem for ruby 2.0.0 on windows
 

data/lib/yaji/version.rb

@@ -18,5 +18,5 @@
 #
 
 module YAJI
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/tasks/compile.rake

@@ -18,17 +18,46 @@ version_router = lambda do |t|
   end
 end
 
+class Platform
+  attr_reader :name, :host, :versions
+
+  def initialize(params)
+    @name = params[:name]
+    @host = params[:host]
+    @versions = params[:versions]
+  end
+
+  def each_version
+    @versions.each do |v|
+      yield(v, v[/\d\.\d\.\d/])
+    end
+  end
+
+  def short_versions
+    res = []
+    each_version do |long, short|
+      res << short
+    end
+    res
+  end
+end
+
+recent = "2.0.0-p353"
+CROSS_PLATFORMS = [
+  Platform.new(:name => 'x64-mingw32', :host => 'x86_64-w64-mingw32', :versions => %w(1.9.3-p484 2.0.0-p353 2.1.0)),
+  Platform.new(:name => 'x86-mingw32', :host => 'i686-w64-mingw32', :versions => %w(1.8.7-p374 1.9.3-p484 2.0.0-p353 2.1.0)),
+]
 Rake::ExtensionTask.new("parser_ext", gemspec) do |ext|
   ext.ext_dir = File.join('ext', 'yaji')
 
   ext.cross_compile = true
-  ext.cross_platform = ENV['HOST'] || "i386-mingw32"
+  ext.cross_platform = ENV['TARGET']
   if ENV['RUBY_CC_VERSION']
     ext.lib_dir = "lib/yaji"
   end
   ext.cross_compiling do |spec|
     spec.files.delete("lib/yaji/parser_ext.so")
-    spec.files.push("lib/parser_ext.rb", Dir["lib/yaji/{1.8,1.9,2.0}/parser_ext.so"])
+    spec.files.push("lib/parser_ext.rb", Dir["lib/yaji/*/parser_ext.so"])
     file "#{ext.tmp_dir}/#{ext.cross_platform}/stage/lib/parser_ext.rb", &version_router
   end
 
@@ -41,8 +70,11 @@ task :cross => "lib/parser_ext.rb"
 
 desc "Package gem for windows"
 task "package:windows" => :package do
-  sh("env RUBY_CC_VERSION=1.8.7 RBENV_VERSION=1.8.7-p370 rbenv exec bundle exec rake cross compile")
-  sh("env RUBY_CC_VERSION=1.9.2 RBENV_VERSION=1.9.2-p320 rbenv exec bundle exec rake cross compile")
-  sh("env RUBY_CC_VERSION=2.0.0 RBENV_VERSION=2.0.0-p247 rbenv exec bundle exec rake cross compile")
-  sh("env RUBY_CC_VERSION=1.8.7:1.9.2:2.0.0 RBENV_VERSION=1.9.2-p320 rbenv exec bundle exec rake cross native gem")
+  CROSS_PLATFORMS.each do |platform|
+    ENV['TARGET'] = platform.name
+    platform.each_version do |long, short|
+      sh("env RUBY_CC_VERSION=#{short} RBENV_VERSION=#{long} rbenv exec rake cross compile")
+    end
+    sh("env RUBY_CC_VERSION=#{platform.short_versions.join(":")} RBENV_VERSION=#{recent} rbenv exec rake cross native gem")
+  end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: yaji
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: x86-mingw32
 authors:
 - Couchbase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: YAJI is a ruby wrapper to YAJL providing iterator interface to streaming
@@ -112,6 +112,7 @@ files:
 - lib/yaji/1.8/parser_ext.so
 - lib/yaji/1.9/parser_ext.so
 - lib/yaji/2.0/parser_ext.so
+- lib/yaji/2.1/parser_ext.so
 - lib/parser_ext.rb
 homepage: https://github.com/avsej/yaji
 licenses:
@@ -123,18 +124,20 @@ 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: yaji
-rubygems_version: 2.0.7
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Yet another JSON iterator
-test_files: []
+test_files:
+- test/fixture.json
+- test/test_parser.rb