bcrypt-ruby 3.1.1.rc1-java → 3.1.2-java

data/.gitignore

@@ -1,6 +1,7 @@
 *.o
 *.bundle
 *.so
+*.jar
 ext/mri/Makefile
 doc
 pkg

data/CHANGELOG

@@ -53,3 +53,7 @@
 
 3.1.1  Jul 10 2013
   - Remove support for Ruby 1.8 in compiled win32 binaries
+
+3.1.2  Aug 26 2013
+  - Add support for Ruby 1.8 and 2.0 (in addition to 1.9) in compiled Windows binaries
+  - Add support for 64-bit Windows

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bcrypt-ruby (3.1.1.rc1)
+    bcrypt-ruby (3.1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -9,8 +9,8 @@ GEM
     diff-lcs (1.2.4)
     json (1.7.3)
     json (1.7.3-java)
-    rake (10.0.4)
-    rake-compiler (0.8.3)
+    rake (10.1.0)
+    rake-compiler (0.9.1)
       rake
     rdoc (3.12)
       json (~> 1.4)
@@ -26,9 +26,9 @@ GEM
 PLATFORMS
   java
   ruby
-  x86-mingw32
 
 DEPENDENCIES
   bcrypt-ruby!
-  rake-compiler
- 
+  rake-compiler (~> 0.9.0)
+  rdoc
+  rspec

data/Rakefile

@@ -57,12 +57,7 @@ else
   Rake::ExtensionTask.new("bcrypt_ext", GEMSPEC) do |ext|
     ext.ext_dir = 'ext/mri'
     ext.cross_compile = true
-    ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
-
-    # inject 1.8/1.9 pure-ruby entry point
-    ext.cross_compiling do |spec|
-      spec.files += ["lib/#{ext.name}.rb"]
-    end
+    ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60', 'x64-mingw32']
   end
 end
 
@@ -72,4 +67,8 @@ task :benchmark do
   TEST_PWD = "this is a test"
   require File.expand_path(File.join(File.dirname(__FILE__), "lib", "bcrypt"))
   Benchmark.bmbm do |results|
-    4.upto(1
+    4.upto(10) do |n|
+      results.report("cost #{n}:") { TESTS.times { BCrypt::Password.create(TEST_PWD, :cost => n) } }
+    end
+  end
+end

data/bcrypt-ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'bcrypt-ruby'
-  s.version = '3.1.1.rc1'
+  s.version = '3.1.2'
 
   s.summary = "OpenBSD's bcrypt() password hashing algorithm."
   s.description = <<-EOF
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.require_path = 'lib'
 
-  s.add_development_dependency 'rake-compiler'
+  s.add_development_dependency 'rake-compiler', '~> 0.9.0'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rdoc'
 

data/lib/bcrypt.rb

@@ -9,7 +9,13 @@ else
   require "openssl"
 end
 
-require 'bcrypt_ext'
+begin
+  RUBY_VERSION =~ /(\d+.\d+)/
+  require "#{$1}/bcrypt_ext"
+rescue LoadError
+  require "bcrypt_ext"
+end
+
 require 'bcrypt/error'
 require 'bcrypt/engine'
 require 'bcrypt/password'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bcrypt-ruby
 version: !ruby/object:Gem::Version
-  prerelease: 6
-  version: 3.1.1.rc1
+  prerelease:
+  version: 3.1.2
 platform: java
 authors:
 - Coda Hale
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
     none: false
   prerelease: false
   type: :development
@@ -128,13 +128,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      segments:
+      - 0
+      hash: 2
+      version: '0'
   none: false
 requirements: []
 rubyforge_project: bcrypt-ruby
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key:
 specification_version: 3
 summary: OpenBSD's bcrypt() password hashing algorithm.