bcrypt-ruby 3.1.1 → 3.1.2.rc1

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 23 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)
+    bcrypt-ruby (3.1.2.rc1)
 
 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)
@@ -30,6 +30,6 @@ PLATFORMS
 
 DEPENDENCIES
   bcrypt-ruby!
-  rake-compiler
+  rake-compiler (~> 0.9.0)
   rdoc
   rspec

data/README.md

@@ -31,13 +31,13 @@ re-hash those passwords. This vulernability only affected the JRuby gem.
 The bcrypt-ruby gem is available on the following ruby platforms:
 
 * JRuby
-* RubyInstaller 1.9 builds on win32
-* Any 1.8 or 1.9 ruby on a BSD/OSX/Linux system with a compiler
+* RubyInstaller 1.8, 1.9, and 2.0 builds on win32
+* Any 1.8, 1.9, or 2.0 ruby on a BSD/OSX/Linux system with a compiler
 
 ## How to use `bcrypt()` in your Rails application
 
 *Note*: Rails versions >= 3 ship with `ActiveModel::SecurePassword` which uses bcrypt-ruby.
-`has_secure_password` [docs](http://api.rubyonrails.org/classes/ActiveModel/SecurePassword/ClassMethods.html#method-i-has_secure_password) 
+`has_secure_password` [docs](http://api.rubyonrails.org/classes/ActiveModel/SecurePassword/ClassMethods.html#method-i-has_secure_password)
 implements a similar authentication strategy to the code below.
 
 ### The _User_ model

data/Rakefile

@@ -57,7 +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']
+    ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60', 'x64-mingw32']
   end
 end
 

data/bcrypt-ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'bcrypt-ruby'
-  s.version = '3.1.1'
+  s.version = '3.1.2.rc1'
 
   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,32 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: bcrypt-ruby
 version: !ruby/object:Gem::Version
-  version: 3.1.1
-  prerelease: 
+  version: 3.1.2.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Coda Hale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -124,16 +124,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 295284865
+      hash: -3767283421835516157
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 295284865
+      version: 1.3.1
 requirements: []
 rubyforge_project: bcrypt-ruby
 rubygems_version: 1.8.25