yaji 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  data.tar.gz: 6ddfe6f9729133f80c96e5ac612e5205f8f755b4
-  metadata.gz: 25851b5682ae696c24bbedd44cae92f8e78edb9c
-SHA512: 
-  data.tar.gz: baec4d3c875fd6b9356d0051d944bb4ebbe6850231a1b0cb06eaf3b1c453c26cc2def4ee303608031d7e231ac32405d2965bce5448c5b3efd740872b161858c1
-  metadata.gz: 7e8cb24d2229f6b2edbcfa057652da586077d493755c6c2ddc59e8e71b9b1bd545512712255c4ee12a707f5eb2a8e3cc04584cea2dba061914bd0e827215d022
+---
+SHA1:
+  metadata.gz: 0e5f8dae5330310fa8f1990beea4585de902164d
+  data.tar.gz: 9d331dd0108a45a98dae652314551ddd5f2838a7
+SHA512:
+  metadata.gz: e83e521a5b33df3f781e858741518e8a9e9182a1c92168ce231e17f46b879a8e287f463109ea84cb4fd3404c9eb4e691b67903fa38291cfd7e21f52051dd59b2
+  data.tar.gz: 72e2634ae6d164fbdcfe3eab2172d4c7ade3d6d741ba4296fb56cf495a093fe03b8abe920cf6b65d896d60bb5f86766e976bcfac57dc4613d752bab22adb4c00

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,60 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: yaji
-version: !ruby/object:Gem::Version 
-  version: 0.3.4
+version: !ruby/object:Gem::Version
+  version: 0.3.5
 platform: ruby
-authors: 
+authors:
 - Couchbase
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-08-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id002 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
+date: 2014-01-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: rake-compiler
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  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
-  name: minitest
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  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: *id005
-description: YAJI is a ruby wrapper to YAJL providing iterator interface to streaming JSON parser
+  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
+  JSON parser
 email: info@couchbase.com
 executables: []
-
-extensions: 
+extensions:
 - ext/yaji/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -92,27 +111,29 @@ files:
 - test/test_parser.rb
 - yaji.gemspec
 homepage: https://github.com/avsej/yaji
-licenses: 
+licenses:
 - ASL-2
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
+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